author: Chris White <chriswhite@gentoo.org> 2005-11-30 09:38:30 +0000
committer: Chris White <chriswhite@gentoo.org> 2005-11-30 09:38:30 +0000
commit: 67c8b060271109f68d8b0a44de61d297ddfbe2e7 (patch)
tree: 42ce8164da9dd6d55caa82dfe6832b4a2a0a6ad5 /sys-devel
parent: *** empty log message *** (diff)
download: gentoo-2-67c8b060271109f68d8b0a44de61d297ddfbe2e7.tar.gz
gentoo-2-67c8b060271109f68d8b0a44de61d297ddfbe2e7.tar.bz2
gentoo-2-67c8b060271109f68d8b0a44de61d297ddfbe2e7.zip
309 files changed, 4327 insertions, 13220 deletions
diff --git a/sys-devel/ac-archive/ChangeLog b/sys-devel/ac-archive/ChangeLog
index bfcca9875763..8846dce78e35 100644
--- a/sys-devel/ac-archive/ChangeLog
+++ b/sys-devel/ac-archive/ChangeLog
@@ -1,24 +1,6 @@
 # ChangeLog for sys-devel/ac-archive
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/ac-archive/ChangeLog,v 1.6 2005/05/25 12:09:50 ka0ttic Exp $
-
-  25 May 2005; Aaron Walker <ka0ttic@gentoo.org> ac-archive-0.5.63.ebuild:
-  Stable on x86.
-
-  23 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> ac-archive-0.5.57.ebuild:
-  Marked stable on x86.
-
-*ac-archive-0.5.63 (03 Apr 2005)
-
-  03 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> +metadata.xml,
-  +ac-archive-0.5.63.ebuild:
-  Version bump; install the few html docs that come with. Added metadata.xml.
-
-  28 Sep 2004; Sven Wegener <swegener@gentoo.org> :
-  Gentoo Technologies, Inc. -> Gentoo Foundation
-
-  18 Jul 2004; David Holm <dholm@gentoo.org> ac-archive-0.5.57.ebuild:
-  Added to ~ppc.
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/ac-archive/ChangeLog,v 1.1 2004/07/18 06:32:40 vapier Exp $
 
 *ac-archive-0.5.57 (18 Jul 2004)
 
diff --git a/sys-devel/ac-archive/Manifest b/sys-devel/ac-archive/Manifest
index 2d244c0f50db..b84eaaac6842 100644
--- a/sys-devel/ac-archive/Manifest
+++ b/sys-devel/ac-archive/Manifest
@@ -1,16 +1,2 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 02f0faab9c684bb9631546a748173e9b ac-archive-0.5.57.ebuild 756
-MD5 a5978addaa1579bd0a47577406db891c ac-archive-0.5.63.ebuild 774
-MD5 48eececd9a4fd5086881590de09557d6 ChangeLog 943
-MD5 1fba9ec2e00f12eebab29e7b126af1f8 metadata.xml 608
+MD5 0ed65eceee4c9b7111515de2c940d312 ac-archive-0.5.57.ebuild 763
 MD5 ac9d7aa98a803fad73610d51fd658c97 files/digest-ac-archive-0.5.57 70
-MD5 64c826fdff2358653311b3d75124caed files/digest-ac-archive-0.5.63 70
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFClGsmEZCkKN40op4RAo3GAKCgUyvOCasbU+0ojivXrYDLz+QykACfcORZ
-Ysy9HNzuykILi7AXIR8e5dc=
-=QquO
------END PGP SIGNATURE-----
diff --git a/sys-devel/ac-archive/ac-archive-0.5.57.ebuild b/sys-devel/ac-archive/ac-archive-0.5.57.ebuild
index a17f77bab5ba..a4cf7d11fd3c 100644
--- a/sys-devel/ac-archive/ac-archive-0.5.57.ebuild
+++ b/sys-devel/ac-archive/ac-archive-0.5.57.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/ac-archive/ac-archive-0.5.57.ebuild,v 1.4 2005/04/23 11:35:08 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/ac-archive/ac-archive-0.5.57.ebuild,v 1.1 2004/07/18 06:32:40 vapier Exp $
 
 inherit fixheadtails
 
@@ -8,9 +8,9 @@ DESCRIPTION="The Autoconf Macro Archive"
 HOMEPAGE="http://ac-archive.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ac-archive/${P}.tar.bz2"
 
-LICENSE="|| ( BSD GPL-2 )"
+LICENSE="BSD | GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-devel/ac-archive/ac-archive-0.5.63.ebuild b/sys-devel/ac-archive/ac-archive-0.5.63.ebuild
index b9af2d332411..063f29d579c9 100644
--- a/sys-devel/ac-archive/ac-archive-0.5.63.ebuild
+++ b/sys-devel/ac-archive/ac-archive-0.5.63.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/ac-archive/ac-archive-0.5.63.ebuild,v 1.2 2005/05/25 12:09:50 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/ac-archive/ac-archive-0.5.63.ebuild,v 1.1 2005/04/03 05:37:30 ka0ttic Exp $
 
 inherit fixheadtails
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/ac-archive/${P}.tar.bz2"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~ppc x86"
+KEYWORDS="~x86 ~ppc"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-devel/autoconf-archive/ChangeLog b/sys-devel/autoconf-archive/ChangeLog
index 4de3cea0b481..ebf73d5b6f3c 100644
--- a/sys-devel/autoconf-archive/ChangeLog
+++ b/sys-devel/autoconf-archive/ChangeLog
@@ -1,24 +1,6 @@
 # ChangeLog for sys-devel/autoconf-archive
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-archive/ChangeLog,v 1.4 2005/08/18 02:00:32 vapier Exp $
-
-*autoconf-archive-2005.08.12 (18 Aug 2005)
-
-  18 Aug 2005; Mike Frysinger <vapier@gentoo.org>
-  +autoconf-archive-2005.08.12.ebuild:
-  Version bump #97887 by Peter Simons.
-
-*autoconf-archive-2005.06.17 (04 Jul 2005)
-
-  04 Jul 2005; Mike Frysinger <vapier@gentoo.org>
-  +autoconf-archive-2005.06.17.ebuild:
-  Version bump #97887 by Peter Simons.
-
-*autoconf-archive-2005.05.31 (01 Jun 2005)
-
-  01 Jun 2005; Mike Frysinger <vapier@gentoo.org>
-  +autoconf-archive-2005.05.31.ebuild:
-  Version bump #94736 by Peter Simons.
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-archive/ChangeLog,v 1.1 2005/04/28 04:16:52 vapier Exp $
 
 *autoconf-archive-2005.04.18 (28 Apr 2005)
 
diff --git a/sys-devel/autoconf-archive/Manifest b/sys-devel/autoconf-archive/Manifest
index 46a4ee1205b9..c291b5fbf17f 100644
--- a/sys-devel/autoconf-archive/Manifest
+++ b/sys-devel/autoconf-archive/Manifest
@@ -1,15 +1,2 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 38041a10de5d4b59c65e23e628872779 autoconf-archive-2005.08.12.ebuild 869
-MD5 afc5e38e833f5829c07f3b49de2fdc10 autoconf-archive-2005.06.17.ebuild 869
-MD5 73e86d05a4bd69e4c5e7f1099d28b32e ChangeLog 900
-MD5 d92a6c79beaad99c575eec23923c5bd5 files/digest-autoconf-archive-2005.06.17 80
-MD5 f5c27aca11d0164ba6e6dbffb9feb780 files/digest-autoconf-archive-2005.08.12 80
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDA+vagIKl8Uu19MoRAobXAJwMilFhRSPp7Myal7ZvuPJE5yN9EQCfciZ3
-kRzPGV9BV8V8VVn53nGQqsU=
-=FOHt
------END PGP SIGNATURE-----
+MD5 86af856586b926af9b2672da058721f0 autoconf-archive-2005.04.18.ebuild 663
+MD5 b85611ba16b0e6db771b88430aeb3024 files/digest-autoconf-archive-2005.04.18 80
diff --git a/sys-devel/autoconf-archive/autoconf-archive-2005.06.17.ebuild b/sys-devel/autoconf-archive/autoconf-archive-2005.06.17.ebuild
index 08d9f8c84f67..6f97106679b3 100644
--- a/sys-devel/autoconf-archive/autoconf-archive-2005.06.17.ebuild
+++ b/sys-devel/autoconf-archive/autoconf-archive-2005.06.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/sys-devel/autoconf-archive/autoconf-archive-2005.06.17.ebuild,v 1.2 2005/08/18 01:54:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-archive/autoconf-archive-2005.06.17.ebuild,v 1.1 2005/07/04 21:29:16 vapier Exp $
 
 MY_PV=${PV//./-}
 DESCRIPTION="GNU Autoconf Macro Archive"
@@ -9,7 +9,7 @@ SRC_URI="http://autoconf-archive.cryp.to/${PN}-${MY_PV}.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=""
diff --git a/sys-devel/autoconf-wrapper/ChangeLog b/sys-devel/autoconf-wrapper/ChangeLog
index 6ae967f14b0e..4e3b9b6a30fb 100644
--- a/sys-devel/autoconf-wrapper/ChangeLog
+++ b/sys-devel/autoconf-wrapper/ChangeLog
@@ -1,73 +1,6 @@
 # ChangeLog for sys-devel/autoconf-wrapper
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/ChangeLog,v 1.19 2005/09/09 23:15:24 azarah Exp $
-
-*autoconf-wrapper-3.2 (09 Sep 2005)
-
-  09 Sep 2005; Martin Schlemmer <azarah@gentoo.org>
-  +files/ac-wrapper-3.2.sh, +autoconf-wrapper-3.2.ebuild:
-  Remove awk compat crap as gawk now works on Darwin.
-
-  03 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org>
-  autoconf-wrapper-3-r1.ebuild:
-  stable on alpha
-
-  17 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
-  autoconf-wrapper-3-r1.ebuild:
-  ppc stable
-
-*autoconf-wrapper-3.1 (16 Jul 2005)
-
-  16 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
-  +files/ac-wrapper-3.1.sh, +autoconf-wrapper-3.1.ebuild:
-  Update to work with MacOS X.  Do not parse comments in acfiles.
-
-  12 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  autoconf-wrapper-3-r1.ebuild:
-  Stable on sparc
-
-  12 Jul 2005; Markus Rothe <corsair@gentoo.org>
-  autoconf-wrapper-3-r1.ebuild:
-  Stable on ppc64
-
-  11 Jul 2005; Danny van Dyk <kugelfang@gentoo.org>
-  autoconf-wrapper-3-r1.ebuild:
-  Marked stable on amd64.
-
-*autoconf-wrapper-3-r1 (30 Jun 2005)
-
-  30 Jun 2005; Martin Schlemmer <azarah@gentoo.org> files/ac-wrapper-3.sh,
-  +autoconf-wrapper-3-r1.ebuild:
-  Also check configure.{in,ac} for AC_PREREQ, bug #97470.
-
-*autoconf-wrapper-3 (28 Jun 2005)
-
-  28 Jun 2005; Martin Schlemmer <azarah@gentoo.org> +files/ac-wrapper-3.sh,
-  +autoconf-wrapper-3.ebuild:
-  Add logic to check automake aux files for AC_PREREQ and run required
-  autoconf version according to that. Some syntax cleanups.
-
-*autoconf-wrapper-2-r1 (08 Feb 2004)
-
-  08 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
-  Force people to re-emerge.
-
-*autoconf-wrapper-2 (05 Dec 2004)
-
-  05 Dec 2004; Mike Frysinger <vapier@gentoo.org> +files/ac-wrapper-2.sh,
-  +autoconf-wrapper-2.ebuild:
-  When guessing which version to run, dont try to use autoconf-2.1x if we are
-  running automake-1.7 or better.
-
-*autoconf-wrapper-1-r1 (05 Dec 2004)
-
-  05 Dec 2004; Mike Frysinger <vapier@gentoo.org>
-  +autoconf-wrapper-1-r1.ebuild, -autoconf-wrapper-1.ebuild:
-  Version bump to fix #73328.
-
-  13 Nov 2004; Mike Frysinger <vapier@gentoo.org> +files/ac-wrapper-1.sh,
-  autoconf-wrapper-1.ebuild:
-  Punt the perl version and use the bash version by Gregorio Guidi #66478.
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/ChangeLog,v 1.1 2004/10/21 01:06:11 vapier Exp $
 
 *autoconf-wrapper-1 (20 Oct 2004)
 
diff --git a/sys-devel/autoconf-wrapper/Manifest b/sys-devel/autoconf-wrapper/Manifest
index 097f8a235a6d..6ad3ccf061a2 100644
--- a/sys-devel/autoconf-wrapper/Manifest
+++ b/sys-devel/autoconf-wrapper/Manifest
@@ -1,23 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 84d41809a827ec0c2e3b3e0804c14886 autoconf-wrapper-2-r1.ebuild 811
-MD5 5893addbc67d6e0d2fff9560a7e5198f autoconf-wrapper-3.ebuild 821
-MD5 46a9fb7a4ebc3453feaf3a1dd2ca4d55 autoconf-wrapper-3-r1.ebuild 811
-MD5 20a8321cbe94e2019e9a141eb6e5ae44 ChangeLog 2581
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 00f8a5c43813f316ce9f6b09c67be559 autoconf-wrapper-3.2.ebuild 823
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-autoconf-wrapper-2-r1 0
-MD5 d4c9467b972dd2b40aa7a1b89d2226b6 files/ac-wrapper-2.sh 2717
-MD5 baa08513b5000a1ecf58715b8d654eae files/ac-wrapper-3.sh 3077
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-autoconf-wrapper-3 0
-MD5 0a542dd224e861aba771526c9b75edca files/ac-wrapper-3.2.sh 3242
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-autoconf-wrapper-3-r1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-autoconf-wrapper-3.2 0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDIikp1ZcsMnZjRyIRAuvDAJ90an2qnffyMkuaZQTG2ZaqNOPhMwCfaKK0
-ZB0Crn7PIPJz1ytR/TOMsCc=
-=56ne
------END PGP SIGNATURE-----
+MD5 6a6e2b7940d001808058faf33c9292b5 autoconf-wrapper-1.ebuild 422
+MD5 c07cd3cad0342c7c9ccafdb4f0ae8b03 files/ac-wrapper-1.pl 2785
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-autoconf-wrapper-1 0
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-2-r1.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-2-r1.ebuild
index a3643deb966d..3177c7a0f73c 100644
--- a/sys-devel/autoconf-wrapper/autoconf-wrapper-2-r1.ebuild
+++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-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-devel/autoconf-wrapper/autoconf-wrapper-2-r1.ebuild,v 1.3 2005/03/13 04:39:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/autoconf-wrapper-2-r1.ebuild,v 1.1 2005/02/08 00:41:18 vapier Exp $
 
 DESCRIPTION="wrapper for autoconf to manage multiple autoconf versions"
 HOMEPAGE="http://www.gentoo.org/"
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND=">=sys-devel/autoconf-2.59-r6
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-3-r1.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-3-r1.ebuild
index cc1c3ed0b94c..32c520515784 100644
--- a/sys-devel/autoconf-wrapper/autoconf-wrapper-3-r1.ebuild
+++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-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-devel/autoconf-wrapper/autoconf-wrapper-3-r1.ebuild,v 1.9 2005/08/03 16:24:28 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/autoconf-wrapper-3-r1.ebuild,v 1.1 2005/06/30 12:58:52 azarah Exp $
 
 DESCRIPTION="wrapper for autoconf to manage multiple autoconf versions"
 HOMEPAGE="http://www.gentoo.org/"
@@ -8,7 +8,7 @@ SRC_URI=""
 
 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=""
 
 RDEPEND=">=sys-devel/autoconf-2.59-r6
diff --git a/sys-devel/autoconf-wrapper/files/ac-wrapper-2.sh b/sys-devel/autoconf-wrapper/files/ac-wrapper-2.sh
index b85fade497bf..97f559dfc39b 100644
--- a/sys-devel/autoconf-wrapper/files/ac-wrapper-2.sh
+++ b/sys-devel/autoconf-wrapper/files/ac-wrapper-2.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-2.sh,v 1.2 2005/05/14 17:40:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-2.sh,v 1.1 2004/12/06 04:29:22 vapier Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -51,7 +51,7 @@ if [ "${WANT_AUTOCONF}" != "2.5" ] ; then
 		1.[7-9]) ;;
 		*)
 			if [ -r "configure" ] ; then
-				confversion=$(gawk \
+				confversion=$(awk \
 					'{
 					if (match($0,
 					          "^# Generated (by (GNU )?Autoconf|automatically using autoconf version) ([0-9].[0-9])",
diff --git a/sys-devel/autoconf-wrapper/files/ac-wrapper-3.sh b/sys-devel/autoconf-wrapper/files/ac-wrapper-3.sh
index 0c2a056fffb6..55250ae0c9fe 100644
--- a/sys-devel/autoconf-wrapper/files/ac-wrapper-3.sh
+++ b/sys-devel/autoconf-wrapper/files/ac-wrapper-3.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-3.sh,v 1.2 2005/06/30 12:58:52 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-3.sh,v 1.1 2005/06/28 21:17:42 azarah Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -50,7 +50,7 @@ if [[ ${WANT_AUTOCONF} != "2.5" ]] ; then
 		case "${WANT_AUTOMAKE}" in
 		1.[7-9]) ;;
 		*)
-			acfiles=$(ls ac{local,include}.m4 configure.{in,ac} 2>/dev/null)
+			acfiles=$(ls ac{local,include}.m4 2>/dev/null)
 			if [[ -n ${acfiles} ]] ; then
 				confversion=$(gawk \
 				'{
diff --git a/sys-devel/autoconf/ChangeLog b/sys-devel/autoconf/ChangeLog
index 7f84fe40f1e2..1f5648f4a239 100644
--- a/sys-devel/autoconf/ChangeLog
+++ b/sys-devel/autoconf/ChangeLog
@@ -1,284 +1,6 @@
 # ChangeLog for sys-devel/autoconf
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.67 2005/09/17 11:26:36 kloeri Exp $
-
-*autoconf-2.59-r7 (23 Jun 2005)
-
-  23 Jun 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/autoconf-2.59-more-quotes.patch, +autoconf-2.59-r7.ebuild:
-  Fix under quoting of the $ac_unique_file variable by Justace Clutter #96882.
-
-  15 Feb 2005; Kito <kito@gentoo.org> autoconf-2.13.ebuild,
-  autoconf-2.59-r6.ebuild:
-  ~ppc-macos keyword
-
-  06 Feb 2005; Joshua Kinard <kumba@gentoo.org> autoconf-2.13.ebuild,
-  autoconf-2.59-r6.ebuild:
-  Marked stable on mips.
-
-  31 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> autoconf-2.13.ebuild,
-  autoconf-2.59-r6.ebuild:
-  Stable on sparc
-
-  30 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> autoconf-2.13.ebuild,
-  autoconf-2.59-r6.ebuild:
-  Stable on alpha.
-
-  30 Jan 2005; Michael Hanselmann <hansmi@gentoo.org>
-  autoconf-2.59-r6.ebuild, autoconf-2.13.ebuild:
-  Stable on ppc.
-
-  29 Jan 2005; Markus Rothe <corsair@gentoo.org> autoconf-2.13.ebuild,
-  autoconf-2.59-r6.ebuild:
-  Stable on ppc64
-
-  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-*autoconf-2.13 (20 Oct 2004)
-
-  20 Oct 2004; Mike Frysinger <vapier@gentoo.org>
-  +files/autoconf-2.13-destdir.patch, +files/autoconf-2.13-gentoo.patch,
-  +autoconf-2.13.ebuild, +autoconf-2.59-r6.ebuild:
-  SLOT-ed versions of autoconf.
-
-*autoconf-2.59-r5 (09 Oct 2004)
-
-  09 Oct 2004; Mike Frysinger <vapier@gentoo.org> files/ac-wrapper.pl,
-  -autoconf-2.59-r4.ebuild, +autoconf-2.59-r5.ebuild:
-  Version bump to push out fixed ac-wrapper.pl that cvs missed from before
-  #66854.
-
-  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
-  autoconf-2.59-r3.ebuild:
-  Masked autoconf-2.59-r3.ebuild stable for ppc
-
-  29 Jul 2004; Guy Martin <gmsoft@gentoo.org> autoconf-2.59-r4.ebuild:
-  Stable on hppa.
-
-  28 Jul 2004; Caleb Tennis <caleb@gentoo.org> autoconf-2.59-r4.ebuild:
-  marking x86 stable
-
-  03 Jul 2004; Joshua Kinard <kumba@gentoo.org> autoconf-2.59-r4.ebuild:
-  Marked stable on mips.
-
-  27 Jun 2004; Gustavo Zacarias <gustavoz@gentoo.org> autoconf-2.59-r4.ebuild:
-  Stable on sparc
-
-  16 Jun 2004; Martin Schlemmer <azarah@gentoo.org> files/ac-wrapper-4.pl:
-  Update comments to show that we check for 2.13 and not 2.1.
-
-  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> autoconf-2.59-r4.ebuild:
-  Stable on alpha.
-
-  06 Jun 2004; Guy Martin <gmsoft@gentoo.org> autoconf-2.59-r3.ebuild:
-  Marked stable on hppa.
-
-*autoconf-2.59-r4 (27 May 2004)
-
-  27 May 2004; Caleb Tennis <caleb@gentoo.org> autoconf-2.59-r4.ebuild:
-  New version which incorporates a new ac-wrapper-4.pl
-  Use a subroutine which will pull out the greatest AC_PREREQ() value in
-  a configure.in file in case there is more than one (see Bug #41389).
-  Also, change the gt statements to be 2.13 instead of 2.1 or AC_PREREQs fail
-  on seeing 2.12 for example (actually, don't fail, but use autoconf-2.5x which
-  is not correct).
-
-  27 May 2004; Caleb Tennis <caleb@gentoo.org> autoconf-2.59-r3.ebuild:
-  Mark x86 stable
-
-*autoconf-2.59-r3 (16 Feb 2004)
-
-  16 Feb 2004; Martin Schlemmer <azarah@gentoo.org> autoconf-2.59-r3.ebuild,
-  files/ac-wrapper-2.pl, files/ac-wrapper-3.pl:
-  Add back fix for testing AC_PREREQ(2.50) to ac-wrapper-2.pl. Add
-  ac-wrapper-3.pl with fixed fix for bug #40983.
-
-*autoconf-2.59-r2 (16 Feb 2004)
-*autoconf-2.58-r1 (16 Feb 2004)
-
-  16 Feb 2004; Brad House <brad_mssw@gentoo.org> autoconf-2.58-r1.ebuild,
-  autoconf-2.59-r2.ebuild:
-  bump versions of autoconf to spur propagation of revertion of ac-wrapper-2.pl
-  goof, as it affects both stable and unstable branches
-
-*autoconf-2.59-r1 (15 Feb 2004)
-
-  15 Feb 2004; Brad House <brad_mssw@gentoo.org> files/ac-wrapper-2.pl:
-  Revert ac-wrapper-2.pl patch, as it causes any package that runs autoheader to
-  fail
-
-  15 Feb 2004; Martin Schlemmer <azarah@gentoo.org> autoconf-2.59-r1.ebuild:
-  New revision to propagate recent wrapper fixes.
-
-  15 Feb 2004; Martin Schlemmer <azarah@gentoo.org> files/ac-wrapper-2.pl:
-  Set AUTOM4TE to autoconf version being run, bug #40983.
-
-  14 Feb 2004; Martin Schlemmer <azarah@gentoo.org> files/ac-wrapper-2.pl:
-  Fix ac-wrapper.pl to also work with AC_PREREQ(2.50) (note the 2.50 and not
-  2.5).
-
-  30 Jan 2004; <tuxus@gentoo.org> autoconf-2.58.ebuild:
-  stable on mips.
-
-  25 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
-  Replace perl replacements with sed ones #39319.
-
-  12 Jan 2004; <gustavoz@gentoo.org> autoconf-2.58.ebuild:
-  stable on hppa, unbreaks kde
-
-*autoconf-2.59 (10 Jan 2004)
-
-  10 Jan 2004; Aron Griffis <agriffis@gentoo.org> autoconf-2.58.ebuild,
-  autoconf-2.59.ebuild:
-  Version bump for bug 33216. Mark 2.58 stable on x86, ppc and sparc since these
-  arches have kdelibs-3.1.4 marked stable, which requires >=autoconf-2.58.
-
-  10 Jan 2004; Aron Griffis <agriffis@gentoo.org> autoconf-2.58.ebuild:
-  stable on alpha and ia64
-
-  06 Jan 2004; Brad House <brad_mssw@gentoo.org> autoconf-2.58.ebuild:
-  mark stable on amd64. kdelibs won't build without autoconf > 2.57 :/
-
-  08 Dec 2003; Seemant Kulleen <seemant@gentoo.org> autoconf-2.13-r2.ebuild,
-  autoconf-2.53a.ebuild, autoconf-2.54-r1.ebuild:
-  removed ancient versions
-
-*autoconf-2.58 (08 Nov 2003)
-
-  08 Nov 2003; Martin Schlemmer <azarah@gentoo.org> autoconf-2.58.ebuild,
-  files/ac-wrapper-2.pl, files/autoconf-2.58-infopage-namechange.patch:
-  Update version closing bug #32830. Change to automake's style of selecting
-  version, closing bug #31016.
-
-  30 Oct 2003; Daniel Robbins <drobbins@gentoo.org>: all ebuilds: modified
-  pkg_preinst() to use $ROOT and prevent non-ROOT="/" autoconf merges from
-  frying the "/" tree (was causing catalyst to die.) Should be a very low-
-  risk change since the overwhelming majority of Gentoo users always have
-  ROOT set to "/" anyway.
-
-*autoconf-2.57a-r1 (08 Oct 2003)
-
-  08 Oct 2003; Martin Schlemmer <azarah@gentoo.org> autoconf-2.57a-r1.ebuild,
-  files/autoconf-2.57a-AC_HELP_STRING.patch:
-  Fix a bug in AC_HELP_STRING definition, bug #29961, thanks to TGL
-  <degrenier@easyconnect.fr> for tracking the problem.
-
-  07 Oct 2003; Martin Schlemmer <azarah@gentoo.org> autoconf-2.57a.ebuild:
-  This breaks a few things, including ntp, etc.
-
-*autoconf-2.57a (28 Sep 2003)
-
-  28 Sep 2003; Martin Schlemmer <azarah@gentoo.org> autoconf-2.57a.ebuild,
-  files/autoconf-2.57a-infopage-namechange.patch:
-  Update version.
-
-  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> autoconf-2.57.ebuild :
-  ia64 keywords.
-
-  02 Sep 2003; Martin Holzer <mholzer@gentoo.org> autoconf-2.13-r2.ebuild,
-  autoconf-2.53a.ebuild, autoconf-2.54-r1.ebuild, autoconf-2.54.ebuild,
-  autoconf-2.57-r1.ebuild, autoconf-2.57.ebuild:
-  Now uses mirror://gnu.
-
-  30 Mar 2003; Martin Schlemmer <azarah@gentoo.org> autoconf-2.57-r1.ebuild :
-  Mark stable.  It had some extensive testing, and it closes bug #14663.
-
-*autoconf-2.54-r1 (15 Mar 2003)
-*autoconf-2.57-r1 (15 Mar 2003)
-
-  15 Mar 2003; Martin Schlemmer <azarah@gentoo.org> :
-  Update m4 DEPEND to work with m4-1.4 we are now using.
-
-  09 Mar 2003; Martin Schlemmer <azarah@gentoo.org> files/ac-wrapper.pl :
-  Some new stuff have AC_PREREQ in [].
-
-  20 Feb 2003; Martin Schlemmer <azarah@gentoo.org> autoconf-2.57.ebuild :
-  Run autom4te-2.5x if called without setting WANT_AUTOMAKE_2_5=1.
-
-  18 Feb 2003; Zach Welch <zwelch@gentoo.org> :
-  Added arm to keywords
-
-  15 Feb 2003; Jan Seidel <tuxus@gentoo.org> autoconf-2.54.ebuild :
-  Added mips to keywords
-
-  07 Feb 2003; Guy Martin <gmsoft@gentoo.org> :
-  Added hppa to keywords.
-
-autoconf-2.57 (21 Jan 2003)
-
-  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> autoconf-2.57.ebuild :
-  Marked testing for mips.
-
-  21 Jan 2003; Martin Schlemmer <azarah@gentoo.org> autoconf-2.57.ebuild :
-  New version.
-
-  17 Jan 2003; Martin Schlemmer <azarah@gentoo.org> autoconf-2.54.ebuild :
-  Depend on texinfo-4.3, else info pages breaks, bug #13041.
-
-  14 Dec 2002; Martin Schlemmer <azarah@gentoo.org> autoconf-2.54.ebuild :
-  Also get autoconf-2.5x info page to show up in DIR index, closing
-  bug #12085.
-
-  12 Dec 2002; Jan Seidel <tuxus@gentoo.org> autoconf-2.53a.ebuild :
-  Added mips to keywords.
-
-  10 Dec 2002; Martin Schlemmer <azarah@gentoo.org> autoconf-2.54.ebuild :
-
-  Mark stable.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> :
-  
-  Changed sparc ~sparc keywords
- 
-autoconf-2.54 (20 Oct 2002)
-
-  25 Oct 2002; Martin Schlemmer <azarah@gentoo.org> autoconf-2.54.ebuild :
-
-  Fix SRC_URI fir version 2.13 tarball.  Close bug #9495.
-
-  20 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  Update version.
-
-  23 Sep 2002; Martin Schlemmer <azarah@gentoo.org> ac-wrapper.pl :
-
-  Firstly i should mention that the perl wrapper 'ac-wrapper.pl', is
-  based on great work by Guillaume Cottenceau (gc@mandrakesoft.com).
-  This updates it to correctly detect if automake-1.6 was used.
-
-autoconf-2.53a (22 May 2002)
-
-  22 May 2002; M.Schlemmer <azarah@gentoo.org> autoconf-2.53a.ebuild :
-
-  Update in hope of fixing the gcc3 build problem (somewhere with
-  m4 version detection, bug #2929.  I am not sure, as I could not
-  get feedback if working or not.
-
-autoconf-2.53-r1 (19 May 2002)
-
-  19 May 2002; M.Schlemmer <azarah@gentoo.org> autoconf-2.53-r1.ebuild :
-
-  Fix it to use "-$PV" as suffix, and not "-2.5x".
-
-  22 April 2002; M.Schlemmer <azarah@gentoo.org> ac-wrapper.pl :
-
-  Update so that it can work with AC_PREREQ([2.13]) as well as AC_PREREQ(2.13).
-
-autoconf-2.52d-r1 (21 March 2002)
-
-  7 April 2002; M.Schlemmer <azarah@gentoo.org> :
-
-  Change the names of the 2.5x binaries to foo-${PV}, since they do support
-  limited parallel versions, and foo-2.5x breaks recursion if they call
-  themselfs.  Fixed doc paths.
-
-*autoconf-2.53 (21 March 2002)
-
-  21 March 2002; M.Schlemmer <azarah@gentoo.org> :
-
-  Add dual ebuild which contain 2.13 and 2.53, and autodetect the
-  correct version to use.
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
 
 *autoconf-2.13-r2 (1 Feb 2002)
 
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 78bee4bcdb07..e69de29bb2d1 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -1,21 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 dbe187da39bfb1546a14fedc9bdbae0e autoconf-2.13.ebuild 1550
-MD5 2f177a535539f25d52f270603bca85fa autoconf-2.59-r6.ebuild 1237
-MD5 042a60afd1c1a505b3265169d373d0d7 autoconf-2.59-r7.ebuild 1336
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 80e4a2fe43c35a808b3dffe025361ff5 ChangeLog 10418
-MD5 dee8e039dbcfd6a6543e28688615ee17 files/autoconf-2.13-destdir.patch 677
-MD5 edfa347b2a6e2c0de846cabda899b429 files/autoconf-2.13-gentoo.patch 898
-MD5 616563340fe214518ae208b42550d851 files/autoconf-2.59-more-quotes.patch 1223
-MD5 02c192b9ea3e4945d007a8cfde221c73 files/digest-autoconf-2.13 65
-MD5 ed1c29020cbdfc79d6a1ece183afd936 files/digest-autoconf-2.59-r6 66
-MD5 ed1c29020cbdfc79d6a1ece183afd936 files/digest-autoconf-2.59-r7 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDK/2BKf2g/qXtneoRAmpWAJ9rQHsZZzyG/hsYRIqK58CXJT0T3wCfXGFI
-dynF5uf1VJD76AFSFDmJMM8=
-=2LbV
------END PGP SIGNATURE-----
diff --git a/sys-devel/autoconf/autoconf-2.13.ebuild b/sys-devel/autoconf/autoconf-2.13.ebuild
index a3ea3e3ee53a..373d0505510f 100644
--- a/sys-devel/autoconf/autoconf-2.13.ebuild
+++ b/sys-devel/autoconf/autoconf-2.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.13.ebuild,v 1.13 2005/03/13 04:40:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.13.ebuild,v 1.1 2004/10/21 01:06:27 vapier Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="${PV:0:3}"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 DEPEND=">=sys-apps/texinfo-4.3
@@ -55,6 +55,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "Please note that the 'WANT_AUTOCONF_2_1=1' syntax is now:"
+	einfo "Please note that the 'WANT_AUTOCONF_2_1=1' syntax is now:" 
 	einfo "  WANT_AUTOCONF=2.1"
 }
diff --git a/sys-devel/autoconf/autoconf-2.59-r6.ebuild b/sys-devel/autoconf/autoconf-2.59-r6.ebuild
index ca82d154e42f..15e811c550c1 100644
--- a/sys-devel/autoconf/autoconf-2.59-r6.ebuild
+++ b/sys-devel/autoconf/autoconf-2.59-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.59-r6.ebuild,v 1.14 2005/06/17 00:59:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.59-r6.ebuild,v 1.1 2004/10/21 01:06:27 vapier Exp $
 
 inherit eutils
 
@@ -10,8 +10,8 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="${PV:0:3}"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-macos"
-IUSE="emacs"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
 
 DEPEND=">=sys-apps/texinfo-4.3
 	sys-devel/autoconf-wrapper
@@ -19,9 +19,6 @@ DEPEND=">=sys-apps/texinfo-4.3
 	dev-lang/perl"
 
 src_compile() {
-	(use emacs && type -p emacs) \
-		&& export EMACS=emacs \
-		|| export EMACS=no
 	econf --program-suffix="-${PV}" || die
 	# We want to transform the binaries, not the manpages
 	sed -i "/^program_transform_name/s:-${PV}::" man/Makefile
@@ -39,6 +36,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "Please note that the 'WANT_AUTOCONF_2_5=1' syntax is now:"
+	einfo "Please note that the 'WANT_AUTOCONF_2_5=1' syntax is now:" 
 	einfo "  WANT_AUTOCONF=2.5"
 }
diff --git a/sys-devel/autoconf/metadata.xml b/sys-devel/autoconf/metadata.xml
index 96a2d586367d..f093d416cbb1 100644
--- a/sys-devel/autoconf/metadata.xml
+++ b/sys-devel/autoconf/metadata.xml
@@ -1,3 +1,5 @@
+ [32;01m*[0m Generated metadata.xml:
+
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/sys-devel/autogen/ChangeLog b/sys-devel/autogen/ChangeLog
index 8d032fb6fa26..cd9ef1413c49 100644
--- a/sys-devel/autogen/ChangeLog
+++ b/sys-devel/autogen/ChangeLog
@@ -1,24 +1,6 @@
 # ChangeLog for sys-devel/autogen
-# Copyright 2004-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autogen/ChangeLog,v 1.5 2005/07/11 03:49:21 agriffis Exp $
-
-*autogen-5.7.1 (11 Jul 2005)
-
-  11 Jul 2005; Aron Griffis <agriffis@gentoo.org> +autogen-5.7.1.ebuild:
-  Update to 5.7.1 #78033
-
-  05 Feb 2005; Michael Hanselmann <hansmi@gentoo.org> autogen-5.6.4.ebuild:
-  Added to ~ppc.
-
-  10 Dec 2004; Aron Griffis <agriffis@gentoo.org> autogen-5.6.4.ebuild:
-  Add ~ia64 since autogen builds with guile-1.6.6
-
-*autogen-5.6.4 (08 Dec 2004)
-
-  08 Dec 2004; Aron Griffis <agriffis@gentoo.org> -autogen-5.5.7.ebuild,
-  +autogen-5.6.4.ebuild:
-  Bump to 5.6.4 since that's the current version (d'oh). Remove ia64 keyword
-  since it isn't building there yet
+# Copyright 2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autogen/ChangeLog,v 1.1 2004/12/08 20:21:58 agriffis Exp $
 
 *autogen-5.5.7 (08 Dec 2004)
 
diff --git a/sys-devel/autogen/Manifest b/sys-devel/autogen/Manifest
index 73cd6fab0d12..41bb8aed538c 100644
--- a/sys-devel/autogen/Manifest
+++ b/sys-devel/autogen/Manifest
@@ -1,16 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 99488d75534448d020cdbea6f10f6d11 autogen-5.6.4.ebuild 685
-MD5 02793af1bd2c41b292a5b24c32e76b07 autogen-5.7.1.ebuild 964
-MD5 bf08bda5668cb55e16319443e7f22ea8 ChangeLog 946
-MD5 8781cbf005c98c1320c7e7afc88d6df4 metadata.xml 307
-MD5 22932a23829bb5a82e333a15df93671a files/digest-autogen-5.6.4 66
-MD5 b0dbdba1c868638ca0b672a329b9ea81 files/digest-autogen-5.7.1 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC0exNBXaUFmZvwyMRAuZ3AKC/Itfv3lKGYVhIz8b30GVvo643dQCeN2dn
-6dTBNOX6roNCB8a7efEafPw=
-=+tzm
------END PGP SIGNATURE-----
+MD5 53c11476ac2f2668f4c154c1d0055e44 metadata.xml 789
+MD5 77ab896e47373b6f48df1775c0aed0a0 autogen-5.5.7.ebuild 491
+MD5 52abec49955ed2a3a87e4932a864c88d files/digest-autogen-5.5.7 66
diff --git a/sys-devel/autogen/autogen-5.6.4.ebuild b/sys-devel/autogen/autogen-5.6.4.ebuild
index 66c05e443b75..87d6ee97410c 100644
--- a/sys-devel/autogen/autogen-5.6.4.ebuild
+++ b/sys-devel/autogen/autogen-5.6.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 2004-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autogen/autogen-5.6.4.ebuild,v 1.4 2005/02/05 21:10:53 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autogen/autogen-5.6.4.ebuild,v 1.1 2004/12/08 20:44:49 agriffis Exp $
 
 DESCRIPTION="Program and text file generation"
 HOMEPAGE="http://www.gnu.org/software/autogen/"
@@ -8,11 +8,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86 ~ia64 ~ppc"
+KEYWORDS="~alpha ~amd64 ~x86"
 IUSE=""
 
-# autogen doesn't build with lower versions of guile on ia64
-DEPEND=">=dev-util/guile-1.6.6"
+DEPEND="dev-util/guile"
 
 src_compile() {
 	econf || die "econf failed"
diff --git a/sys-devel/autogen/metadata.xml b/sys-devel/autogen/metadata.xml
index 18ef3d4e808d..9b148cad4968 100644
--- a/sys-devel/autogen/metadata.xml
+++ b/sys-devel/autogen/metadata.xml
@@ -1,9 +1,24 @@
 <?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>bug-wranglers@gentoo.org</email>
-  <description>This package lacks a primary herd or maintainer.</description>
+  <email>@gentoo.org</email>
+<!--  <description>Description of the maintainership</description> -->
 </maintainer>
+<!-- <longdescription>Long description of the package</longdescription> -->
 </pkgmetadata>
diff --git a/sys-devel/automake-wrapper/ChangeLog b/sys-devel/automake-wrapper/ChangeLog
index 366272ac9969..182677264070 100644
--- a/sys-devel/automake-wrapper/ChangeLog
+++ b/sys-devel/automake-wrapper/ChangeLog
@@ -1,18 +1,6 @@
 # ChangeLog for sys-devel/automake-wrapper
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/ChangeLog,v 1.10 2005/02/15 19:05:06 kito Exp $
-
-  15 Feb 2005; Kito <kito@gentoo.org> automake-wrapper-1-r1.ebuild:
-  ~ppc-macos keyword
-
-*automake-wrapper-1-r1 (08 Feb 2004)
-
-  08 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
-  Force people to re-emerge.
-
-  14 Nov 2004; Mike Frysinger <vapier@gentoo.org> -files/am-wrapper-1.pl,
-  +files/am-wrapper-1.sh, automake-wrapper-1.ebuild:
-  Punt perl version of wrapper in favor of bash by Gregorio Guidi #66478.
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/ChangeLog,v 1.1 2004/10/22 23:45:23 vapier Exp $
 
 *automake-wrapper-1 (22 Oct 2004)
 
diff --git a/sys-devel/automake-wrapper/Manifest b/sys-devel/automake-wrapper/Manifest
index 5559c9ee7d06..6c845ad65d0a 100644
--- a/sys-devel/automake-wrapper/Manifest
+++ b/sys-devel/automake-wrapper/Manifest
@@ -1,5 +1,6 @@
-MD5 b93f39fa4a8860ec4e834937cbabac1e ChangeLog 793
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 77eb448a4621601da91ed2424e176dee automake-wrapper-1-r1.ebuild 904
-MD5 d0c6c645c4dc1ad71a2e017dae4185be files/am-wrapper-1.sh 3394
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-automake-wrapper-1-r1 0
+MD5 b2f103286c8fc6e346a9b2f300b1ac5d automake-wrapper-1.ebuild 627
+MD5 2b5aa34b9c688d919f6b06df0c428cc4 files/am-wrapper-1.pl 6165
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-automake-wrapper-1 0
+MD5 98d5ab8800a53d3e713fd5b083be1e9f f/am-wrapper.pl 4654
+MD5 1834b6d845aa175efd08cfb813a361d2 f/attachment.cgi?id=41195 8685
+MD5 555bbf3a7b5cddb99a45e87655e666c7 f/attachment.cgi?id=41207 3231
diff --git a/sys-devel/automake-wrapper/automake-wrapper-1-r1.ebuild b/sys-devel/automake-wrapper/automake-wrapper-1-r1.ebuild
index 0bae0f676752..80447c11718e 100644
--- a/sys-devel/automake-wrapper/automake-wrapper-1-r1.ebuild
+++ b/sys-devel/automake-wrapper/automake-wrapper-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-devel/automake-wrapper/automake-wrapper-1-r1.ebuild,v 1.3 2005/03/13 04:39:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/automake-wrapper-1-r1.ebuild,v 1.1 2005/02/08 00:40:40 vapier Exp $
 
 DESCRIPTION="wrapper for automake to manage multiple automake versions"
 HOMEPAGE="http://www.gentoo.org/"
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="=sys-devel/automake-1.4*
diff --git a/sys-devel/automake-wrapper/files/am-wrapper-1.sh b/sys-devel/automake-wrapper/files/am-wrapper-1.sh
index b21e0e0a2547..6733f65b1011 100644
--- a/sys-devel/automake-wrapper/files/am-wrapper-1.sh
+++ b/sys-devel/automake-wrapper/files/am-wrapper-1.sh
@@ -1,20 +1,14 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/files/am-wrapper-1.sh,v 1.4 2005/05/14 17:42:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/files/am-wrapper-1.sh,v 1.1 2004/11/14 05:32:54 vapier Exp $
 
 # Based on the am-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
 #
 # Executes the correct automake version.
 #
-# - defaults to automake-1.9
-# - runs automake-1.8 if:
-#   - envvar WANT_AUTOMAKE is set to `1.8'
-#     -or-
-#   - `Makefile.in' was generated by automake-1.8
-#     -or-
-#   - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifying the use of 1.8
+# - defaults to automake-1.8
 # - runs automake-1.7 if:
 #   - envvar WANT_AUTOMAKE is set to `1.7'
 #     -or-
@@ -45,15 +39,15 @@ if [ "${0##*/}" = "am-wrapper.sh" ] ; then
 	exit 1
 fi
 
-vers="1.9 1.8 1.7 1.6 1.5 1.4"
+vers="$(seq 1.9 -0.1 1.4)"
 
 for v in ${vers} ; do
 	eval binary_${v/./_}="${0}-${v}"
 done
-binary="${binary_1_9}"
+binary="binary_1_9"
 
 #
-# Check the WANT_AUTOMAKE setting
+# autodetect routine
 #
 for v in ${vers} x ; do
 	if [ "${v}" = "x" ] ; then
@@ -71,12 +65,9 @@ done
 do_awk() {
 	local file=$1 ; shift
 	local arg=$1 ; shift
-	echo $(gawk "{ if (match(\$0, \"$*\", res)) { print res[${arg}]; exit } }" ${file})
+	echo $(awk "{ if (match(\$0, \"$*\", res)) { print res[${arg}]; exit } }" ${file})
 }
 
-#
-# autodetect routine
-#
 if [ -z "${WANT_AUTOMAKE}" ] ; then
 	if [ -r "Makefile.in" ] ; then
 		confversion_mf=$(do_awk Makefile.in 2 "^# Makefile.in generated (automatically )?by automake ([0-9].[0-9])")
diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog
index 8d21aa53bf5c..5b4b1e305ae7 100644
--- a/sys-devel/automake/ChangeLog
+++ b/sys-devel/automake/ChangeLog
@@ -1,343 +1,6 @@
 # ChangeLog for sys-devel/automake
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.76 2005/09/29 08:48:16 vapier Exp $
-
-*automake-1.9.6-r1 (29 Sep 2005)
-
-  29 Sep 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/automake-1.9.6-include-dir-prefix.patch, +automake-1.9.6-r1.ebuild:
-  Add patch to fix rules with subdirs #107435 by John Ratliff.
-
-*automake-1.9.6 (11 Jul 2005)
-
-  11 Jul 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/automake-1.9.6-infopage-namechange.patch, +automake-1.9.6.ebuild:
-  Version bump.
-
-*automake-1.9.5 (04 Mar 2005)
-
-  04 Mar 2005; Mike Frysinger <vapier@gentoo.org> +automake-1.9.5.ebuild:
-  Version bump.
-
-  15 Feb 2005; Kito <kito@gentoo.org> automake-1.4_p6.ebuild,
-  automake-1.5.ebuild, automake-1.6.3.ebuild, automake-1.7.9-r1.ebuild,
-  automake-1.8.5-r3.ebuild, automake-1.9.4.ebuild:
-  ~ppc-macos keyword
-
-  06 Feb 2005; Joshua Kinard <kumba@gentoo.org> automake-1.4_p6.ebuild,
-  automake-1.5.ebuild, automake-1.6.3.ebuild, automake-1.7.9-r1.ebuild,
-  automake-1.8.5-r3.ebuild, automake-1.9.4.ebuild:
-  Marked stable on mips.
-
-  31 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> automake-1.4_p6.ebuild,
-  automake-1.5.ebuild, automake-1.6.3.ebuild, automake-1.7.9-r1.ebuild,
-  automake-1.8.5-r3.ebuild, automake-1.9.4.ebuild:
-  Stable on sparc
-
-  31 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> automake-1.4_p6.ebuild,
-  automake-1.5.ebuild, automake-1.6.3.ebuild, automake-1.7.9-r1.ebuild,
-  automake-1.8.5-r3.ebuild, automake-1.9.4.ebuild:
-  Stable on alpha.
-
-  30 Jan 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/automake-1.5-test-fixes.patch, automake-1.5.ebuild:
-  Add patches from fedora to fix ccnoco/dirname tests #79505.  Also touch up 
-  our slot patch to not append /usr/share/aclocal if --acdir is passed since 
-  that's (1) wrong and (2) it breaks the aclocalii test.  Update the tail/head 
-  syntax of the insthook test to fix incorrect failure.
-
-  30 Jan 2005; Mike Frysinger <vapier@gentoo.org> automake-1.4_p6.ebuild:
-  Add a few patches from fedora and dont run error.test since its known to fail
-  and no one really cares to fix it in this old version #79529.
-
-  30 Jan 2005; Michael Hanselmann <hansmi@gentoo.org>
-  automake-1.4_p6.ebuild, automake-1.5.ebuild, automake-1.6.3.ebuild,
-  automake-1.7.9-r1.ebuild, automake-1.8.5-r3.ebuild, automake-1.9.4.ebuild:
-  Stable on ppc, bug 74011.
-
-*automake-1.8.5-r3 (29 Jan 2005)
-
-  29 Jan 2005; Markus Rothe <corsair@gentoo.org> automake-1.4_p6.ebuild,
-  automake-1.5.ebuild, automake-1.6.3.ebuild, automake-1.7.9-r1.ebuild,
-  automake-1.8.5-r3.ebuild, automake-1.9.4.ebuild:
-  Stable on ppc64
-
-*automake-1.9.4 (10 Jan 2005)
-
-  10 Jan 2005; Mike Frysinger <vapier@gentoo.org> -automake-1.9.3.ebuild,
-  +automake-1.9.4.ebuild:
-  Version bump.
-
-*automake-1.9.3 (14 Nov 2004)
-
-  14 Nov 2004; Mike Frysinger <vapier@gentoo.org> +automake-1.9.3.ebuild:
-  Version bump #58791.
-
-*automake-1.7.9 (22 Oct 2004)
-
-  22 Oct 2004; Mike Frysinger <vapier@gentoo.org>
-  +files/automake-1.5-slot.patch, +automake-1.4_p6.ebuild,
-  +automake-1.5.ebuild, +automake-1.6.3.ebuild, +automake-1.7.9.ebuild,
-  +automake-1.8.5-r2.ebuild:
-  New SLOT-ed automakes.
-
-  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
-  automake-1.7.7.ebuild:
-  Masked automake-1.7.7.ebuild stable for ppc
-
-  31 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org>
-  automake-1.8.5-r1.ebuild:
-  Stable on sparc
-
-  26 Jun 2004; <solar@gentoo.org> automake-1.8.5-r1.ebuild:
-  update automake-1.8.5-r1 with uclibc logic
-
-*automake-1.8.5-r1 (16 Jun 2004)
-
-  16 Jun 2004; Martin Schlemmer <azarah@gentoo.org>
-  +files/am-wrapper.pl-1.8-v2, +automake-1.8.5-r1.ebuild:
-  Update am-wrapper script to also use ac_version and am_version functions to
-  check AC_PREREQ and AM_AUTOMAKE_VERSION (allows us to check strings beyond the
-  first match).
-
-*automake-1.8.5 (29 May 2004)
-
-  29 May 2004; <solar@gentoo.org> automake-1.8.5.ebuild,
-  files/automake-1.8.5-config-guess-uclibc.patch:
-  Version bump. Added config.guess-uclibc.patch from Peter S. Mazinger
-
-  26 Apr 2004; Michael McCabe <randy@gentoo.org> automake-1.8.3.ebuild:
-  Stable on s390
-
-  07 Apr 2004; Joshua Kinard <kumba@gentoo.org> automake-1.8.3.ebuild:
-  Marked stable on mips.
-
-  04 Apr 2004; Guy Martin <gmsoft@gentoo.org> automake-1.8.3.ebuild:
-  Marked stable on hppa.
-
-  02 Apr 2004; Jon Portnoy <avenj@gentoo.org> automake-1.8.3.ebuild :
-  Stable on x86 for security fix.
-
-  31 Mar 2004; Lars Weiler <pylon@gentoo.org> automake-1.8.3.ebuild:
-  stable on ppc, as requested in bug #45646
-
-  29 Mar 2004; Aron Griffis <agriffis@gentoo.org> automake-1.8.3.ebuild:
-  Mark stable on alpha and ia64 for bug 45646
-
-  26 Mar 2004; Jason Wever <weeve@gentoo.org> automake-1.8.3.ebuild:
-  Marked stable on sparc wrt bug #45646.
-
-  26 Mar 2004; Jon Portnoy <avenj@gentoo.org> automake-1.8.3.ebuild :
-  Stable on AMD64.
-
-*automake-1.8.3 (24 Mar 2004)
-
-  24 Mar 2004; <solar@gentoo.org> automake-1.8.3.ebuild:
-  Version bump. Insecure Temporary Directory Creation Symbolic Link
-  Vulnerability. bug #45646
-
-  23 Mar 2004; Jason Wever <weeve@gentoo.org> automake-1.8.2.ebuild:
-  Stable on sparc.
-
-  19 Feb 2004; <tuxus@gentoo.org> automake-1.7.7.ebuild:
-  Marked stable on mips
-
-*automake-1.8.2 (03 Feb 2004)
-
-  03 Feb 2004; Martin Schlemmer <azarah@gentoo.org> automake-1.8.2.ebuild,
-  files/am-wrapper.pl-1.8, files/automake-1.8.2-infopage-namechange.patch,
-  files/automake-1.7.9-infopage-namechange.patch:
-  Update version.  Also update 1.7 versions to 1.7.9.  I should really try to
-  figure out if we can drop some versions, as it is starting to get a bit much.
-
-  17 Jan 2004; Christian Birchinger <joker@gentoo.org> automake-1.7.7.ebuild:
-  Added sparc stable keyword
-
-  13 Dec 2003; Brad House <brad_mssw@gentoo.org> automake-1.7.8.ebuild:
-  mark stable on amd64
-
-  24 Nov 2003; Brad House <brad_mssw@gentoo.org> automake-1.7.7.ebuild:
-  someone bumped up the coreutils deps, but
-  didn't bump up all deps for different arches.  Please let me know if
-  marking this stable on amd64 causes any problems.
-
-  21 Nov 2003; Aron Griffis <agriffis@gentoo.org> automake-1.7.8.ebuild:
-  Stable on ia64 and alpha in support of coreutils DEPEND
-
-  20 Nov 2003; Bartosch Pixa <darkspecter@gentoo.org> automake-1.7.8.ebuild:
-  set ppc in keywords
-
-*automake-1.7.8 (26 Oct 2003)
-
-  26 Oct 2003; Daniel Ahlberg <aliz@gentoo.org> automake-1.7.8.ebuild:
-  Version bump
-
-*automake-1.7.7 (28 Sep 2003)
-
-  28 Sep 2003; Martin Schlemmer <azarah@gentoo.org> automake-1.7.7.ebuild,
-  files/automake-1.7.7-infopage-namechange.patch:
-  Update version.
-
-  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> automake-1.7.5-r2.ebuild :
-  ia64 keywords.
-
-  02 Sep 2003; Martin Holzer <mholzer@gentoo.org> automake-1.6.1-r6.ebuild,
-  automake-1.6.3.ebuild, automake-1.7.2.ebuild, automake-1.7.5-r2.ebuild:
-  Now uses mirror://gnu.
-
-  02 Aug 2003; Martin Schlemmer <azarah@gentoo.org> automake-1.7.5-r2.ebuild:
-  Mark stable.
-
-*automake-1.7.5-r2 (02 Jul 2003)
-
-  04 Jul 2003; Joshua Kinard <kumba@gentoo.org> :
-  Fixed b0rked Manifest (yay)
-  Removed stray digests
-
-  02 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> automake-1.7.5-r2.ebuild, automake-1.7.5-r1.ebuild, 
-						automake-1.7.5.ebuild :
-  Another versionbump to fix this new version. Also removed the faulty versions.  
-
-*automake-1.7.5-r1 (01 Jul 2003)
-
-  01 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> automake-1.7.5-r1.ebuild :
-  Force update.
-
-  01 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> automake-1.7.5.ebuild. :
-  Do not run fix_bins for 1.4.
-
-*automake-1.7.5 (30 Jun 2003)
-
-  30 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> automake-1.7.5.ebuild :
-  Version bump.
-
-  12 Jun 2003; <msterret@gentoo.org> automake-1.6.1-r6.ebuild:
-  fix Header
-
-  30 Mar 2003; Martin Schlemmer <azarah@gentoo.org> automake-1.7.2.ebuild :
-  Mark stable.  It had extensive testing, and it sorda goes with latest
-  autoconf, which was marked stable to fix bug #14663.
-
-  09 Mar 2003; Martin Schlemmer <azarah@gentoo.org> files/am-wrapper.pl-1.7 :
-  Some new stuff have AC_PREREQ in [].
-
-  18 Feb 2003; Zach Welch <zwelch@gentoo.org> :
-  Added arm to keywords.
-
-  07 Feb 2003; Guy Martin <gmsoft@gentoo.org> automake-1.6.3.ebuild :
-  Added hppa to keywords.
-
-*automake-1.7.2 (21 Jan 2003)
-
-  21 Jan 2003; Martin Schlemmer <azarah@gentoo.org> automake-1.7.2.ebuild :
-  Update version.  Change WANT_AUTOMAKE_1_?=1 selection scheme to
-  WANT_AUTOMAKE=<version>.
-
-  14 Dec 2002; Martin Schlemmer <azarah@gentoo.org> automake-1.6.3.ebuild :
-  Fix info pages to also get 1.5 and 1.6 in info DIR.
-
-  12 Dec 2002; Jan Seidel <tuxus@gentoo.org> automake-1.6.3.ebuild :
-  Added mips to keywords.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-  24 Nov 2002; Martin Schlemmer <azarah@gentoo.org> automake-1.6.3.ebuild :
-  Mark stable for rest of archs.
-
-  23 Nov 2002; Olivier Reisch <doctomoe@gentoo.org> automake-1.6.3.ebuild :
-  Added ppc keyword. 1.6.3 will be needed for KDE 3.1
-
-*automake-1.6.3 (20 Oct 2002)
-
-  20 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
-  Update version.
-
-  23 Sep 2002; Martin Schlemmer <azarah@gentoo.org> am-wrapper.pl-1.6 :
-  Firstly, 'am-wrapper.pl' is based on 'ac-wrapper.pl'.  This is a nifty
-  script by Guillaume Cottenceau (gc@mandrakesoft.com).  This release
-  adds updates for automake-1.6 detection.
-
-*automake-1.6.1-r6 (28 Jun 2002)
-
-  28 Jun 2002; Martin Schlemmer <azarah@gentoo.org> automake-1.6.1-r6.ebuild :
-  Patch aclocal-1.4 to behave like 1.5 and 1.6, and not error our on duplicates.
-  This should fix bug #4157 and others.
-
-*automake-1.6.1-r5 (21 Jun 2002)
-
-  21 Jun 2002; Martin Schlemmer <azarah@gentoo.org> automake-1.6.1-r5.ebuild :
-  Resolve bug #3985.
-
-*automake-1.6.1-r4 (22 May 2002)
-
-  22 May 2002; M.Schlemmer <azarah@gentoo.org> automake-1.6.1-r4.ebuild :
-
-  Remove duplicate macros in /usr/share/aclocal/ (old stale ones that is
-  now in /usr/share/aclocal-1.4/.
-
-*automake-1.6.1-r3 (22 May 2002)
-
-  22 May 2002; M.Schlemmer <azarah@gentoo.org> automake-1.6.1-r3.ebuild :
-
-  Create /usr/share/automake as symlink to /usr/share/automake-1.4, as
-  some packages needs it.  Resolves bug #2903.
-
-*automake-1.6.1-r2 (20 May 2002)
-
-  20 May 2002; M.Schlemmer <azarah@gentoo.org> automake-1.6.1-r2.ebuild :
-
-  Seems aclocal-1.6 already searched /usr/share/aclocal-1.6/ and
-  /usr/share/aclocal/ by default, so no need to fix it like we have to
-  for 1.5 and 1.4.
-
-*automake-1.6.1-r1 (19 May 2002)
-
-  19 May 2002; M.Schlemmer <azarah@gentoo.org> automake-1.6.1-r1.ebuild :
-
-  Use automake-1.5 instead of automake-1.5d to try and fix KDE.
-
-  Another big change, is that we now have all the macros (.m4 files) for
-  each version of automake in their own private dirs, but then add
-  /usr/share/aclocal/ to each version's aclocal's include path.  This
-  makes it possible for each version to use custom macros added by
-  other programs to /usr/share/aclocal/.
-
-*automake-1.6.1 (19 May 2002)
-
-  19 May 2002; M.Schlemmer <azarah@gentoo.org> automake-1.6.1.ebuild,
-                                               am-wrapper.pl-1.6 :
-
-  New version.  Thanks to Alexander Kelett for the initial version that
-  contains all three major releases, and also am-wrapper.pl-1.6.
-
-  Changes from his version:  1.5d has to have "-1.5d" as suffix, and
-  not "-1.5", as this causes calls by aclocal to automake to fail,
-  as they have multiversion support.  Also fixed some other problems
-  that was part of my first dual version.  Added the sed to change
-  the "-1.5x" in am-wrapper.pl-1.6 to "-1.5d".
-
-  Anyway, should resolve bug 2803.
-
-  22 April 2002; M.Schlemmer <azarah@gentoo.org> am-wrapper.pl :
-
-  Update so that it can work with AC_PREREQ([2.13]) as well as AC_PREREQ(2.13).
-	
-*automake-1.5d-r2 (21 March 2002)
-
-  7 April 2002; M.Schlemmer <azarah@gentoo.org> :
-
-  Change the names of the 1.5x binaries to foo-${PV}, since they do support
-  limited parallel versions, and foo-1.5x breaks recursion if they call
-  themselfs.  Fixed doc paths.
-
-*automake-1.6-r1 (21 March 2002)
-
-  21 March 2002; M.Schlemmer <azarah@gentoo.org> :
-
-  Create dual ebuild for automake-1.4x and automake-1.6x.  Have the
-  same autodetection as autoconf-1.53, check am-wrapper.pl for details.
-
-*automake-1.6 (21 March 2002)
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
 
 *automake-1.4_p5 (1 Feb 2002)
 
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 5a2609739233..e69de29bb2d1 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -1,35 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6fd04a53a1b2b9d7508f84336d0497c7 ChangeLog 12769
-MD5 60753f865fa023a3bcd0466250a743a7 automake-1.4_p6.ebuild 1809
-MD5 88db2f78adf73dd93c0e21a58259d2eb automake-1.5.ebuild 1696
-MD5 c2b7648d70be8a4ab0080ed00cb796e3 automake-1.6.3.ebuild 1431
-MD5 f648af66d23f848644ae7f0e0a0fd8a9 automake-1.7.9-r1.ebuild 1506
-MD5 3ad0b6b355e91b67210e8e14e81de267 automake-1.8.5-r3.ebuild 1503
-MD5 188db2d15ee2fd59751f0f4b90f82bf4 automake-1.9.6-r1.ebuild 1625
-MD5 b04899a3860b0623bd45c705258ceabd files/automake-1.4-ansi2knr-stdlib.patch 249
-MD5 91bfbe9a39ed2eee6bfa0254bad56d5d files/automake-1.4-libtoolize.patch 542
-MD5 a4327436d159f9262364994c88489ee6 files/automake-1.4-subdirs-89656.patch 944
-MD5 a56b2416416ab1f0bdc71cb7ab0454d6 files/automake-1.5-slot.patch 1191
-MD5 fbf3743bc8590dcb5bd34c675cb9d9f0 files/automake-1.5-target_hook.patch 1132
-MD5 5c2fe79f8f664efdb7e2736e88c10f09 files/automake-1.5-test-fixes.patch 2303
-MD5 e93136e02eb000c938f564484d306d76 files/automake-1.7.9-infopage-namechange.patch 592
-MD5 9587f00ace066c11b5c22d72afe630a9 files/automake-1.8.2-infopage-namechange.patch 1131
-MD5 4c0ad89956f0b70972c19a60c65f9275 files/automake-1.9.3-infopage-namechange.patch 1109
-MD5 41bfebb78fd15ed76ef2ae3a7d76d726 files/automake-1.9.6-include-dir-prefix.patch 1106
-MD5 bc49c3ba33df8d9bd85ab91d7ffa50bd files/automake-1.9.6-infopage-namechange.patch 1156
-MD5 252f1212a83cc74c42cd557bc3f65e32 files/digest-automake-1.4_p6 67
-MD5 61706a6ada025b2f032fb24668457cef files/digest-automake-1.5 64
-MD5 a591fd70f20b40a46667f57326ad4b7c files/digest-automake-1.6.3 67
-MD5 29dec70b283dffd42358d3643b1754c3 files/digest-automake-1.7.9-r1 67
-MD5 0fe9854b3a6384ef4c7b0bd2bad72c59 files/digest-automake-1.8.5-r3 67
-MD5 a1b9c06cc3ba7ac88f3b870f51d35758 files/digest-automake-1.9.6-r1 67
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDbDAdgIKl8Uu19MoRAjtCAJ9FiR3e3tjr0dZhL9utxRZvR5txSgCfe85G
-twZJsag4ra5KOEEul9ZOlrM=
-=5URL
------END PGP SIGNATURE-----
diff --git a/sys-devel/automake/automake-1.4_p6.ebuild b/sys-devel/automake/automake-1.4_p6.ebuild
index 03aae43478e5..c708766e94b8 100644
--- a/sys-devel/automake/automake-1.4_p6.ebuild
+++ b/sys-devel/automake/automake-1.4_p6.ebuild
@@ -1,39 +1,35 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.4_p6.ebuild,v 1.19 2005/08/23 23:58:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.4_p6.ebuild,v 1.1 2004/10/22 23:47:26 vapier Exp $
 
-inherit eutils
+inherit eutils gnuconfig
 
 MY_P="${P/_/-}"
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="http://sources.redhat.com/automake/"
+HOMEPAGE="http://www.gnu.org/software/automake/automake.html"
 SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="${PV:0:3}"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 ~ppc-macos s390 sh sparc x86"
-IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="uclibc"
 
 DEPEND="dev-lang/perl
 	sys-devel/automake-wrapper
-	>=sys-devel/autoconf-2.59-r6
+	>=sys-devel/autoconf-2.58
 	sys-devel/gnuconfig"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/automake-1.4-libtoolize.patch
-	epatch "${FILESDIR}"/automake-1.4-subdirs-89656.patch
-	epatch "${FILESDIR}"/automake-1.4-ansi2knr-stdlib.patch
-	sed -i 's:error\.test::' tests/Makefile.in #79529
+	cd ${S}
 	sed -i \
 		-e "/^@setfilename/s|automake|automake${SLOT}|" \
 		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
 		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
 		automake.texi || die "sed failed"
-	export WANT_AUTOCONF=2.5
+	gnuconfig_update
 }
 
 src_install() {
diff --git a/sys-devel/automake/automake-1.5.ebuild b/sys-devel/automake/automake-1.5.ebuild
index ab5b67acdb4a..abcba1b73730 100644
--- a/sys-devel/automake/automake-1.5.ebuild
+++ b/sys-devel/automake/automake-1.5.ebuild
@@ -1,57 +1,26 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.5.ebuild,v 1.24 2005/08/23 23:58:59 vapier Exp $
-
-inherit eutils
-
+# 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-devel/automake/automake-1.5.ebuild,v 1.1 2001/08/27 01:14:11 hallski Exp $
+
+P=automake-1.4-p5
+A=${P}.tar.gz
+S=${WORKDIR}/${P}
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="http://sources.redhat.com/automake/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/automake/${A}
+	 ftp://prep.ai.mit.edu/gnu/automake/${A}"
+HOMEPAGE="http://www.gnu.org/software/automake/automake.html"
 
-LICENSE="GPL-2"
-SLOT="${PV:0:3}"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 ~ppc-macos s390 sh sparc x86"
-IUSE=""
+DEPEND="sys-devel/perl"
 
-DEPEND="dev-lang/perl
-	sys-devel/automake-wrapper
-	>=sys-devel/autoconf-2.59-r6
-	sys-devel/gnuconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-target_hook.patch
-	epatch "${FILESDIR}"/${P}-slot.patch
-	epatch "${FILESDIR}"/${P}-test-fixes.patch #79505
-	sed -i \
-		-e "/^@setfilename/s|automake|automake${SLOT}|" \
-		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
-		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
-		automake.texi || die "sed failed"
-	export WANT_AUTOCONF=2.5
+src_compile() {
+    try ./configure --prefix=/usr --infodir=/usr/share/info --host=${CHOST}
+    try make ${MAKEOPTS}
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
-
-	local x=
-	for x in aclocal automake ; do
-		mv "${D}"/usr/bin/${x}{,-${SLOT}} || die "rename ${x}"
-		mv "${D}"/usr/share/${x}{,-${SLOT}} || die "move ${x}"
-	done
-
-	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
-	doinfo *.info
-
-	# remove all config.guess and config.sub files replacing them
-	# w/a symlink to a specific gnuconfig version
-	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
-	done
+    try make prefix=${D}/usr infodir=${D}/usr/share/info install
+    dodoc COPYING NEWS README THANKS TODO AUTHORS ChangeLog
 }
 
-pkg_postinst() {
-	einfo "Please note that the 'WANT_AUTOMAKE_1_5=1' syntax has changed to:"
-	einfo "  WANT_AUTOMAKE=1.5"
-}
+
diff --git a/sys-devel/automake/automake-1.6.3.ebuild b/sys-devel/automake/automake-1.6.3.ebuild
index 0c721995f204..f6e88753ee46 100644
--- a/sys-devel/automake/automake-1.6.3.ebuild
+++ b/sys-devel/automake/automake-1.6.3.ebuild
@@ -1,50 +1,322 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.6.3.ebuild,v 1.34 2005/08/23 23:58:59 vapier Exp $
+# /space/gentoo/cvsroot/gentoo-x86/sys-devel/automake/automake-1.6.1.ebuild,v 1.4 2002/04/23 19:42:16 azarah Exp
 
-inherit eutils
+# OLD14 = 1.4
+# OLD15 = 1.5
+# NEW = 1.6 (.3)
 
+# NOTE:  For all of those brave souls out there that wants to fix
+#        or update this, note that all three versions install
+#        .m4 files to /usr/share/aclocal-${ver}/ and .am files
+#        to /usr/share/automake-${ver}/.  We then add the default
+#        /usr/share/aclocal/ to aclocal's search path by adding
+#        "push (@dirlist, \"/usr/share/aclocal\");" after @dirlist
+#        is defined the first time (done in fix_bins() function).
+#
+#        The theory thus is, all version specific data goes into
+#        version specific directories, but programs like ogg/whatever
+#        can still install thier .m4 macros into /usr/share/aclocal/.
+#
+#        Martin Schlemmer <azarah@gentoo.org>
+#        19 May 2002
+
+
+# Currently this is 1.6, but it could change to 1.6.x as it
+# does with 1.5d ... to determine this, install latest version
+# of 1.6, and look at the generated files in the bin dir ..
+# it should be something like (for 1.6.1):
+#
+# nosferatu automake-1.6.1 # ls /myinstallroot/bin/
+# aclocal  aclocal-1.6  automake  automake-1.6
+# nosferatu automake-1.6.1 #
+#
+# You should then set NEW_PV to 1.6, as this is the suffix
+NEW_PV=1.6
+
+OLD15_PV=1.5
+OLD15_P=${PN}-${OLD15_PV}
+OLD14_PV=1.4-p5
+OLD14_P=${PN}-${OLD14_PV}
+S=${WORKDIR}/${P}
+OLD15_S=${WORKDIR}/${OLD15_P}
+OLD14_S=${WORKDIR}/${OLD14_P}
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="http://sources.redhat.com/automake/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz
+	ftp://ftp.gnu.org/gnu/${PN}/${OLD15_P}.tar.gz
+	ftp://ftp.gnu.org/gnu/${PN}/${OLD14_P}.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/automake/automake.html"
 
 LICENSE="GPL-2"
-SLOT="${PV:0:3}"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 ~ppc-macos s390 sh sparc x86"
-IUSE=""
+SLOT="1.5"
+KEYWORDS="~x86 ~ppc ~sparc ~sparc64 ~alpha"
+
+DEPEND="sys-devel/perl
+	>=sys-devel/autoconf-2.53-r1"
 
-DEPEND="dev-lang/perl
-	sys-devel/automake-wrapper
-	>=sys-devel/autoconf-2.59-r6
-	sys-devel/gnuconfig"
 
 src_unpack() {
+
 	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e "/^@setfilename/s|automake|automake${SLOT}|" \
-		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
-		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
-		automake.texi || die "sed failed"
-	export WANT_AUTOCONF=2.5
+
+	cd ${OLD15_S}
+	patch -p1 <${FILESDIR}/${PN}-${OLD15_PV}-target_hook.patch || die
+}
+
+src_compile() {
+
+	#
+	# ************ automake-1.6x ************
+	#
+
+	# stupid configure script goes and run autoconf in a subdir,
+	# so 'ac-wrapper.pl' do not detect that it should use
+	# autoconf-2.5x
+	export WANT_AUTOCONF_2_5=1
+	
+	cd ${S}
+
+	perl -pi -e "s:setfilename automake.info:setfilename automake-1.6.info:" \
+		automake.texi
+	
+	./configure --prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		--target=${CHOST} || die
+	
+	emake || die
+
+	#
+	# ************ automake-1.5x ************
+	#
+
+	cd ${OLD15_S}
+
+	perl -pi -e "s:setfilename automake.info:setfilename automake-1.5.info:" \
+		automake.texi
+	
+	./configure --prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		--target=${CHOST} || die
+	
+	emake || die
+	unset WANT_AUTOCONF_2_5
+
+	#
+	# ************ automake-1.4-p5 ************
+	#
+	cd ${OLD14_S}
+	./configure --prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		--target=${CHOST} || die
+		
+	emake || die
+}
+
+# This basically fix aclocal and automake so that they
+# use the correct directories, and also adds the normal
+# /usr/share/aclocal for aclocal to include.
+fix_bins() {
+	
+	for x in aclocal automake
+	do
+		perl -pi -e "s:share/automake\":share/automake-${1}\":g" ${x}
+		perl -pi -e "s:share/aclocal\":share/aclocal-${1}\":g" ${x}
+	done
+	
+	# add "/usr/share/aclocal" to m4 search patch
+	cp aclocal aclocal.orig
+	sed -e '/&scan_m4_files (@dirlist);/i \push (@dirlist, \"/usr/share/aclocal\");' \
+		aclocal.orig > aclocal
+	# same as above, but 1.4 looks a bit differently
+	cp aclocal aclocal.orig
+	sed -e '/&scan_m4_files ($acdir, @dirlist);/i \push (@dirlist, \"/usr/share/aclocal\");' \
+		aclocal.orig > aclocal
+	# "aclocal --print-ac-dir" should return "/usr/share/aclocal"
+	cp aclocal aclocal.orig
+	sed -e 's:print $acdir:print "/usr/share/aclocal":' \
+		aclocal.orig > aclocal
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
-	rm -f "${D}"/usr/bin/{aclocal,automake}
 
-	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
-	doinfo *.info
+	# install wrapper script for autodetecting the proper version
+	# to use.
+	exeinto /usr/lib/${PN}
+	newexe ${FILESDIR}/am-wrapper.pl-1.6 am-wrapper.pl
+	# Name binaries to exact version, as they have limited support for
+	# more than one version installs
+	dosed "s:1\.6x:${NEW_PV}:g" /usr/lib/${PN}/am-wrapper.pl
+	dosed "s:1\.5x:${OLD15_PV}:g" /usr/lib/${PN}/am-wrapper.pl
+
+	#
+	# ************ automake-1.6x ************
+	#
+
+	cd ${S}
+# not needed for 1.6.3
+#	fix_bins ${NEW_PV}
+	
+	make DESTDIR=${D} \
+		install || die
+
+	for x in automake aclocal
+	do
+#		mv ${D}/usr/bin/${x} ${D}/usr/bin/${x}-${NEW_PV}
+		rm -f ${D}/usr/bin/${x}
+	done
+
+	doinfo automake-1.6.info*
+
+	docinto ${PV}
+	dodoc COPYING NEWS README THANKS TODO AUTHORS ChangeLog
+
+	#
+	# ************ automake-1.5x ************
+	#
+
+	cd ${OLD15_S}
+	fix_bins ${OLD15_PV}
+	
+	make DESTDIR=${D} \
+		pkgdatadir=/usr/share/automake-${OLD15_PV} \
+		m4datadir=/usr/share/aclocal-${OLD15_PV} \
+		install || die
+
+	for x in automake aclocal
+	do
+		mv ${D}/usr/bin/${x} ${D}/usr/bin/${x}-${OLD15_PV}
+		rm -f ${D}/usr/bin/${x}
+	done
+
+	doinfo automake-1.5.info*
+
+	docinto ${OLD15_PV}
+	dodoc COPYING NEWS README THANKS TODO AUTHORS ChangeLog
+
+	#
+	# ************ automake-1.4-p5 ************
+	#
+
+	cd ${OLD14_S}
+	fix_bins "1.4"
+
+	# Ignore duplicates like automake-1.5 and 1.6
+	patch -p0 <${FILESDIR}/${PN}-1.4_p5-ignore-duplicates.patch || die
+	
+	make DESTDIR=${D} \
+		pkgdatadir=/usr/share/automake-1.4 \
+		m4datadir=/usr/share/aclocal-1.4 \
+		install || die
 
-	# remove all config.guess and config.sub files replacing them
-	# w/a symlink to a specific gnuconfig version
-	local x=
-	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
+	for x in automake aclocal
+	do
+		mv ${D}/usr/bin/${x} ${D}/usr/bin/${x}-1.4
+		dosym ../lib/${PN}/am-wrapper.pl /usr/bin/${x}
 	done
+
+	docinto ${OLD14_PV}
+	dodoc COPYING NEWS README THANKS TODO AUTHORS ChangeLog
+
+	#
+	# ************ misc stuff ****************
+	
+	# Some packages needs a /usr/share/automake directory
+	dosym automake-1.4 /usr/share/automake
+
+	# This is the default macro directory that apps use ..
+	dodir /usr/share/aclocal
+	touch ${D}/usr/share/aclocal/.keep
+}
+
+pkg_preinst() {
+	
+	# remove these to make sure symlinks install properly if old versions
+	# was binaries
+	for x in automake aclocal
+	do
+		if [ -e ${ROOT}/usr/bin/${x} ]
+		then
+			rm -f ${ROOT}/usr/bin/${x}
+		fi
+	done
+
+	# nuke this if it is a directory, as the new one is a symlink
+	if [ -d ${ROOT}/usr/share/automake ]
+	then
+		rm -rf ${ROOT}/usr/share/automake
+	fi
+
+	# Make sure we move all the macros not installed with automake
+	# to the non version specific aclocal dir.
+	if [ ! -d ${ROOT}/usr/share/aclocal ]
+	then
+		mkdir -p ${ROOT}/usr/share/aclocal
+	fi
+	if [ -d ${OLD14_S}/m4 ] && [ -d ${ROOT}/usr/share/aclocal-1.4 ]
+	then
+		for x in ${ROOT}/usr/share/aclocal-1.4/*.m4
+		do
+			if [ ! -f ${OLD14_S}/m4/${x##*/} ]
+			then
+				if [ ! -f ${ROOT}/usr/share/aclocal/${x##*/} ]
+				then
+					einfo "Moving ${x} to aclocal..."
+					mv -f ${x} ${ROOT}/usr/share/aclocal
+				else
+					einfo "Deleting duplicate ${x}..."
+					rm -f ${x}
+				fi
+			fi
+		done
+	fi
+	if [ -d ${OLD15_S}/m4 ] && [ -d ${ROOT}/usr/share/aclocal-${OLD15_PV} ]
+	then
+		for x in ${ROOT}/usr/share/aclocal-${OLD15_PV}/*.m4
+		do
+			if [ ! -f ${OLD15_S}/m4/${x##*/} ]
+			then
+				if [ ! -f ${ROOT}/usr/share/aclocal/${x##*/} ]
+				then
+					einfo "Moving ${x} to aclocal..."
+					mv -f ${x} ${ROOT}/usr/share/aclocal
+				else
+					einfo "Deleting duplicate ${x}..."
+					rm -f ${x}
+				fi
+			fi
+		done
+	fi
+	if [ -d ${S}/m4 ] && [ -d ${ROOT}/usr/share/aclocal-${NEW_PV} ]
+	then
+		for x in ${ROOT}/usr/share/aclocal-${NEW_PV}/*.m4
+		do
+			if [ ! -f ${S}/m4/${x##*/} ]
+			then
+				if [ ! -f ${ROOT}/usr/share/aclocal/${x##*/} ]
+				then
+					einfo "Moving ${x} to aclocal..."
+					mv -f ${x} ${ROOT}/usr/share/aclocal
+				else
+					einfo "Deleting duplicate ${x}..."
+					rm -f ${x}
+				fi
+			fi
+		done
+	fi
 }
 
 pkg_postinst() {
-	einfo "Please note that the 'WANT_AUTOMAKE_1_6=1' syntax has changed to:"
-	einfo "  WANT_AUTOMAKE=1.6"
+
+	# nuke duplicate macros
+	for x in ${ROOT}/usr/share/aclocal-1.4/*.m4
+	do
+		if [ -f ${ROOT}/usr/share/aclocal/${x##*/} ]
+		then
+			rm -f ${ROOT}/usr/share/aclocal/${x##*/}
+		fi
+	done
 }
+
diff --git a/sys-devel/automake/automake-1.7.9-r1.ebuild b/sys-devel/automake/automake-1.7.9-r1.ebuild
index a125bc821e3a..dca41080ead0 100644
--- a/sys-devel/automake/automake-1.7.9-r1.ebuild
+++ b/sys-devel/automake/automake-1.7.9-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.7.9-r1.ebuild,v 1.11 2005/08/23 23:58:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.7.9-r1.ebuild,v 1.1 2005/01/29 07:12:33 vapier Exp $
 
-inherit eutils
+inherit eutils gnuconfig
 
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
 HOMEPAGE="http://sources.redhat.com/automake/"
@@ -10,8 +10,8 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="${PV:0:3}"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 ~ppc-macos s390 sh sparc x86"
-IUSE=""
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh ~sparc x86"
+IUSE="uclibc"
 
 DEPEND="dev-lang/perl
 	sys-devel/automake-wrapper
@@ -20,13 +20,14 @@ DEPEND="dev-lang/perl
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
+	cd ${S}
 	sed -i \
 		-e "/^@setfilename/s|automake|automake${SLOT}|" \
 		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
 		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
-		automake.texi || die "sed texi failed"
-	epatch "${FILESDIR}"/${P}-infopage-namechange.patch
+		automake.texi || die "sed failed"
+	epatch ${FILESDIR}/${P}-infopage-namechange.patch
+	gnuconfig_update
 	export WANT_AUTOCONF=2.5
 }
 
@@ -35,7 +36,7 @@ src_install() {
 	rm -f "${D}"/usr/bin/{aclocal,automake}
 
 	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
-	doinfo automake${SLOT}.info
+	mv "${D}"/usr/share/info/automake{,${SLOT}}.info
 
 	# remove all config.guess and config.sub files replacing them
 	# w/a symlink to a specific gnuconfig version
diff --git a/sys-devel/automake/automake-1.8.5-r3.ebuild b/sys-devel/automake/automake-1.8.5-r3.ebuild
index 7ea50974340e..3d1b89a19dcd 100644
--- a/sys-devel/automake/automake-1.8.5-r3.ebuild
+++ b/sys-devel/automake/automake-1.8.5-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-devel/automake/automake-1.8.5-r3.ebuild,v 1.11 2005/08/23 23:58:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.8.5-r3.ebuild,v 1.1 2005/01/29 07:12:33 vapier Exp $
 
-inherit eutils
+inherit eutils gnuconfig
 
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
 HOMEPAGE="http://sources.redhat.com/automake/"
@@ -10,8 +10,8 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="${PV:0:3}"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 ~ppc-macos s390 sh sparc x86"
-IUSE=""
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh ~sparc x86"
+IUSE="uclibc"
 
 DEPEND="dev-lang/perl
 	sys-devel/automake-wrapper
@@ -20,13 +20,14 @@ DEPEND="dev-lang/perl
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
+	cd ${S}
 	sed -i \
 		-e "/^@setfilename/s|automake|automake${SLOT}|" \
 		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
 		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
 		doc/automake.texi || die "sed failed"
-	epatch "${FILESDIR}"/${PN}-1.8.2-infopage-namechange.patch
+	epatch ${FILESDIR}/${PN}-1.8.2-infopage-namechange.patch
+	gnuconfig_update
 	export WANT_AUTOCONF=2.5
 }
 
@@ -35,11 +36,15 @@ src_install() {
 	rm -f "${D}"/usr/bin/{aclocal,automake}
 
 	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
-	doinfo doc/*.info*
+
+	local x=
+	cd "${D}"/usr/share/info
+	for x in * ; do
+		mv ${x} ${x/${PN}/${PN}${SLOT}}
+	done
 
 	# remove all config.guess and config.sub files replacing them
 	# w/a symlink to a specific gnuconfig version
-	local x=
 	for x in guess sub ; do
 		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
 	done
diff --git a/sys-devel/automake/automake-1.9.6-r1.ebuild b/sys-devel/automake/automake-1.9.6-r1.ebuild
index 027cbdb13183..89956a3d4b9a 100644
--- a/sys-devel/automake/automake-1.9.6-r1.ebuild
+++ b/sys-devel/automake/automake-1.9.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-devel/automake/automake-1.9.6-r1.ebuild,v 1.4 2005/11/05 04:06:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.9.6-r1.ebuild,v 1.1 2005/09/29 08:48:16 vapier Exp $
 
 inherit eutils
 
@@ -13,15 +13,11 @@ SLOT="${PV:0:3}"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 ~ppc-macos s390 sh sparc x86"
 IUSE=""
 
-# stupid blocker for stupid package #98762
-RDEPEND="!app-text/dgs
-	dev-lang/perl
+RDEPEND="dev-lang/perl
 	sys-devel/automake-wrapper
 	>=sys-devel/autoconf-2.59-r6
 	>=sys-apps/texinfo-4.7
 	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
 
 src_unpack() {
 	unpack ${A}
@@ -38,19 +34,14 @@ src_unpack() {
 
 src_install() {
 	make DESTDIR="${D}" install || die
-
-	local x
-	for x in aclocal automake ; do
-		help2man ${x} > ${x}.1
-		doman ${x}.1
-		rm -f "${D}"/usr/bin/${x}
-	done
+	rm -f "${D}"/usr/bin/{aclocal,automake}
 
 	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
 	doinfo doc/*.info*
 
 	# remove all config.guess and config.sub files replacing them
 	# w/a symlink to a specific gnuconfig version
+	local x=
 	for x in guess sub ; do
 		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
 	done
diff --git a/sys-devel/automake/files/automake-1.5-slot.patch b/sys-devel/automake/files/automake-1.5-slot.patch
index 348775abe751..d1e82983c1aa 100644
--- a/sys-devel/automake/files/automake-1.5-slot.patch
+++ b/sys-devel/automake/files/automake-1.5-slot.patch
@@ -10,7 +10,7 @@
 @@ -116,4 +116,5 @@
  
  local (@dirlist) = &parse_arguments (@ARGV);
-+push (@dirlist, "/usr/share/aclocal") if (!grep(/^--acdir/, @ARGV));
++push (@dirlist, "/usr/share/aclocal");
  &scan_m4_files (@dirlist);
  &scan_configure;
 @@ -203,5 +204,5 @@
diff --git a/sys-devel/automake/files/digest-automake-1.5 b/sys-devel/automake/files/digest-automake-1.5
index bda1b103bfdf..82e2c525ba2b 100644
--- a/sys-devel/automake/files/digest-automake-1.5
+++ b/sys-devel/automake/files/digest-automake-1.5
@@ -1 +1 @@
-MD5 74a22ac0581378e807ecb334a55c5bab automake-1.5.tar.gz 526934
+MD5 e10679bba411f8602eed004012d915e3 automake-1.4-p5.tar.gz
diff --git a/sys-devel/automake/files/digest-automake-1.6.3 b/sys-devel/automake/files/digest-automake-1.6.3
index a8caee84c462..2d51a1b3de81 100644
--- a/sys-devel/automake/files/digest-automake-1.6.3
+++ b/sys-devel/automake/files/digest-automake-1.6.3
@@ -1 +1,3 @@
-MD5 2e8053609e9d318f80db0fce29dca7e9 automake-1.6.3.tar.bz2 476275
+MD5 2bd506db63b6d10458cb644b6171ce93 automake-1.6.3.tar.gz 609618
+MD5 74a22ac0581378e807ecb334a55c5bab automake-1.5.tar.gz 526934
+MD5 e10679bba411f8602eed004012d915e3 automake-1.4-p5.tar.gz 376992
diff --git a/sys-devel/automake/metadata.xml b/sys-devel/automake/metadata.xml
index 96a2d586367d..f093d416cbb1 100644
--- a/sys-devel/automake/metadata.xml
+++ b/sys-devel/automake/metadata.xml
@@ -1,3 +1,5 @@
+ [32;01m*[0m Generated metadata.xml:
+
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/sys-devel/bc/ChangeLog b/sys-devel/bc/ChangeLog
index 0ed09ecac227..3f0dd6c54c33 100644
--- a/sys-devel/bc/ChangeLog
+++ b/sys-devel/bc/ChangeLog
@@ -1,76 +1,9 @@
 # ChangeLog for sys-devel/bc
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bc/ChangeLog,v 1.22 2005/06/28 05:20:06 kumba Exp $
-
-  28 Jun 2005; Joshua Kinard <kumba@gentoo.org> bc-1.06-r6.ebuild:
-  Marked stable on mips.
-
-  09 Apr 2005; Markus Rothe <corsair@gentoo.org> bc-1.06-r6.ebuild:
-  Stable on ppc64
-
-  19 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> bc-1.06-r6.ebuild:
-  Stable on alpha.
-
-  17 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> bc-1.06-r6.ebuild:
-  Stable on ppc.
-
-  09 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> bc-1.06-r6.ebuild:
-  Stable on sparc
-
-*bc-1.06-r6 (11 Feb 2005)
-
-  11 Feb 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/bc-1.06-longopts.patch, +files/bc-1.06-static-save.patch,
-  +bc-1.06-r6.ebuild:
-  Add patch to fix longopts handling #51525 and a patch from fedora to fix
-  saved register handling.
-
-  08 Nov 2004; Mike Frysinger <vapier@gentoo.org> bc-1.06-r5.ebuild:
-  USE=static support #70276 by Sascha Silbe.
-
-  02 Mar 2004; Brian Jackson <iggy@gentoo.org> bc-1.06-r5.ebuild:
-  adding initial s390 support
-
-  27 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> bc-1.06-r5.ebuild:
-  replace-flags for amd64.
-
-*bc-1.06-r5 (19 Feb 2003)
-
-  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> bc-1.06-r5.ebuild :
-  ia64 keywords.
-
-  16 Jul Jan Seidel <tuxus@gentoo.org> bc-1.06-r5.ebuild :
-  Mark stable on mips
-
-  14 Mar 2003; Seemant Kulleen <seemant@gentoo.org> bc-1.06-r3.ebuild,
-  bc-1.06-r3.ebuild, bc-1.06-r4.ebuild, bc-1.06-r4.ebuild, bc-1.06-r5.ebuild:
-  change -Os to -O2 on x86.  Closes bug #17536 by frank <frbiscani@libero.it>
-
-  19 Feb 2003; Mark Guertin <gerk@gentoo.org> bc-1.06-r5.ebuild 
-  files/digest-bc-1.06-r5 :
-  rev bump to close bug #16043, -O2 on ppc causes segfault.  
-  Kept stable all arches (only change)
-
-  20 Feb 2003; Zach Welch <zwelch@gentoo.org> bc-1.06-r4.ebuild :
-  Added arm to keywords.
-
-  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> bc-1.06-r4.ebuild :
-  Added hppa to keywords.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*bc-1.06-r4 (11 Nov 2002)
-
-  11 Nov 2002; Martin Schlemmer <azarah@gentoo.org> bc-1.06-r4.ebuild :
-
-  Fix bug #10546.
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bc/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
 
 *bc-1.06-r3 (1 Feb 2002)
 
-  23 Oct 2002; Martin Schlemmer <azarah@gentoo.org> bc-1.06-r3.ebuild :
-
-  Fix to work with flex-2.5.22 and up.
-
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/sys-devel/bc/Manifest b/sys-devel/bc/Manifest
index 1367798f42d4..e69de29bb2d1 100644
--- a/sys-devel/bc/Manifest
+++ b/sys-devel/bc/Manifest
@@ -1,10 +0,0 @@
-MD5 e7ff2f4655b0e4bccfbde707b5c59231 ChangeLog 2800
-MD5 5dcd4193123a3278c4e8f06a9fc46532 bc-1.06-r5.ebuild 1811
-MD5 be43043c6324dd2538fd1aa3b7cee384 bc-1.06-r6.ebuild 1909
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 c6bc9e8c6698c429c778901b2d353c3f files/bc-1.06-info-fix.diff 3182
-MD5 678de048f9423a545c34894a9e9045b0 files/bc-1.06-longopts.patch 913
-MD5 40794acac9c09ee182af19387df613b4 files/bc-1.06-readline42.diff 430
-MD5 fb32cf57c22acd86e7bd5afdb2191552 files/bc-1.06-static-save.patch 519
-MD5 ab5dc8993a9b72c7a4f4160c6a6348ac files/digest-bc-1.06-r5 59
-MD5 ab5dc8993a9b72c7a4f4160c6a6348ac files/digest-bc-1.06-r6 59
diff --git a/sys-devel/bc/bc-1.06-r5.ebuild b/sys-devel/bc/bc-1.06-r5.ebuild
index 1ce76ec40d2a..7cf2f0365f03 100644
--- a/sys-devel/bc/bc-1.06-r5.ebuild
+++ b/sys-devel/bc/bc-1.06-r5.ebuild
@@ -1,30 +1,30 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bc/bc-1.06-r5.ebuild,v 1.21 2005/03/09 00:31:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bc/bc-1.06-r5.ebuild,v 1.1 2003/02/20 01:20:43 gerk Exp $
 
-inherit eutils flag-o-matic toolchain-funcs
+IUSE="readline"
 
+inherit flag-o-matic
+
+S="${WORKDIR}/${P}"
 DESCRIPTION="Handy console-based calculator utility"
+SRC_URI="ftp://prep.ai.mit.edu/pub/gnu/bc/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/bc/bc.html"
-SRC_URI="mirror://gnu/bc/${P}.tar.gz"
 
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="GPL-2 & LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="readline static"
+KEYWORDS="x86 ppc sparc alpha hppa"
 
-RDEPEND="readline? ( >=sys-libs/readline-4.1
+RDEPEND="readline? ( >=sys-libs/readline-4.1 
 	>=sys-libs/ncurses-5.2 )"
-DEPEND="${RDEPEND}
-	sys-devel/flex"
+DEPEND="$RDEPEND sys-devel/flex"
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}
 
-	epatch ${FILESDIR}/bc-1.06-info-fix.diff
-	epatch ${FILESDIR}/bc-1.06-readline42.diff
-	sed -i -e '/^AR =/s:.*::' lib/Makefile.in
+	unpack ${A} ; cd ${S}
+
+	patch -p1 < ${FILESDIR}/bc-1.06-info-fix.diff || die
+	patch -p1 < ${FILESDIR}/bc-1.06-readline42.diff || die
 
 	# Command line arguments for flex changed from the old
 	# 2.5.4 to 2.5.22, so fix configure if we are using the
@@ -38,31 +38,31 @@ src_unpack() {
 	     "${flminor/flex* }" -ge 5 -a \
 	     "${flmicro/flex* }" -ge 22 ]
 	then
-		sed -i -e 's:flex -I8:flex -I:g' \
-			configure
+		cd ${S}; cp configure configure.orig
+		sed -e 's:flex -I8:flex -I:g' \
+			configure.orig > configure
 	fi
 }
 
 src_compile() {
-	case ${ARCH} in
-		ppc) filter-flags -O2;;
-		x86) replace-flags -Os -O2;;
-		amd64) replace-flags -O? -O0;;
-	esac
-	tc-export CC AR RANLIB
 
+	# -O2 causes segafults on ppc with zero backtrace :/
+	use ppc && filter-flags "-O2"
 	local myconf=""
-	use static && append-ldflags -static
 	use readline && myconf="--with-readline"
+
 	econf ${myconf} || die
+
 	emake || die
 }
 
 src_install() {
+
 	into /usr
-	dobin bc/bc dc/dc || die
+	dobin bc/bc dc/dc
 
 	doinfo doc/*.info
 	doman doc/*.1
-	dodoc AUTHORS FAQ NEWS README ChangeLog
+	dodoc AUTHORS COPYING* FAQ NEWS README ChangeLog
 }
+
diff --git a/sys-devel/bc/bc-1.06-r6.ebuild b/sys-devel/bc/bc-1.06-r6.ebuild
index d62de4ef9f1d..65f9c8872772 100644
--- a/sys-devel/bc/bc-1.06-r6.ebuild
+++ b/sys-devel/bc/bc-1.06-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-devel/bc/bc-1.06-r6.ebuild,v 1.7 2005/06/28 05:20:06 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bc/bc-1.06-r6.ebuild,v 1.1 2005/02/11 06:15:03 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -10,11 +10,13 @@ SRC_URI="mirror://gnu/bc/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="readline static"
 
-RDEPEND="readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 )"
+RDEPEND="readline? ( >=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2 )"
 DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.47-r10
 	sys-devel/flex"
 
 src_unpack() {
diff --git a/sys-devel/bc/metadata.xml b/sys-devel/bc/metadata.xml
index 96a2d586367d..f093d416cbb1 100644
--- a/sys-devel/bc/metadata.xml
+++ b/sys-devel/bc/metadata.xml
@@ -1,3 +1,5 @@
+ [32;01m*[0m Generated metadata.xml:
+
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/sys-devel/bin86/ChangeLog b/sys-devel/bin86/ChangeLog
index 2b949ef0556e..e270471a84e3 100644
--- a/sys-devel/bin86/ChangeLog
+++ b/sys-devel/bin86/ChangeLog
@@ -1,60 +1,6 @@
 # ChangeLog for sys-devel/bin86
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bin86/ChangeLog,v 1.15 2005/05/09 02:04:05 tester Exp $
-
-  09 May 2005; Olivier Crête <tester@gentoo.org>
-  +files/bin86-0.16.17-amd64-build.patch, bin86-0.16.17.ebuild:
-  Added patch to make it build on amd64
-
-*bin86-0.16.17 (30 Jan 2005)
-
-  30 Jan 2005; Mike Frysinger <vapier@gentoo.org> +bin86-0.16.17.ebuild:
-  Version bump.
-
-*bin86-0.16.16 (29 Nov 2004)
-
-  29 Nov 2004; Mike Frysinger <vapier@gentoo.org> +bin86-0.16.16.ebuild:
-  Version bump.
-
-  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> bin86-0.15.5.ebuild,
-  bin86-0.16.0.ebuild, bin86-0.16.11-r1.ebuild, bin86-0.16.13.ebuild:
-  virtual/glibc -> virtual/libc
-
-  07 Jan 2004; <gustavoz@gentoo.org> bin86-0.15.5.ebuild, bin86-0.16.0.ebuild,
-  bin86-0.16.11-r1.ebuild, bin86-0.16.13.ebuild:
-  -sparc all of them, this doesn't work on sparc!
-
-*bin86-0.16.13 (04 Oct 2003)
-
-  04 Oct 2003; Martin Schlemmer <azarah@gentoo.org> bin86-0.16.13.ebuild:
-  Update version.
-
-*bin86-0.16.11-r1 (17 Aug 2003)
-
-  17 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> bin86-0.16.11-r1.ebuild:
-  Update ebuild to actually build with the users CFLAGS
-
-  16 Mar 2003; Martin Schlemmer <azarah@gentoo.org> bin86-0.16.0.ebuild :
-  Mark stable for x86.
-
-*bin86-0.16.11 (16 Mar 2003)
-
-  16 Mar 2003; Martin Schlemmer <azarah@gentoo.org> bin86-0.16.11.ebuild :
-  Update version.
-
-*bin86-0.16.10 (30 Dec 2002)
-
-  30 Dec 2002; Martin Schlemmer <azarah@gentoo.org> bin86-0.16.10.ebuild :
-  Update version.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> :
-  Changed sparc ~sparc keywords
- 
-*bin86-0.16.0 (16 Nov 2002)
-
-  16 Nov 2002; Brandon Low <lostlogic@gentoo.org> bin86-0.16.0.ebuild :
-  Ok here is 0.16.0, the make system of this package smells bad, but I
-  kicked it into shape.  Hope you all enjoy the new version.
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bin86/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
 
 *bin86-0.15.5 (1 Feb 2002)
 
diff --git a/sys-devel/bin86/Manifest b/sys-devel/bin86/Manifest
index 24767def7139..e69de29bb2d1 100644
--- a/sys-devel/bin86/Manifest
+++ b/sys-devel/bin86/Manifest
@@ -1,19 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1829f973a2d448647261c6e196aa2871 bin86-0.16.16.ebuild 890
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 bda0ffdd178c330eb3bb8e6d40ef3816 ChangeLog 2373
-MD5 d6b8cf3783abb5974e5ed7809f3b285c bin86-0.16.0.ebuild 724
-MD5 a273486444f92a35845813b92789b6eb bin86-0.16.17.ebuild 1019
-MD5 9737e2b2121543298c07b50ccd22abbc files/digest-bin86-0.16.16 65
-MD5 7d22d60b602b4280bac1e01f3d92a31a files/digest-bin86-0.16.0 65
-MD5 29c73c3800c42a8ea661a62f5c489a30 files/digest-bin86-0.16.17 65
-MD5 4f8a1fb4b57659469489673ed352e45c files/bin86-0.16.17-amd64-build.patch 314
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCfsUimOfEJZHYOKcRApOiAKDfktxt3/gRhR791EPkK2DC6RllIwCg6Zuf
-gt7UgzBpT9CxTbsZVrU162c=
-=HH40
------END PGP SIGNATURE-----
diff --git a/sys-devel/bin86/bin86-0.16.0.ebuild b/sys-devel/bin86/bin86-0.16.0.ebuild
index 641823058a31..a8fdec63970b 100644
--- a/sys-devel/bin86/bin86-0.16.0.ebuild
+++ b/sys-devel/bin86/bin86-0.16.0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bin86/bin86-0.16.0.ebuild,v 1.11 2005/01/31 03:01:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bin86/bin86-0.16.0.ebuild,v 1.1 2002/11/16 17:24:01 lostlogic Exp $
 
+S=${WORKDIR}/${P}
 DESCRIPTION="Assembler and loader used to create kernel bootsector"
 SRC_URI="http://www.cix.co.uk/~mayday/${PN/bin/dev}/${P}.tar.bz2"
 HOMEPAGE="http://www.cix.co.uk/~mayday/"
 
-DEPEND="virtual/libc"
+DEPEND="virtual/glibc"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 -sparc -ppc"
-IUSE=""
+KEYWORDS="~x86 ~sparc ~sparc64"
 
 src_compile() {
 
@@ -25,7 +25,7 @@ src_install() {
 
 	einstall PREFIX="${D}/usr" MANDIR="${D}/usr/share/man/man1"
 
-	dodoc README README-0.4 ChangeLog
+	dodoc README README-0.4 ChangeLog 
 	docinto as
 	dodoc as/COPYING as/TODO
 }
diff --git a/sys-devel/bin86/bin86-0.16.16.ebuild b/sys-devel/bin86/bin86-0.16.16.ebuild
index 3d23b9301f00..704416c6768f 100644
--- a/sys-devel/bin86/bin86-0.16.16.ebuild
+++ b/sys-devel/bin86/bin86-0.16.16.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bin86/bin86-0.16.16.ebuild,v 1.3 2005/01/27 04:00:16 vapier Exp $
-
-inherit toolchain-funcs
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bin86/bin86-0.16.16.ebuild,v 1.1 2004/11/30 02:35:41 vapier Exp $
 
 DESCRIPTION="Assembler and loader used to create kernel bootsector"
 HOMEPAGE="http://www.cix.co.uk/~mayday/"
@@ -10,7 +8,7 @@ SRC_URI="http://www.cix.co.uk/~mayday/dev86/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* x86"
+KEYWORDS="-* ~x86"
 IUSE=""
 
 RDEPEND="virtual/libc"
@@ -24,12 +22,7 @@ src_unpack() {
 }
 
 src_compile() {
-	emake \
-		PREFIX="/usr" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} -D_POSIX_SOURCE" \
-		LDFLAGS="${LDFLAGS}" \
-		|| die
+	emake PREFIX="/usr" CFLAGS="${CFLAGS} -D_POSIX_SOURCE" || die
 }
 
 src_install() {
diff --git a/sys-devel/bin86/bin86-0.16.17.ebuild b/sys-devel/bin86/bin86-0.16.17.ebuild
index 7cd373c25692..4700fb7b1964 100644
--- a/sys-devel/bin86/bin86-0.16.17.ebuild
+++ b/sys-devel/bin86/bin86-0.16.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-devel/bin86/bin86-0.16.17.ebuild,v 1.3 2005/05/09 02:04:05 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bin86/bin86-0.16.17.ebuild,v 1.1 2005/01/31 03:01:55 vapier Exp $
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="Assembler and loader used to create kernel bootsector"
 HOMEPAGE="http://www.cix.co.uk/~mayday/"
@@ -10,10 +10,12 @@ SRC_URI="http://www.cix.co.uk/~mayday/dev86/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* x86 ~amd64"
+KEYWORDS="-* ~x86"
 IUSE=""
 
-RDEPEND=""
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+	sys-apps/sed"
 
 src_unpack() {
 	unpack ${A}
@@ -22,9 +24,6 @@ src_unpack() {
 		-e 's:/man/man1:/share/man/man1:' \
 		-e '/^INSTALL_OPTS/s:-s::' \
 		Makefile || die "sed"
-
-	# This should make it built on other archictectures as well 
-	use amd64 && epatch ${FILESDIR}/${P}-amd64-build.patch
 }
 
 src_compile() {
diff --git a/sys-devel/bin86/metadata.xml b/sys-devel/bin86/metadata.xml
index 96a2d586367d..f093d416cbb1 100644
--- a/sys-devel/bin86/metadata.xml
+++ b/sys-devel/bin86/metadata.xml
@@ -1,3 +1,5 @@
+ [32;01m*[0m Generated metadata.xml:
+
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/sys-devel/binutils-config/ChangeLog b/sys-devel/binutils-config/ChangeLog
index f4b1640221d1..472edc7c1520 100644
--- a/sys-devel/binutils-config/ChangeLog
+++ b/sys-devel/binutils-config/ChangeLog
@@ -1,93 +1,6 @@
 # ChangeLog for sys-devel/binutils-config
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.18 2005/11/20 17:48:48 vapier Exp $
-
-*binutils-config-1.8-r6 (20 Nov 2005)
-
-  20 Nov 2005; Mike Frysinger <vapier@gentoo.org> files/binutils-config-1.8,
-  -binutils-config-1.8-r5.ebuild, +binutils-config-1.8-r6.ebuild:
-  Allow people to select profiles via version only.
-
-*binutils-config-1.8-r5 (27 Aug 2005)
-
-  27 Aug 2005; Mike Frysinger <vapier@gentoo.org> files/binutils-config-1.8,
-  -binutils-config-1.8-r4.ebuild, +binutils-config-1.8-r5.ebuild:
-  Ooops, last change removed a cd line by accident.
-
-*binutils-config-1.8-r3 (13 Jun 2005)
-
-  13 Jun 2005; Mike Frysinger <vapier@gentoo.org> files/binutils-config-1.8,
-  +binutils-config-1.8-r3.ebuild:
-  When uninstalling, clean out a few more dirs if they are empty.
-
-*binutils-config-1.8-r2 (03 Apr 2005)
-
-  03 Apr 2005; Mike Frysinger <vapier@gentoo.org> files/binutils-config-1.8,
-  -binutils-config-1.8-r1.ebuild, +binutils-config-1.8-r2.ebuild:
-  Touch up the unistall so it works with the eclass again.
-
-*binutils-config-1.8-r1 (22 Feb 2005)
-
-  22 Feb 2005; Mike Frysinger <vapier@gentoo.org>
-  +binutils-config-1.8-r1.ebuild:
-  Make sure manpage gets installed #81553 by Aron Griffis.
-
-*binutils-config-1.8 (30 Jan 2005)
-
-  30 Jan 2005; Mike Frysinger <vapier@gentoo.org> +files/binutils-config-1.8,
-  files/binutils-config.8, +binutils-config-1.8.ebuild:
-  Add support for generating fake arm/mips little/big targets. Also make it so
-  the user can select which profile to fake against.
-
-*binutils-config-1.7 (13 Jan 2005)
-
-  13 Jan 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/binutils-config-1.7, +files/binutils-config.8,
-  +binutils-config-1.7.ebuild:
-  Allow users to install fake x86/amd64 symlinks easily and add a manpage.
-
-*binutils-config-1.6 (01 Jan 2005)
-
-  01 Jan 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/binutils-config-1.6, +binutils-config-1.6.ebuild:
-  Upgrade support for FAKE_TARGETS.
-
-*binutils-config-1.5-r1 (31 Dec 2004)
-
-  31 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  files/binutils-config-1.5:
-  Fixed syntax error in binutils-condif-1.5.
-
-*binutils-config-1.5 (30 Dec 2004)
-
-  30 Dec 2004; Mike Frysinger <vapier@gentoo.org>
-  +files/binutils-config-1.5, +binutils-config-1.5.ebuild:
-  New version to support extra symlink generation for multilib systems.
-
-*binutils-config-1.4 (26 Dec 2004)
-
-  26 Dec 2004; Mike Frysinger <vapier@gentoo.org>
-  +files/binutils-config-1.4, +binutils-config-1.4.ebuild:
-  Fill out {INFO,LD,MAN}PATH variables to fix #74726 and #75636.
-
-*binutils-config-1.3 (15 Dec 2004)
-
-  15 Dec 2004; Mike Frysinger <vapier@gentoo.org>
-  +files/binutils-config-1.3, +binutils-config-1.3.ebuild:
-  Support $(get_libdir) for funky arches.
-
-*binutils-config-1.2 (15 Dec 2004)
-
-  15 Dec 2004; Mike Frysinger <vapier@gentoo.org>
-  +files/binutils-config-1.2, +binutils-config-1.2.ebuild:
-  Version bump to resolve upgrade issues #74348.
-
-*binutils-config-1.1 (08 Dec 2004)
-
-  08 Dec 2004; Mike Frysinger <vapier@gentoo.org>
-  +files/binutils-config-1.1, +binutils-config-1.1.ebuild:
-  Support unmerging of targets and move the symlink generation out of packages
-  and into binutils.
+# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.1 2004/11/14 08:50:38 vapier Exp $
 
 *binutils-config-1.0 (14 Nov 2004)
 
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index db265c447b85..e69de29bb2d1 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a3e9a0aa09d957e2b33dff7ceb210d1c ChangeLog 3430
-MD5 0e31c1486a2559fd48120d5f263dbbec binutils-config-1.8-r6.ebuild 562
-MD5 ef63d7e1a955a5461bea2a9094a385c1 files/binutils-config-1.8 9796
-MD5 953efbc2a688428dfb75ecfa3c2d3d43 files/binutils-config.8 2989
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-binutils-config-1.8-r6 0
-MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDgLdigIKl8Uu19MoRAoW5AJ9zwvPt7j5co+k4ojMjkWhXep6hzQCcCCHh
-KQJUgtb9a9v7Gmggio4gkdU=
-=atr+
------END PGP SIGNATURE-----
diff --git a/sys-devel/binutils-config/files/binutils-config-1.8 b/sys-devel/binutils-config/files/binutils-config-1.8
index f5e396f7ac1d..ead21ffdfdd1 100755
--- a/sys-devel/binutils-config/files/binutils-config-1.8
+++ b/sys-devel/binutils-config/files/binutils-config-1.8
@@ -1,14 +1,12 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.8,v 1.7 2005/11/20 17:48:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.8,v 1.1 2005/01/30 06:21:38 vapier Exp $
 
 # Format of /etc/env.d/binutils/:
 #  config-TARGET:	CURRENT=version for TARGET
 #  TARGET-VER:		has a TARGET and VER variable
 
-cd /
-
 trap ":" INT QUIT TSTP
 
 source /etc/init.d/functions.sh || {
@@ -121,18 +119,16 @@ switch_profile() {
 	# Generate include symlinks
 	#
 	INCPATH=${LIBPATH}/include
-	if [[ -d ${ROOT}/${INCPATH} ]] ; then
-		cd "${ROOT}/${INCPATH}" || exit 1
-		if [[ ${TARGET} == ${HOST} ]] ; then
-			dstinc=${ROOT}/usr/include
-		else
-			dstinc=${ROOT}/usr/${TARGET}/include
-		fi
-		mkdir -p "${dstinc}"
-		for x in * ; do
-			ln -sf "${INCPATH}/${x}" "${dstinc}/${x}"
-		done
+	cd "${ROOT}/${INCPATH}" || exit 1
+	if [[ ${TARGET} == ${HOST} ]] ; then
+		dstinc=${ROOT}/usr/include
+	else
+		dstinc=${ROOT}/usr/${TARGET}/include
 	fi
+	mkdir -p "${dstinc}"
+	for x in * ; do
+		ln -sf "${INCPATH}/${x}" "${dstinc}/${x}"
+	done
 
 	#
 	# Make sure proper paths get updated
@@ -178,14 +174,13 @@ uninstall_target() {
 		ewarn "Removing all signs of ${PROFILE##*/}"
 		rm -f "${ENV_D}"/${PROFILE}
 	done
-	if [[ -z ${PROFILE} ]] && [[ ! -e ${ENV_D}/config-${TARGET} ]] ; then
+	if [[ -z ${PROFILE} ]] ; then
 		eerror "$0: No profiles exist for '${TARGET}'"
 		exit 1
 	fi
 
 	rm -f "${ENV_D}"/config-${TARGET}
 
-	# XXX: we still leave behind FAKE_TARGETS in /usr/bin ...
 	for x in addr2line ar as c++filt ld nm objcopy \
 	         objdump ranlib readelf size strings strip ; do
 		rm -f "${ROOT}"/usr/bin/${TARGET}-${x}
@@ -194,13 +189,7 @@ uninstall_target() {
 	for x in ansidecl.h bfd.h bfdlink.h dis-asm.h symcat.h ; do
 		rm -f "${ROOT}"/usr/${TARGET}/include/${x}
 	done
-	for x in bfd iberty opcodes ; do
-		rm -f "${ROOT}"/usr/${HOST}/${TARGET}/lib/lib${x}{{-*,}.so,.a,.la}
-	done
-	rmdir "${ROOT}"/usr/${HOST}/${TARGET}/lib "${ROOT}"/usr/${HOST}/${TARGET} 2>/dev/null
 	rm -f "${ROOT}"/usr/${TARGET}/lib/ldscripts
-	rmdir "${ROOT}"/usr/${TARGET}/{bin,include,lib} "${ROOT}"/usr/${TARGET} 2>/dev/null
-	rmdir "${ROOT}"/var/db/pkg/cross-${TARGET} 2>/dev/null
 
 	rm -f "${ENV_D}"/${TARGET}-*
 }
@@ -244,21 +233,11 @@ list_profiles() {
 				[[ ${VER} == ${CURRENT} ]] && x="${x} ${GOOD}*${NORMAL}"
 			fi
 			echo " [${i}] ${x}"
-			((++i))
+			i=$((i + 1))
 		fi
 	done
 }
 
-set_HOST() {
-	[[ -n ${HOST} ]] && return 0
-
-	if [[ -z ${CHOST} ]] ; then
-		HOST=$(portageq envvar CHOST)
-	else
-		HOST=${CHOST}
-	fi
-}
-
 [[ -z ${ROOT} ]] && ROOT="/"
 ENV_D="${ROOT}etc/env.d/binutils"
 
@@ -267,7 +246,6 @@ NEED_ACTION="yes"
 DOIT="switch_profile"
 PROFILE=""
 FAKE_TARGETS_USER=""
-HOST=""
 
 while [[ $# -gt 0 ]] ; do
 	x=$1
@@ -301,7 +279,7 @@ while [[ $# -gt 0 ]] ; do
 			exit 0
 			;;
 		-v|--version)
-			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.8,v 1.7 2005/11/20 17:48:48 vapier Exp $"
+			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.8,v 1.1 2005/01/30 06:21:38 vapier Exp $"
 			cvsver=${cvsver##*binutils-config-}
 			echo "binutils-config-${cvsver%%,v *}"
 			exit 0
@@ -340,20 +318,14 @@ while [[ $# -gt 0 ]] ; do
 						NEED_ACTION="no"
 						break
 					fi
-					((++i))
+					i=$((i + 1))
 				done
 			else
 				# User gave us a full HOST-ver
 				x=${x##*/}
 				if [[ ! -f ${ENV_D}/${x} ]] && [[ ! -f ${ENV_D}/config-${x} ]] ; then
-					# Maybe they just gave us a ver ...
-					set_HOST
-					if [[ -f ${ENV_D}/${HOST}-${x} ]] ; then
-						x=${HOST}-${x}
-					else
-						eerror "$0: Could not locate '$x' in '${ENV_D}/'!"
-						exit 1
-					fi
+					eerror "$0: Could not locate '$x' in '${ENV_D}/'!"
+					exit 1
 				fi
 				PROFILE=${x}
 				NEED_ACTION="no"
@@ -365,7 +337,13 @@ done
 [[ ${NEED_ACTION} == "yes" ]] && usage && exit 1
 [[ ${DEBUG} == "yes" ]] && set -x
 
-[[ ${DOIT} != "list_profiles" ]] && set_HOST
+if [[ ${DOIT} != "list_profiles" ]] ; then
+	if [[ -z ${CHOST} ]] ; then
+		HOST=$(portageq envvar CHOST)
+	else
+		HOST=${CHOST}
+	fi
+fi
 [[ -z ${PROFILE} ]] && PROFILE=${HOST}
 [[ ${PROFILE} == "current" ]] && PROFILE=$(PROFILE=${HOST} get_current_profile)
 eval ${DOIT}
diff --git a/sys-devel/binutils-config/files/binutils-config.8 b/sys-devel/binutils-config/files/binutils-config.8
index 0872f4f15c5b..77626e99bf4a 100644
--- a/sys-devel/binutils-config/files/binutils-config.8
+++ b/sys-devel/binutils-config/files/binutils-config.8
@@ -31,30 +31,17 @@ This is really for internal use only.  Used to remove all traces of the
 \fBTARGET\fR binutils from your system.
 .SH "SPECIFIC OPTIONS"
 .TP
-\fB\-\-amd64\fR
-A nice feature of the amd64/x86 toolchain is that each can produce code for 
-other.  The typical user could care less, but some may want to be able to 
-cross-compile for an amd64 on a x86 system.  This will install the extra 
-symlinks ('x86_64') to facilitate this process.
-.TP
-\fB\-\-arm\fR
-The arm architecture comes in both big and little endian versions.  Typically 
-you only need support for the native target, but sometimes it's helpful to 
-have links for the other endian target.  This will make sure you have both the 
-big endian target ('armeb') and the little endian target ('arm').
-.TP
-\fB\-\-mips\fR
-The mips architecture (like arm) comes in both big and little endian versions.  
-Typically you only need support for the native target, but sometimes it's 
-helpful to have links for the other endian target.  This will make sure you 
-have both the big endian target ('mips') and the little endian target 
-('mipsel').
-.TP
 \fB\-\-x86\fR
 One oddity of the x86 toolchain is that they may be named 'i386', or 'i486', 
 or 'i586', or 'i686', yet still produce the same exact code.  When dealing 
 with distcc systems that are mixed (some i586 and some i686), you will need 
 symlinks for all these targets.  This option will install those extra targets.
+.TP
+\fB\-\-amd64\fR
+A nice feature of the amd64/x86 toolchain is that each can produce code for 
+other.  The typical user could care less, but some may want to be able to 
+cross-compile for an amd64 on a x86 system.  This will install the extra 
+symlinks ('x86_64') to facilitate this process.
 .SH "REPORTING BUGS"
 Please report bugs via http://bugs.gentoo.org/
 .SH "SEE ALSO"
@@ -75,4 +62,4 @@ Please report bugs via http://bugs.gentoo.org/
 .SH "AUTHORS"
 Mike Frysinger <vapier@gentoo.org>
 .SH "CVS HEADER"
-$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config.8,v 1.2 2005/01/30 06:21:38 vapier Exp $
+$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config.8,v 1.1 2005/01/14 03:28:15 vapier Exp $
diff --git a/sys-devel/binutils-hppa64/ChangeLog b/sys-devel/binutils-hppa64/ChangeLog
index dd934aba8fc4..a2cb684ee7e2 100644
--- a/sys-devel/binutils-hppa64/ChangeLog
+++ b/sys-devel/binutils-hppa64/ChangeLog
@@ -1,25 +1,8 @@
 # ChangeLog for sys-devel/binutils-hppa64
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-hppa64/ChangeLog,v 1.6 2004/07/02 09:31:32 eradicator Exp $
-
-  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  binutils-hppa64-2.14.90.0.7.ebuild, binutils-hppa64-2.14.90.0.8.ebuild:
-  virtual/glibc -> virtual/libc
-
-  13 May 2004; Guy Martin <gmsoft@gentoo.org>
-  binutils-hppa64-2.14.90.0.8.ebuild:
-  Marked stable on hppa.
-
-*binutils-hppa64-2.14.90.0.8 (28 Jan 2004)
-
-  28 Jan 2004, Guy Martin <gmsoft@gentoo.org> binutils-hppa64-2.14.90.0.8.ebuild,
-  hppa64-fptr-reloc.diff :
-  Version bump. Should fix function pointer comparison.
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-hppa64/ChangeLog,v 1.1 2004/01/03 16:14:24 gmsoft Exp $
 
 *binutils-hppa64-2.14.90.0.7 (03 Jan 2004)
 
-  07 Jan 2004; Guy Martin <gmsoft@gentoo.org> metadata.xml :
-  Fixed typo.
-
   03 Jan 2004; Guy Martin <gmsoft@gentoo.org> binutils-hppa64-2.14.90.0.7.ebuild :
   First add of binutils for hppa64. This one will compile 64 bit kernels.
diff --git a/sys-devel/binutils-hppa64/Manifest b/sys-devel/binutils-hppa64/Manifest
index bb4709e81bd3..5b779f1a91e0 100644
--- a/sys-devel/binutils-hppa64/Manifest
+++ b/sys-devel/binutils-hppa64/Manifest
@@ -1,7 +1,4 @@
-MD5 50f0b81e123fa1d47020dbafc59d4265 ChangeLog 988
-MD5 33dbb713232169127652ad4d60ddd48a binutils-hppa64-2.14.90.0.7.ebuild 2430
-MD5 ce91778060c7a5a627c0a29388ecb355 metadata.xml 229
-MD5 d8e3fe3c0b0555a45e800e14b619d124 binutils-hppa64-2.14.90.0.8.ebuild 2484
+MD5 deeb3a36cec4e1103dc102c604593900 ChangeLog 335
+MD5 de79bd48762a61610e04f1f9302a49f4 metadata.xml 229
+MD5 cf1645bb86c97c1b72830856d54c75a3 binutils-hppa64-2.14.90.0.7.ebuild 2423
 MD5 c19b60c5d77c4e0779d7820598b3b749 files/digest-binutils-hppa64-2.14.90.0.7 75
-MD5 8e759bc1ef0d2aae8ccc2be3452ee2a9 files/digest-binutils-hppa64-2.14.90.0.8 75
-MD5 27c72e7e1c52f4d01e702a8d7c186556 files/hppa64-fptr-reloc.diff 3020
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.14.90.0.7.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.14.90.0.7.ebuild
index c4a2d38584da..43c9039236a3 100644
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.14.90.0.7.ebuild
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.14.90.0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-hppa64/binutils-hppa64-2.14.90.0.7.ebuild,v 1.4 2004/11/08 08:50:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-hppa64/binutils-hppa64-2.14.90.0.7.ebuild,v 1.1 2004/01/03 16:14:24 gmsoft Exp $
 
 IUSE="nls bootstrap build"
 
@@ -19,11 +19,11 @@ SRC_URI="mirror://kernel/linux/devel/binutils/${MY_P}.tar.bz2
 	mirror://kernel/linux/devel/binutils/test/${MY_P}.tar.bz2"
 HOMEPAGE="http://sources.redhat.com/binutils/"
 
-LICENSE="|| ( GPL-2 LGPL-2 )"
 SLOT="0"
+LICENSE="GPL-2 | LGPL-2"
 KEYWORDS="-* ~hppa"
 
-DEPEND="virtual/libc
+DEPEND="virtual/glibc
 	nls? ( sys-devel/gettext )
 	!build? ( !bootstrap? ( dev-lang/perl ) )"
 
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.14.90.0.8.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.14.90.0.8.ebuild
index 3e518db583c8..5654e779f704 100644
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.14.90.0.8.ebuild
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.14.90.0.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-hppa64/binutils-hppa64-2.14.90.0.8.ebuild,v 1.6 2004/11/08 08:50:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-hppa64/binutils-hppa64-2.14.90.0.8.ebuild,v 1.1 2004/03/27 23:04:54 gmsoft Exp $
 
 IUSE="nls bootstrap build"
 
@@ -19,11 +19,11 @@ SRC_URI="mirror://kernel/linux/devel/binutils/${MY_P}.tar.bz2
 	mirror://kernel/linux/devel/binutils/test/${MY_P}.tar.bz2"
 HOMEPAGE="http://sources.redhat.com/binutils/"
 
-LICENSE="|| ( GPL-2 LGPL-2 )"
 SLOT="0"
-KEYWORDS="-* hppa"
+LICENSE="GPL-2 | LGPL-2"
+KEYWORDS="-* ~hppa"
 
-DEPEND="virtual/libc
+DEPEND="virtual/glibc
 	nls? ( sys-devel/gettext )
 	!build? ( !bootstrap? ( dev-lang/perl ) )"
 
@@ -32,7 +32,7 @@ TARGET=hppa64-linux
 src_unpack() {
 
 	unpack ${A}
-
+	
 	cd ${S}
 	#epatch ${FILESDIR}/hppa64-fptr-reloc.diff
 
diff --git a/sys-devel/binutils-hppa64/metadata.xml b/sys-devel/binutils-hppa64/metadata.xml
index d71df29caf61..665bc8a02b23 100644
--- a/sys-devel/binutils-hppa64/metadata.xml
+++ b/sys-devel/binutils-hppa64/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>hppa</herd>
 <longdescription>
-binutils for 64bit kernel on hppa.
+binutils for 64bit kernel on hppa2
 </longdescription>
 </pkgmetadata>
diff --git a/sys-devel/binutils/ChangeLog b/sys-devel/binutils/ChangeLog
index 32be419c1775..7998154bf2ff 100644
--- a/sys-devel/binutils/ChangeLog
+++ b/sys-devel/binutils/ChangeLog
@@ -1,1224 +1,6 @@
 # ChangeLog for sys-devel/binutils
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/ChangeLog,v 1.235 2005/11/23 23:07:00 metalgod Exp $
-
-  23 Nov 2005; Luis Medinas <metalgod@gentoo.org> binutils-2.16.1.ebuild:
-  Stable on amd64.
-
-  23 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  binutils-2.16.1.ebuild:
-  Stable on sparc
-
-  23 Nov 2005; Mark Loeser <halcy0n@gentoo.org> binutils-2.16.1.ebuild:
-  Stable on x86; bug #112666
-
-  18 Nov 2005; Joshua Kinard <kumba@gentoo.org> binutils-2.16.90.0.3.ebuild,
-  binutils-2.16.91.0.2.ebuild:
-  -mips to binutils-2.16.90.0.3, as it has unfixable quirks; ~mips to
-  binutils-2.16.91.0.2 for testing.
-
-*binutils-2.16.91.0.4 (13 Nov 2005)
-
-  13 Nov 2005; Mike Frysinger <vapier@gentoo.org>
-  +binutils-2.16.91.0.4.ebuild:
-  Version bump.
-
-  18 Oct 2005; Joseph Jezak <josejx@gentoo.org> binutils-2.16.1.ebuild:
-  Marked ppc stable.
-
-  06 Sep 2005; Markus Rothe <corsair@gentoo.org> binutils-2.16.1.ebuild:
-  Stable on ppc64
-
-  28 Aug 2005; Joshua Kinard <kumba@gentoo.org> binutils-2.16.1.ebuild,
-  binutils-2.16.90.0.3.ebuild:
-  Bump 2.16.1 to stable on mips, and 2.16.90.0.3 to unstable.
-
-*binutils-2.16.91.0.3 (23 Aug 2005)
-
-  23 Aug 2005; Mike Frysinger <vapier@gentoo.org>
-  +binutils-2.16.91.0.3.ebuild:
-  Version bump.
-
-*binutils-2.16.91.0.2 (02 Aug 2005)
-
-  02 Aug 2005; Mike Frysinger <vapier@gentoo.org>
-  +binutils-2.16.91.0.2.ebuild:
-  Version bump.
-
-  13 Jul 2005; MATSUU Takuto <matsuu@gentoo.org>
-  binutils-2.15.92.0.2-r10.ebuild:
-  Stable on sh.
-
-  13 Jul 2005; bret curtis <psi29a@gentoo.org> binutils-2.16.1.ebuild,
-  binutils-2.16-r1.ebuild:
-  added to ~mips
-
-  12 Jul 2005; MATSUU Takuto <matsuu@gentoo.org>
-  binutils-2.15.92.0.2-r10.ebuild:
-  Added ~sh to KEYWORDS.
-
-  07 Jul 2005; Hardave Riar <hardave@gentoo.org>
-  binutils-2.15.92.0.2-r10.ebuild:
-  Stable on mips.
-
-  28 Jun 2005; Markus Rothe <corsair@gentoo.org> binutils-2.16-r1.ebuild:
-  Back to ~ppc64; ld problem with current stable glibc :-/
-
-  28 Jun 2005; Markus Rothe <corsair@gentoo.org> binutils-2.16-r1.ebuild:
-  Stable on ppc64
-
-*binutils-2.16.91.0.1 (28 Jun 2005)
-
-  28 Jun 2005; Mike Frysinger <vapier@gentoo.org>
-  +binutils-2.16.91.0.1.ebuild:
-  Version bump.
-
-*binutils-2.16.1 (12 Jun 2005)
-
-  12 Jun 2005; Mike Frysinger <vapier@gentoo.org> +binutils-2.16.1.ebuild:
-  Version bump.
-
-  31 May 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  binutils-2.15.92.0.2-r10.ebuild:
-  Stable on sparc wrt #91398
-
-  31 May 2005; Markus Rothe <corsair@gentoo.org> binutils-2.16.ebuild,
-  binutils-2.16-r1.ebuild:
-  Added ~ppc64 to KEYWORDS
-
-  29 May 2005; Bryan Østergaard <kloeri@gentoo.org>
-  binutils-2.14.90.0.8-r3.ebuild:
-  Stable on ia64, bug 91398.
-
-  29 May 2005; Bryan Østergaard <kloeri@gentoo.org>
-  binutils-2.14.90.0.8-r3.ebuild:
-  Stable on alpha, bug 91398.
-
-  28 May 2005; Rene Nussbaumer <killerfox@gentoo.org>
-  binutils-2.15.92.0.2-r10.ebuild:
-  Stable on hppa; bug #91398
-
-  28 May 2005; Markus Rothe <corsair@gentoo.org>
-  binutils-2.15.90.0.3-r5.ebuild:
-  Stable on ppc64
-
-  28 May 2005; <dang@gentoo.org> binutils-2.15.92.0.2-r10.ebuild:
-  Mark amd64 stable per bug #91398
-
-  28 May 2005; Luca Barbato <lu_zero@gentoo.org>
-  binutils-2.15.90.0.3-r5.ebuild:
-  Marked ppc
-
-*binutils-2.16-r1 (28 May 2005)
-*binutils-2.15.92.0.2-r10 (28 May 2005)
-*binutils-2.15.91.0.2-r2 (28 May 2005)
-*binutils-2.15.90.0.3-r5 (28 May 2005)
-*binutils-2.15.90.0.1.1-r5 (28 May 2005)
-*binutils-2.14.90.0.8-r3 (28 May 2005)
-
-  28 May 2005; Mike Frysinger <vapier@gentoo.org>
-  +binutils-2.14.90.0.8-r3.ebuild, binutils-2.15.ebuild,
-  +binutils-2.15.90.0.1.1-r5.ebuild, +binutils-2.15.90.0.3-r5.ebuild,
-  +binutils-2.15.91.0.2-r2.ebuild, +binutils-2.15.92.0.2-r10.ebuild,
-  +binutils-2.16-r1.ebuild, binutils-2.16.90.0.3.ebuild:
-  Add some more bfd checks and fix tls stripping.
-
-*binutils-2.15.92.0.2-r9 (17 May 2005)
-
-  17 May 2005; Mike Frysinger <vapier@gentoo.org>
-  +binutils-2.15.92.0.2-r9.ebuild:
-  Add patches to fix security issues #91398.
-
-*binutils-2.16.90.0.3 (11 May 2005)
-
-  11 May 2005; Mike Frysinger <vapier@gentoo.org>
-  +binutils-2.16.90.0.3.ebuild:
-  Version bump.
-
-  10 May 2005; Lars Weiler <pylon@gentoo.org>
-  binutils-2.15.92.0.2-r1.ebuild, binutils-2.15.92.0.2-r7.ebuild,
-  binutils-2.15.92.0.2-r8.ebuild:
-  Downgrading and masking on ppc due to compile errors; bug #91887.
-
-  07 May 2005; Michael Hanselmann <hansmi@gentoo.org>
-  binutils-2.15.92.0.2-r8.ebuild:
-  Stable on hppa.
-
-  07 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
-  binutils-2.15.92.0.2-r8.ebuild:
-  stable on amd64 wrt security bug #91813
-
-  07 May 2005; Michael Hanselmann <hansmi@gentoo.org>
-  binutils-2.15.92.0.2-r8.ebuild:
-  Stable on ppc.
-
-*binutils-2.16 (04 May 2005)
-
-  04 May 2005; Mike Frysinger <vapier@gentoo.org> +binutils-2.16.ebuild:
-  Version bump.
-
-*binutils-2.16.90.0.2 (30 Apr 2005)
-
-  30 Apr 2005; Mike Frysinger <vapier@gentoo.org>
-  +binutils-2.16.90.0.2.ebuild:
-  Version bump.
-
-*binutils-2.15.97 (21 Apr 2005)
-
-  21 Apr 2005; Mike Frysinger <vapier@gentoo.org> +binutils-2.15.97.ebuild:
-  Version bump.
-
-*binutils-2.14 (17 Apr 2005)
-
-  17 Apr 2005; Mike Frysinger <vapier@gentoo.org> +binutils-2.14.ebuild:
-  Add older version for ps2 support.
-
-*binutils-2.16.90.0.1 (12 Apr 2005)
-
-  12 Apr 2005; Mike Frysinger <vapier@gentoo.org>
-  +binutils-2.16.90.0.1.ebuild:
-  Version bump.
-
-  11 Apr 2005; Markus Rothe <corsair@gentoo.org>
-  -binutils-2.15.91.0.1-r1.ebuild:
-  removed for bug #88678
-
-  09 Apr 2005; Markus Rothe <corsair@gentoo.org>
-  binutils-2.15.92.0.2-r8.ebuild, binutils-2.15.94.0.2.2.ebuild:
-  Added ~ppc64 to KEYWORDS
-
-*binutils-2.15.92.0.2-r8 (06 Apr 2005)
-
-  06 Apr 2005; Mike Frysinger <vapier@gentoo.org>
-  +binutils-2.15.92.0.2-r8.ebuild:
-  Add ld speedup / readelf buffer fix patches from redhat and a better
-  unlink() patch from solar/upstream.
-
-  30 Mar 2005; Joshua Kinard <kumba@gentoo.org>
-  binutils-2.14.90.0.8-r2.ebuild, binutils-2.15.91.0.2-r1.ebuild,
-  binutils-2.15.94.0.2.2.ebuild:
-  Marked 2.14.90.0.8-r2 and 2.15.91.0.2-r1 as stable on mips, and moved
-  2.15.94.0.2.2 to unstable.
-
-*binutils-2.15.92.0.2-r7 (22 Mar 2005)
-
-  22 Mar 2005; Mike Frysinger <vapier@gentoo.org>
-  +binutils-2.15.92.0.2-r7.ebuild:
-  Add a TEXTREL fix for arm and warn about TEXTRELs in ld.
-
-*binutils-2.15.92.0.2-r6 (11 Mar 2005)
-
-  11 Mar 2005; Mike Frysinger <vapier@gentoo.org>
-  +binutils-2.15.92.0.2-r6.ebuild:
-  Delete old/duplicated patches and add newer/spiffier ones. See the
-  patchtarball and/or CVS commits for more info :P. Just be happy this one
-  passes make check on amd64.
-
-  09 Mar 2005; <solar@gentoo.org> binutils-2.15.92.0.2-r5.ebuild:
-  - uClibc supports relro now. remove exception from ebuild
-
-*binutils-2.15.92.0.2-r5 (08 Mar 2005)
-
-  08 Mar 2005; Mike Frysinger <vapier@gentoo.org>
-  +binutils-2.15.92.0.2-r5.ebuild:
-  Fix up gcc-4 support for real #82907 by richard juckes.
-
-*binutils-2.15.92.0.2-r4 (23 Feb 2005)
-
-  23 Feb 2005; Mike Frysinger <vapier@gentoo.org>
-  -binutils-2.15.92.0.2-r3.ebuild, +binutils-2.15.92.0.2-r4.ebuild:
-  Fix gcc-4 patch to not break gcc-3 #83047.
-
-  23 Feb 2005; Jon Portnoy <avenj@gentoo.org> binutils-2.15.92.0.2-r3.ebuild :
-  Reverted PATCHVER=1.4 to PATCHVER=1.3 due to bug
-  #83047
-
-*binutils-2.15.92.0.2-r3 (20 Feb 2005)
-
-  20 Feb 2005; <solar@gentoo.org> +binutils-2.15.92.0.2-r3.ebuild:
-  - bump the binutils-patches 1.2 -> 1.3. New option ld -z nonow/-Wl,-z,nonow
-
-*binutils-2.15.94.0.2.2 (19 Feb 2005)
-
-  19 Feb 2005; Mike Frysinger <vapier@gentoo.org>
-  +binutils-2.15.94.0.2.2.ebuild:
-  Version bump.
-
-  23 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  binutils-2.15.92.0.2-r1.ebuild:
-  Stable on amd64.
-
-  22 Jan 2005; <plasmaroo@gentoo.org> binutils-2.15.92.0.2-r1.ebuild,
-  binutils-2.15.92.0.2-r2.ebuild:
-  Converting 2.1.95 ~IA64 KEYWORDS into -IA64 KEYWORDS as kernels as well as
-  gnu-efi fail to compile with these versions...
-
-  11 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  binutils-2.15.92.0.2-r1.ebuild:
-  Stable on sparc, it's about time
-
-  03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-*binutils-2.15.91.0.2-r1 (28 Dec 2004)
-
-  28 Dec 2004; Mike Frysinger <vapier@gentoo.org>
-  +binutils-2.15.91.0.2-r1.ebuild:
-  New versions to support binutils-config.
-
-*binutils-2.15.91.0.1-r1 (28 Dec 2004)
-
-  28 Dec 2004; Mike Frysinger <vapier@gentoo.org>
-  +binutils-2.15.91.0.1-r1.ebuild:
-  New versions to support binutils-config.
-
-*binutils-2.15.90.0.3-r4 (28 Dec 2004)
-
-  28 Dec 2004; Mike Frysinger <vapier@gentoo.org>
-  +binutils-2.15.90.0.3-r4.ebuild:
-  New versions to support binutils-config.
-
-  28 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  binutils-2.15.92.0.2-r2.ebuild:
-  Added to ~sparc.
-
-  26 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  binutils-2.15.92.0.2-r1.ebuild:
-  Removing sparc64-multilib stuff as we're just using the superior
-  binutils-config versions in that profile.
-
-*binutils-2.15.94.0.2 (21 Dec 2004)
-
-  21 Dec 2004; Mike Frysinger <vapier@gentoo.org>
-  +binutils-2.15.94.0.2.ebuild:
-  Version bump.
-
-  13 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  binutils-2.15.92.0.2-r1.ebuild:
-  Updated sparc64-multilib to use MULTILIB_CHOSTS example.
-
-*binutils-2.14.90.0.8-r2 (12 Dec 2004)
-
-  12 Dec 2004; Mike Frysinger <vapier@gentoo.org>
-  +binutils-2.14.90.0.8-r2.ebuild:
-  Use toolchain eclass.
-
-  10 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  binutils-2.15.92.0.2-r1.ebuild:
-  Updated for sparc64-multilib.
-
-*binutils-2.15.90.0.1.1-r4 (04 Dec 2004)
-
-  04 Dec 2004; Mike Frysinger <vapier@gentoo.org>
-  +binutils-2.15.90.0.1.1-r4.ebuild:
-  Version bump for toolchain-binutils support.
-
-*binutils-2.14.90.0.6-r8 (02 Dec 2004)
-
-  02 Dec 2004; Mike Frysinger <vapier@gentoo.org>
-  +binutils-2.14.90.0.6-r8.ebuild:
-  Use toolchain eclass.
-
-  30 Nov 2004; Guy Martin <gmsoft@gentoo.org> binutils-2.15.92.0.2-r1.ebuild:
-  Stable on hppa. Fix problems with libxml2 and others.
-
-  24 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org>
-  binutils-2.15.92.0.2-r1.ebuild:
-  Keyworded ~sparc
-
-*binutils-2.15.94.0.1 (23 Nov 2004)
-
-  23 Nov 2004; Mike Frysinger <vapier@gentoo.org>
-  +binutils-2.15.94.0.1.ebuild:
-  Version bump.
-
-  21 Nov 2004; Mike Frysinger <vapier@gentoo.org>
-  binutils-2.15.90.0.1.1-r3.ebuild:
-  Move to x86 stable finally.
-
-  21 Nov 2004; Mike Frysinger <vapier@gentoo.org>
-  binutils-2.15.90.0.1.1-r3.ebuild:
-  Move to x86 stable finally.
-
-*binutils-2.15.92.0.2-r2 (20 Oct 2004)
-
-  20 Oct 2004; Mike Frysinger <vapier@gentoo.org>
-  +binutils-2.15.92.0.2-r2.ebuild:
-  Clean up ebuild. Try to handle $CTARGET/$CHOST correctly. Use symlinks
-  instead of hard links in src_install().
-
-  18 Oct 2004; Guy Martin <gmsoft@gentoo.org> binutils-2.15.92.0.2-r1.ebuild:
-  Added ~hppa.
-
-*binutils-2.15.92.0.2-r1 (11 Oct 2004)
-
-  11 Oct 2004; Travis Tilley <lv@gentoo.org> +binutils-2.15.92.0.2-r1.ebuild:
-  removed a few unused patches from the tarball. removed an old ppc -fPIC patch
-  that was causing the compile to fail, closes bug 66738. updated a few patches
-  borrowed from fedora to their latest versions, closes bug 66871. updated pax
-  patch to the latest version available on pax.grsecurity.net, version
-  2.15.91.0.2-200410091215
-
-  06 Oct 2004; Travis Tilley <lv@gentoo.org> binutils-2.15.92.0.2.ebuild:
-  added ~x86 keyword, as requested in bug 66555
-
-  03 Oct 2004; Travis Tilley <lv@gentoo.org> binutils-2.15.92.0.2.ebuild:
-  added ~amd64 keyword. among other things, this release fixes an x86-64 linker
-  warning while building the Linux kernel.
-
-*binutils-2.15.92.0.2 (01 Oct 2004)
-
-  01 Oct 2004; Joshua Kinard <kumba@gentoo.org> +binutils-2.15.92.0.2.ebuild:
-  Version bump.
-
-  01 Oct 2004; Joshua Kinard <kumba@gentoo.org> binutils-2.15.91.0.2.ebuild:
-  Added ~sparc to KEYWORDS.
-
-  01 Oct 2004; Joshua Kinard <kumba@gentoo.org> binutils-2.15.91.0.2.ebuild:
-  Marked ~mips. Works great for o32, n32 has problems, and is thus masked in
-  cascade profiles.
-
-  28 Sep 2004; Mike Frysinger <vapier@gentoo.org>
-  +files/2.15/40_all_binutils-uclibc-linker.patch,
-  binutils-2.15.90.0.1.1-r1.ebuild, binutils-2.15.90.0.1.1-r3.ebuild:
-  Add a patch to fix uclibc linking/ld.so.con.
-
-  08 Sep 2004; Mike Frysinger <vapier@gentoo.org>
-  binutils-2.14.90.0.8-r1.ebuild, -binutils-2.14.90.0.8-r2.ebuild:
-  Merge the changes from -r2 back into -r1 since it was just uclibc specific.
-
-  06 Sep 2004; <solar@gentoo.org>
-  +files/2.15/binutils-2.15-elf32-arm-textrel.patch,
-  binutils-2.15.90.0.1.1-r3.ebuild:
-  added patch from RH which allows ARCH=arm to compile & link correctly with
-  binutils-2.15
-
-  06 Sep 2004; Luca Barbato <lu_zero@gentoo.org>
-  binutils-2.15.90.0.3-r3.ebuild:
-  Marked ppc
-
-  02 Sep 2004; Mike Frysinger <vapier@gentoo.org>
-  binutils-2.14.90.0.8-r1.ebuild, binutils-2.14.90.0.8-r2.ebuild,
-  binutils-2.15.90.0.3-r3.ebuild:
-  Versions 2.15 <= x <= 2.15.91.0.2 are known to produce bad code for arm under
-  certain circumstances.
-
-  01 Sep 2004; <solar@gentoo.org> binutils-2.15.90.0.1.1-r1.ebuild,
-  binutils-2.15.90.0.1.1-r3.ebuild:
-  marking binutils-2.15.91.0.1 ~x86 again
-
-  31 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org>
-  binutils-2.14.90.0.8-r1.ebuild:
-  Stable on sparc
-
-  26 Aug 2004; Rob Holland <tigger@gentoo.org> binutils-2.14.90.0.8-r2.ebuild,
-  binutils-2.15.91.0.1-r2.ebuild, binutils-2.15.91.0.2.ebuild:
-  gnuconfig_update belongs in src_unpack, not src_compile
-
-  11 Aug 2004; Travis Tilley <lv@gentoo.org> binutils-2.15.91.0.2.ebuild:
-  masking this release -amd64. most software builds fine, but on mozilla firefox
-  and occasionally glibc this release will segfault
-
-  09 Aug 2004; Travis Tilley <lv@gentoo.org> binutils-2.15.91.0.2.ebuild:
-  adding ~amd64 keyword for testing
-
-*binutils-2.15.91.0.2 (02 Aug 2004)
-
-  02 Aug 2004; Joshua Kinard <kumba@gentoo.org> +binutils-2.15.91.0.2.ebuild:
-  New revision of binutils.  Doesn't include 51* or 52* uclibc patches.
-
-  27 Jul 2004; Mike Frysinger <vapier@gentoo.org>
-  +files/2.14/binutils-2.14.90.0.6-build_modules.patch,
-  +files/2.14/binutils-2.14.90.0.6-cflags.patch,
-  +files/2.14/binutils-2.14.90.0.6-conf.patch,
-  +files/2.14/binutils-2.14.90.0.6-debian.patch,
-  binutils-2.14.90.0.6-r7.ebuild:
-  Add patches from uClibc build root.
-
-  24 Jul 2004; Travis Tilley <lv@gentoo.org> binutils-2.15.91.0.1-r1.ebuild:
-  removing ~amd64 keyword
-
-  22 Jul 2004; <solar@gentoo.org> binutils-2.14.90.0.8-r2.ebuild:
-  uclibc update
-
-  08 Jul 2004; Travis Tilley <lv@gentoo.org> binutils-2.15.91.0.1-r1.ebuild:
-  adding ~amd64 keyword for wider testing
-
-  08 Jul 2004; Alexander Gabert <pappy@gentoo.org>
-  binutils-2.14.90.0.8-r2.ebuild:
-  added filter-flags for freduce-all-givs (bug id 27456)
-
-  03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org>
-  binutils-2.14.90.0.8-r1.ebuild:
-  Stable on alpha.
-
-  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  binutils-2.11.92.0.12.3-r2.ebuild, binutils-2.11.92.0.7.ebuild,
-  binutils-2.12.90.0.15.ebuild, binutils-2.13.90.0.16-r1.ebuild,
-  binutils-2.13.90.0.18-r1.ebuild, binutils-2.13.90.0.18.ebuild,
-  binutils-2.14.90.0.2.ebuild, binutils-2.14.90.0.4.1-r1.ebuild,
-  binutils-2.14.90.0.5-r1.ebuild, binutils-2.14.90.0.6-r2.ebuild,
-  binutils-2.14.90.0.6-r3.ebuild, binutils-2.14.90.0.6-r6.ebuild,
-  binutils-2.14.90.0.6-r7.ebuild, binutils-2.14.90.0.7-r4.ebuild,
-  binutils-2.14.90.0.7.ebuild, binutils-2.14.90.0.8-r1.ebuild,
-  binutils-2.14.90.0.8-r2.ebuild, binutils-2.14.90.0.8.ebuild,
-  binutils-2.15.90.0.1.1-r1.ebuild, binutils-2.15.90.0.1.1-r3.ebuild,
-  binutils-2.15.90.0.3-r3.ebuild, binutils-2.15.91.0.1-r1.ebuild,
-  binutils-2.15.91.0.1-r2.ebuild, binutils-2.15.91.0.1.ebuild:
-  virtual/glibc -> virtual/libc
-
-  27 Jun 2004; <solar@gentoo.org> binutils-2.15.91.0.1-r2.ebuild:
-  remove unused patches from tarball an no_rel_ro patches
-
-  23 Jun 2004; Aron Griffis <agriffis@gentoo.org>
-  binutils-2.11.92.0.12.3-r2.ebuild, binutils-2.11.92.0.7.ebuild,
-  binutils-2.12.90.0.15.ebuild, binutils-2.13.90.0.16-r1.ebuild,
-  binutils-2.13.90.0.18-r1.ebuild, binutils-2.13.90.0.18.ebuild,
-  binutils-2.14.90.0.2.ebuild, binutils-2.14.90.0.4.1-r1.ebuild,
-  binutils-2.14.90.0.5-r1.ebuild, binutils-2.14.90.0.6-r2.ebuild,
-  binutils-2.14.90.0.6-r3.ebuild, binutils-2.14.90.0.6-r6.ebuild,
-  binutils-2.14.90.0.6-r7.ebuild, binutils-2.14.90.0.7-r4.ebuild,
-  binutils-2.14.90.0.7.ebuild, binutils-2.14.90.0.8-r1.ebuild,
-  binutils-2.14.90.0.8.ebuild:
-  QA - fix use invocation
-
-  20 Jun 2004; Daniel Black <dragonheart@gentoo.org>
-  binutils-2.14.90.0.8-r2.ebuild, binutils-2.15.91.0.1-r2.ebuild:
-  Fix unpacks for bugs #54316 and #54059. Added sample test routine to
-  binutils-2.15.91.0.1-r2
-
-  15 Jun 2004; Travis Tilley <lv@gentoo.org> binutils-2.14.90.0.8-r2.ebuild:
-  changed the ebuild to not have "use uclibc ... || die", but it still doesnt
-  patch cleanly so it is still masked
-
-  15 Jun 2004; Travis Tilley <lv@gentoo.org> binutils-2.14.90.0.8-r2.ebuild:
-  masking -* due to bug 54059
-
-*binutils-2.15.91.0.1-r2 (16 Jun 2004)
-
-  16 Jun 2004; Daniel Black <dragonheart@gentoo.org>
-  +binutils-2.14.90.0.8-r2.ebuild, +binutils-2.15.91.0.1-r2.ebuild:
-  uclibc fixes thanks to Peter S. Mazinger <ps.m@gmx.net>
-
-  13 Jun 2004; Luca Barbato <lu_zero@gentoo.org>
-  binutils-2.15.90.0.3-r3.ebuild:
-  Fixes a problem with kdeutils not linking
-
-  08 Jun 2004; Mike Frysinger <vapier@gentoo.org>
-  binutils-2.15.91.0.1-r1.ebuild:
-  This version breaks pretty bad on ppc/altivec ... cant build kernel/gcc/etc...
-  :(
-
-  05 Jun 2004; Ilya A. Volynets-Evenbach <iluxa@gentoo.org>
-  binutils-2.14.90.0.8-r1.ebuild:
-  Mark binutils-2.14.90.0.8-r1 ~mips
-
-*binutils-2.15.91.0.1-r1 (04 Jun 2004)
-
-  04 Jun 2004; Travis Tilley <lv@gentoo.org> +files/libiberty-pic.patch,
-  +binutils-2.15.91.0.1-r1.ebuild:
-  new ebuild with patch updates from Peter Mazinger
-
-  03 Jun 2004; Tom Gall <tgall@gentoo.org> binutils-2.15.90.0.3-r3.ebuild,
-  	binutils-2.15.91.0.1.ebuild:
-  binutils-2.15.90.0.3-r3.ebuild stable on ppc64, binutils-2.15.91.0.1.ebuild
-  ~ppc64 
-
-  02 Jun 2004; Travis Tilley <lv@gentoo.org> binutils-2.15.90.0.1.1-r3.ebuild:
-  stable on amd64
-
-*binutils-2.15.91.0.1 (28 May 2004)
-
-  28 May 2004; Joshua Kinard <kumba@gentoo.org>
-  binutils-2.15.90.0.3-r3.ebuild, +binutils-2.15.91.0.1.ebuild:
-  New revision, keyword masked for now, needs testing.
-
-  26 May 2004; Luca Barbato <lu_zero@gentoo.org>
-  binutils-2.15.90.0.1.1-r3.ebuild, binutils-2.15.90.0.3-r3.ebuild:
-  Marked ~ppc
-
-*binutils-2.15.90.0.1.1-r3 (23 May 2004)
-
-  23 May 2004; Travis Tilley <lv@gentoo.org>
-  -binutils-2.15.90.0.1.1-r2.ebuild, +binutils-2.15.90.0.1.1-r3.ebuild:
-  make patchset apply all patches on all archs and re-added hppa keyword since
-  the relro backport should apply cleanly now
-
-  16 May 2004; <solar@gentoo.org> binutils-2.14.90.0.8-r1.ebuild,
-  binutils-2.15.90.0.1.1-r1.ebuild, binutils-2.15.90.0.1.1-r2.ebuild,
-  binutils-2.15.90.0.1.1.ebuild, binutils-2.15.90.0.3-r3.ebuild:
-  added gprof/bbconv.pl install phase of >=binutils-2.14.90.0.8-r1, added
-  multitarget USE flag for canadian cross compiling bug #49934 also
-  >=binutils-2.14.90.0.8-r1. marked 2.14.90.0.8-r1 stable on x86
-
-  13 May 2004; <solar@gentoo.org> binutils-2.15.90.0.3-r3.ebuild:
-  bbconv.pl script is needed to convert profiling information in bb.out files to
-  format understood by gprof. reported by pasi valminen bug 50911
-
-*binutils-2.15.90.0.3-r3 (11 May 2004)
-
-  11 May 2004; <solar@gentoo.org> binutils-2.15.90.0.3-r2.ebuild,
-  binutils-2.15.90.0.3-r3.ebuild:
-  updated patches to match upstream fixes. Includes fix s390{,x} .{,b,p2}align
-  handling, ppc/ppc64 testsuite fixes. -z relro ppc/ppc64/ia64 fixes, change
-  x86-64 .plt symbol st_size handling to match ia32, prettify objdump -d output,
-  several SPARC fixes. Submitted by Peter S. Mazinger
-
-*binutils-2.15.90.0.3-r2 (10 May 2004)
-
-  10 May 2004; <solar@gentoo.org> binutils-2.15.90.0.3-r1.ebuild,
-  binutils-2.15.90.0.3-r2.ebuild:
-  Fix .tbss handling
-
-  08 May 2004; Joshua Kinard <kumba@gentoo.org>
-  binutils-2.14.90.0.8-r1.ebuild:
-  Originally masked because these binutils would produce non-booting kernels on
-  mips. That problem has been resolved in the kernel sources now, so it's safe
-  to put these into unstable (2.15 needs more testing).
-
-*binutils-2.15.90.0.1.1-r2 (10 May 2004)
-
-  10 May 2004; Travis Tilley <lv@gentoo.org>
-  +binutils-2.15.90.0.1.1-r2.ebuild:
-  added backports of the tbss fix and relro patch
-
-*binutils-2.15.90.0.1.1-r1 (04 May 2004)
-
-  04 May 2004; Travis Tilley <lv@gentoo.org>
-  +binutils-2.15.90.0.1.1-r1.ebuild:
-  added a more amd64-friendly revision of 2.15.90.0.1.1. besides the patches
-  included in the previous ebuild, the following have been added:
-  34_all_binutils-2.15.90.0.3-place-orphan.patch,
-  70_amd64_binutils_x86_64_testsuite.patch,
-  71_ppc_binutils-2.13-ppc32-fPIC.patch, 72_all_fde-alignment.patch,
-  73_amd64_x86-64-gotpcrel.patch, 74_all_gcc34-no-unit-at-a-time.patch,
-  75_amd64_sysenter-sysexit-are-valid-IA32e-assembly.patch,
-  76_all_use-new-ld-dtags.patch, 77_x86_via-padlock-gas.patch, and
-  78_x86_via-padlock-tests.patch. this ebuild /should/ work with gcc 3.4 more
-  consistantly than the previous one.
-
-  24 Apr 2004; Travis Tilley <lv@gentoo.org> binutils-2.14.90.0.7-r1.ebuild,
-  binutils-2.14.90.0.7-r2.ebuild, binutils-2.14.90.0.7-r3.ebuild,
-  binutils-2.14.90.0.7-r4.ebuild, binutils-2.14.90.0.7.ebuild,
-  binutils-2.14.90.0.8-r1.ebuild, binutils-2.14.90.0.8.ebuild,
-  binutils-2.15.90.0.1.1.ebuild, binutils-2.15.90.0.3-r1.ebuild,
-  binutils-2.15.90.0.3.ebuild:
-  GCC 3.4 breaks binutils if CFLAGS arent conservative. Adding fix for bug #47581
-
-  23 Apr 2004; Travis Tilley <lv@gentoo.org> binutils-2.15.90.0.1.1.ebuild:
-  added ~amd64 keyword for testing
-
-*binutils-2.15.90.0.3-r1 (19 Apr 2004)
-
-  19 Apr 2004; <solar@gentoo.org> binutils-2.15.90.0.3-r1.ebuild:
-  - the patches 03,04,07 were replaced w/ the redhat ones - the patch 01 was
-  moved to apply after the uclibc patches (59) - the 20 patch got a replacement
-  64 for the case relro is used (default in ebuild) - the 90 patch (pt_pax) has
-  also a replacement as 63 to apply after relro - the patches 3x_ are from
-  redhat having the same patch number 3x coresponds in redhat to x, (unmodified
-  patches) - the patches 5x_ are uclibc related coming from buildroot (51 and 52
-  are ports of the buildroot versions to this binutils, 51 is generic, only 52
-  is uclibc specific), the 59 patch is really the 01 one, but the 52 patch is so
-  big, that I didn't want to patch it again, it applies correctly in the reverse
-  order - the patches 6x_ are from me: 61_ I had a situation on cross-compiling
-  where I needed it 62_ is an uclibc addon (missing configure stuff to recognize
-  uclibc) 63_ pt_pax patch to apply after relro 64_ is a 20_ patch replacement
-  for amd64.
-  I have left in all the patches, so that some can build w/ and w/o relro. The
-  ebuild offers this possibility, see comment inside.
-  The uclibc stuff shouldn't disturb normal functionality, mainly the configure
-  stuff is enabled to recognize uclibc systems. Peter S. Mazinger <ps.m@gmx.net>
-
-*binutils-2.15.90.0.3 (15 Apr 2004)
-
-  15 Apr 2004; Joshua Kinard <kumba@gentoo.org> binutils-2.12.90.0.15.ebuild,
-  binutils-2.13.90.0.16-r1.ebuild, binutils-2.13.90.0.18-r1.ebuild,
-  binutils-2.13.90.0.18.ebuild, binutils-2.14.90.0.2.ebuild,
-  binutils-2.14.90.0.4.1-r1.ebuild, binutils-2.14.90.0.5-r1.ebuild,
-  binutils-2.14.90.0.6-r2.ebuild, binutils-2.14.90.0.6-r3.ebuild,
-  binutils-2.14.90.0.6-r6.ebuild, binutils-2.14.90.0.6-r7.ebuild,
-  binutils-2.15.90.0.3.ebuild:
-  New ebuild for binutils-2.15.90.0.3, and removed portage from DEPEND in older
-  ebuilds as it caused repoman troubles.
-
-  14 Mar 2004; Joshua Kinard <kumba@gentoo.org> :
-  Added a patch to the patchball for mips that reverses a patch added in
-  Dec-2003 that seemingly makes unbootable kernels. The issue needs to be
-  investigated further to make sure that this doesn't not affect 2.6 kernels as
-  well (tested with 2.4 kernels for now).
-
-*binutils-2.15.90.0.1.1 (06 Mar 2004)
-
-  06 Mar 2004; Joshua Kinard <kumba@gentoo.org> binutils-2.15.90.0.1.1.ebuild,
-  binutils-2.15.90.0.1.ebuild:
-  New minor revision that fixes the as.1 manpage issue and an ia64 linker bug.
-
-*binutils-2.15.90.0.1 (04 Mar 2004)
-
-  04 Mar 2004; Joshua Kinard <kumba@gentoo.org> binutils-2.15.90.0.1.ebuild:
-  New Version + fix for generating as.1 manpage. Keyword masked on all archs,
-  test and keyword as necessary.
-
-  21 Feb 2004; Brad House <brad_mssw@gentoo.org>
-  binutils-2.14.90.0.8-r1.ebuild:
-  stable on amd64 for 2004.0 release
-
-  17 Feb 2004; Martin Schlemmer <azarah@gentoo.org>
-  binutils-2.14.90.0.8-r1.ebuild:
-  Move to unstable to give the PAX_FLAGS stuff a test run.
-
-  10 Feb 2004; Joshua Kinard <kumba@gentoo.org> binutils-2.14.90.0.8.ebuild:
-  Masked on mips because this version of binutils won't produce bootable kernel
-  images. could be a missing patch or such.
-
-*binutils-2.14.90.0.8-r1 (27 Jan 2004)
-
-  27 Jan 2004; <solar@gentoo.org> binutils-2.14.90.0.8-r1.ebuild:
-  Added support for new PT_PAX_FLAGS markings for program headers.
-
-  19 Jan 2004; <agriffis@gentoo.org> binutils-2.14.90.0.7-r4.ebuild:
-  stable on alpha and ia64 for bug 37033
-
-*binutils-2.14.90.0.8 (18 Jan 2004)
-
-  18 Jan 2004; Martin Schlemmer <azarah@gentoo.org>
-  binutils-2.14.90.0.8.ebuild:
-  Update version.  Move patches to tarball.  Many thanks to
-  Kumba <kumba@gentoo.org> for updating the pni (prescott support) patch
-  and the mips-brswap patch.
-
-*binutils-2.14.90.0.7-r4 (18 Jan 2004)
-
-  18 Jan 2004; Martin Schlemmer <azarah@gentoo.org>
-  binutils-2.14.90.0.7-r4.ebuild,
-  files/2.14/binutils-2.14.90.0.7-bfd-pt-gnu-segment-fix.patch:
-  Do not add sections to a PT_GNU_STACK segment, which might be
-  a possible security issue, bug #37033.
-  
-    http://sources.redhat.com/ml/binutils/2003-12/msg00205.html
-
-  Also bump x86 to stable, and do not drop already stable archs from
-  -r3 to testing, as it is a crusial patch.
-
-  07 Jan 2004; Jason Wever <weeve@gentoo.org> binutils-2.14.90.0.7-r3.ebuild:
-  Marked stable on sparc.
-
-  30 Dec 2003; Sven Blumenstein <bazik@gentoo.org>
-  binutils-2.11.92.0.12.3-r2.ebuild, binutils-2.11.92.0.7.ebuild,
-  binutils-2.14.90.0.6-r6.ebuild:
-  Marked stable on sparc.
-
-  28 Dec 2003; Joshua Kinard <kumba@gentoo.org>
-  binutils-2.14.90.0.7-r3.ebuild:
-  Move to mips stable (~mips -> mips)
-
-  29 Nov 2003; Brad House <brad_mssw@gentoo.org>
-  binutils-2.14.90.0.7-r3.ebuild:
-  mark stable on amd64
-
-*binutils-2.14.90.0.7-r3 (09 Nov 2003)
-
-  08 Dec 2003; Guy Martin <gmsoft@gentoo.org> binutils-2.14.90.0.7-r3.ebuild:
-  Marked stable on hppa.
-
-  09 Nov 2003; Martin Schlemmer <azarah@gentoo.org>
-  binutils-2.14.90.0.2.ebuild, binutils-2.14.90.0.4.1-r1.ebuild,
-  binutils-2.14.90.0.6-r7.ebuild, binutils-2.14.90.0.7-r1.ebuild,
-  binutils-2.14.90.0.7-r2.ebuild, binutils-2.14.90.0.7-r3.ebuild,
-  binutils-2.14.90.0.7.ebuild:
-  Fix sparc64/mips64 symlinks to point to /usr/sparc-*/bin/*. Do not apply
-  -ppc-reloc.patch to sparc as ld quits with SIGBUS.
-
-  08 Nov 2003; Jason Wever <weeve@gentoo.org> binutils-2.14.90.0.7-r2.ebuild:
-  Masked on sparc until ld issue is fixed.
-
-*binutils-2.14.90.0.7-r2 (08 Nov 2003)
-
-  08 Nov 2003; Martin Schlemmer <azarah@gentoo.org>
-  binutils-2.14.90.0.7-r2.ebuild,
-  files/2.14/binutils-2.14.90.0.7-ppc-reloc.patch,
-  files/2.14/binutils-2.14.90.0.7-tls-section-alignment.patch:
-  Cleanup -ppc-reloc.patch (had cruft like .orig in) and apply for all, as it
-  fixes dynamic relocs for more archs than ppc.
-  Add -tls-section-alignment.patch and put into testing for all.
-
-*binutils-2.14.90.0.7-r1 (07 Nov 2003)
-
-  07 Nov 2003; Luca Barbato <lu_zero@gentoo.org> 
-  binutils-2.14.90.0.7-r1.ebuild, 
-  files/2.14/binutils-2.14.90.0.7-ppc-reloc.patch:
-  Fix to bug #32755
-
-  05 Nov 2003; Luca Barbato <lu_zero@gentoo.org> binutils-2.14.90.0.7.ebuild:
-  Maked -ppc :seems to have too many issues
-
-  04 Nov 2003; Brad House <brad_mssw@gentoo.org>
-  binutils-2.14.90.0.6-r7.ebuild:
-  mark as stable on amd64
-
-  04 Nov 2003; Martin Schlemmer <azarah@gentoo.org>
-  binutils-2.14.90.0.2.ebuild, binutils-2.14.90.0.4.1-r1.ebuild,
-  binutils-2.14.90.0.6-r7.ebuild, binutils-2.14.90.0.7.ebuild:
-  Enable building of 64bit apps on Sparc and Mips, closing bug #24631.
-  Fix is an modified one from Jason Wever <weeve@gentoo.org>.
-
-*binutils-2.14.90.0.7 (01 Nov 2003)
-
-  08 Nov 2003; Guy Martin <gmsoft@gentoo.org> binutils-2.14.90.0.7.ebuild,
-  binutils-2.14.90.0.7-r1.ebuild : Marked -hppa as it can't even compile glibc.
-
-  01 Nov 2003; Martin Schlemmer <azarah@gentoo.org>
-  binutils-2.14.90.0.7.ebuild:
-  Update version.
-
-*binutils-2.14.90.0.6-r7 (26 Oct 2003)
-
-  26 Oct 2003; Martin Schlemmer <azarah@gentoo.org>
-  binutils-2.14.90.0.6-r7.ebuild,
-  files/2.14/binutils-2.14.90.0.6-bfd-elf-interp-4.patch:
-  Add the official binutils-2.14.90.0.6-bfd-elf-interp.patch patch.
-
-  26 Oct 2003; Martin Schlemmer <azarah@gentoo.org>
-  binutils-2.14.90.0.6-r6.ebuild:
-  Bump ppc to stable, as the .interp fix in -r5 is wrong. Bump x86, amd64 and
-  ia64 to stable.
-
-  22 Oct 2003; Aron Griffis <agriffis@gentoo.org>
-  binutils-2.14.90.0.6-r6.ebuild:
-  Stable on alpha
-
-  22 Oct 2003; Bartosch Pixa <darkspecter@gentoo.org>
-  binutils-2.14.90.0.6-r5.ebuild:
-  set ppc in keywords
-
-*binutils-2.14.90.0.6-r6 (07 Oct 2003)
-
-  07 Oct 2003; Martin Schlemmer <azarah@gentoo.org>
-  binutils-2.14.90.0.6-r6.ebuild,
-  files/2.14/binutils-2.14.90.0.6-bfd-elf-interp-3.patch:
-  Add correct patch to fix attributes on .interp section, thanks to feedback
-  from pipcas <pageexec@freemail.hu> and Ned Ludd <solar@gentoo.org>.
-
-*binutils-2.14.90.0.6-r5 (05 Oct 2003)
-
-  05 Oct 2003; Martin Schlemmer <azarah@gentoo.org>
-  binutils-2.14.90.0.6-r5.ebuild,
-  files/2.14/binutils-2.14.90.0.6-ppc-bfd.patch:
-  Add ppc-bfd.patch to fix ppc issues, bug #28011. Remove bfd-elf-interp.patch,
-  as it breaks section attibutes as in
-  http://gcc.gnu.org/ml/gcc/2003-10/msg00141.html.
-
-*binutils-2.14.90.0.6-r4 (05 Oct 2003)
-
-  05 Oct 2003; Martin Schlemmer <azarah@gentoo.org>
-  binutils-2.14.90.0.6-r4.ebuild,
-  files/2.14/binutils-2.14.90.0.6-eh-frame-ro-2.patch,
-  files/2.14/binutils-2.14.90.0.6-ia64-howto.patch,
-  files/2.14/binutils-2.14.90.0.6-ia64-sdata.patch,
-  files/2.14/binutils-2.14.90.0.6-ia64-speedup.patch,
-  files/2.14/binutils-2.14.90.0.6-merge-speedup.patch,
-  files/2.14/binutils-2.14.90.0.6-sparc-cfi.patch:
-  Update eh-frame-ro patch - seems as if I might have missed a needed change or
-  two. Also update merge patch, as well as add some ia64 and sparc patches.
-
-  03 Oct 2003; Brad House <brad_mssw@gentoo.org>
-  binutils-2.14.90.0.6-r3.ebuild,
-  files/binutils-2.14.amd64-32bit-path-fix.patch:
-  32bit search path for amd64 was /lib and /usr/lib. That is obviously wrong.
-  Make the search path /lib32 and /usr/lib32 instead, which should be symlinks
-  to the real location of your 32bit install. This patch is amd64 ONLY
-
-*binutils-2.14.90.0.6-r3 (13 Sep 2003)
-
-  20 Sep 2003; Alexander Gabert <pappy@gentoo.org>
-  binutils-2.14.90.0.6-r3.ebuild:
-  added hppa static fpic bugfix by tausq
-
-  20 Sep 2003; <solar@gentoo.org> binutils-2.14.90.0.6-r3.ebuild,
-  files/2.14/binutils-2.14.90.0.6-bfd-elf-interp.patch:
-  A change that defines expected section attributes for a select set of
-  hardcoded section names was incorrectly added to binutils by redhat. This fix
-  is for bfd/elf.c for the .interp entry which should have SHF_ALLOC instead of 0
-
-  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> binutils-2.14.90.0.6-r3.ebuild :
-  ia64 keywords.
-
-  13 Sep 2003; Martin Schlemmer <azarah@gentoo.org>
-  binutils-2.14.90.0.6-r3.ebuild,
-  files/2.14/binutils-2.14.90.0.6-cxx-speedup.patch:
-  Add patch that speedup C++ linking. Originally submitted by
-  <holger-gentoo@holgis.net> (got from Nove Hrady KDE hackfest), updated to
-  latest binutls by Chris Lee <clee@kde.org>, bug #27540.
-
-*binutils-2.14.90.0.6-r2 (01 Sep 2003)
-
-  21 Sep 2003; Joshua Kinard <kumba@gentoo.org> binutils-2.14.90.0.6-r2.ebuild:
-  Changed ~mips to mips in KEYWORDS
-
-  03 Sep 2003; Stefan Jones <cretin@gentoo.org> 
-  binutils-2.14.90.0.6-r2.ebuild :
-  Move to stable for x86, to fix bug #27440
-
-  01 Sep 2003; Martin Schlemmer <azarah@gentoo.org>
-  binutils-2.14.90.0.2.ebuild, binutils-2.14.90.0.4.1-r1.ebuild,
-  binutils-2.14.90.0.5-r1.ebuild, binutils-2.14.90.0.6-r2.ebuild,
-  files/2.14/binutils-2.14.90.0.6-dont-crash-on-null-owner.patch:
-  There is a bug in binutils 2.14.* which causes a segfault in certain
-  circumstances when linking. This bug does not exist in binutils 2.11.*.
-                                                                                                                            
-  More details on the bug can be found here:
-    http://sources.redhat.com/ml/bug-binutils/2003-q3/msg00559.html
-    http://sources.redhat.com/ml/bug-binutils/2003-q3/msg00735.html
-                                                                                                                            
-  Bug #27492, thanks to Adam Chodorowski <adam@chodorowski.com> for reporting.
-
-*binutils-2.14.90.0.6-r1 (26 Aug 2003)
-
-  26 Aug 2003; Martin Schlemmer <azarah@gentoo.org>
-  binutils-2.14.90.0.6-r1.ebuild:
-  Remove the place-orphan.patch patch, as it causes failures in sash and
-  util-linux-2.12 (bug #27330)
-
-*binutils-2.14.90.0.6 (24 Aug 2003)
-
-  24 Aug 2003; Martin Schlemmer <azarah@gentoo.org>
-  binutils-2.14.90.0.6.ebuild,
-  files/2.14/binutils-2.14.90.0.5-place-orphan.patch,
-  files/2.14/binutils-2.14.90.0.6-eh-frame-ro.patch:
-  Update version.
-
-  20 Aug 2003; Luca Barbato <lu_zero@gentoo.org> binutils-2.14.90.0.5-r1.ebuild:
-  Marked ~ppc
-
-*binutils-2.14.90.0.5-r1 (10 Aug 2003)
-
-  10 Aug 2003; Joshua Kinard <kumba@gentoo.org> binutils-2.14.90.0.5-r1.ebuild:
-  Moved binutils-2.14.90.0.5-r1 to mips unstable, since latest CVS this comes
-  from includes major mips updates.  And to test it in Stager.
-  Also moved it to sparc unstable for testing.
-
-
-*binutils-2.14.90.0.5 (23 Jul 2003)
-
-  23 Jul 2003; Joshua Kinard <kumba@gentoo.org> binutils-2.14.90.0.5.ebuild:
-  Changed "mips" to "-mips" in KEYWORDS until further testing can be done.
-
-  23 Jul 2003; Martin Schlemmer <azarah@gentoo.org>
-  binutils-2.14.90.0.5.ebuild:
-  New release.
-
-*binutils-2.14.90.0.4.1-r1 (28 Jun 2003)
-
-  12 Jul 2003; Joshua Kinard <kumba@gentoo.org> binutils-2.14.90.0.4.1-r1.ebuild:
-  Changed -mips to ~mips in KEYWORDS. Experimentation seems to prove that
-  binutils-2.14.90.0.2 has some issue triggered at random in which a compile
-  errors out claiming "linking abicalls to non-abicalls". Some google searching
-  indicates binutils-2.14.90.0.4 or greater fixes this issue.
-  Has been tested in a mips stage1 rebuild and is currently used in building a 
-  mipsel stage1 for Cobalt servers.
-
-  28 Jun 2003; Martin Schlemmer <azarah@gentoo.org>
-  binutils-2.14.90.0.4.1-r1.ebuild, files/2.14/binutils-2.14.90.0.4-cfi.patch,
-  files/2.14/binutils-2.14.90.0.4-cfi2.patch,
-  files/2.14/binutils-2.14.90.0.4-cfi3.patch,
-  files/2.14/binutils-2.14.90.0.4-cfi4.patch,
-  files/2.14/binutils-2.14.90.0.4-eh-frame-ro.patch,
-  files/2.14/binutils-2.14.90.0.4-gas-execstack.patch,
-  files/2.14/binutils-2.14.90.0.4-gas-pred.patch,
-  files/2.14/binutils-2.14.90.0.4-ltconfig-multilib.patch,
-  files/2.14/binutils-2.14.90.0.4-pie.patch,
-  files/2.14/binutils-2.14.90.0.4-pie2.patch,
-  files/2.14/binutils-2.14.90.0.4-pni.patch,
-  files/2.14/binutils-2.14.90.0.4-ppc-bigplt.patch,
-  files/2.14/binutils-2.14.90.0.4-ppc64-ctors.patch,
-  files/2.14/binutils-2.14.90.0.4-ppc64-prelink.patch,
-  files/2.14/binutils-2.14.90.0.4-pt-gnu-stack.patch,
-  files/2.14/binutils-2.14.90.0.4-sparc-nonpic.patch:
-  Add patches from Redhat.  Add fix for libtool borkage.
-
-*binutils-2.14.90.0.4.1 (25 Jun 2003)
-
-  25 Jun 2003; Martin Schlemmer <azarah@gentoo.org>
-  binutils-2.11.92.0.12.3-r2.ebuild, binutils-2.13.90.0.20-r1.ebuild,
-  binutils-2.14.90.0.2.ebuild, binutils-2.14.90.0.4.1.ebuild,
-  binutils-2.14.90.0.4.ebuild:
-  New version with some amd64 fixes. Also fix SRC_URI for some of the newer
-  ebuilds.
-
-  14 Jun 2003; Joshua Kinard <kmba@gentoo.org> binutils-2.14.90.0.2.ebuild:
-  Changes ~mips to mips in KEYWORDS
-
-  08 Jun 2003; Luca Barbato <lu_zero@gentoo.org>
-  binutils-2.14.90.0.1-r1.ebuild, binutils-2.14.90.0.2.ebuild:
-  marked stable on ppc.
-
-*binutils-2.14.90.0.4 (26 May 2003)
-
-  07 Jun 2003; Joshua Kinard <kumba@gentoo.org> binutils-2.14.90.0.4.ebuild:
-  Changed ~mips to -mips.  This package should stay masked until dragon
-  can release a fixed version that fixes the bad libbfd linkage.
-
-  26 May 2003; Joshua Kinard <kumba@gentoo.org>
-  binutils-2.14.90.0.4.ebuild:
-  New Version.  Masked for all archs except unstable/testing on mips.
-
-  26 May 2003; Joshua Kinard <kumba@gentoo.org>
-  binutils-2.14.90.0.2.ebuild, binutils-2.14.90.0.4.ebuild:
-  Added a patch for MIPS arch which fixes binutils so that it does not generate
-  a broken dynamic relocation table for the OpenSSL libs. This happens because
-  the global GOT entry count is too low. The bug itself was introduced in
-  binutils CVS by the following patch:
-  http://sources.redhat.com/cgi-bin/cvsweb.cgi/src/bfd/elfxx-mips.c.diff?r1=1.38
-  &r2=1.39&cvsroot=src
-
-  26 May 2003; Joshua Kinard <kumba@gentoo.org>
-  binutils-2.14.90.0.2.ebuild, binutils-2.14.90.0.4.ebuild:
-  Corrected a minor error in SRC_URI so that the
-  package is found in the right location on the kernel.org website.
-
-*binutils-2.11.92.0.7 (25 May 2003)
-
-  25 May 2003; Martin Holzer <mholzer@gentoo.org>
-  binutils-2.11.92.0.12.3-r2.ebuild, binutils-2.11.92.0.7.ebuild,
-  binutils-2.12.90.0.15.ebuild, binutils-2.12.90.0.7.ebuild,
-  binutils-2.13.90.0.16-r1.ebuild, binutils-2.13.90.0.18-r1.ebuild,
-  binutils-2.13.90.0.18.ebuild, binutils-2.13.90.0.20-r1.ebuild,
-  binutils-2.14.90.0.1-r1.ebuild, binutils-2.14.90.0.2.ebuild:
-  now uses mirror://kernel
-
-*binutils-2.14.90.0.2 (17 May 2003)
-
-  16 Jul 2003; Jay Pfeifer <pfeifer@gentoo.org> binutils-2.14.90.0.2.ebuild:
-  set stable on x86
-
-  01 Jul 2003; Todd Sunderlin <todd@gentoo.org> binutils-2.14.90.0.2.ebuild:
-  set stable on sparc
-
-  17 May 2003; Martin Schlemmer <azarah@gentoo.org>
-  binutils-2.14.90.0.2.ebuild:
-  New version.
-
-  17 May 2003; Martin Schlemmer <azarah@gentoo.org>
-  binutils-2.13.90.0.10.ebuild, binutils-2.13.90.0.10.ebuild,
-  binutils-2.13.90.0.14.ebuild, binutils-2.13.90.0.14.ebuild,
-  binutils-2.13.90.0.16-r1.ebuild, binutils-2.13.90.0.16.ebuild,
-  binutils-2.13.90.0.16.ebuild, binutils-2.13.90.0.18-r1.ebuild,
-  binutils-2.13.90.0.18.ebuild, binutils-2.13.90.0.20-r1.ebuild,
-  binutils-2.13.90.0.4.ebuild, binutils-2.13.90.0.4.ebuild,
-  binutils-2.14.90.0.1-r1.ebuild, binutils-2.14.90.0.1.ebuild,
-  binutils-2.14.90.0.1.ebuild :
-  Add c++filt back in anticipation for gcc-3.3.  Cleanup.
-
-*binutils-2.14.90.0.1-r1 (08 May 2003)
-
-  09 May 2003; Joshua Kinard <kumba@gentoo.org>
-  binutils-2.14.90.0.1-r1.ebuild:
-  Changed -sparc to ~sparc.  Merges fine on sparc,
-  but further testing to be done.  With mips, edited out the
-  gas-mips-gprel from binutils-2.13.90.0.20, as this patch already
-  appears to be included in 2.14.90.0.1 (emerge failed on attempting to
-  patch it).  Mips testing is underway via "emerge system".
-
-  08 May 2003; Nicholas Wourms <dragon@gentoo.org>
-  binutils-2.14.90.0.1-r1.ebuild:
-  Fix a small typo in the patch section.
-
-  08 May 2003; Nicholas Wourms <dragon@gentoo.org>
-  binutils-2.14.90.0.1-r1.ebuild,
-  files/2.14/binutils-2.14.90.0.1-eh-frame-ro.patch,
-  files/2.14/binutils-2.14.90.0.1-sparc-nonpic.patch:
-  Added patch to resync with CVS head, bumped revision to reflect this. This
-  version should resolve any outstanding testsuite & weak symbol issues.  I
-  have also added the previous patches back into the ebuild, compiles and
-  passes the testsuite on x86 w/o any regressions.
-
-*binutils-2.14.90.0.1 (06 May 2003)
-
-  06 May 2003; Luca Barbato <lu_zero@gentoo.org>
-  binutils-2.14.90.0.1.ebuild:
-  New version, seems to solve the ppc relocation issues.
-
-*binutils-2.13.90.0.20-r1 (09 Apr 2003)
-
-  09 Apr 2003; Nicholas Wourms <dragon@gentoo.org>
-  binutils-2.13.90.0.20-r1.ebuild:
-  Added cvs update patch to (hopefully) address the problems reported in
-  bugs #16363, #17986, & #18873.  This also includes the fix from Alan
-  Modra for the problem where ld would segfault when building kde on
-  ppc.  In addition to that, it also has some more mips/mips64 updates
-  which should address a few of the current problems we were experiencing
-  initially.  As with the previous version, "Handle With Care..."  That
-  being said, testing would be greatly appreciated and arches unmasked
-  as they are confirmed stable.  I removed the previous ebuild since it
-  has been causing lots of trouble.
-
-  23 Mar 2003; Martin Schlemmer <azarah@gentoo.org> binutils-2.13.90.0.20.ebuild :
-  Add '~x86' to KEYWORDS.
-
-*binutils-2.13.90.0.20 (22 Mar 2003)
-
-  22 Mar 2003; Nicholas Wourms <dragon@gentoo.org>
-  binutils-2.13.90.0.20.ebuild,
-  files/2.13/binutils-2.13.90.0.10-x86_64-gotpcrel.patch,
-  files/2.13/binutils-2.13.90.0.18-testsuite-Wall-fixes.patch,
-  files/2.13/binutils-2.13.90.0.20-array-sects-compat.patch,
-  files/2.13/binutils-2.13.90.0.20-gas-mips-gprel.patch:
-  Bump to new beta version.  This release contains a boatload of fixes for
-  a wide variety of platforms.  It also fixes a critical bug in the previous
-  version for the mips platform.  Due to the beta nature of this version and
-  the proximity to a new gentoo release, I have set keywords to "-arch" for
-  all platforms except mips.  However, it should be tested on these other
-  platforms and keywords modified as necessary.
-
-*binutils-2.13.90.0.18-r1 (08 Mar 2003)
-
-  31 Mar 2003; Christian Birchinger <joker@gentoo.org>
-  binutils-2.13.90.0.18-r1.ebuild:
-  Commented out sparc-nonpic.patch and added ~sparc keyword
-
-  27 Mar 2003; Seemant Kulleen <seemant@gentoo.org>
-  binutils-2.13.90.0.18-r1.ebuild:
-  masked for sparc, it breaks, dunno why. see bug #17193
-
-  08 Mar 2003; Martin Schlemmer <azarah@gentoo.org> binutils-2.13.90.0.18-r1.ebuild :
-  Update patches from Redhat.
-
-  18 Feb 2003; Zach Welch <zwelch@gentoo.org> :
-  Added arm to keywords.
-
-
-*binutils-2.13.90.0.18 (26 Jan 2003)
-
-  27 May 2003; Guy Martin <gmsoft@gentoo.org> binutils-2.13.90.0.18.ebuild:
-  Remasking binutils 2.13.90.0.18 for hppa which cause random segfault on
-  hppa1.1 stations.
-
-  29 Mar 2003; Christian Birchinger <joker@gentoo.org>
-  binutils-2.13.90.0.18.ebuild:
-  Added sparc stable keyword
-
-  01 Mar 2003; Brandon Low <lostlogic@gentoo.org>
-  binutils-2.13.90.0.10.ebuild, binutils-2.13.90.0.14.ebuild,
-  binutils-2.13.90.0.16-r1.ebuild, binutils-2.13.90.0.16.ebuild,
-  binutils-2.13.90.0.18.ebuild, binutils-2.13.90.0.4.ebuild:
-  Filter another flag that was causing problems
-
-  26 Feb 2003; Zach Welch <zwelch@gentoo.org> binutils-2.13.90.0.18.ebuild :
-  filter -O2 from ARM builds to prevent gcc ICE
-
-  24 Feb 2003; Martin Schlemmer <azarah@gentoo.org> binutils-2.13.90.0.18.ebuild :
-  Mark stable for x86.  Rip out static stuff as it anyhow do not work.
-
-  22 Feb 2003; Guy Martin <gmsoft@gentoo.org> binutils-2.13.90.0.18.ebuild :
-  Commited stable for hppa.
-
-  21 Feb 2003; Aron Griffis <agriffis@gentoo.org> binutils-2.13.90.0.18.ebuild :
-  Mark stable on alpha
-
-  08 Feb 2003; Guy Martin <gmsoft@gentoo.org> binutils-2.13.90.0.18.ebuild :
-  Added hppa to keywords.
-
-  01 Feb 2003; Jon Nall <nall@gentoo.org> binutils-2.13.90.0.18.ebuild :
-  made stable for ppc. this is to allow kde to compile happily and closes bug
-  #14776
-
-  29 Jan 2003; Nicholas Wourms <dragon@gentoo.org> binutils-2.13.90.0.18.ebuild :
-  Fixed Jakub's eh-frame-ro patch to apply and compile cleanly against
-  binutils-2.13.90.0.18.  Passed all tests locally on x86, but please test on 
-  other platforms.
-
-  26 Jan 2003; Martin Schlemmer <azarah@gentoo.org> binutils-2.13.90.0.18.ebuild :
-  New version.  Some cleanups + patches.  This closes bug #14518.
-
-*binutils-2.13.90.0.16-r1 (30 Dec 2002)
-
-  08 Jan 2003; Martin Schlemmer <azarah@gentoo.org> binutils-2.13.90.0.16-r1.ebuild :
-  Mark stable.
-
-  19 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
-  Add patches for mips
-  Added mips to keywords
-
-  30 Dec 2002; Martin Schlemmer <azarah@gentoo.org> binutils-2.13.90.0.16-r1.ebuild :
-  Update with patches from Redhat/Mandrake for various issues.
-
-  13 Dec 2002; Mark Guertin <gerk@gentoo.org> binutils-2.13.90.0.16.ebuild :
-  Marked stable for ppc.
-
-  10 Dec 2002; Martin Schlemmer <azarah@gentoo.org> binutils-2.13.90.0.16.ebuild :
-  Mark as stable for x86.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org>:
-  Changed sparc ~sparc keywords
- 
-*binutils-2.13.90.0.16 (29 Nov 2002)
-
-  07 Jan 2003: Jan Seidel <tuxus@gentoo.org> binutils-2.13.90.0.16.ebuild :
-  Add patches for mips
-  Added mips to keywords.
-
-  29 Nov 2002; Nick Hadaway <raker@gentoo.org>
-  binutils-2.13.90.0.16.ebuild, files/digest-binutils-2.13.90.0.16 :
-  Version bump.  No changes in the ebuild.  Solves bug #11088
-
-*binutils-2.13.90.0.14 (18 Nov 2002)
-
-  18 Nov 2002; Stefan Jones <cretin@gentoo.org> :
-  Version update, masked for testing.
-
-*binutils-2.13.90.0.10 (14 Oct 2002)
-
-  14 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  Version update.  Remove sparc until further testing
-  from Seemant.
-
-*binutils-2.13.90.0.8 (10 Oct 2002)
-
-  10 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  New version.  PPC and SPARC elf linkage fixes.  More
-  TLS support code added.
-
-*binutils-2.13.90.0.4 (15 Aug 2002)
-
-  15 Aug 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  Update to latest version.
-
-  1 Aug 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  Updated DEPEND not to use if statements, but rather
-  new syntax of portage-2.0.21 and up.
-
-*binutils-2.12.90.0.15 (30 Jul 2002)
-
-  30 Jul 2002; Mark Guertin <gerk@gentoo.org>:
-  Added ppc to keywords
-
-*binutils-2.12.90.0.14 (6 Jul 2002)
-
-  6 Jul 2002; Martin Schlemmer <azarah@gentoo.org> :
-  Version update.
-
-*binutils-2.12.90.0.9 (10 Jun 2002)
-
-  9 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
-  Version update.
-
-*binutils-2.12.90.0.7 (25 Apr 2002)
-
-*binutils-2.12.90.0.4 (16 Apr 2002)
-
-*binutils-2.12.90.0.3 (7 Apr 2002)
-
-*binutils-2.12.90.0.1 (21 Mar 2002)
-
-*binutils-2.11.92.0.12.3-r2 (12 Mar 2002)
-
-  12 Mar 2002; Seemant Kulleen <seemant@gentoo.org> ChangeLog :
-
-  Updated copyright year, and added USE dependent nls compilation.
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
 
 *binutils-2.11.92.0.12.3-r1 (1 Feb 2002)
 
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 08090cde1d21..13ea35ffc281 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -1,42 +1,55 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1c0754663fee98a99e6f083e9935c1f0 ChangeLog 46864
-MD5 d60f4df7ccfeef4d4f5eea9de8a71ad3 binutils-2.14.90.0.8-r3.ebuild 363
-MD5 0680ca6de3b49aa48861d46a14a759e7 binutils-2.14.ebuild 298
-MD5 779755665878f5e4b9142a0e7d13985b binutils-2.15.90.0.1.1-r5.ebuild 343
-MD5 b0641d59fc4a770438ddc58148ec911d binutils-2.15.90.0.3-r5.ebuild 325
-MD5 12358fd5b4cbb83ba296ab50607d8f2b binutils-2.15.91.0.2-r2.ebuild 336
-MD5 0b2aa8431d3f1efaf12b67441381d6f8 binutils-2.15.92.0.2-r10.ebuild 375
-MD5 fae6ef750b66a27f9161bfd414a7353f binutils-2.15.94.0.2.2.ebuild 328
-MD5 b9ed4c67553ad1d493e8d91f4cece334 binutils-2.15.ebuild 480
-MD5 98d35099698542dab3713e8db109bd35 binutils-2.16-r1.ebuild 657
-MD5 d7fce7ce8928e6f3ac72f20d712a8710 binutils-2.16.1.ebuild 662
-MD5 8b4375f98fefe66f27cd8cf48bb64da7 binutils-2.16.90.0.3.ebuild 354
-MD5 9d88c0379eb30fa8756b81fed7e0796a binutils-2.16.91.0.1.ebuild 349
-MD5 3bccd125737862cfad68502423d7745d binutils-2.16.91.0.2.ebuild 354
-MD5 69fba759662e9acbe7d0acec6083a6e5 binutils-2.16.91.0.3.ebuild 349
-MD5 c1b6cc4e201eb5d686a5208636b19d0a binutils-2.16.91.0.4.ebuild 349
-MD5 c21439c7d3b1c16b0521e1bcc234cc10 files/digest-binutils-2.14 145
-MD5 101096a94aae0d7e4d49e98df7925b4d files/digest-binutils-2.14.90.0.8-r3 249
-MD5 515d916dfb5a16f1bb50160553d7802a files/digest-binutils-2.15 146
-MD5 6b02d30c2c46486ab1d31a6617aad1e2 files/digest-binutils-2.15.90.0.1.1-r5 255
-MD5 08f9d4099f935217c457c9779107b29e files/digest-binutils-2.15.90.0.3-r5 248
-MD5 65e8974b5665fe9a11b66932e4b9f462 files/digest-binutils-2.15.91.0.2-r2 249
-MD5 f8b9153fa8e36ee807db1504ebff69fd files/digest-binutils-2.15.92.0.2-r10 249
-MD5 4839babc8ab974f4c7600fc5a207e28a files/digest-binutils-2.15.94.0.2.2 255
-MD5 6a8b5efc573656e95cc8a9982330f1ff files/digest-binutils-2.16-r1 229
-MD5 3988c0111d3afbd41ef6f64817154901 files/digest-binutils-2.16.1 235
-MD5 8255ac21a15b8897906c9cafc1f78b2a files/digest-binutils-2.16.90.0.3 249
-MD5 5efaab17f713cb9309dd458abfaa8463 files/digest-binutils-2.16.91.0.1 249
-MD5 ffd27192c1a9eba99ad1a84679b9e892 files/digest-binutils-2.16.91.0.2 248
-MD5 d343db5709bbf67c12ca4060de2484f4 files/digest-binutils-2.16.91.0.3 248
-MD5 01fab938c938373ccc846ee980c9dc7e files/digest-binutils-2.16.91.0.4 249
-MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDhPXmwUpWvClEHQoRAg/uAJ4683/X00p6JYj9z8qoHaVLsi01/gCfUsq8
-n9xZNXAU3iAbDKOfw00F/Vk=
-=qvbp
------END PGP SIGNATURE-----
+MD5 d189f3ead52fedbc4494c79157c153f7 binutils-2.11.92.0.12.3-r2.ebuild 3134
+MD5 a665aacd5e8087aa9c51272fa8c357c7 binutils-2.11.92.0.7.ebuild 2366
+MD5 743a59e3857ba3b11beab01e6a5442b5 binutils-2.12.90.0.15.ebuild 3521
+MD5 aed3681ad237eeaaccd17a4a5966d725 binutils-2.12.90.0.7.ebuild 3603
+MD5 fc33bac7f5cf434287780155f6089523 binutils-2.13.90.0.10.ebuild 3791
+MD5 168ff8bce369611fa1dbad697e69d5c7 binutils-2.13.90.0.14.ebuild 3791
+MD5 8466c03c4caacd4a83453caedad19861 binutils-2.13.90.0.16.ebuild 3975
+MD5 192e1fab6246a3ecbf8bf2b4ff65dd47 binutils-2.13.90.0.4.ebuild 3721
+MD5 14e2306267d538d5385c25355a08a29f binutils-2.13.90.0.16-r1.ebuild 4692
+MD5 8730038a660b29c4398be9320bedb1c7 binutils-2.13.90.0.18.ebuild 4533
+MD5 c98f5e3a4ce9bbb59162ee9b3bbf319e binutils-2.13.90.0.18-r1.ebuild 5329
+MD5 855ce7fa6338891b809792256a07a1be ChangeLog 6840
+MD5 ff717bcf4a9aebb432e43af00bd65ba6 binutils-2.13.90.0.20-r1.ebuild 4970
+MD5 fe5fb935b171a472f5eb1a8bca63c136 files/binutils-2.12.90.0.14-glibc21.patch 7936
+MD5 f453b3f208b17cd18380bc3653936487 files/binutils-2.12.90.0.14-x86_64-libpic.patch 1184
+MD5 db3f89b51f6961b0cf92bdddf8127ea7 files/digest-binutils-2.11.92.0.12.3-r2 161
+MD5 6c32de9a9503293bb03048f09dadc182 files/digest-binutils-2.11.92.0.7 74
+MD5 e6b97971464cab854a321254d84ae44f files/digest-binutils-2.12.90.0.15 75
+MD5 64f2cf145447cc0996540814afb15c68 files/digest-binutils-2.12.90.0.7 74
+MD5 46e9653f1eb3d6afda8359561f007bde files/digest-binutils-2.13.90.0.10 75
+MD5 7bc91dd082a42a43cc69b7327e76c2a9 files/digest-binutils-2.13.90.0.14 75
+MD5 b7ccd9bdcb0ab7c26bcf2a3e4c2e2afc files/digest-binutils-2.13.90.0.16 75
+MD5 66853297f69630967c4832acc66edf06 files/digest-binutils-2.13.90.0.4 74
+MD5 b7ccd9bdcb0ab7c26bcf2a3e4c2e2afc files/digest-binutils-2.13.90.0.16-r1 75
+MD5 4270b9eea6fb9d807bc63ba0a221ea9b files/digest-binutils-2.13.90.0.18 75
+MD5 d435975192db69b96d36c62e2ad0876c files/digest-binutils-2.13.90.0.18-r1 160
+MD5 b04e5a5665b4e9987cbef313d24bc349 files/digest-binutils-2.13.90.0.20-r1 172
+MD5 ddcb10d9ab716f378c1fe596673a6251 files/2.13/binutils-2.13.90.0.16-tls-strip.patch 5383
+MD5 8e6216c4ee8463ab38d9761a1be712f0 files/2.13/binutils-2.13.90.0.16-stt_tls.patch 6518
+MD5 6dd59bc404c01dd65a21a68cf62c639e files/2.13/binutils-2.13.90.0.16-rodata-cst.patch 974
+MD5 5d6014cd92f7f981294fac37c677bc8b files/2.13/binutils-2.13.90.0.16-ppc-apuinfo.patch 518
+MD5 c16f13adaeb21909a350b0a562b8a4d5 files/2.13/binutils-2.13.90.0.16-ia64-bootstrap.patch 3535
+MD5 9cb4e1aa89e17b711543bfbc18e6dd42 files/2.13/binutils-2.13.90.0.16-eh-frame-ro.patch 17193
+MD5 cbf08de84154ca2dcf26e572f2892f00 files/2.13/binutils-2.13.90.0.10-x86_64-testsuite.patch 1205
+MD5 1841b2037b3da0e0dfddb0345a0526e8 files/2.13/binutils-2.13.90.0.10-x86_64-gotpcrel.patch 769
+MD5 03bc9914be9e707ed18fdfc9a35332d3 files/2.13/binutils-2.13.90.0.10-ia64-brl.patch 436
+MD5 b811d65855a74369e0faccf7574b886b files/2.13/binutils-2.13.90.0.10-glibc21.patch 2931
+MD5 0670eef65a3797752d6f4376aee8bb3a files/2.13/binutils-2.13.90.0.16-sparc-nonpic.patch 3197
+MD5 feebd067c397d519e1ca9340606968a8 files/2.13/binutils-2.13.90.0.16-array-sects-compat.patch 1054
+MD5 e0bd20dafcff53d856546d93a0d291f2 files/2.13/binutils-2.13.90.0.18-eh-frame-hdr.patch 3035
+MD5 5eea3d007abf53ca4c416a1ef715d0da files/2.13/binutils-2.13.90.0.18-alpha-relax.patch 627
+MD5 f4b4e9a06281de3fb837b2e337fe590e files/2.13/binutils-2.13.90.0.18-compatsym.patch 14498
+MD5 0a94baa713a60d9b3ec11847dc8f887f files/2.13/binutils-2.13.90.0.18-eh-frame-ro.patch 16506
+MD5 081ac3fc51a0c66a797b1408fdbc11b9 files/2.13/binutils-2.13.90.0.18-libpath-suffix.patch 1244
+MD5 fed0711b95edc0c64ee93ccfbc8e6268 files/2.13/binutils-2.13.90.0.18-ltconfig-multilib.patch 878
+MD5 886c4cf5037f3e353f5ea9793564f737 files/2.13/binutils-2.13.90.0.18-ppc64-tls1.patch 66696
+MD5 5691090f1b2c356df4cc30f01820d3f3 files/2.13/binutils-2.13.90.0.18-ppc64-tls2.patch 14098
+MD5 5843be8cd03f28a31ec20592c392dd3b files/2.13/binutils-2.13.90.0.18-s390-file-loc.patch 1493
+MD5 deaf6a8f7c0151b4b02a86ebcb399188 files/2.13/binutils-2.13.90.0.18-s390-noreladyn.patch 906
+MD5 b265b60d8878dd647f2e39fb9fcf4871 files/2.13/binutils-2.13.90.0.18-searchdir.patch 1523
+MD5 303de899d608b90e7b367c890bb05717 files/2.13/binutils-2.13.90.0.18-sparc-nonpic.patch 3205
+MD5 3adacb6f6d6330dc9a54cc129d09743a files/2.13/binutils-2.13.90.0.18-sub-same.patch 1035
+MD5 c013cc4711373f43cb426e8b08d69ae1 files/2.13/binutils-2.13.90.0.18-testsuite-Wall-fixes.patch 943
+MD5 feebd067c397d519e1ca9340606968a8 files/2.13/binutils-2.13.90.0.20-array-sects-compat.patch 1054
+MD5 2183b775b86400dd7eda35bf1ccee678 files/2.13/binutils-2.13.90.0.20-gas-mips-gprel.patch 945
diff --git a/sys-devel/binutils/binutils-2.14.90.0.8-r3.ebuild b/sys-devel/binutils/binutils-2.14.90.0.8-r3.ebuild
index d0399c372d63..85bb836bcd5e 100644
--- a/sys-devel/binutils/binutils-2.14.90.0.8-r3.ebuild
+++ b/sys-devel/binutils/binutils-2.14.90.0.8-r3.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-devel/binutils/binutils-2.14.90.0.8-r3.ebuild,v 1.4 2005/05/31 22:04:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.8-r3.ebuild,v 1.1 2005/05/28 08:37:38 vapier Exp $
 
 PATCHVER="1.6"
 UCLIBC_PATCHVER="1.1"
 inherit toolchain-binutils
 
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/sys-devel/binutils/binutils-2.15.90.0.1.1-r5.ebuild b/sys-devel/binutils/binutils-2.15.90.0.1.1-r5.ebuild
index fb7c3feac305..147fd45e3224 100644
--- a/sys-devel/binutils/binutils-2.15.90.0.1.1-r5.ebuild
+++ b/sys-devel/binutils/binutils-2.15.90.0.1.1-r5.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-devel/binutils/binutils-2.15.90.0.1.1-r5.ebuild,v 1.2 2005/06/01 23:04:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.90.0.1.1-r5.ebuild,v 1.1 2005/05/28 08:37:38 vapier Exp $
 
 PATCHVER="1.2"
 UCLIBC_PATCHVER="1.0"
 inherit toolchain-binutils
 
-KEYWORDS="-* amd64 -arm -hppa ppc s390 x86"
+KEYWORDS="-* ~amd64 -arm -hppa ~ppc ~s390 ~x86"
diff --git a/sys-devel/binutils/binutils-2.15.90.0.3-r5.ebuild b/sys-devel/binutils/binutils-2.15.90.0.3-r5.ebuild
index 46f1e028f566..77e98ec25cc7 100644
--- a/sys-devel/binutils/binutils-2.15.90.0.3-r5.ebuild
+++ b/sys-devel/binutils/binutils-2.15.90.0.3-r5.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-devel/binutils/binutils-2.15.90.0.3-r5.ebuild,v 1.4 2005/06/12 21:52:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.90.0.3-r5.ebuild,v 1.1 2005/05/28 08:37:38 vapier Exp $
 
 PATCHVER="1.5"
 UCLIBC_PATCHVER="1.0"
 inherit toolchain-binutils
 
-KEYWORDS="-* arm ppc ppc64"
+KEYWORDS="-* ~arm ~ppc ~ppc64"
diff --git a/sys-devel/binutils/binutils-2.15.91.0.2-r2.ebuild b/sys-devel/binutils/binutils-2.15.91.0.2-r2.ebuild
index 42523df3af70..b35237c02eae 100644
--- a/sys-devel/binutils/binutils-2.15.91.0.2-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.15.91.0.2-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/sys-devel/binutils/binutils-2.15.91.0.2-r2.ebuild,v 1.3 2005/06/21 06:03:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.91.0.2-r2.ebuild,v 1.1 2005/05/28 08:37:38 vapier Exp $
 
-PATCHVER="1.2"
-UCLIBC_PATCHVER="1.0"
+PATCHVER="1.1"
+UCLIBC_PATCHVER=""
 inherit toolchain-binutils
 
-KEYWORDS="-* -amd64 ~hppa mips ~sparc"
+KEYWORDS="-* -amd64 ~hppa ~mips ~sparc"
diff --git a/sys-devel/binutils/binutils-2.15.92.0.2-r10.ebuild b/sys-devel/binutils/binutils-2.15.92.0.2-r10.ebuild
index 8e03973ff7c1..7745283befe1 100644
--- a/sys-devel/binutils/binutils-2.15.92.0.2-r10.ebuild
+++ b/sys-devel/binutils/binutils-2.15.92.0.2-r10.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-devel/binutils/binutils-2.15.92.0.2-r10.ebuild,v 1.10 2005/10/05 05:18:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.92.0.2-r10.ebuild,v 1.1 2005/05/28 08:37:38 vapier Exp $
 
-PATCHVER="2.7"
+PATCHVER="2.5"
 UCLIBC_PATCHVER="1.1"
 inherit toolchain-binutils
 
-KEYWORDS="-* alpha amd64 -arm hppa ia64 m68k mips -ppc ~ppc64 sh sparc x86"
+KEYWORDS="-* ~alpha ~amd64 -arm ~hppa ~ia64 ~m68k ~mips -ppc ~ppc64 ~sparc ~x86"
diff --git a/sys-devel/binutils/binutils-2.15.94.0.2.2.ebuild b/sys-devel/binutils/binutils-2.15.94.0.2.2.ebuild
index 77de4fa72beb..350e72208084 100644
--- a/sys-devel/binutils/binutils-2.15.94.0.2.2.ebuild
+++ b/sys-devel/binutils/binutils-2.15.94.0.2.2.ebuild
@@ -1,9 +1,19 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.94.0.2.2.ebuild,v 1.5 2005/04/17 07:37:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.94.0.2.2.ebuild,v 1.1 2005/02/19 21:21:46 vapier Exp $
 
-PATCHVER="1.1"
+PATCHVER="1.0"
 UCLIBC_PATCHVER="1.0"
 inherit toolchain-binutils
 
-KEYWORDS="-* -arm ~mips ~ppc64"
+KEYWORDS="-* -arm"
+
+src_unpack() {
+	toolchain-binutils_src_unpack
+
+	# Patches
+	#cd ${WORKDIR}/patch
+	#mkdir skip
+
+	apply_binutils_updates
+}
diff --git a/sys-devel/binutils/binutils-2.15.ebuild b/sys-devel/binutils/binutils-2.15.ebuild
index 4bc72f2cd0f4..6fae527ea460 100644
--- a/sys-devel/binutils/binutils-2.15.ebuild
+++ b/sys-devel/binutils/binutils-2.15.ebuild
@@ -1,19 +1,14 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.ebuild,v 1.7 2005/05/28 08:37:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.ebuild,v 1.1 2004/12/04 05:40:14 vapier Exp $
 
-PATCHVER="1.2"
+PATCHVER=""
 UCLIBC_PATCHVER=""
 inherit toolchain-binutils
 
 KEYWORDS="-*"
 
 src_unpack() {
-	tc-binutils_unpack
-
-	cd "${WORKDIR}"/patch
-	# FreeBSD patches are not safe
-	[[ ${CTARGET} != *-freebsd* ]] && mv 00_all_freebsd* skip/
-
-	tc-binutils_apply_patches
+	toolchain-binutils_src_unpack
+	apply_binutils_updates
 }
diff --git a/sys-devel/binutils/binutils-2.16-r1.ebuild b/sys-devel/binutils/binutils-2.16-r1.ebuild
index efcf3736bd61..451def39c50d 100644
--- a/sys-devel/binutils/binutils-2.16-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.16-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/sys-devel/binutils/binutils-2.16-r1.ebuild,v 1.7 2005/07/13 04:32:43 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.16-r1.ebuild,v 1.1 2005/05/28 08:37:38 vapier Exp $
 
 PATCHVER="1.5"
 UCLIBC_PATCHVER="1.0"
 inherit toolchain-binutils
 
 # ARCH - packages to test before marking
-KEYWORDS="-* ~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="-* ~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 
 src_unpack() {
 	tc-binutils_unpack
diff --git a/sys-devel/binutils/binutils-2.16.1.ebuild b/sys-devel/binutils/binutils-2.16.1.ebuild
index 6ede27068dd4..d10060099115 100644
--- a/sys-devel/binutils/binutils-2.16.1.ebuild
+++ b/sys-devel/binutils/binutils-2.16.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/sys-devel/binutils/binutils-2.16.1.ebuild,v 1.14 2005/11/23 23:07:00 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.16.1.ebuild,v 1.1 2005/06/12 22:42:36 vapier Exp $
 
-PATCHVER="1.5"
+PATCHVER="1.0"
 UCLIBC_PATCHVER="1.0"
 inherit toolchain-binutils
 
 # ARCH - packages to test before marking
-KEYWORDS="-* ~alpha amd64 arm ~hppa ~ia64 mips ppc ppc64 ~s390 sh sparc x86"
+KEYWORDS="-* ~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 src_unpack() {
 	tc-binutils_unpack
diff --git a/sys-devel/binutils/binutils-2.16.90.0.3.ebuild b/sys-devel/binutils/binutils-2.16.90.0.3.ebuild
index e11dffde9e35..b03c83bb0a05 100644
--- a/sys-devel/binutils/binutils-2.16.90.0.3.ebuild
+++ b/sys-devel/binutils/binutils-2.16.90.0.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.16.90.0.3.ebuild,v 1.6 2005/11/18 22:42:50 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.16.90.0.3.ebuild,v 1.1 2005/05/11 03:02:05 vapier Exp $
 
-PATCHVER="1.3"
+PATCHVER="1.0"
 UCLIBC_PATCHVER="1.0"
 inherit toolchain-binutils
 
 # ARCH - packages to test before marking
-KEYWORDS="-* -mips"
+KEYWORDS="-*"
diff --git a/sys-devel/binutils/binutils-2.16.91.0.2.ebuild b/sys-devel/binutils/binutils-2.16.91.0.2.ebuild
index 2f18b7953864..7177b0225af1 100644
--- a/sys-devel/binutils/binutils-2.16.91.0.2.ebuild
+++ b/sys-devel/binutils/binutils-2.16.91.0.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.16.91.0.2.ebuild,v 1.2 2005/11/18 22:42:50 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.16.91.0.2.ebuild,v 1.1 2005/08/02 04:27:07 vapier Exp $
 
 PATCHVER="1.0"
 UCLIBC_PATCHVER="1.0"
 inherit toolchain-binutils
 
 # ARCH - packages to test before marking
-KEYWORDS="-* ~mips"
+KEYWORDS="-*"
diff --git a/sys-devel/binutils/files/digest-binutils-2.15 b/sys-devel/binutils/files/digest-binutils-2.15
index 3ad1d5bf71e8..044fffb3c110 100644
--- a/sys-devel/binutils/files/digest-binutils-2.15
+++ b/sys-devel/binutils/files/digest-binutils-2.15
@@ -1,2 +1 @@
 MD5 624e6b74983ac6b2960edaf2d522ca58 binutils-2.15.tar.bz2 11515075
-MD5 6fd78348e4c9d5725053a61ef5ffc759 binutils-2.15-patches-1.2.tar.bz2 128897
diff --git a/sys-devel/binutils/files/digest-binutils-2.15.91.0.2-r2 b/sys-devel/binutils/files/digest-binutils-2.15.91.0.2-r2
index 84d96b36fda1..c8358e97a662 100644
--- a/sys-devel/binutils/files/digest-binutils-2.15.91.0.2-r2
+++ b/sys-devel/binutils/files/digest-binutils-2.15.91.0.2-r2
@@ -1,3 +1,2 @@
 MD5 41983069bef07af4f1350c6d30666b2d binutils-2.15.91.0.2.tar.bz2 10920145
-MD5 26eae22d17a4bd953a75b5058936e586 binutils-2.15.91.0.2-patches-1.2.tar.bz2 15042
-MD5 6abb69220369b62dae5e669cfa3a8794 binutils-2.15.91.0.2-uclibc-patches-1.0.tar.bz2 5759
+MD5 9462a3e6d552521854aa8f32418eb1c1 binutils-2.15.91.0.2-patches-1.1.tar.bz2 15349
diff --git a/sys-devel/binutils/files/digest-binutils-2.15.92.0.2-r10 b/sys-devel/binutils/files/digest-binutils-2.15.92.0.2-r10
index 379fa14a0bf5..161bf9fc45b5 100644
--- a/sys-devel/binutils/files/digest-binutils-2.15.92.0.2-r10
+++ b/sys-devel/binutils/files/digest-binutils-2.15.92.0.2-r10
@@ -1,3 +1,3 @@
 MD5 702bc82d8b10914e112fb5c5d8b66498 binutils-2.15.92.0.2.tar.bz2 11019727
-MD5 451ec1b4ee2f591355a8e3e86aceb85c binutils-2.15.92.0.2-patches-2.7.tar.bz2 33384
+MD5 32336f96fcdeb9ca7fa7dd22f2a062e3 binutils-2.15.92.0.2-patches-2.5.tar.bz2 32918
 MD5 d7c24c3391171278d90f1bdb4be2e673 binutils-2.15.92.0.2-uclibc-patches-1.1.tar.bz2 5729
diff --git a/sys-devel/binutils/files/digest-binutils-2.15.94.0.2.2 b/sys-devel/binutils/files/digest-binutils-2.15.94.0.2.2
index 780b56c8b196..2685122296fa 100644
--- a/sys-devel/binutils/files/digest-binutils-2.15.94.0.2.2
+++ b/sys-devel/binutils/files/digest-binutils-2.15.94.0.2.2
@@ -1,3 +1,3 @@
 MD5 e9bcf84d9e6b5a2d840e76f22a3fce5f binutils-2.15.94.0.2.2.tar.bz2 11300932
-MD5 e4813ea726696ccb487c0c14996a74e0 binutils-2.15.94.0.2.2-patches-1.1.tar.bz2 20401
+MD5 fd6d63d63243f1068221a85923e133ff binutils-2.15.94.0.2.2-patches-1.0.tar.bz2 15467
 MD5 603b783ed6d253fb1eb3f752f4e0ca4c binutils-2.15.94.0.2.2-uclibc-patches-1.0.tar.bz2 5934
diff --git a/sys-devel/binutils/files/digest-binutils-2.16.1 b/sys-devel/binutils/files/digest-binutils-2.16.1
index 34c29e4e8954..ee15a2372535 100644
--- a/sys-devel/binutils/files/digest-binutils-2.16.1
+++ b/sys-devel/binutils/files/digest-binutils-2.16.1
@@ -1,3 +1,3 @@
-MD5 eeaebf202fff82a2e436f46e65014caf binutils-2.16.1-patches-1.5.tar.bz2 133846
-MD5 e0db1c5854dcb0398f78cd7c7ddca7bd binutils-2.16.1-uclibc-patches-1.0.tar.bz2 5991
 MD5 6a9d529efb285071dad10e1f3d2b2967 binutils-2.16.1.tar.bz2 12549917
+MD5 4f1e21b7430264f67451fd23d63eb659 binutils-2.16.1-patches-1.0.tar.bz2 132184
+MD5 e0db1c5854dcb0398f78cd7c7ddca7bd binutils-2.16.1-uclibc-patches-1.0.tar.bz2 5991
diff --git a/sys-devel/binutils/files/digest-binutils-2.16.90.0.3 b/sys-devel/binutils/files/digest-binutils-2.16.90.0.3
index 84efd87e515e..da64b061af6c 100644
--- a/sys-devel/binutils/files/digest-binutils-2.16.90.0.3
+++ b/sys-devel/binutils/files/digest-binutils-2.16.90.0.3
@@ -1,3 +1,3 @@
 MD5 46637559faa3157b189e0835a9bed08b binutils-2.16.90.0.3.tar.bz2 11461734
-MD5 8629f445509fed3ed0c4a7d9c1f125c0 binutils-2.16.90.0.3-patches-1.3.tar.bz2 22031
+MD5 cc8c96f3137f1c6e9d5225854ba7cbcd binutils-2.16.90.0.3-patches-1.0.tar.bz2 25244
 MD5 fbe5c5073069307f9f37986ddc4a1249 binutils-2.16.90.0.3-uclibc-patches-1.0.tar.bz2 2635
diff --git a/sys-devel/binutils/metadata.xml b/sys-devel/binutils/metadata.xml
index fb4199eb7afe..f093d416cbb1 100644
--- a/sys-devel/binutils/metadata.xml
+++ b/sys-devel/binutils/metadata.xml
@@ -1,5 +1,7 @@
+ [32;01m*[0m Generated metadata.xml:
+
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>toolchain</herd>
+<herd>base-system</herd>
 </pkgmetadata>
diff --git a/sys-devel/bison/ChangeLog b/sys-devel/bison/ChangeLog
index 28a69a34891d..b1f3a90ea89c 100644
--- a/sys-devel/bison/ChangeLog
+++ b/sys-devel/bison/ChangeLog
@@ -1,169 +1,6 @@
 # ChangeLog for sys-devel/bison
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/ChangeLog,v 1.43 2005/09/21 23:43:04 vapier Exp $
-
-*bison-2.1 (21 Sep 2005)
-
-  21 Sep 2005; Mike Frysinger <vapier@gentoo.org> +bison-2.1.ebuild:
-  Version bump #106803 by Michael Cramer.
-
-  15 Sep 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/bison-2.0-token-name-translate.patch, bison-2.0.ebuild:
-  Fix from upstream for segfault in error reporting #106014 by postmodern.
-
-  04 Mar 2005; Kito <kito@gentoo.org> bison-1.875d.ebuild:
-  ~ppc-macos keyword. closes Bug 65957
-
-  06 Feb 2005; Joshua Kinard <kumba@gentoo.org> bison-1.875d.ebuild:
-  Marked stable on mips.
-
-  13 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> bison-1.875d.ebuild:
-  Stable on alpha, bug 77437.
-
-  12 Jan 2005; Karol Wojtaszek <sekretarz@gentoo.org> bison-1.875d.ebuild:
-  Marked stable on amd64, bug #77438
-
-  11 Jan 2005; Markus Rothe <corsair@gentoo.org> bison-1.875d.ebuild:
-  Stable on ppc64; bug #77434
-
-  11 Jan 2005; Luca Barbato <lu_zero@gentoo.org> bison-1.875d.ebuild:
-  Marked ppc
-
-*bison-2.0 (10 Jan 2005)
-
-  10 Jan 2005; Mike Frysinger <vapier@gentoo.org> +bison-2.0.ebuild:
-  Version bump #77407 by Michael Cramer.
-
-  10 Jan 2005; Jason Wever <weeve@gentoo.org> bison-1.875d.ebuild:
-  Marked stable on sparc wrt bug #77435 so Spanky can't spank us
-
-*bison-1.875d (31 Oct 2004)
-
-  31 Oct 2004; Aron Griffis <agriffis@gentoo.org> +bison-1.875d.ebuild:
-  Update to 1.875d for the sake of toolchain.org builds
-
-  14 Oct 2004; Mike Frysinger <vapier@gentoo.org> bison-1.875.ebuild:
-  Dont install bison as yacc, but if yacc doesnt exist, create a symlink
-  #49331 by Bruno Redondi.
-
-  19 Jul 2004; <solar@gentoo.org> bison-1.875.ebuild:
-  updated bison to use gnuconfig.eclass. Needed for uclibc and maybe others.
-
-  23 Jun 2004; Aron Griffis <agriffis@gentoo.org> bison-1.34-r1.ebuild,
-  bison-1.35.ebuild, bison-1.75.ebuild:
-  QA - fix use invocation
-
-  16 Jun 2004; Daniel Black <dragonheart@gentoo.org> bison-1.875.ebuild:
-  syntax fix on 3.4 compare condition
-
-  16 Jun 2004; Daniel Black <dragonheart@gentoo.org> bison-1.875.ebuild:
-  uclibc fixes thanks to Peter S. Mazinger <ps.m@gmx.net>
-
-  06 Feb 2004; <gustavoz@gentoo.org> bison-1.875.ebuild:
-  stable on sparc
-
-  06 Feb 2004; Aron Griffis <agriffis@gentoo.org> bison-1.875.ebuild:
-  k6 replacement in the ebuild was resulting in -march=i586-3, fix and make more
-  stringent
-
-  04 Feb 2004; Aron Griffis <agriffis@gentoo.org> bison-1.875.ebuild:
-  Fix bug 29017 by replacing -march=k6 and -march=k6-2 with -march=i586. Fix bug
-  39842 by restricting optimization on amd64 to -O0. Mark stable on x86.
-  Remove icc cruft (leftover from 2002) and remove IUSE="build" since it isn't
-  true.
-
-  01 Feb 2004; Joshua Kinard <kumba@gentoo.org> bison-1.34-r1.ebuild,
-  bison-1.35.ebuild, bison-1.75.ebuild, bison-1.875.ebuild:
-  Bump to mips stable (needed for upcoming stageballs)
-
-  20 Nov 2003; Aron Griffis <agriffis@gentoo.org> bison-1.875.ebuild:
-  Stable on alpha
-
-  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> bison-1.875.ebuild :
-  ia64 keywords.
-
-  08 Sep 2003; Martin Schlemmer <azarah@gentoo.org> bison-1.34-r1.ebuild,
-  bison-1.35.ebuild, bison-1.75.ebuild, bison-1.875.ebuild:
-  Add m4 DEPEND (bug #28119), with some other cleanups to older
-  ebuilds than 1.875.
-
-  07 Sep 2003; Martin Schlemmer <azarah@gentoo.org> bison-1.875.ebuild:
-  Fix DEPEND for when we have 'build' in USE.
-
-*bison-1.875 (07 Sep 2003)
-
-  08 Dec 2003; Guy Martin <gmsoft@gentoo.org> bison-1.875.ebuild :
-  Marked stable on hppa.
-
-  07 Sep 2003; Martin Schlemmer <azarah@gentoo.org> bison-1.875.ebuild,
-  files/bison-1.32-extfix.patch, files/bison-1.875-gccerror.patch:
-  Update version.
-
-  02 Sep 2003; Martin Holzer <mholzer@gentoo.org> bison-1.34-r1.ebuild,
-  bison-1.35.ebuild, bison-1.75.ebuild:
-  Now uses mirror://gnu.
-
-  18 Feb 2003; Zach Welch <zwelch@gentoo.org> bison-1.35.ebuild :
-  Added arm to keywords.
-
-  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> bison-1.35.ebuild :
-  Added hppa to keywords.
-
-  19 Dec 2002; Martin Schlemmer <azarah@gentoo.org> bison-1.35.ebuild :
-
-  Ripp out the icc stuff, as it cause problem, bug #12357.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-  20 Oct 2002; Maik Schreiber <blizzy@gentoo.org> bison-1.75.ebuild:
-  Fixed KEYWORDS.
-
-*bison-1.75 (20 Oct 2002)
-
-  20 Oct 2002; Martin Schlemmer <azarah@gentoo.org> : Update version.
-
-  09 Dec 2002; Jon Portnoy <avenj@gentoo.org> :
-
-  Update to be icc-able with USE=icc.
-
-  09 Dec 2002; Jon Portnoy <avenj@gentoo.org> :
-
-  Fixed dependencies for USE="icc".
-
-*bison-1.35 (09 Aug 2002)
-
-  18 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
-  Added mips to keywords
-
-  16 Aug 2002; Seemant Kulleen <seemant@gentoo.org> bison-1.35.ebuild :
-
-  It turns out that yannick.koehler@colubris.com (Yannick Koehler) had
-  actually submitted the ebuild in bug #5178, and I didn't even see it.
-  Apologies :(
-
-  09 Aug 2002; Seemant Kulleen <seemant@gentoo.org> bison-1.35.ebuild
-  files/digest-bison-1.35 :
-
-  Version bump to newest stable, which fixes issues with the spanish
-  language environment.
-
-  09 Dec 2002; Jon Portnoy <avenj@gentoo.org> bison-1.35.ebuild :
- 
-  Update to be icc-able with USE=icc.
-
-  09 Dec 2002; Jon Portnoy <avenj@gentoo.org> :
-
-  Fixed dependencies for USE="icc".
-
-*bison-1.34-r1 (2 Apr 2002)
-
-  2 Apr 2002; M.Schlemmer <azarah@gentoo.org> :
-
-  Change "make install" in src_install() to use $DESTDIR and not
-  $prefix, as some packages have the nasty habit of hardcoding
-  $prefix in "make install".  Hopefully this will fix an invalid
-  search patch for bison.{hairy,simple} some users experienced
-  (${D}/usr/...).
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
 
 *bison-1.28-r3 (1 Feb 2002)
 
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index 45f6dacb3f5d..e69de29bb2d1 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -1,23 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 56d59371f0e88e2c74e0d59462a8b873 bison-2.1.ebuild 1407
-MD5 8daee23ecbd311833a371ff404cde24a bison-1.875d.ebuild 1791
-MD5 2242f1d96824a7a82fcb75e0660f1eb2 bison-2.0.ebuild 1468
-MD5 891a59b63cc7cc11c919095f55a38de3 bison-1.875.ebuild 1796
-MD5 74ace92cfb9424b11c27843d501ee4e6 ChangeLog 6204
-MD5 4ac198b61c1a87f5070a32369477eda0 files/digest-bison-2.0 62
-MD5 644a4912da3e5107f509022f173ec146 files/bison-1.875-gccerror.patch 1538
-MD5 de372a3e3ac4588a2322ac386997d8c9 files/digest-bison-2.1 63
-MD5 6af3f9859615301181f6a1536aa56fb1 files/digest-bison-1.875d 65
-MD5 4a875793f3bd808692002c152e5e26c4 files/digest-bison-1.875 64
-MD5 61b224a9eaf1ae7f77c2d1456d8fda87 files/bison-1.32-extfix.patch 1170
-MD5 b0e8983afb264754c539f1eb53116970 files/bison-2.0-token-name-translate.patch 826
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDMlJMgIKl8Uu19MoRAkuQAJ9IyDVdexybictt94D1LN8h4MQsvQCfYG4f
-pKCPX8LP5wQtK8rtwjGJI6Q=
-=Qldl
------END PGP SIGNATURE-----
diff --git a/sys-devel/bison/bison-1.875.ebuild b/sys-devel/bison/bison-1.875.ebuild
index adb16695e638..7684d55f1477 100644
--- a/sys-devel/bison/bison-1.875.ebuild
+++ b/sys-devel/bison/bison-1.875.ebuild
@@ -1,49 +1,50 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-1.875.ebuild,v 1.29 2005/05/15 22:49:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-1.875.ebuild,v 1.1 2003/09/06 22:22:21 azarah Exp $
 
-inherit flag-o-matic eutils gnuconfig toolchain-funcs
+IUSE="nls static build" # icc"
 
+S="${WORKDIR}/${P}"
 DESCRIPTION="A yacc-compatible parser generator"
-HOMEPAGE="http://www.gnu.org/software/bison/bison.html"
 SRC_URI="mirror://gnu/bison/${P}.tar.bz2"
+HOMEPAGE="http://www.gnu.org/software/bison/bison.html"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls static"
+# do not compile xfree
+KEYWORDS="~amd64 ~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+
+DEPEND="nls? ( sys-devel/gettext )"
+#	icc? ( dev-lang/icc )"
 
-DEPEND="sys-devel/m4
-	nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
+
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-1.32-extfix.patch
 	epatch ${FILESDIR}/${PN}-1.875-gccerror.patch
 }
 
 src_compile() {
-	# Bug 39842 says that bison segfaults when built on amd64 with
-	# optimizations.  This will probably be fixed in a future gcc
-	# version, but for the moment just disable optimizations for that
-	# arch (04 Feb 2004 agriffis)
-	[ "$ARCH" == "amd64" ] && append-flags -O0
-
-	# Bug 29017 says that bison has compile-time issues with
-	# -march=k6* prior to 3.4CVS.  Use -march=i586 instead
-	# (04 Feb 2004 agriffis)
-	#
-	if (( $(gcc-major-version) == 3 && $(gcc-minor-version) < 4 )) ; then
-		replace-cpu-flags k6 k6-1 k6-2 i586
-	fi
 
-	econf $(use_enable nls) || die
-	use static && append-ldflags -static
-	emake || die
+#	use icc && CC="iccbin" CXX="iccbin" LD="iccbin"
+	local myconf=
+	
+	use nls || myconf="--disable-nls"
+
+	econf ${myconf} || die
+
+	if [ -z "`use static`" ]
+	then
+		emake || die
+	else
+		emake LDFLAGS="-static" || die
+	fi
 }
 
-src_install() {
+src_install() {                               
+
 	make DESTDIR=${D} \
 		datadir=/usr/share \
 		mandir=/usr/share/man \
@@ -51,16 +52,18 @@ src_install() {
 		install || die
 
 	# This one is installed by dev-util/yacc
-	mv ${D}/usr/bin/yacc ${D}/usr/bin/yacc.bison || die
+	mv ${D}/usr/bin/yacc ${D}/usr/bin/yacc.bison
 
 	# We do not need this.
 	rm -f ${D}/usr/lib/liby.a
 
-	dodoc AUTHORS NEWS ChangeLog README REFERENCES OChangeLog doc/FAQ
-}
-
-pkg_postinst() {
-	if [ ! -e "${ROOT}/usr/bin/yacc" ] ; then
-		ln -s yacc.bison /usr/bin/yacc
+	if [ -z "`use build`" ]
+	then
+		dodoc COPYING AUTHORS NEWS ChangeLog README REFERENCES OChangeLog
+		docinto txt
+		dodoc doc/FAQ
+	else
+		rm -rf ${D}/usr/share/man ${D}/usr/share/info
 	fi
 }
+
diff --git a/sys-devel/bison/bison-1.875d.ebuild b/sys-devel/bison/bison-1.875d.ebuild
index 7cf87ac9b00e..0b031663d6de 100644
--- a/sys-devel/bison/bison-1.875d.ebuild
+++ b/sys-devel/bison/bison-1.875d.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-1.875d.ebuild,v 1.11 2005/03/09 02:12:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-1.875d.ebuild,v 1.1 2004/10/30 03:58:47 agriffis Exp $
 
-inherit toolchain-funcs flag-o-matic eutils
+inherit gcc flag-o-matic eutils gnuconfig
 
 DESCRIPTION="A yacc-compatible parser generator"
 HOMEPAGE="http://www.gnu.org/software/bison/bison.html"
@@ -10,7 +10,7 @@ SRC_URI="ftp://alpha.gnu.org/pub/gnu/bison/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 ppc-macos s390 sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="nls static"
 
 DEPEND="sys-devel/m4
@@ -18,8 +18,9 @@ DEPEND="sys-devel/m4
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.32-extfix.patch
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-1.32-extfix.patch
+	gnuconfig_update
 }
 
 src_compile() {
@@ -43,23 +44,23 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" \
+	make DESTDIR=${D} \
 		datadir=/usr/share \
 		mandir=/usr/share/man \
 		infodir=/usr/share/info \
 		install || die
 
 	# This one is installed by dev-util/yacc
-	mv "${D}"/usr/bin/yacc "${D}"/usr/bin/yacc.bison || die
+	mv ${D}/usr/bin/yacc ${D}/usr/bin/yacc.bison || die
 
 	# We do not need this.
-	rm -f "${D}"/usr/lib/liby.a
+	rm -f ${D}/usr/lib/liby.a
 
 	dodoc AUTHORS NEWS ChangeLog README REFERENCES OChangeLog doc/FAQ
 }
 
 pkg_postinst() {
-	if [[ ! -e ${ROOT}/usr/bin/yacc ]] ; then
-		ln -s yacc.bison "${ROOT}"/usr/bin/yacc
+	if [ ! -e "${ROOT}/usr/bin/yacc" ] ; then
+		ln -s yacc.bison /usr/bin/yacc
 	fi
 }
diff --git a/sys-devel/bison/bison-2.0.ebuild b/sys-devel/bison/bison-2.0.ebuild
index 7a5cc3754b1b..e720e5870b1a 100644
--- a/sys-devel/bison/bison-2.0.ebuild
+++ b/sys-devel/bison/bison-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-2.0.ebuild,v 1.3 2005/09/15 04:26:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-2.0.ebuild,v 1.1 2005/01/11 01:32:00 vapier Exp $
 
 inherit toolchain-funcs flag-o-matic eutils gnuconfig
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/bison/${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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="nls static"
 
 DEPEND="sys-devel/m4
@@ -18,9 +18,8 @@ DEPEND="sys-devel/m4
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.32-extfix.patch
-	epatch "${FILESDIR}"/${P}-token-name-translate.patch #106014
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-1.32-extfix.patch
 }
 
 src_compile() {
diff --git a/sys-devel/bison/bison-2.1.ebuild b/sys-devel/bison/bison-2.1.ebuild
index 976a0d2e4554..9067c30df7de 100644
--- a/sys-devel/bison/bison-2.1.ebuild
+++ b/sys-devel/bison/bison-2.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-2.1.ebuild,v 1.2 2005/09/22 06:41:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-2.1.ebuild,v 1.1 2005/09/21 23:43:04 vapier Exp $
 
 inherit toolchain-funcs flag-o-matic eutils gnuconfig
 
 DESCRIPTION="A yacc-compatible parser generator"
 HOMEPAGE="http://www.gnu.org/software/bison/bison.html"
-SRC_URI="mirror://gnu/bison/${P}.tar.bz2"
+SRC_URI="mirror://gnu/bison/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-devel/bison/files/digest-bison-2.1 b/sys-devel/bison/files/digest-bison-2.1
index de411061a568..fd37b4ad3f14 100644
--- a/sys-devel/bison/files/digest-bison-2.1
+++ b/sys-devel/bison/files/digest-bison-2.1
@@ -1 +1 @@
-MD5 ef3110077462b1140b2ae612626e8486 bison-2.1.tar.bz2 1005925
+MD5 b1468d49c1357aebcd1de6ef12cbf3e8 bison-2.1.tar.gz 1316270
diff --git a/sys-devel/bison/metadata.xml b/sys-devel/bison/metadata.xml
index 96a2d586367d..f093d416cbb1 100644
--- a/sys-devel/bison/metadata.xml
+++ b/sys-devel/bison/metadata.xml
@@ -1,3 +1,5 @@
+ [32;01m*[0m Generated metadata.xml:
+
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/sys-devel/cctools-extras/ChangeLog b/sys-devel/cctools-extras/ChangeLog
index 794d2ee20323..e733bed87123 100644
--- a/sys-devel/cctools-extras/ChangeLog
+++ b/sys-devel/cctools-extras/ChangeLog
@@ -1,15 +1,6 @@
 # ChangeLog for sys-devel/cctools-extras
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/cctools-extras/ChangeLog,v 1.4 2005/04/19 05:38:14 kito Exp $
-
-  19 Apr 2005; Kito <kito@gentoo.org> :
-  bump to 573.1 corresponds with OS X 10.3.9
-
-  27 Feb 2005; Kito <kito@gentoo.org> cctools-extras-525.ebuild:
-  stable on ppc-macos
-
-  18 Nov 2004; Kito <kito@gentoo.org> cctools-extras-525.ebuild:
-  fix libkld.a static build
+# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/cctools-extras/ChangeLog,v 1.1 2004/11/07 22:56:00 kito Exp $
 
 *cctools-extras-525 (07 Nov 2004)
 
diff --git a/sys-devel/cctools-extras/Manifest b/sys-devel/cctools-extras/Manifest
index d5a2522807cf..2e095585ead8 100644
--- a/sys-devel/cctools-extras/Manifest
+++ b/sys-devel/cctools-extras/Manifest
@@ -1,8 +1,6 @@
-MD5 52e022233f8c69f6d0d34ffe5342c18a ChangeLog 653
-MD5 ba64d3b3e93533f82c79c35d500a6b92 cctools-extras-525.ebuild 1557
-MD5 da9aa0c16da013a9138a164dd24f1172 cctools-extras-573.1.ebuild 1559
-MD5 9d77c96fd34325d89cb51dafd31a6a33 cctools-extras-576.2.ebuild 1561
+MD5 6284e262ce2ed2b3531a796bfa2ac01b ChangeLog 291
+MD5 157fc0f8714d18fa02e23a12d74c13ac cctools-extras-495.8.ebuild 873
+MD5 64f24d9953be0f079d77f40c0b53335d cctools-extras-525.ebuild 893
 MD5 e526e84277cb8eb1bcf73840117ff45a metadata.xml 220
+MD5 fa2bd3a13c7f1219adb4f11850b94fb6 files/digest-cctools-extras-495.8 66
 MD5 7224fbe051fc8939e6ddeb9c73055e35 files/digest-cctools-extras-525 64
-MD5 871f5e7ec7f89f44f90dba7bf366a0d5 files/digest-cctools-extras-573.1 66
-MD5 f1c15c3c14fc20789ecff7d846fb8b39 files/digest-cctools-extras-576.2 66
diff --git a/sys-devel/cctools-extras/cctools-extras-525.ebuild b/sys-devel/cctools-extras/cctools-extras-525.ebuild
index 173ec37f4a53..028d7e4ea035 100644
--- a/sys-devel/cctools-extras/cctools-extras-525.ebuild
+++ b/sys-devel/cctools-extras/cctools-extras-525.ebuild
@@ -1,57 +1,35 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/cctools-extras/cctools-extras-525.ebuild,v 1.5 2005/02/27 21:57:10 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/cctools-extras/cctools-extras-525.ebuild,v 1.1 2004/11/07 22:56:00 kito Exp $
 
-S=${WORKDIR}/cctools-${PV}
-
-DESCRIPTION="Extra cctools"
+DESCRIPTION="Extra cctools utils"
 HOMEPAGE="http://darwinsource.opendarwin.org/"
 SRC_URI="http://darwinsource.opendarwin.org/tarballs/apsl/cctools-${PV}.tar.gz"
+RESTRICT="nomirror"
 
 LICENSE="APSL-2"
 
 SLOT="0"
-KEYWORDS="ppc-macos"
-IUSE="build"
-
-DEPEND="sys-apps/bootstrap_cmds
-		sys-libs/libstreams
-		sys-libs/libsystem"
+KEYWORDS="~ppc-macos"
+IUSE=""
 
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}/ld
-	sed -i -e 's:seg_hack:${S}/misc/seg_hack.NEW:' Makefile
-}
+DEPEND=""
 
 src_compile() {
-	cd ${S}
-	rm -rf ar as cbtlibs dyld file gprof libdyld mkshlib otool
-	make SUBDIRS="libmacho libstuff misc" RC_OS=macos || die "make failed"
-
-	cd ${S}/ld
-	make RC_OS=macos kld_build || die "static kld build failed"
+	cd ${WORKDIR}/cctools-${PV}
+	rm -rf ar as cbtlibs dyld file gprof ld libdyld libmacho mkshlib otool
+	make SUBDIRS="libstuff misc" || die "make failed"
 }
 
 src_install() {
-	cd ${S}/misc
-	newbin check_dylib.NEW check_dylib || die "check_dylib failed"
-	newbin checksyms.NEW checksyms || die "checksyms failed"
-	newbin dylib_pcsampler.NEW dylib_pcsampler || die "dylib_pcsampler failed"
-	newbin indr.NEW indr || die "indr failed"
-	newbin seg_addr_table.NEW seg_addr_table || die "seg_addr_table failed"
-	newbin seg_hack.NEW seg_hack || die "seg_hack failed"
-
-	mkdir -p ${D}/usr/include/mach
-	cp -Rfp ${S}/include/mach-o ${D}/usr/include
-	cp -Rfp ${S}/include/mach/* ${D}/usr/include/mach
-
-	cd ${S}/ld/static_kld
-	dolib.a *.a
-
-	if ! use build; then
-		cd ${S}/man
-		doman {check_dylib.1,checksyms.1,indr.1,seg_addr_table.1}
-	fi
+	cd ${WORKDIR}/cctools-${PV}/misc
+	newbin check_dylib.NEW check_dylib
+	newbin checksyms.NEW checksyms
+	newbin dylib_pcsampler.NEW dylib_pcsampler
+	newbin indr.NEW indr
+	newbin seg_addr_table.NEW seg_addr_table
+	newbin seg_hack.NEW seg_hack
+
+	cd ${WORKDIR}/cctools-${PV}/man
+	doman {check_dylib.1,checksyms.1,indr.1,seg_addr_table.1}
 }
 \ No newline at end of file
diff --git a/sys-devel/cons/ChangeLog b/sys-devel/cons/ChangeLog
index be5df381832a..193d508ca418 100644
--- a/sys-devel/cons/ChangeLog
+++ b/sys-devel/cons/ChangeLog
@@ -1,21 +1,7 @@
-# ChangeLog for sys-devel/cons
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/cons/ChangeLog,v 1.10 2005/05/24 16:01:05 mcummings Exp $
+# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/cons/ChangeLog,v 1.1 2002/10/24 15:20:09 mcummings Exp $
 
-  24 May 2005; Michael Cummings <mcummings@gentoo.org> cons-2.2.0.ebuild:
-  dev-perl/Digest-MD5 => perl-core/Digest-MD5
-
-  03 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> cons-2.2.0.ebuild:
-  Masked cons-2.2.0.ebuild stable for ppc
-
-  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> cons-2.2.0.ebuild:
-  Stable on alpha.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 *cons-2.2.0 (24 Oct 2002)
 
   24 Oct 2002; <mcummings@gentoo.org> cons-2.2.0.ebuild, ChangeLog: Initial
diff --git a/sys-devel/cons/Manifest b/sys-devel/cons/Manifest
index 95e28aee98dc..e69de29bb2d1 100644
--- a/sys-devel/cons/Manifest
+++ b/sys-devel/cons/Manifest
@@ -1,14 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 00723f8a3065d38f257c2b36e5682d66 ChangeLog 895
-MD5 76538c4a4126088ae64a28ba06f29137 cons-2.2.0.ebuild 606
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 edfa71105447060a26f34bccf832032d files/digest-cons-2.2.0 59
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCk0/etG5z4I8BtQoRAiDEAJ9o++Xl63cnh1jGZiS2LPMn6hOJLACeLWST
-KmOGCV+fU0+pqXZoFDcy0u0=
-=I/Hj
------END PGP SIGNATURE-----
diff --git a/sys-devel/cons/cons-2.2.0.ebuild b/sys-devel/cons/cons-2.2.0.ebuild
index ec1d94bfdffc..8e14c5e1e43e 100644
--- a/sys-devel/cons/cons-2.2.0.ebuild
+++ b/sys-devel/cons/cons-2.2.0.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/cons/cons-2.2.0.ebuild,v 1.12 2005/05/24 16:01:05 mcummings Exp $
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: 
 
+MY_P=${PN}-2.2.0
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="Extensible perl-based build utility"
-SRC_URI="http://www.dsmit.com/cons/stable/${P}.tgz"
+SRC_URI="http://www.dsmit.com/cons/stable/${MY_P}.tgz"
 HOMEPAGE="http://www.dsmit.com/cons/"
 
-SLOT="2.2"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~sparc alpha"
-IUSE=""
+DEPEND="sys-devel/perl
+	dev-perl/Digest-MD5"
 
-DEPEND="dev-lang/perl
-	perl-core/Digest-MD5"
+SLOT="2.2"
+LICENSE="GPL"
+KEYWORDS="x86 ~ppc ~sparc ~sparc64 ~alpha"
 
-src_install() {
-	dobin cons
+src_install () {
+	exeinto /usr/bin
+	doexe cons
 	dodoc CHANGES COPYING COPYRIGHT INSTALL MANIFEST README RELEASE TODO
 	dohtml *.html
 	doman cons.1.gz
diff --git a/sys-devel/cons/metadata.xml b/sys-devel/cons/metadata.xml
index 96a2d586367d..f093d416cbb1 100644
--- a/sys-devel/cons/metadata.xml
+++ b/sys-devel/cons/metadata.xml
@@ -1,3 +1,5 @@
+ [32;01m*[0m Generated metadata.xml:
+
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/sys-devel/crossdev/ChangeLog b/sys-devel/crossdev/ChangeLog
index a60b36f7ca8c..5e365c26e5d6 100644
--- a/sys-devel/crossdev/ChangeLog
+++ b/sys-devel/crossdev/ChangeLog
@@ -1,157 +1,7 @@
 # ChangeLog for sys-devel/crossdev
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/ChangeLog,v 1.26 2005/11/18 04:02:33 vapier Exp $
+# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/ChangeLog,v 1.1 2003/12/04 09:31:50 kumba Exp $
 
-*crossdev-0.9.10 (18 Nov 2005)
-
-  18 Nov 2005; Mike Frysinger <vapier@gentoo.org> files/crossdev,
-  -crossdev-0.9.9-r3.ebuild, +crossdev-0.9.10.ebuild:
-  Add support for building bootstrap gcc with libc/kernel headers
-  (--with-headers), fix cleaning of categories/package.keywords files, add
-  generic support for future --with-/--without- options, better detect when a
-  package needs to be re-emerged or can be safely skipped, and touchup code in
-  general.
-
-*crossdev-0.9.9-r3 (08 Oct 2005)
-
-  08 Oct 2005; Mike Frysinger <vapier@gentoo.org> files/crossdev,
-  -crossdev-0.9.9-r2.ebuild, +crossdev-0.9.9-r3.ebuild:
-  Add support for passing -d to portage #108383 by Jan Kobler and allow env
-  USE/ABI to be passed in.
-
-*crossdev-0.9.9-r2 (29 Aug 2005)
-
-  29 Aug 2005; Mike Frysinger <vapier@gentoo.org> files/crossdev,
-  +crossdev-0.9.9-r2.ebuild:
-  Update avr to require 3.4.4-r1 since 3.4.4 no longer exists.
-
-*crossdev-0.9.9-r1 (23 Aug 2005)
-
-  23 Aug 2005; Mike Frysinger <vapier@gentoo.org> files/crossdev,
-  -crossdev-0.9.9.ebuild, +crossdev-0.9.9-r1.ebuild:
-  Touchup help output, add more error checking, clean more directories when
-  uninstalling, be a bit more user friendly with cmdline options, add untested
-  support for klibc, touchup internal syntax, and improve ABI faking out.
-
-*crossdev-0.9.9 (17 Aug 2005)
-
-  17 Aug 2005; Mike Frysinger <vapier@gentoo.org> files/crossdev,
-  +crossdev-0.9.9.ebuild:
-  Add a help target so the user knows what crossdev supports, and add initial
-  support for msp430 targets.
-
-*crossdev-0.9.8 (25 Jul 2005)
-
-  25 Jul 2005; Mike Frysinger <vapier@gentoo.org> files/crossdev,
-  +crossdev-0.9.8.ebuild:
-  Add an option to create a cross gdb.
-
-*crossdev-0.9.7 (15 Jul 2005)
-
-  15 Jul 2005; Mike Frysinger <vapier@gentoo.org> files/crossdev,
-  +crossdev-0.9.7.ebuild:
-  Add support for C++ with avr targets; fixes by Ludek Stepan #99014 / #99020.
-
-*crossdev-0.9.6-r1 (14 Jul 2005)
-
-  14 Jul 2005; Mike Frysinger <vapier@gentoo.org> files/crossdev,
-  +crossdev-0.9.6-r1.ebuild:
-  Make sure the stupid ABI var doesnt screw us up.
-
-  20 Jun 2005; Markus Rothe <corsair@gentoo.org> crossdev-0.9.6.ebuild:
-  Stable on ppc64
-
-  25 May 2005; Markus Rothe <corsair@gentoo.org> crossdev-0.9.6.ebuild:
-  Added ~ppc64 to KEYWORDS
-
-*crossdev-0.9.6 (18 Apr 2005)
-
-  18 Apr 2005; Mike Frysinger <vapier@gentoo.org>
-  -files/crossdev-0.4-fixes-one.patch, files/crossdev,
-  -crossdev-0.9.5-r1.ebuild, +crossdev-0.9.6.ebuild:
-  Add some initial support for ps2 targets (ee/iop/dvp).
-
-*crossdev-0.9.5-r1 (25 Mar 2005)
-
-  25 Mar 2005; Mike Frysinger <vapier@gentoo.org> files/crossdev,
-  +crossdev-0.9.5-r1.ebuild:
-  Make sure PORTDIR_OVERLAY is set #86641.
-
-*crossdev-0.9.5 (16 Mar 2005)
-
-  16 Mar 2005; Mike Frysinger <vapier@gentoo.org> files/crossdev,
-  -crossdev-0.9.1-r2.ebuild, +crossdev-0.9.5.ebuild:
-  Make binutils/gcc/linux-headers dynamic package names (to support
-  mips-headers). Add support for pulling in avr libc (thanks to Scott).
-
-*crossdev-0.9.1-r2 (12 Mar 2005)
-
-  12 Mar 2005; Mike Frysinger <vapier@gentoo.org> files/crossdev,
-  -crossdev-0.9.1-r1.ebuild, +crossdev-0.9.1-r2.ebuild:
-  Add a --stage0 (for binutils), use a diff PORTAGE_TMPDIR, and make sure that
-  the diff PKGDIR is actually used.
-
-*crossdev-0.9.1-r1 (10 Mar 2005)
-
-  10 Mar 2005; Mike Frysinger <vapier@gentoo.org> files/crossdev,
-  +crossdev-0.9.1-r1.ebuild:
-  Fix the set_use function to actually work, add an uninstall option, and make
-  sure the stage1-gcc is just a C compiler (no fortran/etc...).
-
-*crossdev-0.9.1 (09 Mar 2005)
-
-  09 Mar 2005; Mike Frysinger <vapier@gentoo.org> files/crossdev,
-  -crossdev-0.9-r3.ebuild, +crossdev-0.9.1.ebuild:
-  Add sanity checks for host system and add support for avr (fixes from Scott
-  L Price).
-
-*crossdev-0.9-r3 (04 Mar 2005)
-
-  04 Mar 2005; Mike Frysinger <vapier@gentoo.org> files/crossdev,
-  -crossdev-0.9-r2.ebuild, +crossdev-0.9-r3.ebuild:
-  Fix option collsion between internal -b (--binutils) and portages -b (build
-  package).
-
-*crossdev-0.9-r2 (03 Mar 2005)
-
-  03 Mar 2005; Mike Frysinger <vapier@gentoo.org> files/crossdev,
-  +crossdev-0.9-r2.ebuild:
-  Add sanity checks to keep from breaking the host system.
-
-*crossdev-0.9-r1 (03 Mar 2005)
-
-  03 Mar 2005; Mike Frysinger <vapier@gentoo.org> files/crossdev,
-  +crossdev-0.9-r1.ebuild:
-  Make sure we use a custom PKGDIR so we dont overwrite the users normal
-  toolchain binpkgs.
-
-*crossdev-0.9 (03 Mar 2005)
-
-  03 Mar 2005; Mike Frysinger <vapier@gentoo.org> +files/crossdev,
-  +crossdev-0.9.ebuild:
-  Version bumpage, use the portage tree now.
-
-  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
-  crossdev-0.4-r1.ebuild:
-  Masked crossdev-0.4-r1.ebuild stable for ppc
-
-*crossdev-0.4-r1 (26 Feb 2004)
-
-  26 Feb 2004; Joshua Kinard <kumba@gentoo.org> crossdev-0.4-r1.ebuild,
-  crossdev-0.4.ebuild, files/crossdev-0.4-fixes-one.patch:
-  Added a patch to fix some annoying bugs, and bumped into stable for x86,
-  sparc, and mips.
-
-*crossdev-0.4 (30 Jan 2004)
-
-  30 Jan 2004; Joshua Kinard <kumba@gentoo.org> crossdev-0.4.ebuild:
-  New version, has lots of changes.  See the package changelog for more details.
-
-*crossdev-0.3 (24 Dec 2003)
-
-  23 Dec 2003; Joshua Kinard <kumba@gentoo.org> metadata.xml:
-  New revision, adds toolchain support for several new archs and other minor
-  fixes
 
 *crossdev-0.2 (04 Dec 2003)
 
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 3537275a78a3..ddd606dfde25 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,15 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1e4889f5a0724f8e3336c8fe46ba7061 ChangeLog 5677
-MD5 6f298398bc8f1ae76ceb2e5e2602f706 crossdev-0.9.10.ebuild 594
-MD5 b9ab69efcb0d1987ac6c935886e6ada9 files/crossdev 14735
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-crossdev-0.9.10 0
-MD5 e91cdaf464f515f3528da02cf06e54a1 metadata.xml 222
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDfVKwgIKl8Uu19MoRAgJXAJ9fQXXNZ6eN21B3f7ZXNDpBsESxPQCeO6x+
-YixBN9k0qkT7IePdA8pFUm8=
-=Zkxo
------END PGP SIGNATURE-----
+MD5 5ed7cd8910aba03bec55eff0c102466a crossdev-0.2.ebuild 802
+MD5 127d45787ba2d3b02a96facfcc7c8e61 metadata.xml 374
+MD5 0938db38a28bf3c7ce2db70500546c88 ChangeLog 272
+MD5 41882d5c4b72122ba324821b3d8e02fa files/digest-crossdev-0.2 64
diff --git a/sys-devel/crossdev/files/crossdev b/sys-devel/crossdev/files/crossdev
index cacae17a6e4a..14c27a82301d 100755
--- a/sys-devel/crossdev/files/crossdev
+++ b/sys-devel/crossdev/files/crossdev
@@ -1,17 +1,9 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/files/crossdev,v 1.41 2005/11/18 04:02:33 vapier Exp $
-
-cd /
-
-if [[ ${ROOT:-/} != "/" ]] ; then
-	echo "Sorry, but crossdev does not support ROOT."
-	exit 2
-fi
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/files/crossdev,v 1.1 2005/03/03 18:44:33 vapier Exp $
 
 source /sbin/functions.sh || exit 1
-esyslog() { :; }
 die() {
 	echo
 	eerror $*
@@ -23,66 +15,51 @@ die() {
 
 usage() {
 cat << EOF
-Usage: ${HILITE}crossdev${NORMAL} ${GOOD}[options]${NORMAL} ${BRACKET}--target TARGET${NORMAL}
 
-Options:
-    ${GOOD}--b, --binutils${NORMAL} ver   Specify version of binutils to use
-    ${GOOD}--g, --gcc${NORMAL} ver        Specify version of gcc to use
-    ${GOOD}--k, --kernel${NORMAL} ver     Specify version of kernel headers to use
-    ${GOOD}--l, --libc${NORMAL} ver       Specify version of libc to use
-    ${GOOD}-C, --clean${NORMAL} target    Uninstall specified target
-    ${GOOD}-b, -d, -p, -v${NORMAL}        Options to pass to emerge (see emerge(1))
-Stage Options:
-    ${GOOD}-s0, --stage0${NORMAL}         Build just binutils
-    ${GOOD}-s1, --stage1${NORMAL}         Also build a C compiler (no libc/C++)
-    ${GOOD}-s2, --stage2${NORMAL}         Also build kernel headers
-    ${GOOD}-s3, --stage3${NORMAL}         Also build the C library (no C++)
-    ${GOOD}-s4, --stage4${NORMAL}         Also build a C++ compiler [default]
-Extra Fun (must be run after above stages):
-    ${GOOD}--ex-only${NORMAL}             Skip the stage steps above
-    ${GOOD}--ex-gcc${NORMAL}              Build extra gcc targets (gcj/ada/etc...)
-    ${GOOD}--ex-gdb${NORMAL}              Build a cross gdb
+Usage: ${HILITE}crossdev${NORMAL} ${GOOD}[options]${NORMAL} ${BRACKET}--target TARGET${NORMAL}
 
-${BRACKET}Target (-t)${NORMAL}:   takes the form: ${BRACKET}ARCH-VENDOR-OS-LIBC${NORMAL}
-    Run 'crossdev -t help' for examples
+${GOOD}Options${NORMAL}:
+    ${GOOD}-b, --binutils${NORMAL} ver    Specify version of binutils to use
+    ${GOOD}-g, --gcc${NORMAL} ver         Specify version of gcc to use
+    ${GOOD}-k, --kernel${NORMAL} ver      Specify version of kernel headers to use
+    ${GOOD}-l, --libc${NORMAL} ver        Specify version of libc to use
+    ${GOOD}-p, -v, -a${NORMAL}            Options to pass to emerge (see emerge(1))
+
+    ${GOOD}-s1, --stage1${NORMAL}         Build a C compiler (no libc/C++)
+    ${GOOD}-s2, --stage2${NORMAL}         Build a C compiler & libc (no C++)
+    ${GOOD}-s3, --stage3${NORMAL}         Build a C/C++ compiler & libc [default]
+
+${BRACKET}Target (-t)${NORMAL}:
+    The target takes the form:   ${BRACKET}ARCH-VENDOR-OS-LIBC${NORMAL}
+    The default 'pc-linux-gnu' will be appended if only ARCH is specified.
+    Examples:
+       arm-pc-linux-gnu      hppa2.0-pc-linux-gnu   sparc-pc-linux-gnu
+       i386-pc-linux-uclibc  mips-pc-linux-uclibc   sh4-pc-linux-uclibc
+
+For more info, please see ${HILITE}crossdev${NORMAL}(8).
 EOF
 	exit ${1:-0}
 }
-STAGE_BINUTILS=0
-STAGE_C_ONLY=1
-STAGE_LIBC=3
-STAGE_C_CPP=4
-STAGE_DISP=( "binutils" "C compiler only" "kernel headers" "C compiler & libc" "C/C++ compiler" )
 
 parse_target() {
 	[[ -z $1 ]] && usage 1
-	CTARGET=${1#cross-}
+	CTARGET=$1
 	local CPRE=${CTARGET%%-*} CPOST=${CTARGET#*-}
 
 	# Did they give us just an ARCH or the full TARGET ?
-	if [[ ${CTARGET/-} == ${CTARGET} || -z ${CPOST} ]] ; then
-		case ${CPRE} in
-			x86|i?86*|amd64|x86_64*) CPOST="pc-linux-gnu";;
-			s390*) CPOST="ibm-linux-gnu";;
-			*) CPOST="unknown-linux-gnu";;
-		esac
-	fi
+	[[ ${CTARGET/-} == ${CTARGET} || -z ${CPOST} ]] && CPOST="pc-linux-gnu"
 
 	# Let's accept ARCH in both the portage and the standard forms ...
 	# CTARGET is in the standard form while TARCH is in the portage form
 	case ${CPRE} in
-
-		#####################
-		### linux targets ###
 		alpha*)     TARCH=alpha;;
 		arm*)       TARCH=arm;;
 		hppa*)      TARCH=hppa;;
-		parisc)     TARCH=hppa;   CPRE="hppa";;
-		ia64*)      TARCH=ia64    WITH_DEF_HEADERS="yes";;
+		ia64*)      TARCH=ia64;;
 		i?86*)      TARCH=x86;;
 		x86)        TARCH=x86;    CPRE="i386";;
 		m68*)       TARCH=m68k;;
-		mips*)      TARCH=mips ;  KPKG="mips-headers";;
+		mips*)      TARCH=mips;;
 		powerpc64*) TARCH=ppc64;;
 		ppc64)      TARCH=ppc64;  CPRE="powerpc64";;
 		powerpc*)   TARCH=ppc;;
@@ -92,173 +69,10 @@ parse_target() {
 		sh*)        TARCH=sh;;
 		x86_64*)    TARCH=amd64;;
 		amd64)      TARCH=amd64;  CPRE="x86_64";;
-
-		#####################
-		### other targets ###
-		avr*) TARCH=${HARCH}; CPOST="";
-		      KPKG="[none]"; STAGE=${STAGE_LIBC};
-		      LCAT="dev-embedded"; LPKG="avr-libc";
-		      GVER="3.4.4-r1"; BVER="2.16.1";
-		      GUSE="-fortran -gtk -gcj -objc";;
-
-		msp430)
-		      TARCH=${HARCH}; CPOST="";
-		      STAGE=${STAGE_BINUTILS};;
-
-		ps2*) einfo "The ps2 target is really an alias for the ee/iop/dvp targets"
-		      ${CROSSDEV} -t ee  || exit 1
-		      ${CROSSDEV} -t iop || exit 1
-		      ${CROSSDEV} -t dvp || exit 1
-		      exit 0;;
-		ee*)  TARCH=${HARCH}; CPOST="";
-		      KPKG="[none]"
-		      GVER="3.2.2"; BVER="2.14";
-		      STAGE=${STAGE_C_ONLY};
-		      GUSE="-fortran -gtk -gcj -objc";;
-		iop*) TARCH=${HARCH}; CPOST="";
-		      GVER="3.2.2"; BVER="2.14";
-		      STAGE=${STAGE_C_ONLY};
-		      GUSE="-fortran -gtk -gcj -objc";;
-		dvp*) TARCH=${HARCH}; CPOST="";
-		      GVER="3.2.2"; BVER="2.14";
-		      STAGE=${STAGE_BINUTILS};;
-
-		############
-		### help ###
-		help)
-			cat <<-EOF
-			Supported Architectures:
-			   alpha
-			   arm / armeb
-			   hppa (parisc)
-			   ia64
-			   i386 / i486 / i586 / i686 (x86)
-			   m68k
-			   mips / mipsel / mips64 / mips64el
-			   powerpc (ppc) / powerpc64 (ppc64)
-			   sparc / sparc64
-			   s390 / s390x
-			   sh / sh[1-5] / sh64
-			   x86_64 (amd64)
-			Supported C Libraries:
-			   gnu (glibc)
-			   klibc       [prob wont work]
-			   uclibc      [not all arches are ported]
-			Special Targets:
-			   avr
-			   msp430
-			   ee / iop / dvp (ps2) [Playstation 2 targets]
-			EOF
-			exit 0
-			;;
-
-		#######################
-		### unknown targets ###
-		*) usage 1;;
+		*)          usage 1;;
 	esac
-
-	CTARGET=${CPRE}
-	[[ -n ${CPOST} ]] && CTARGET=${CTARGET}-${CPOST}
-
-	# Tweak packages based upon CTARGET
-	case ${CTARGET} in
-		# Normal Linux host, just diff libc
-		*-dietlibc) LPKG="dietlibc";;
-		*-klibc)    LPKG="klibc";;
-		*-uclibc)   LPKG="uclibc";;
-
-		# Now for the BSDs ...
-		*-freebsd*)
-			TARCH="${TARCH}-fbsd"
-			LCAT="sys-freebsd" LPKG="freebsd-lib"
-			KCAT="sys-freebsd" KPKG="freebsd-headers"
-			;;
-	esac
-}
-
-setup_portage_vars() {
-	PORTDIR_OVERLAY=$(portageq envvar PORTDIR_OVERLAY)
-	PORTDIR_OVERLAY=${PORTDIR_OVERLAY%% *}
-	PORTDIR=$(portageq envvar PORTDIR)
-	PORT_LOGDIR=$(portageq envvar PORT_LOGDIR)
-	PORT_LOGDIR=${PORT_LOGDIR:-/var/log/portage}
-	export PKGDIR=$(portageq envvar PKGDIR)/cross/${CTARGET}
-	export PORTAGE_TMPDIR=$(portageq envvar PORTAGE_TMPDIR)/cross/${CTARGET}
-	[[ ! -d ${PORT_LOGDIR} ]] && mkdir -p ${PORT_LOGDIR}
-	[[ ! -d ${PORTAGE_TMPDIR} ]] && mkdir -p ${PORTAGE_TMPDIR}
-}
-
-uninstall() {
-	setup_portage_vars
-
-	ewarn "Uninstalling target '${CTARGET}' ..."
-
-	[[ -d ${PORTDIR_OVERLAY}/cross-${CTARGET} ]] \
-		&& rm -r ${PORTDIR_OVERLAY}/cross-${CTARGET}
-	for f in package.{mask,keywords,use} categories ; do
-		f="/etc/portage/${f}"
-		[[ ! -e ${f} ]] && continue
-		sed -i -e "/cross-${CTARGET}\//d" "${f}"
-	done
-
-	if [[ ! -d /var/db/pkg/cross-${CTARGET} ]] ; then
-		eerror "${CTARGET} is not installed."
-		exit 1
-	fi
-
-	export CLEAN_DELAY=0
-	cd /var/db/pkg
-	for p in cross-${CTARGET}/* ; do
-		emerge -C =${p} || exit 1
-	done
-	for b in addr2line ar as c++filt ld nm objcopy objdump ranlib readelf size strings strip ; do
-		rm -f /usr/bin/${CTARGET}-${b} /usr/${CTARGET}/bin/${b}
-	done
-	rm -f /usr/${CTARGET}/{sys-include,usr}
-	rm -f /usr/bin/${CTARGET}-{gcc,{c,g}++}
-	rmdir /usr/${CTARGET}/{include/asm,include} &> /dev/null
-	for d in /usr/${CTARGET} /usr/lib/gcc{,-lib}/${CTARGET} ; do
-		if [[ ! -d ${d} ]] ; then
-			rm -f "${d}" &> /dev/null
-		else
-			rmdir "${d}" &> /dev/null && continue
-			rm -ri "${d}"
-		fi
-	done
-	rm -f /etc/env.d/{binutils,gcc}/config-${CTARGET}
-	rmdir /var/db/pkg/cross-${CTARGET}
-
-	exit 0
-}
-
-set_withval() {
-	local withval varname
-	varname=${*#--with-}
-	varname=${varname#--without-}
-	varname=${varname%%=*}
-	if [[ $* == *=* ]] ; then
-		withval=${*#*=}
-	else
-		[[ $* == --with-* ]] && withval="yes" || withval="no"
-	fi
-
-	echo WITH_`echo ${varname} | tr '[:lower:]' '[:upper:]'`=\"${withval}\"
+	CTARGET=${CPRE}-${CPOST}
 }
-
-is_stage() { [[ ${STAGE} -ge $1 ]] ; }
-is_s0()    { is_stage 0 ; }
-is_s1()    { is_stage 1 ; }
-is_s2()    { is_stage 2 ; }
-is_s3()    { is_stage 3 ; }
-is_s4()    { is_stage 4 ; }
-is_s5()    { is_stage 5 ; }
-
-with_headers()   { [[ ${WITH_HEADERS}   == "yes" ]] ; }
-
-ex_fast()  { [[ ${EX_FAST} == "yes" ]] ; }
-ex_gcc()   { [[ ${EX_GCC}  == "yes" ]] ; }
-ex_gdb()   { [[ ${EX_GDB}  == "yes" ]] ; }
-
 hr() {
 	local c=${COLUMNS:-0}
 	if [[ ${c} -eq 0 ]] ; then
@@ -267,260 +81,125 @@ hr() {
 			&& c=50 \
 			|| c=${c##* }
 	fi
-	local ext=${1:-  _  -  ~  -} br=""
-	while [[ ${#br} -lt ${c} ]] ; do
-		br=${br}${ext}
+	local br=""
+	for ((i=0; i<${c}; ++i)) ; do
+		br=${br}-
 	done
-	echo "${br:0:${c}}"
+	echo ${br}
 }
 
-##################
-### setup vars ###
-CROSSDEV=$0
+#################
 EOPTS=
 UOPTS=
 TARCH=
-HARCH=$(env -uARCH portageq envvar ARCH)
+HARCH=
 CTARGET=
-STAGE="COW"
-BCAT="sys-devel"  ; BPKG="binutils"      ; BVER="[latest]" ; BUSE=""
-GCAT="sys-devel"  ; GPKG="gcc"           ; GVER="[latest]" ; GUSE=""
-KCAT="sys-kernel" ; KPKG="linux-headers" ; KVER="[latest]" ; KUSE=""
-LCAT="sys-libs"   ; LPKG="glibc"         ; LVER="[latest]" ; LUSE=""
-WITH_HEADERS="COW"   WITH_DEF_HEADERS="no"
-EX_FAST="no"
-EX_GCC="no"
-EX_GDB="no"
-SET_X="no"
+STAGE=3
+BVER="[latest]"
+GVER="[latest]"
+KVER="[latest]"
+LPKG="glibc"
+LVER="[latest]"
 
 while [[ $# -gt 0 ]] ; do
 	case $1 in
-	-V|--version)   echo "crossdev-GENTOO_PV"; exit 0;;
-	-t|--target)    shift; parse_target $1;;
-	--b|--binutils) shift; BVER=$1;;
-	--g|--gcc)      shift; GVER=$1;;
-	--k|--kernel)   shift; KVER=$1;;
-	--l|--libc)     shift; LVER=$1;;
-	-C|--clean)     shift; parse_target $1; uninstall;;
-	-s?|--stage?)   [[ ${STAGE} == "COW" ]] && STAGE=${1:0-1};;
-	--ex-only)      EX_FAST="yes";;
-	--ex-gcc)       EX_GCC="yes";;
-	--ex-gdb)       EX_GDB="yes";;
-	--with-*)       eval $(set_withval $1);;
-	--without-*)    eval $(set_withval $1);;
-	-x)             SET_X="yes";;
-	-b|-d|-p|-v)    UOPTS="${UOPTS} $1";;
-	-pv|-vp)        UOPTS="${UOPTS} -p -v";;
-	-h|--help)      usage;;
-	-*)             eerror "UNKNOWN OPTION: '$1'" ; usage 1;;
-	*)              parse_target $1;;
+	-t|--target)   shift; parse_target $1;;
+	-b|--binutils) shift; BVER=-$1;;
+	-g|--gcc)      shift; GVER=-$1;;
+	-k|--kernel)   shift; KVER=-$1;;
+	-l|--libc)     shift; LVER=-$1;;
+	-s?|--stage?)  STAGE=${1:0-1};;
+	-p|-v|-a)      UOPTS="${UOPTS} $1";;
+	-h|--help)     usage;;
+	*)             eerror "UNKNOWN OPTION: '$1'" ; usage 1;;
 	esac
 	shift
 done
-[[ ${SET_X} == "yes" ]] && set -x
-
 [[ -z ${CTARGET} ]] && usage 1
-[[ ${STAGE} == "COW" ]] && STAGE=${STAGE_C_CPP}
-for with in HEADERS ; do
-	var=WITH_${with} defvar=WITH_DEF_${with}
-	[[ ${!var} == "COW" ]] && eval ${var}=${!defvar}
-done
+[[ ${CTARGET} == *-uclibc ]] && LPKG="uclibc"
 
-#####################
-### sanity checks ###
-if ! binutils-config -v &> /dev/null ; then
-	eerror "Sorry, but your host system needs to have binutils-config"
-	eerror "in order to keep from screwing things up."
-	eerror "That means you must be running unstable versions of"
-	eerror "both binutils and binutils-config."
-	exit 1
-fi
-if ! egrep -qs 'inherit.*toolchain( |$)' /var/db/pkg/sys-devel/gcc-*/*.ebuild ; then
-	eerror "Sorry, but your host system needs to have"
-	eerror "an unstable version of gcc in order to"
-	eerror "keep from screwing things up."
-	exit 1
-fi
-
-setup_portage_vars
-if [[ -z ${PORTDIR_OVERLAY} ]] ; then
-	eerror "You need to set PORTDIR_OVERLAY in your make.conf."
-	eerror "A standard setting is /usr/local/portage"
-	exit 1
-fi
-
-if [[ $(env -u CHOST portageq envvar CHOST) == ${CTARGET} ]] ; then
-	eerror "Refusing to create a cross-compiler using the same"
-	eerror "target name as your host utils."
-	exit 1
-fi
-
-#####################
-### do the emerge ###
+#################
+HARCH=$(env -uARCH portageq envvar ARCH)
+PORTDIR_OVERLAY=$(portageq envvar PORTDIR_OVERLAY)
+PORTDIR=$(portageq envvar PORTDIR)
+PORT_LOGDIR=$(portageq envvar PORT_LOGDIR)
+PORT_LOGDIR=${PORT_LOGDIR:-/var/log/portage}
+[[ ! -d ${PORT_LOGDIR} ]] && mkdir -p ${PORT_LOGDIR}
 (
-hr -
+hr
 einfo "Host Portage ARCH:     ${HARCH}"
 einfo "Target Portage ARCH:   ${TARCH}"
 einfo "Target System:         ${CTARGET}"
-einfo "Stage:                 ${STAGE} (${STAGE_DISP[${STAGE}]})"
+einfo "Stage:                 ${STAGE}"
 echo
-ex_fast || {
-is_s0 && {
-einfo "binutils:              ${BPKG}-${BVER}"
-}
-is_s1 && {
-einfo "gcc:                   ${GPKG}-${GVER}"
-}
-is_s2 && {
-[[ ${KPKG} != "[none]" ]] && \
-einfo "headers:               ${KPKG}-${KVER}"
-}
-is_s3 && {
-einfo "libc:                  ${LPKG}-${LVER}"
-}
-}
-ex_gcc && {
-einfo "Extra: gcc pass:       DO IT"
-}
-ex_gdb && {
-einfo "Extra: gdb:            DO IT"
-}
+einfo "binutils:              ${BVER}"
+einfo "gcc:                   ${GVER}"
+[[ ${STAGE} -gt 1 ]] && \
+einfo "linux-headers:         ${KVER}" && \
+einfo "libc:                  ${LPKG}${LVER}"
 echo
 einfo "PORTDIR_OVERLAY:       ${PORTDIR_OVERLAY}"
 einfo "PORT_LOGDIR:           ${PORT_LOGDIR}"
-einfo "PKGDIR:                ${PKGDIR}"
-einfo "PORTAGE_TMPDIR:        ${PORTAGE_TMPDIR}"
 hr
-) >& ${PORT_LOGDIR}/cross-${CTARGET}-info.log || exit 1
+) >& ${PORT_LOGDIR}/cross-${CTARGET}-info.log
 cat ${PORT_LOGDIR}/cross-${CTARGET}-info.log
-emerge info >> ${PORT_LOGDIR}/cross-${CTARGET}-info.log
 
-####################################
-### Fix up portage files / paths ###
+#################
+mkdir -p /etc/portage
+[[ -z $(grep -s "^cross-${CTARGET}$" /etc/portage/categories) ]] \
+	&& echo cross-${CTARGET} >> /etc/portage/categories
+mkdir -p "${PORTDIR_OVERLAY}"/cross-${CTARGET}
 
+cd /etc/portage
 set_keywords() {
 	local pkg=$1 ver=$2
-	[[ -z ${pkg} ]] && return 0
-	sed -i -e "/^cross-${CTARGET}\/${pkg} /d" package.keywords
-	if [[ ${ver} == "[latest]" ]] || [[ -z ${ver} ]] ; then
+	sed -i -e "/cross-${CTARGET}\/${pkg}/d" package.keywords package.mask
+	if [[ ${ver} == "[latest]" ]] ; then
 		echo "cross-${CTARGET}/${pkg} $TARCH ~$TARCH" >> package.keywords
 	else
-		sed -i -e "/cross-${CTARGET}\/${pkg}/d" package.mask
 		echo ">cross-${CTARGET}/${pkg}-${ver}" >> package.mask
 		echo "cross-${CTARGET}/${pkg} * ~* -*" >> package.keywords
 	fi
 }
-set_use() {
-	local pkg=$1
-	shift
-	local use=$@
-	[[ -z ${use} ]] && return 0
-	sed -i -e "/cross-${CTARGET}\/${pkg}/d" package.use
-	echo "cross-${CTARGET}/${pkg} ${use}" >> package.use
-}
-set_links() {
-	local cat=$1 pkg=$2
-	[[ -e ${PORTDIR_OVERLAY}/cross-${CTARGET}/${pkg} ]] \
-		&& rm -f "${PORTDIR_OVERLAY}"/cross-${CTARGET}/${pkg}
-	ln -s "${PORTDIR}"/${cat}/${pkg} "${PORTDIR_OVERLAY}"/cross-${CTARGET}/${pkg}
-}
-set_portage() {
-	local cat=$1 pkg=$2 ver=$3
-	shift ; shift ; shift
-	local use=$@
-
-	[[ ${pkg} == "[none]" ]] && return 0
+touch package.keywords package.mask
+set_keywords binutils ${BVER}
+set_keywords gcc ${GVER}
+set_keywords linux-headers ${KVER}
+set_keywords ${LPKG} ${LVER}
 
-	set_keywords ${pkg} ${ver}
-	set_use ${pkg} ${use}
-	set_links ${cat} ${pkg}
-}
-
-mkdir -p /etc/portage
-grep -qs "^cross-${CTARGET}$" /etc/portage/categories \
-	|| echo cross-${CTARGET} >> /etc/portage/categories
-mkdir -p "${PORTDIR_OVERLAY}"/cross-${CTARGET}
-cd /etc/portage
-touch package.{keywords,mask,use}
-
-set_portage ${BCAT} ${BPKG} ${BVER} ${BUSE}
-set_portage ${GCAT} ${GPKG} ${GVER} ${GUSE}
-set_portage ${KCAT} ${KPKG} ${KVER} ${KUSE}
-set_portage ${LCAT} ${LPKG} ${LVER} ${LUSE}
-set_portage sys-devel gdb
+cd "${PORTDIR_OVERLAY}"/cross-${CTARGET}
+ln -sf "${PORTDIR}"/sys-devel/binutils
+ln -sf "${PORTDIR}"/sys-kernel/linux-headers
+ln -sf "${PORTDIR}"/sys-devel/gcc
+ln -sf "${PORTDIR}"/sys-libs/${LPKG} ${LPKG}
 
 #################
-emerged_with_use() {
-	local pkg=$1 use=$2
-	grep -qs ${use} /var/db/pkg/cross-${CTARGET}/${pkg}-*/USE
-}
-set_eopts_on_pkg_status() {
-	emerged_with_use "$@" \
-		&& EOPTS=${EOPTS_DEF} \
-		|| EOPTS=${EOPTS_UP}
-}
 doemerge() {
-	[[ $1 == "[none]" ]] && return 0
-
 	local logfile=${PORT_LOGDIR}/cross-${CTARGET}
 	[[ -z $2 ]] \
 		&& logfile=${logfile}-$1.log \
 		|| logfile=${logfile}-$2.log
 
-	einfo "Log: ${logfile}"
 	ebegin "Emerging cross-${2:-$1}"
-
 	if [[ ${UOPTS/-v} != ${UOPTS} ]] ; then
 		emerge cross-${CTARGET}/$1 ${EOPTS} \
-			2>&1 | tee ${logfile}
+			2>&1 | tee ${logfile} || die "$1 failed :("
 	else
 		emerge cross-${CTARGET}/$1 ${EOPTS} \
-			>& ${logfile}
+			>& ${logfile} || die "$1 failed :("
 	fi
-	local _pipestatus=${PIPESTATUS[*]}
-	[[ "${_pipestatus// /}" -eq 0 ]] || die "$1 failed :("
 	eend 0
 }
 
 # we include the '-u' so that we don't re-emerge packages
-EOPTS_DEF="${UOPTS} --nodeps"
-EOPTS_UP="${EOPTS_DEF} -u"
-EOPTS=${EOPTS_UP}
-
-# make sure multilib crap doesn't screw us over
-export ABI=${ABI:-pos} LIBDIR_pos="lib" CFLAGS_pos="" LDFLAGS_pos=""
+EOPTS="${UOPTS} -u --nodeps"
 
-ex_fast || {
+doemerge binutils
+USE=nocxx doemerge gcc gcc-stage1
+doemerge linux-headers
+USE=$TARCH doemerge ${LPKG}
 
-doemerge ${BPKG}
-
-is_s1 || exit 0
-if with_headers ; then
-USE="${USE} _E_CROSS_HEADERS_ONLY" _E_CROSS_HEADERS_ONLY="yes" \
-	doemerge ${KPKG} ${KPKG}-quick
-USE="${USE} _E_CROSS_HEADERS_ONLY" _E_CROSS_HEADERS_ONLY="yes" \
-	doemerge ${LPKG} ${LPKG}-headers
+if ! type -p ${CTARGET}-g++ > /dev/null ; then
+	EOPTS="${UOPTS} --nodeps"
 fi
-USE="${USE} -boundschecking -fortran -gcj -mudflap nocxx -objc -static _E_CROSS_BOOTSTRAP" \
-	doemerge ${GPKG} ${GPKG}-stage1
-
-is_s2 || exit 0
-set_eopts_on_pkg_status ${KPKG} _E_CROSS_HEADERS_ONLY
-doemerge ${KPKG}
-
-is_s3 || exit 0
-set_eopts_on_pkg_status ${LPKG} _E_CROSS_HEADERS_ONLY
-USE="${USE} $TARCH" doemerge ${LPKG}
-
-is_s4 || exit 0
-set_eopts_on_pkg_status ${GPKG} _E_CROSS_BOOTSTRAP
-USE="${USE} -fortran -gcj -objc" \
-	doemerge ${GPKG} ${GPKG}-stage2
-
-}
-
-EOPTS=${EOPTS_UP}
-ex_gcc && doemerge ${GPKG} ${GPKG}-extra
-ex_gdb && doemerge gdb
-
-exit 0
+doemerge gcc gcc-stage2
diff --git a/sys-devel/crossdev/metadata.xml b/sys-devel/crossdev/metadata.xml
index 5d7997da749c..ce6852c1a575 100644
--- a/sys-devel/crossdev/metadata.xml
+++ b/sys-devel/crossdev/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>toolchain</herd>
-<maintainer>
-<email>vapier@gentoo.org</email>
-</maintainer>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>kumba@gentoo.org</email>
+		<name>Joshua Kinard</name>
+	</maintainer>
+
+	<longdescription>
+		crossdev is a script which generates cross-toolchains for other architectures
+	</longdescription>
 </pkgmetadata>
+
diff --git a/sys-devel/dev86/ChangeLog b/sys-devel/dev86/ChangeLog
index 782d8a57c986..935c026528e1 100644
--- a/sys-devel/dev86/ChangeLog
+++ b/sys-devel/dev86/ChangeLog
@@ -1,18 +1,6 @@
 # ChangeLog for sys-devel/dev86
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/dev86/ChangeLog,v 1.3 2005/11/11 00:14:37 chrb Exp $
-
-*dev86-0.16.17-r2 (11 Nov 2005)
-
-  11 Nov 2005; <chrb@gentoo.org> +files/dev86-pic.patch,
-  +dev86-0.16.17-r2.ebuild:
-  Fix PIC compile, CFLAGS (#111257)
-
-*dev86-0.16.17-r1 (10 Nov 2005)
-
-  10 Nov 2005; Robin H. Johnson <robbat2@gentoo.org>
-  +dev86-0.16.17-r1.ebuild:
-  New revision that compiles on amd64.
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/dev86/ChangeLog,v 1.1 2005/10/26 15:23:38 chrb Exp $
 
 *dev86-0.16.17 (26 Oct 2005)
 
diff --git a/sys-devel/dev86/Manifest b/sys-devel/dev86/Manifest
index 323bb317a98a..9b00f6baf638 100644
--- a/sys-devel/dev86/Manifest
+++ b/sys-devel/dev86/Manifest
@@ -1,9 +1,3 @@
-MD5 0ef0cfe0db29b56f6af5ce5de710fe5a ChangeLog 690
-MD5 966e0769a2356eeca1a6fb4add9bafa1 dev86-0.16.17-r1.ebuild 1063
-MD5 860a3508215014dbf073c0099bffa9f3 dev86-0.16.17-r2.ebuild 1152
-MD5 54f319d0135ff3bc61d637b76285bb04 dev86-0.16.17.ebuild 822
+MD5 c8fef1a088cfdc0b476694d45ae78617 dev86-0.16.17.ebuild 726
 MD5 87678bbfc18f05318fd76826a8e579d8 metadata.xml 349
-MD5 1b750c5561a4bde5f83f65e5827feb73 files/dev86-pic.patch 546
 MD5 e6dfe026aef9d20d51b843727b089db6 files/digest-dev86-0.16.17 68
-MD5 e6dfe026aef9d20d51b843727b089db6 files/digest-dev86-0.16.17-r1 68
-MD5 e6dfe026aef9d20d51b843727b089db6 files/digest-dev86-0.16.17-r2 68
diff --git a/sys-devel/distcc-config/ChangeLog b/sys-devel/distcc-config/ChangeLog
index 279f0bd895a8..c392c54f720a 100644
--- a/sys-devel/distcc-config/ChangeLog
+++ b/sys-devel/distcc-config/ChangeLog
@@ -1,9 +1,6 @@
 # ChangeLog for sys-devel/distcc-config
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc-config/ChangeLog,v 1.2 2005/09/16 11:18:57 agriffis Exp $
-
-  16 Sep 2005; Aron Griffis <agriffis@gentoo.org> distcc-config-1.3.ebuild:
-  Mark 1.3 stable on alpha
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc-config/ChangeLog,v 1.1 2005/06/26 17:57:10 pyrania Exp $
 
 *distcc-config-1.3 (26 Jun 2005)
 
diff --git a/sys-devel/distcc-config/Manifest b/sys-devel/distcc-config/Manifest
index e1734e0fc2cd..d384bcf6b28f 100644
--- a/sys-devel/distcc-config/Manifest
+++ b/sys-devel/distcc-config/Manifest
@@ -1,4 +1,2 @@
-MD5 75efaf772a6c78df9ec1441cb98f34a1 metadata.xml 335
-MD5 f7c5040d6c92ed2e6871b59e2bb88196 ChangeLog 481
-MD5 7c73215e64602b560c4cdd1d54eaab8b distcc-config-1.3.ebuild 575
+MD5 b810ac914cb24d60ee89cf203306343e distcc-config-1.3.ebuild 404
 MD5 c68a7deb09ddd39c470cebaeb8863b83 files/digest-distcc-config-1.3 68
diff --git a/sys-devel/distcc-config/distcc-config-1.3.ebuild b/sys-devel/distcc-config/distcc-config-1.3.ebuild
index 984f2181cb13..1ca0b960e407 100644
--- a/sys-devel/distcc-config/distcc-config-1.3.ebuild
+++ b/sys-devel/distcc-config/distcc-config-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc-config/distcc-config-1.3.ebuild,v 1.2 2005/09/16 11:18:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc-config/distcc-config-1.3.ebuild,v 1.1 2005/06/26 17:57:10 pyrania Exp $
 
 DESCRIPTION="Utility to change distcc's behavior"
 HOMEPAGE="http://dev.gentoo.org/~pyrania/distcc-config"
@@ -8,7 +8,7 @@ SRC_URI="http://dev.gentoo.org/~pyrania/${PN}/${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 ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="sys-apps/shadow"
diff --git a/sys-devel/distcc-config/metadata.xml b/sys-devel/distcc-config/metadata.xml
index d53140506825..559b0cd3b9c1 100644
--- a/sys-devel/distcc-config/metadata.xml
+++ b/sys-devel/distcc-config/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>cluster</herd>
+<herd>sys-cluster</herd>
 <maintainer>
 	<email>pYrania@gentoo.org</email>
 	<name>Markus Nigbur</name>
@@ -10,3 +10,4 @@
 	Utility to change distcc's behavior.
 </longdescription>
 </pkgmetadata>
+
diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index 50b0d676c3f4..a7b30855060c 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -1,766 +1,19 @@
 # ChangeLog for sys-devel/distcc
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.151 2005/09/05 15:41:09 lisa Exp $
-
-  05 Sep 2005; Lisa Seelye <lisa@gentoo.org> distcc-2.16-r3.ebuild,
-  distcc-2.18.3-r8.ebuild:
-  Change PN to PF for bug #99386.
-
-  30 Jul 2005; MATSUU Takuto <matsuu@gentoo.org> distcc-2.18.3-r7.ebuild:
-  Stable on sh.
-
-  20 Jul 2005; Markus Rothe <corsair@gentoo.org> distcc-2.18.3-r7.ebuild:
-  Stable on ppc64
-
-  17 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
-  distcc-2.18.3-r7.ebuild:
-  ppc stable
-
-  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
-  distcc-2.18.3-r7.ebuild:
-  Stable on alpha.
-
-  28 Jun 2005; Aron Griffis <agriffis@gentoo.org> distcc-2.16-r3.ebuild,
-  distcc-2.18.3-r7.ebuild, distcc-2.18.3-r8.ebuild:
-  Minor ebuild cleanups. Fix use invocation. keepdir does mkdir, so there's no
-  need to use dodir first
-
-  19 Jun 2005; Jason Wever <weeve@gentoo.org> distcc-2.18.3-r7.ebuild:
-  Stable on SPARC.
-
-  18 Jun 2005; Daniel Goller <morfic@gentoo.org>
-  files/2.18/distcc-config.patch:
-  added one more script to array
-
-*distcc-2.18.3-r8 (18 Jun 2005)
-
-  18 Jun 2005; Daniel Goller <morfic@gentoo.org>
-  +files/2.18/distcc-config.patch, +distcc-2.18.3-r8.ebuild:
-  Added crosscompile USE flag to allow proper cross compilation in multi arch
-  environments, thanks to Andrew de Quincey on bug #87859
-
-  18 Jun 2005; Markus Rothe <corsair@gentoo.org> distcc-2.18.3-r7.ebuild:
-  added ~ppc64
-
-*distcc-2.18.3-r7 (15 Jun 2005)
-*distcc-2.16-r3 (15 Jun 2005)
-
-  15 Jun 2005; Lisa Seelye <lisa@gentoo.org> +distcc-2.16-r3.ebuild,
-  +distcc-2.18.3-r7.ebuild:
-  Did a little jiggeypokery with the Gnome/GTK+ monitor: mv distccmon-gnome ->
-  distccmon-gui and a symlink for backwards compatability. It seems a bit
-  silly to have the gtk+ monitor called distccmon-gnome (when it isn't).
-
-*distcc-2.18.3-r6 (18 May 2005)
-
-  18 May 2005; Lisa Seelye <lisa@gentoo.org> distcc-2.16-r2.ebuild,
-  -distcc-2.18.3-r2.ebuild, -distcc-2.18.3-r4.ebuild,
-  -distcc-2.18.3-r5.ebuild, +distcc-2.18.3-r6.ebuild:
-  Edit ebuilds to comply with bug #92745, inherit gcc -> toolchain-funcs. Also
-  do a little cleanup.
-
-  09 May 2005; Aron Griffis <agriffis@gentoo.org> distcc-2.18.3-r2.ebuild:
-  stable on ia64
-
-  19 Mar 2005; Lisa Seelye <lisa@gentoo.org> :
-  Finally put a test around newuser to test for bootstrap condition (where
-  shadow is not present) and cleaned out some legacy stuff.
-
-*distcc-2.18.3-r4 (05 Feb 2005)
-
-  05 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  files/distcc-gentoo-multilib-r1.patch, -distcc-2.18.3-r3.ebuild,
-  +distcc-2.18.3-r4.ebuild:
-  Fix segfault when freeing argv in the multilib patch.  Closes bug #80518.
-
-*distcc-2.18.3-r3 (30 Jan 2005)
-
-  30 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  +files/distcc-gentoo-multilib-r1.patch, +distcc-2.18.3-r3.ebuild:
-  Let command line arguments override those set by ${ABI}.  See bug #78652.
-
-*distcc-2.18.3-r2 (18 Jan 2005)
-
-  18 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  -distcc-2.18.3-r1.ebuild, +distcc-2.18.3-r2.ebuild:
-  Revbumping to force people to get the updated patch.
-
-  15 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  distcc-2.18.3-r1.ebuild:
-  Stable amd64 for 2005.0.
-
-  14 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  files/distcc-gentoo-multilib.patch:
-  Updating patch to properly initialze newflagsCount. Thanks to Sven Wegener
-  <swegener@gentoo.org>.
-
-  12 Jan 2005; Lisa Seelye <lisa@gentoo.org> -distcc-2.17-r1.ebuild,
-  -distcc-2.18.3.ebuild:
-  Removed 2.18.3-r1 from p.mask and 2.17-r1 from the repository: no point in
-  it, especially since users with ~arch will get 2.18.3 anyways.
-
-  31 Dec 2004; Lisa Seelye <lisa@gentoo.org> :
-  Added distcc-2.18.3-r1.ebuild with the ABI patch in bug #75420. this release
-  is package.masked.
-
-  28 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  +files/distcc-gentoo-multilib.patch, distcc-2.18.3.ebuild:
-  Added patch to honor CFLAGS_${ABI}. It's commented out in the ebuild pending
-  lisa's approval since she's the maintainer. See bug #75420.
-
-  14 Dec 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.18.3.ebuild:
-  fix dependency on pkgconfig for only gtk/gnome. bug #68168
-
-*distcc-2.18.3 (14 Dec 2004)
-
-  14 Dec 2004; Lisa Seelye <lisa@gentoo.org> -distcc-2.18.2.ebuild,
-  +distcc-2.18.3.ebuild, -distcc-2.18.ebuild:
-  version bump, too
-
-  14 Dec 2004; Lisa Seelye <lisa@gentoo.org> -distcc-2.18.2.ebuild,
-  -distcc-2.18.ebuild:
-  2.18 and 2.18.2 are outdated by 2.18.3
-
-  24 Nov 2004; Hardave Riar <hardave@gentoo.org> distcc-2.16-r2.ebuild,
-  distcc-2.18.2.ebuild:
-  Re-enable gnome/gtk support on mips.
-
-*distcc-2.18.2 (15 Nov 2004)
-
-  15 Nov 2004; Lisa Seelye <lisa@gentoo.org> +distcc-2.18.2.ebuild:
-  version bump
-
-*distcc-2.18 (12 Oct 2004)
-
-  12 Oct 2004; Lisa Seelye <lisa@gentoo.org> +files/2.18/conf,
-  +files/2.18/init, +distcc-2.18.ebuild:
-  New version. Hoorraay; --allow flag is now mandatory.
-
-  05 Oct 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.16-r2.ebuild:
-  bump 2.16-r2 on mips
-
-  05 Oct 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.16-r2.ebuild:
-  bump to arch on a few arches for 2.16-r2
-
-  05 Oct 2004; Lisa Seelye <lisa@gentoo.org> -distcc-2.14-r1.ebuild:
-  Removing 2.14 due to security concerns bug #66424
-
-*distcc-2.16-r2 (17 Sep 2004)
-
-  17 Sep 2004; Lisa Seelye <lisa@gentoo.org> +distcc-2.16-r2.ebuild:
-  bump to -r2 for bug #64317... and pending glsa
-
-  16 Sep 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.16-r1.ebuild:
-  forgot to bump patchlevel var
-
-*distcc-2.14-r1 (16 Sep 2004)
-
-  16 Sep 2004; Lisa Seelye <lisa@gentoo.org> -files/2.11.1p/conf,
-  -files/2.11.1p/init, +distcc-2.14-r1.ebuild, +distcc-2.16-r1.ebuild,
-  distcc-2.17-r1.ebuild:
-  And force the users to update with a -r1 on 2.14 and 2.16...
-
-  16 Sep 2004; Lisa Seelye <lisa@gentoo.org> -files/2.11.1p/conf,
-  -files/2.11.1p/init, distcc-2.14.ebuild, distcc-2.16.ebuild:
-  Put old versions on the new "patchlevel" - updating conf and init files.
-
-  16 Sep 2004; Lisa Seelye <lisa@gentoo.org> -distcc-2.12.1-r1.ebuild,
-  -distcc-2.13-r1.ebuild, distcc-2.17-r1.ebuild, -distcc-2.17.ebuild:
-  Doing a bit of tidying and then some fun stuff after
-
-  13 Sep 2004; Jason Wever <weeve@gentoo.org> distcc-2.16.ebuild:
-  Stable on sparc.
-
-  09 Sep 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.16.ebuild:
-  bump 2.16 to x86
-
-  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> distcc-2.12.1-r1.ebuild,
-  distcc-2.13-r1.ebuild, distcc-2.14.ebuild, distcc-2.16.ebuild,
-  distcc-2.17-r1.ebuild, distcc-2.17.ebuild:
-  Switch to use epause and ebeep, bug #62950
-
-  27 Aug 2004; <pyrania@gentoo.org> +files/distcc-config,
-  -files/2.11.1p/distcc-config, -files/2.17/distcc-config,
-  distcc-2.12.1-r1.ebuild, distcc-2.13-r1.ebuild, distcc-2.14.ebuild,
-  distcc-2.16.ebuild, distcc-2.17-r1.ebuild, distcc-2.17.ebuild:
-  Fixing bug #57421, thanks to Stefan Sperling. Cleaning up older distcc-config
-  version.
-
-  22 Aug 2004; Tom Gall <tgall@gentoo.org> distcc-2.16.ebuild:
-  added ~ppc64, bug #59224
-
-*distcc-2.17-r1 (22 Aug 2004)
-
-  22 Aug 2004; Lisa Seelye <lisa@gentoo.org>
-  +files/2.17/2.17-ipv6-fix.diff.gz, +files/2.17/conf,
-  +files/2.17/distcc-config, +files/2.17/init, +distcc-2.17-r1.ebuild:
-  Adding a patch for 2.17 to enable ipv6, updating the init and conf scripts.
-  also set the distcc-config script to try and use userid 240.
-
-  20 Aug 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.17.ebuild:
-  <@SpanKY> make the first line 'ipv6 does not work with distcc-2.17' ?
-
-*distcc-2.17 (20 Aug 2004)
-
-  20 Aug 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.14.ebuild,
-  distcc-2.16.ebuild, +distcc-2.17.ebuild:
-  version bump and fix RDEPEND.badindev errors
-
-  26 Jul 2004; Mike Frysinger <vapier@gentoo.org> distcc-2.16.ebuild:
-  gnuconfig loving for us non-mainstream users.
-
-*distcc-2.16 (08 Jul 2004)
-
-  08 Jul 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.14.ebuild,
-  -distcc-2.15.ebuild, +distcc-2.16.ebuild:
-  First: Bumped the testing version to 2.16 (released today) and removed the
-  2.15 since it's silly to let people test that when there's no real need
-  Second: Changed KEYWORDS on 2.14 to -* s390 since s390 had moved to stable and
-  nothing else had moved (everything is stable on 2.13-r1), so let's have people
-  on ~arch test 2.16 Third: s390 maintainers, or whoever bumped 2.14 please heed
-  http://groups.google.com/groups?hl=no&lr=&ie=UTF-8&c2coff=1&safe=off&selm=2fpl
-  q-1cD-43%40gated-at.bofh.it
-
-*distcc-2.15 (06 Jul 2004)
-
-  06 Jul 2004; Lisa Seelye <lisa@gentoo.org> +distcc-2.15.ebuild:
-  version bump
-
-  15 May 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.13-r1.ebuild,
-  distcc-2.14.ebuild:
-  Add >=gnome-base/gconf-2 as a depend for gnome to resolve bug #50594
-
-  15 May 2004; Lisa Seelye <lisa@gentoo.org> :
-  cleanup of old files
-
-  12 May 2004; Michael McCabe <randy@gentoo.org> distcc-2.14.ebuild:
-  Added s390 keywords
-
-*distcc-2.14 (02 May 2004)
-
-  02 May 2004; Lisa Seelye <lisa@gentoo.org> +distcc-2.14.ebuild:
-  bump to 2.14
-
-  11 Apr 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.12.1.ebuild,
-  distcc-2.13-r1.ebuild, distcc-2.13.ebuild:
-  bump to stable. yell at me if your arch breaks
-
-  11 Apr 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.12.1.ebuild,
-  distcc-2.13.ebuild:
-  General cleanup of old ebuilds & digests.
-
-  21 Mar 2004; Lisa Seelye <lisa@gentoo.org> files/2.11.1p/init:
-  Change the init script to do TMPDIR=TMPDIR basically so that the user can
-  inherit a new TMPDIR location. Closes bug #44915
-
-*distcc-2.13-r1 (06 Mar 2004)
-*distcc-2.12.1-r1 (06 Mar 2004)
-
-  06 Mar 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.12.1-r1.ebuild,
-  distcc-2.13-r1.ebuild:
-  chown /var/run/distccd for distcc:daemon after install since in some cases its
-  being reset to root:root
-
-*distcc-2.13 (02 Mar 2004)
-
-  02 Mar 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.13.ebuild,
-  files/2.11.1p/conf, files/2.11.1p/init:
-  Version bump and to remove DISTCC_DIR remnants from the daemon config files
-  (see bug #42947). the config files are non critical, since an unuse envvar
-  never hurt anyone i will not bump 2.12.1.
-
-  22 Feb 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.11.1.ebuild,
-  distcc-2.11.2-r1.ebuild, distcc-2.11.2.ebuild, distcc-2.8-r2.ebuild,
-  distcc-2.9.ebuild:
-  Removing old stuff since everyone is now stable on 2.12.1. (cool huh)
-
-  22 Feb 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.12.1.ebuild:
-  Move 2.12.1 to stable on ppc. Directory cleanup in this dir to follow
-  shortly....
-
-  22 Feb 2004; Aron Griffis <agriffis@gentoo.org> distcc-2.12.1.ebuild:
-  stable on alpha
-
-  21 Feb 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.11.1.ebuild,
-  distcc-2.11.2-r1.ebuild, distcc-2.11.2.ebuild, distcc-2.12.1.ebuild,
-  distcc-2.5-r1.ebuild, distcc-2.8-r2.ebuild, distcc-2.9.ebuild:
-  remove arm keyword from old ebuilds. i will clean (rdepend.bad and prune)
-  these up shortly...
-
-  21 Feb 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.12.1.ebuild:
-  Bump 2.12.1 to stable across several arches - still need to hear from alpha
-  and ppc. Also add amd64 and ia64 to keyword
-
-  11 Jan 2004; Markus Nigbur <pyrania@gentoo.org> distcc-2.11.2-r1.ebuild,
-  distcc-2.11.2.ebuild, distcc-2.12.1.ebuild:
-  Changed the distcc-config related ewarn message.
-
-  11 Jan 2004; Markus Nigbur <pyrania@gentoo.org> files/2.11.1p/distcc-config:
-  Removing verbose msg from writeenv.
-
-  10 Jan 2004; Markus Nigbur <pyrania@gentoo.org> files/2.11.1p/distcc-config:
-  Restarting the daemon is no good.
-
-*distcc-2.12.1 (09 Jan 2004)
-
-  09 Jan 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.12.1.ebuild:
-  This is a version bump with some pretty big fixes (setuid/gid ordering, gentoo
-  bug #37592) and more.
-
-  05 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> files/2.10/distcc-config,
-  files/2.11/distcc-config, files/2.8/distcc-config, files/2.9/distcc-config:
-  fix tail -1 stuff in distcc-config files
-
-*distcc-2.12 (24 Dec 2003)
-
-  24 Dec 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.12.ebuild,
-  files/setuid-2.12-order-fix.gz:
-  Version bump, which includes IPv6 support (shoulda been in last one, but oh
-  well), and a setuid patch that was posted to the distcc ml by Wayne Davison
-  <wayned@samba.org> (this patch fixes the order in which setuid happens in
-  the daemon startup)
-
-  11 Dec 2003; Markus Nigbur <pyrania@gentoo.org> files/2.11.1p/distcc-config:
-  Fixed distcc-config. See bug #27432 for details.
-
-  06 Dec 2003; Lisa Seelye <lisa@gentoo.org> files/2.11/distcc-config,
-  files/2.11.1p/distcc-config:
-  fix distcc-config to default to uid 240, to close bug 35096
-
-  06 Dec 2003; Lisa Seelye <lisa@gentoo.org> files/2.11.1p/distcc-config:
-  fix distcc-config to default to uid 240, to close bug 35096 (will fix the
-  lower versions in a second)
-
-*distcc-2.11.2-r1 (21 Nov 2003)
-
-  21 Nov 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.11.2-r1.ebuild,
-  files/2.11.1p/distcc-config:
-  New distcc-config from bug 27432; fixes comment 18
-
-  03 Nov 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.11.1.ebuild:
-  Bump to arch on mips for 2.11.1
-
-  01 Nov 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.11-r1.ebuild,
-  distcc-2.11-r2.ebuild:
-  Cleaning up a little. These two ebuilds (2.11-r1,r2) are obsolete
-
-  24 Oct 2003; Chris PeBenito <pebenito@gentoo.org> distcc-2.10-r3.ebuild,
-  distcc-2.11-r1.ebuild, distcc-2.11-r2.ebuild, distcc-2.11.1-r1.ebuild,
-  distcc-2.11.1.ebuild, distcc-2.11.2.ebuild, distcc-2.5-r1.ebuild,
-  distcc-2.8-r2.ebuild, distcc-2.9.ebuild:
-  Add in selinux to IUSE, since I forgot to do it when I added the selinux RDEP.
-
-*distcc-2.11.2 (23 Oct 2003)
-
-  23 Oct 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.11.1.ebuild,
-  distcc-2.11.2.ebuild:
-  Version bump, using the new distcc-config
-
-  23 Oct 2003; Jason Wever <weeve@gentoo.org> distcc-2.10-r3.ebuild:
-  Marked stable on sparc.
-
-*distcc-2.11.1-r1 (18 Oct 2003)
-
-  18 Oct 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.11.1-r1.ebuild,
-  files/2.11.1p/conf, files/2.11.1p/distcc-config, files/2.11.1p/init:
-  Distcc-2.11.1-r1 is to test distcc-config rewritten in python as per bug
-  27432. Thanks to Pyrania for the rewrite.
-
-*distcc-2.11.1 (08 Oct 2003)
-
-  08 Oct 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.11.1.ebuild:
-  version bump.  gtk non using gnome users should be happy!
-
-*distcc-2.11-r2 (24 Sep 2003)
-
-  24 Sep 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.11-r2.ebuild:
-  gtk again
-
-*distcc-2.11-r1 (24 Sep 2003)
-
-  24 Sep 2003; Lisa Seelye <lisa@gentoo.org distcc-2.11-r1.ebuild:
-  -m Fix bug 29511.  Seems as if the depends were silently changed.
-
-*distcc-2.11 (23 Sep 2003)
-
-  23 Oct 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.11.1.ebuild:
-  Move 2.11.1 to stable on a few arches, going to move the rest ASAP.
-
-  23 Sep 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.11.ebuild,
-  files/2.11/conf, files/2.11/distcc-config, files/2.11/init:
-  Version bump, and it now requires Portage-2.0.49-r6 or greater.
-
-*distcc-2.10-r3 (15 Sep 2003)
-
-  15 Sep 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.10-r3.ebuild,
-  files/2.10/conf, files/2.10/distcc-config, files/2.10/init:
-  Moved DISTCC_DIR to /etc/make.conf and resolved bug 26697.
-
-*distcc-2.10-r2 (15 Aug 2003)
-
-  15 Aug 2003; Seemant Kulleen <seemant@gentoo.org> distcc-2.10-r2.ebuild:
-  fixed the distcc_log env installation on installation. Lisa gave me the fix to
-  commit while she has technical issues. So please don't think I'm maintaining
-  it, coz I'm not :)
-
-*distcc-2.10-r1 (13 Aug 2003)
-
-  13 Aug 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.10-r1.ebuild:
-  Fix the ebuild. should be doing distcc-config --install, too
-
-  12 Aug 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.9.ebuild:
-  Mark distcc 2.9 stable on x86.
-
-*distcc-2.10 (12 Aug 2003)
-
-  12 Aug 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.10.ebuild, files/2.10/conf,
-  files/2.10/distcc-config, files/2.10/init:
-  add distcc 2.10 and related files
-
-  10 Aug 2003; Chris PeBenito <pebenito@gentoo.org> distcc-2.5-r1.ebuild,
-  distcc-2.8-r2.ebuild, distcc-2.9.ebuild:
-  Add selinux policy to RDEP
-
-  08 Aug 2003; Lisa M. Seelye <lisa@gentoo.org> files/2.8/conf,
-  files/2.8/init, files/2.9/conf, files/2.9/init:
-  Incorporated bug 26204 into the conf and init scripts (DISTCC_TMPDIR), and
-  added a CVS Header
-
-  08 Aug 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.5-r1.ebuild,
-  distcc-2.8-r2.ebuild, distcc-2.9.ebuild:
-  updated guide document URI
-
-*distcc-2.8-r1 (08 Aug 2003)
-
-  08 Aug 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.5.ebuild, distcc-2.7.1.ebuild,
-  distcc-2.7.ebuild, distcc-2.8-r1.ebuild, distcc-2.8.ebuild,
-  files/2.7.1/001_fix_tmpdir.patch.gz, files/2.7.1/conf,
-  files/2.7.1/distcc-config, files/2.7.1/init:
-  Cleaning the repository. non x86 will go from 2.5-r1 to 2.8-r2 or 2.9. There
-  is no need to keep the old ones around.
-
-  04 Aug 2003; Aron Griffis <agriffis@gentoo.org> distcc-2.8-r2.ebuild:
-  Mark stable on alpha.  Fix formatting and some errors in ChangeLog
-
-  02 Aug 2003: Lisa Marie Seelye <lisa@gentoo.org> ChangeLog :
-  Added a metadata.xml file. Initially under the `cluster' herd.  Also
-  normalized this file (distcc-2.8) to have most recent dates at the top of
-  the file
-
-*distcc-2.9 (21 Jul 2003)
-
-  24 Aug 2003; Guy Martin <gmsoft@gentoo.org> distcc-2.9.ebuild :
-  Added hppa to KEYWORDS.
-
-  21 Jul 2003: Lisa Marie Seelye <lisa@gentoo.org> :
-  New version released and committed (Still with the patch to fix tmpdir)
-  Updated distcc-config to reflect bug #24972  I'll make this change in
-  all versions in the repository.
-
-*distcc-2.8 (09 Jul 2003)
-
-  06 Aug 2003; Lisa Marie Seelye <lisa@gentoo.org> distcc-2.8-r2.ebuild:
-  Marked 2.8-r2 stable on sparc thanks todd
-
-  05 Aug 2003; Guy Martin <gmsoft@gentoo.org> distcc-2.8-r2.ebuild :
-  Marked stable on hppa.
-
-  27 Jul 2003; Lisa Marie Seelye <lisa@gentoo.org> :
-  Bumped distcc-2.8-r2 to x86
-
-  13 Jul 2003; Lisa Marie Seelye <lisa@gentoo.org> :
-  (files/2.8/conf) Added a --port to DISTCC_OPTS (/etc/conf.d/distccd) to
-  change the running port.
-  (distcc-2.8-r2.ebuild) Added a note to the backup distcc website
-
-  12 Jul 2003; Lisa Marie Seelye <lisa@gentoo.org> :
-  Oops. :)  `gtk' is preferred over `gtk2'.  Thanks Spider for the
-  heads up!
-
-  10 Jul 2003; Lisa Marie Seelye <lisa@gentoo.org> :
-  New version released and committed (Still with the patch to fix tmpdir)
-
-*distcc-2.7.1 (01 Jul 2003)
-
-  21 Jul 2003; Lisa Marie Seelye <lisa@gentoo.org> :
-  Updated distcc-config to reflect bug #24972
-
-  17 Jul 2003; Lisa Marie Seelye <lisa@gentoo.org> :
-  Changed gnome stuff to gtk. How on earth did this get missed??
-
-  14 Jul 2003; Lisa Marie Seelye <lisa@gentoo.org> :
-  Updated the "How-to" website URI in the .ebuild
-
-  10 Jul 2003; Lisa Marie Seelye <lisa@gentoo.org> :
-  Moved to x86 (from ~x86)
-
-  04 Jul 2003; Joshua Kinard <kumba@gentoo.org> :
-  Fixed b0rked digests
-
-  01 Jul 2003; Karl Trygve Kalleberg <karltk@gentoo.org> :
-  distcc-2.7.ebuild, files/2.7.1/distcc-config, files/2.7.1/conf,
-  files/2.7.1/init, files/2.7.1/001_fix_tmpdir.patch.gz:
-  New upstream version. Ebuild submitted by Lisa Marie <lisa@thedoh.com>.
-  This version is self-contained, so previous versions may be nuked at 
-  whim.
-
-*distcc-2.7 (16 Jun 2003)
-
-  17 Jun 2003; Mike Frysinger <vapier@gentoo.org> distcc-2.7.ebuild:
-  Filter out large file flags on gcc-2.x machines.
-
-  16 Jun 2003; Zach Welch <zwelch@gentoo.org> distcc-2.7.ebuild:
-  bump version; add support provided by Lisa Marie in bug 22914
-
-  04 Jun 2003; Zach Welch <zwelch@gentoo.org> distcc-2.5-r1.ebuild:
-  mark 2.5-r1 stable on all arches; update web page address to use new wiki
-  restore truncated change log, oopsie.
-
-*distcc-2.5-r1 (30 May 2003)
-
-  30 May 2003; Zach Welch <zwelch@gentoo.org> distcc-2.5-r1.ebuild,
-  files/2.3/distcc-config:
-  update to fix problems with DISTCC_HOSTS when upgrading from earlier versions
-
-*distcc-2.5 (27 May 2003)
-
-  27 May 2003; Zach Welch <zwelch@gentoo.org distcc-2.5.ebuild,
-  files/1.2/init:
-  new version; fixes to init script as proposed by agriffis@gentoo.org
-
-*distcc-2.4.2 (23 May 2003)
-
-  23 May 2003; Hanno Boeck <hanno@gentoo.org> distcc-2.4.2.ebuild:
-  New version.
-
-*distcc-2.4 (21 May 2003)
-
-  21 May 2003; Zach Welch <zwelch@gentoo.org distcc-2.3.ebuild,
-  files/2.3/distcc-config, distcc-2.4.ebuild:
-  Update to latest versions; updates to distcc-config to use new
-  DISTCC_HOSTS configuration.  May require some cleaning of previous
-  settings, notably DISTCC_HOSTS in /etc/env.d/02distcc
-
-*distcc-2.0.1 (31 Mar 2003)
-
-  28 Apr 2003; Zach Welch <zwelch@gentoo.org> distcc-0.12.ebuild,
-  distcc-0.12.ebuild, distcc-0.15.ebuild, distcc-0.15.ebuild,
-  distcc-1.0.ebuild, distcc-1.0.ebuild, distcc-1.1-r11.ebuild,
-  distcc-1.1-r11.ebuild, distcc-1.1-r8.ebuild, distcc-1.1-r8.ebuild,
-  distcc-1.1.ebuild, distcc-1.1.ebuild, distcc-1.2.1.ebuild,
-  distcc-1.2.1.ebuild, distcc-1.2.3.ebuild, distcc-1.2.3.ebuild,
-  distcc-1.2.ebuild, distcc-1.2.ebuild, files/distccd, files/distccd.1,
-  files/distccd.2, files/distccd.4, files/wrapper-1.1.patch,
-  files/1.2/distcc-config, files/1.2/wrapper.patch, files/1.2.1/distcc-config,
-  files/1.2.1/wrapper.patch, files/1.2.3/distcc-config:
-  Bump distcc-2.0.1 revision and add new --set-j option for setting MAKEOPTS.
-  Remove old versions that are no longer needed or desired.
-
-  17 Apr 2003; Zach Welch <zwelch@gentoo.org> files/1.2.3/distcc-config:
-  fix distcc-config to add DCCC_QUIET
-
-  31 Mar 2003; Zach Welch <zwelch@gentoo.org> distcc-2.0.1.ebuild,
-  files/1.2.3/distcc-config:
-  bump version to close bug 18566; masquerade patch now mainlined
-  info file removed upstream; add --help to distcc-config
-
-*distcc-1.2.3-r3 (17 Mar 2003)
-
-  17 Apr 2003; Zach Welch <zwelch@gentoo.org> distcc-1.2.3-r3.ebuild:
-  bump to stable for all arches
-
-  19 Mar 2003; Aron Griffis <agriffis@gentoo.org> distcc-1.2.3-r3.ebuild:
-  Mark stable on alpha
-
-  17 Mar 2003; Zach Welch <zwelch@gentoo.org> distcc-1.2.3-r1.ebuild,
-  files/1.2.3/distcc-config:
-  set ROOTPATH, refactor env-update code, rename env file
-
-*distcc-1.2.3-r2 (17 Mar 2003)
-
-  17 Mar 2003; Zach Welch <zwelch@gentoo.org> files/1.2.3/distcc-config:
-  usability additions, see online docs for info
-
-  17 Mar 2003; Zach Welch <zwelch@gentoo.org> distcc-1.2.3-r1.ebuild,
-  distcc-1.2.3-r1.ebuild, distcc-1.2.3-r2.ebuild, files/1.2.3/distcc-config:
-  fix einfo issue in new config function
-
-*distcc-1.2.3-r1 (17 Mar 2003)
-
-  17 Mar 2003; Zach Welch <zwelch@gentoo.org> distcc-1.2.3-r1.ebuild,
-  files/1.2.3/distcc-config, files/1.2.3/info.patch:
-  Add distcc environment file and options to distcc-config to manage it
-  Fix ebuild to address defects reported in but 17716
-
-*distcc-1.2.3 (03 Mar 2003)
-
-  11 Mar 2003; Zach Welch <zwelch@gentoo.org> distcc-1.2.3.ebuild,
-  files/1.2.1/distcc-config:
-  add shadow as DEPEND (for now), fix distcc-config if shadow tools not
-  installed (for later)
-
-  07 Mar 2003; Zach Welch <zwelch@gentoo.org> distcc-1.2.3.ebuild:
-  mark distcc-1.2.3 as stable on x86 and ppc
-
-  03 Mar 2003; Zach Welch <zwelch@gentoo.org> distcc-1.2.3.ebuild,
-  files/1.2.3/wrapper.patch:
-  Bump to latest bug release version
-
-*distcc-1.2.1 (26 Feb 2003)
-
-  26 Feb 2003; Zach Welch <zwelch@gentoo.org> distcc-1.2.1.ebuild,
-  files/1.2.1/distcc-config, files/1.2.1/wrapper.patch:
-  New version, with fixes for installs under strange ROOTs
-  Moved user creation, directory fixups into distcc-config script
-  Fix typo in conf script; fixes bug 16432
-
-*distcc-1.2 (21 Feb 2003)
-
-  21 Feb 2003; Zach Welch <zwelch@gentoo.org> distcc-1.2.ebuild :
-  Add new version, cleanup patch from 1.1-r11
-  Add initial distcc-config script
-
-*distcc-1.1-r11 (17 Feb 2003)
-
-  21 Feb 2003; Zach Welch <zwelch@gentoo.org> distcc-1.1-r11.ebuild :
-  Remove extra cp of $S
-
-  19 Feb 2003; Zach Welch <zwelch@gentoo.org> distcc-1.1-r11.ebuild :
-  Added arm to keywords.
-
-  19 Feb 2003; Guy Martin <gmsoft@gentoo.org> distcc-1.1-r11.ebuild :
-  Added ~hppa to keywords.
-
-  18 Feb 2003; Zach Welch <zwelch@gentoo.org> :
-  Updated to fix minor bugs in -r11
-
-*distcc-1.1-r10 (17 Feb 2003)
-  
-  17 Feb 2003; Zach Welch <zwelch@gentoo.org> :
-  Add /var/run/distccd for pid and distcc user... (bugs 15048 and 15769)
-  Updated to fix minor bugs in original -r10
-
-*distcc-1.1-r9 (17 Feb 2003)
-  
-  17 Feb 2003; Zach Welch <zwelch@gentoo.org> :
-  Fix location of pid file... (bug 15769)
-  Fix einfo Portage version reference
-  (THIS VERSION IS BROKEN - ztw)
-
-*distcc-1.1-r8 (10 Feb 2003)
-  
-  17 Feb 2003; Zach Welch <zwelch@gentoo.org> :
-  Fix einfo Portage version reference
-
-  15 Feb 2003; Zach Welch <zwelch@gentoo.org> :
-  Extended einfo and added link to configuration page
-  
-  10 Feb 2003; Zach Welch <zwelch@gentoo.org> :
-  Includes wrapper-1.1.patch from bug 13897; now installs symlinks
-  in /usr/lib/distcc/bin to gcc, g++, and others.  Users should no 
-  longer set CC or CXX to distcc; instead, for non-portage builds,
-  set PATH="/usr/lib/distcc/bin:$PATH".  See the follow for more info:
-  http://gentoo.superlucidity.net/www/distcc.html
-  
-*distcc-1.1 (26 Jan 2003)
-
-  26 Jan 2003; Brad Cowan <bcowan@gentoo.org> distcc-1.1.ebuild,
-  files/digest-distcc-1.1:
-  
-  Bumped version.
-
-*distcc-1.0 (15 Jan 2003)
-
-  15 Jan 2003; Brad Cowan <bcowan@gentoo.org> distcc-1.0.ebuild,
-  files/digest-distcc-1.0:
-  
-  Bumped version. Added new init script thanks to Eric Andreson (Ndiin).
-
-  16 Dec 2002; Aron Griffis <agriffis@gentoo.org> distcc-0.15.ebuild:
-  Added ~alpha to KEYWORDS
-
-*distcc-0.15 (12 Dec 2002)
-
-  12 Dec 2002; Brad Cowan <bcowan@gentoo.org> distcc-0.15.ebuild,
-  files/digest-distcc-0.15:
-  
-  Bumped version.
-
-*distcc-0.14-r1 (11 Dec 2002)
-
-  11 Dec 2002; Brad Cowan <bcowan@gentoo.org> distcc-0.14-r1.ebuild,
-  files/digest-distcc-0.14-r1:
-  
-  Removed bad info file.
-
-*distcc-0.14 (16 Nov 2002)
-
-  16 Nov 2002; Brad Cowan <bcowan@gentoo.org> distcc-0.14.ebuild,
-  files/digest-distcc-0.14 :
-  
-  Version bump.
-
-*distcc-0.13 (12 Nov 2002)
-
-  12 Nov 2002; Brad Cowan <bcowan@gentoo.org> distcc-0.13.ebuild,
-  files/digest-distcc-0.13 :
-  
-  Version bump, with many major bugfixes.
-
-*distcc-0.12 (07 Oct 2002)
-
-  12 Nov 2002; Mark Guertin <gerk@gentoo.org> distcc-0.12.ebuild :
-  Added ppc to keywords again.
-
-  13 Oct 2002; Brad Cowan <bcowan@gentoo.org> distcc-0.12.ebuild,
-  files/distccd :
-  
-  Added distccd init script.
-
-  22 Sep 2002; Brad Cowan <bcowan@gentoo.org> distcc-0.12.ebuild :
-  
-  Version bump.
-
-*distcc-0.11 (25 Sep 2002)
-
-  22 Sep 2002; Brad Cowan <bcowan@gentoo.org> distcc-0.11.ebuild : 
-  
-  Version bump.
-
-*distcc-0.10.1 (17 Sep 2002)
-
-  17 Sep 2002; Brad Cowan <bcowan@gentoo.org> distcc-0.10.1.ebuild : 
-  
-  Version bump, updated docs.
-
-*distcc-0.8 (20 Aug 2002)
-
-  20 Aug 2002; Maik Schreiber <blizzy@gentoo.org> : New release.
-
-*distcc-0.7 (06 Aug 2002)
-
-  06 Aug 2002; Maik Schreiber <blizzy@gentoo.org> : New release.
-
-*distcc-0.6 (12 Jul 2002)
-
-  25 Jul 2002; Mark Guertin <gerk@gentoo.org> : Added ppc to
-  keywords
-
-  12 Jul 2002; Maik Schreiber <blizzy@gentoo.org> : New release.
-
-*distcc-0.5 (05 Jul 2002)
-
-  05 Jul 2002; Daniel Robbins <drobbins@gentoo.org> : new release
-  that includes missing KEYWORDS, SLOT, LICENSE and new man pages,
-  closes bug #4506.
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.1 2002/06/21 20:19:30 rphillips Exp $
 
 *distcc-0.4 (21 Jun 2002)
 
-  07 Jun 2002; Ryan Phillips <rphillips@gentoo.org> : Added popt
-  dep. Fixes # 4466. Thanks to Michael Grigoriev
-
-  21 Jun 2002; Ryan Phillips <rphillips@gentoo.org> : New release
+  21 Jun 2002; Ryan Phillips <rphillips@gentoo.org> distcc-0.4.ebuild :
+ 
+  New release
 
 *distcc-0.3 (21 Jun 2002)
 
-  21 Jun 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog 
+  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
+  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-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index e930a3726109..8bdbdbaed327 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,20 +1,37 @@
-MD5 7bc1aee90e14979b35651d553168cf09 ChangeLog 27467
-MD5 02847d17d77f9fa6b67c232400108e44 distcc-2.16-r2.ebuild 4856
-MD5 107bb84ee572370b4543bcec642ae87f distcc-2.18.3-r7.ebuild 4920
-MD5 4dcddb685b2174d4bb5f037de2a34d1a distcc-2.16-r3.ebuild 5174
-MD5 c04441917ccb5e5f9790642545c1f469 metadata.xml 375
-MD5 64e0afe30accc560225a5c48fc49119d distcc-2.18.3-r6.ebuild 4593
-MD5 94b1faf946a456fcab1ccf9b57d3494e distcc-2.18.3-r8.ebuild 5016
-MD5 c462167d99c154e9f8b9f94022ed2a71 files/digest-distcc-2.16-r2 64
-MD5 fa3f7ab9f7829ba28b454f624b11da53 files/digest-distcc-2.18.3-r7 66
-MD5 c462167d99c154e9f8b9f94022ed2a71 files/digest-distcc-2.16-r3 64
-MD5 fec77b3be8d8bd8f2d6e5a708cb35717 files/distcc-config 4874
-MD5 ec06b50c03c5002d4df60e49b9798445 files/distcc-gentoo-multilib-r1.patch 4245
-MD5 687a622f11f457581b267ce5fb3c2721 files/distcc-gentoo-multilib.patch 3784
-MD5 fa3f7ab9f7829ba28b454f624b11da53 files/digest-distcc-2.18.3-r8 66
-MD5 fa3f7ab9f7829ba28b454f624b11da53 files/digest-distcc-2.18.3-r6 66
-MD5 69a089566bd18a1bfba2da639964c19e files/2.17/conf 1317
-MD5 1161999a5d25185f95a8c284bd7307d1 files/2.17/init 733
-MD5 bb53a18e009ef62f4402a23f83bfda20 files/2.18/conf 1384
-MD5 739ebfc62fe125b76021cf7987a158f7 files/2.18/init 733
-MD5 601b451b5d2555281660ee7f96562dbd files/2.18/distcc-config.patch 1200
+MD5 cbe186b2ca223d45d68fd34246d89c47 ChangeLog 6307
+MD5 56a795e9b01a51ee8d06b0025d598666 distcc-0.12.ebuild 755
+MD5 8345d0afbdc7ba12864a3dfec341e913 distcc-1.2.ebuild 2672
+MD5 674f0be5b4083d6218f5b2af9bd4c9e2 distcc-1.1-r11.ebuild 2562
+MD5 f19a4237cc9fc24b22e962113ccfa4bd distcc-1.2.1.ebuild 2843
+MD5 5d44b8e6c40d10979d90887add7d8292 distcc-0.15.ebuild 680
+MD5 52548880c8b86b4116934d8eed8e1c25 distcc-1.0.ebuild 691
+MD5 7c00159285e607040776fc53b8aad0c0 distcc-1.1.ebuild 735
+MD5 8fe3f21d256cde3299214eb57142a47b distcc-1.1-r8.ebuild 1937
+MD5 16dcbd3ed07ff06430bd066ca594612c distcc-1.2.3.ebuild 2871
+MD5 372827ac4fc6b9dae1d585934369ce8e distcc-1.2.3-r3.ebuild 2882
+MD5 da890f4d3d7a6c3cb65ad47f80feff6a distcc-2.0.1.ebuild 2895
+MD5 fa7251d05e59e7e69d1f9ab1ba36fe8c files/digest-distcc-1.2 63
+MD5 8660209b53c9d4a4fbdec16ab06cbb73 files/digest-distcc-0.12 63
+MD5 df234292a7c154429928fd61001909bd files/digest-distcc-1.2.1 65
+MD5 dde64f8c942c4ca3911974c594bd30a9 files/digest-distcc-0.15 63
+MD5 f10d40ffe1c8c3e551f09349ec542f78 files/digest-distcc-1.0 63
+MD5 3250d3022ba56c3c5951c023a6263e22 files/digest-distcc-1.1 63
+MD5 56e56d776bf109aa3de5bd737d188016 files/distccd 561
+MD5 ec6b5c858b58f5b2cac73a6271c7e8fe files/distccd.1 600
+MD5 3250d3022ba56c3c5951c023a6263e22 files/digest-distcc-1.1-r8 63
+MD5 639347a0ffeb0f102b1afceb4e7cdffc files/distccd.2 629
+MD5 5b94de547a2bf88385ca56329ff6dbaa files/wrapper-1.1.patch 5175
+MD5 be82b50ba67c84a4feaaec17832abfb1 files/distccd.4 696
+MD5 9bad5d7dc8c33d22ff42efcc299f1067 files/digest-distcc-1.2.3 65
+MD5 9bad5d7dc8c33d22ff42efcc299f1067 files/digest-distcc-1.2.3-r3 65
+MD5 3250d3022ba56c3c5951c023a6263e22 files/digest-distcc-1.1-r11 63
+MD5 9a3a39b4f229559e6a855d777c6fe807 files/digest-distcc-2.0.1 65
+MD5 6bc82bf32667e5398497b2dae88f1033 files/1.2.3/wrapper.patch 5242
+MD5 5d39125cc20bcfab04ccbf2ce224307a files/1.2.3/distcc-config 6427
+MD5 d4fd07d7d3d3e3952baef8c654d2715f files/1.2.3/info.patch 545
+MD5 a103f965186c1fd631caa36e79d65a5e files/1.2.1/wrapper.patch 5242
+MD5 d2f03086d9f3b2a2888702f1ca415330 files/1.2.1/distcc-config 3193
+MD5 93e42352940e5e0cb91d32b253270fb4 files/1.2/wrapper.patch 5171
+MD5 be559a3c08d73712aeac74b8991a9cb3 files/1.2/init 696
+MD5 34d20e7bf223ac2f2ec61c5a7a9b2e3c files/1.2/conf 314
+MD5 fa8cc678f5d9bb8a659b735bd630671e files/1.2/distcc-config 1558
diff --git a/sys-devel/distcc/distcc-2.16-r2.ebuild b/sys-devel/distcc/distcc-2.16-r2.ebuild
index 04d81c1e2dd2..d604769d2814 100644
--- a/sys-devel/distcc/distcc-2.16-r2.ebuild
+++ b/sys-devel/distcc/distcc-2.16-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.16-r2.ebuild,v 1.7 2005/05/18 10:44:10 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.16-r2.ebuild,v 1.1 2004/09/17 19:11:18 lisa Exp $
 
 # If you change this in any way please email lisa@gentoo.org and make an
 # entry in the ChangeLog (this means you spanky :P). (2004-04-11) Lisa Seelye
 
-inherit eutils flag-o-matic gnuconfig toolchain-funcs
+inherit eutils gcc flag-o-matic gnuconfig
 
 PATCHLEVEL="2.17"
 
@@ -15,7 +15,10 @@ SRC_URI="http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha ~hppa ~ia64 ~amd64 ppc64 ~s390 ~arm"
+KEYWORDS="x86 ~ppc sparc ~mips ~alpha ~arm ~hppa ~ia64 ~amd64 ~s390 ~ppc64"
+# ATTN s390 MAINTANER: if you bump this stable on s390 please remove 2.14 from cvs -lisa
+# 2004-07-08
+
 
 IUSE="gnome gtk selinux ipv6"
 
@@ -24,7 +27,7 @@ DEPEND=">=sys-apps/portage-2.0.49-r6
 	sys-apps/shadow
 	dev-util/pkgconfig"
 RDEPEND="
-	!arm? ( !s390? (
+	!arm? ( !mips? ( !s390? (
 	gnome? (
 		>=x11-libs/gtk+-2.0.0
 		>=gnome-base/libgnome-2.0.0
@@ -37,7 +40,7 @@ RDEPEND="
 		>=x11-libs/gtk+-2.0.0
 		x11-libs/pango
 	)
-	) )
+	) ) )
 	selinux? ( sec-policy/selinux-distcc )"
 
 src_unpack() {
@@ -54,8 +57,10 @@ src_compile() {
 	#configure script, so we'll just make the distinction here:
 	#gnome takes precedence over gtk if both are specified (gnome pulls
 	#in gtk anyways...)
-	use gtk && ! use gnome && myconf="${myconf} --with-gtk"
-	use gtk && use gnome && myconf="${myconf} --with-gnome"
+	use gtk && ! use gnome && ! use mips && myconf="${myconf} --with-gtk"
+	use gtk && use gnome && ! use mips && myconf="${myconf} --with-gnome"
+	use mips && use gtk || use gnome && ewarn "X support for Mips has been disabled."
+	#Above, mips is excluded due to version issues. 2004-02-20
 
 	[ `gcc-major-version` -eq 2 ] && filter-lfs-flags
 
diff --git a/sys-devel/distcc/distcc-2.16-r3.ebuild b/sys-devel/distcc/distcc-2.16-r3.ebuild
index 3f6c902feac6..858f32a228f0 100644
--- a/sys-devel/distcc/distcc-2.16-r3.ebuild
+++ b/sys-devel/distcc/distcc-2.16-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.16-r3.ebuild,v 1.3 2005/09/05 15:41:09 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.16-r3.ebuild,v 1.1 2005/06/15 12:52:17 lisa Exp $
 
 # If you change this in any way please email lisa@gentoo.org and make an
 # entry in the ChangeLog (this means you spanky :P). (2004-04-11) Lisa Seelye
@@ -73,7 +73,7 @@ src_compile() {
 src_install() {
 	make DESTDIR="${D%/}" install
 
-	insinto /usr/share/doc/${PF}
+	insinto /usr/share/doc/${PN}
 	doins "${S}/survey.txt"
 
 	exeinto /usr/bin
@@ -93,7 +93,7 @@ src_install() {
 	dodir /var/run/distccd
 	keepdir /var/run/distccd
 
-	if use gnome || use gtk; then
+	if [ `use gnome` -o `use gtk` ]; then
 	  einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui"
 	  einfo "This is to have a little sensability in naming schemes between distcmon programs"
 	  mv ${D}/usr/bin/distccmon-gnome ${D}/usr/bin/distccmon-gui
diff --git a/sys-devel/distcc/distcc-2.18.3-r7.ebuild b/sys-devel/distcc/distcc-2.18.3-r7.ebuild
index 260c8e66ff9f..7f4a782ab325 100644
--- a/sys-devel/distcc/distcc-2.18.3-r7.ebuild
+++ b/sys-devel/distcc/distcc-2.18.3-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.18.3-r7.ebuild,v 1.8 2005/07/30 23:01:22 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.18.3-r7.ebuild,v 1.1 2005/06/15 12:52:17 lisa Exp $
 
 # If you change this in any way please email lisa@gentoo.org and make an
 # entry in the ChangeLog (this means you spanky :P). (2004-04-11) Lisa Seelye
@@ -15,7 +15,7 @@ SRC_URI="http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 sh sparc x86"
+KEYWORDS="x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ia64 amd64 ~s390"
 
 IUSE="gnome gtk selinux ipv6"
 
@@ -101,7 +101,7 @@ src_install() {
 	dodir /var/run/distccd
 	keepdir /var/run/distccd
 
-	if use gnome || use gtk; then
+	if [ `use gnome` -o `use gtk` ]; then
 	  einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui"
 	  einfo "This is to have a little sensability in naming schemes between distccmon programs"
 	  mv ${D}/usr/bin/distccmon-gnome ${D}/usr/bin/distccmon-gui
diff --git a/sys-devel/distcc/distcc-2.18.3-r8.ebuild b/sys-devel/distcc/distcc-2.18.3-r8.ebuild
index 164b1ad050ee..d96dd5f8d885 100644
--- a/sys-devel/distcc/distcc-2.18.3-r8.ebuild
+++ b/sys-devel/distcc/distcc-2.18.3-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-devel/distcc/distcc-2.18.3-r8.ebuild,v 1.4 2005/09/05 15:41:09 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.18.3-r8.ebuild,v 1.1 2005/06/18 19:38:32 morfic Exp $
 
 # If you change this in any way please email lisa@gentoo.org and make an
 # entry in the ChangeLog (this means you spanky :P). (2004-04-11) Lisa Seelye
@@ -15,7 +15,7 @@ SRC_URI="http://distcc.samba.org/ftp/distcc/distcc-${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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 IUSE="crosscompile gnome gtk ipv6 selinux"
 
@@ -81,7 +81,7 @@ src_compile() {
 src_install() {
 	make DESTDIR="${D%/}" install
 
-	insinto /usr/share/doc/${PF}
+	insinto /usr/share/doc/${PN}
 	doins "${S}/survey.txt"
 
 	exeinto /usr/bin
@@ -94,16 +94,18 @@ src_install() {
 	newexe "${FILESDIR}/${PATCHLEVEL}/init" distccd
 
 	# create and keep the symlink dir
+	dodir /usr/lib/distcc/bin
 	keepdir /usr/lib/distcc/bin
 
 	# create the distccd pid directory
+	dodir /var/run/distccd
 	keepdir /var/run/distccd
 
-	if use gnome || use gtk; then
+	if [ `use gnome` -o `use gtk` ]; then
 	  einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui"
 	  einfo "This is to have a little sensability in naming schemes between distccmon programs"
 	  mv ${D}/usr/bin/distccmon-gnome ${D}/usr/bin/distccmon-gui
-	  dosym distccmon-gui /usr/bin/distccmon-gnome
+	  dosym /usr/bin/distccmon-gui /usr/bin/distccmon-gnome
 	fi
 
 }
diff --git a/sys-devel/distcc/files/2.17/conf b/sys-devel/distcc/files/2.17/conf
index 0010ea8c35c0..54790beca4de 100644
--- a/sys-devel/distcc/files/2.17/conf
+++ b/sys-devel/distcc/files/2.17/conf
@@ -1,5 +1,5 @@
-# Copyright 1999-2004 Gentoo Foundation
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.17/conf,v 1.2 2004/10/21 16:20:10 vapier Exp $
+# Copyright 2003 Gentoo Technologies, Inc
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.17/conf,v 1.1 2004/08/22 19:14:10 lisa Exp $
 # distccd configuration file
 
 DISTCCD_OPTS=""
diff --git a/sys-devel/distcc/files/2.18/conf b/sys-devel/distcc/files/2.18/conf
index 478c7e186410..700ed42fb6f0 100644
--- a/sys-devel/distcc/files/2.18/conf
+++ b/sys-devel/distcc/files/2.18/conf
@@ -1,5 +1,5 @@
-# Copyright 1999-2004 Gentoo Foundation
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.18/conf,v 1.2 2004/10/21 16:20:10 vapier Exp $
+# Copyright 2003 Gentoo Technologies, Inc
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.18/conf,v 1.1 2004/10/12 17:21:43 lisa Exp $
 # distccd configuration file
 
 DISTCCD_OPTS=""
diff --git a/sys-devel/distcc/files/2.18/distcc-config.patch b/sys-devel/distcc/files/2.18/distcc-config.patch
index d06a7844c533..4aa2f6a28aa3 100644
--- a/sys-devel/distcc/files/2.18/distcc-config.patch
+++ b/sys-devel/distcc/files/2.18/distcc-config.patch
@@ -8,7 +8,7 @@
 +		os.chmod(path+file,0755)
 +
 +def installoverrides(chost):
-+	for file in ['gcc', 'cc', 'c++', 'g++']:
++	for file in ['gcc', 'c++', 'g++']:
 +		path = '/usr/lib/distcc/bin/'
 +		if os.path.exists('/usr/bin/'+chost+'-'+file):
 +			if os.path.exists(path+file):
diff --git a/sys-devel/distcc/files/distcc-gentoo-multilib-r1.patch b/sys-devel/distcc/files/distcc-gentoo-multilib-r1.patch
index 8a7b37e878bb..9ded9e0e43c8 100644
--- a/sys-devel/distcc/files/distcc-gentoo-multilib-r1.patch
+++ b/sys-devel/distcc/files/distcc-gentoo-multilib-r1.patch
@@ -126,7 +126,7 @@ diff -Naurp distcc-2.18.3.orig/src/distcc.c distcc-2.18.3/src/distcc.c
 +            goto out;
 +        }
 +        dcc_find_compiler(newargv, &compiler_args);
-+        if (newargv != argv) free(newargv);
++        free(newargv);
          /* compiler_args is now respectively either "cc -c hello.c" or
           * "gcc -c hello.c" */
  
@@ -140,7 +140,7 @@ diff -Naurp distcc-2.18.3.orig/src/distcc.c distcc-2.18.3/src/distcc.c
 +            goto out;
 +        }
 +        dcc_copy_argv(newargv, &compiler_args, 0);
-+        if (newargv != argv) free(newargv);
++        free(newargv);
          compiler_args[0] = compiler_name;
      }
  
diff --git a/sys-devel/distcc/files/distcc-gentoo-multilib.patch b/sys-devel/distcc/files/distcc-gentoo-multilib.patch
index 02e0486c2a8b..cc17764fdc5a 100644
--- a/sys-devel/distcc/files/distcc-gentoo-multilib.patch
+++ b/sys-devel/distcc/files/distcc-gentoo-multilib.patch
@@ -1,6 +1,6 @@
 diff -Naur distcc-2.18.3-vanilla/src/distcc.c distcc-2.18.3/src/distcc.c
 --- distcc-2.18.3-vanilla/src/distcc.c	2004-10-01 17:47:07.000000000 -0700
-+++ distcc-2.18.3/src/distcc.c	2004-12-28 01:04:51.017574246 -0800
++++ distcc-2.18.3/src/distcc.c	2004-12-28 00:39:10.101746859 -0800
 @@ -135,7 +135,86 @@
      signal(SIGHUP, &dcc_client_signalled);
  }
@@ -11,7 +11,7 @@ diff -Naur distcc-2.18.3-vanilla/src/distcc.c distcc-2.18.3/src/distcc.c
 +static char **getNewArgv(char **argv) {
 +    char **newargv;
 +    char newflags[MAXNEWFLAGS][MAXFLAGLEN + 1];
-+    unsigned newflagsCount = 0;
++    unsigned newflagsCount;
 +    unsigned argc;
 +    unsigned i;
 +    char **p;
@@ -96,21 +96,7 @@ diff -Naur distcc-2.18.3-vanilla/src/distcc.c distcc-2.18.3/src/distcc.c
      int ret;
  
      dcc_client_catch_signals();
-@@ -183,7 +263,12 @@
-             goto out;
-         }
-         
--        dcc_find_compiler(argv, &compiler_args);
-+        if(!(newargv = getNewArgv(argv))) {
-+            ret = EXIT_OUT_OF_MEMORY;
-+            goto out;
-+        }
-+        dcc_find_compiler(newargv, &compiler_args);
-+        free(newargv);
-         /* compiler_args is now respectively either "cc -c hello.c" or
-          * "gcc -c hello.c" */
- 
-@@ -200,7 +285,12 @@
+@@ -200,7 +280,12 @@
                                            &tweaked_path)) != 0)
              goto out;
          
diff --git a/sys-devel/distcc/metadata.xml b/sys-devel/distcc/metadata.xml
index 24881f8d050a..c4eca095377c 100644
--- a/sys-devel/distcc/metadata.xml
+++ b/sys-devel/distcc/metadata.xml
@@ -4,7 +4,8 @@
 <herd>cluster</herd>
 <maintainer>
   <email>lisa@gentoo.org</email>
-  <name>Lisa Seelye</name>
+<name>Lisa Seelye</name>
+<!-- <description>Description of the maintainership</description> -->
 </maintainer>
 <longdescription>Distcc is a program to distribute compilation of C code across several machines on a network</longdescription>
 </pkgmetadata>
diff --git a/sys-devel/flex/ChangeLog b/sys-devel/flex/ChangeLog
index 60b5e8aa404d..c1a591de927e 100644
--- a/sys-devel/flex/ChangeLog
+++ b/sys-devel/flex/ChangeLog
@@ -1,63 +1,6 @@
 # ChangeLog for sys-devel/flex
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.34 2005/09/16 11:19:41 agriffis Exp $
-
-  16 Sep 2005; Aron Griffis <agriffis@gentoo.org> flex-2.5.4a-r6.ebuild:
-  Mark 2.5.4a-r6 stable on alpha
-
-  03 Sep 2005; Markus Rothe <corsair@gentoo.org> flex-2.5.4a-r6.ebuild:
-  Stable on ppc64
-
-  18 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> flex-2.5.4a-r6.ebuild:
-  Stable on ppc.
-
-  16 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> flex-2.5.4a-r6.ebuild:
-  Stable on sparc
-
-  11 Aug 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/flex-2.5.31-include.patch, flex-2.5.31.ebuild:
-  Fix cross-compile support.
-
-*flex-2.5.31 (09 Jul 2005)
-
-  09 Jul 2005; Mike Frysinger <vapier@gentoo.org>
-  -files/flex-2.5.31-yytext_ptr.patch, flex-2.5.4a-r6.ebuild,
-  +flex-2.5.31.ebuild, -flex-2.5.31-r1.ebuild:
-  Add flex-2.5.31 back in with Debian patchset #97921 by Martin Mokrejs.
-
-*flex-2.5.4a-r6 (20 Jan 2005)
-
-  20 Jan 2005; Mike Frysinger <vapier@gentoo.org> flex-2.5.4a-r5.ebuild,
-  +flex-2.5.4a-r6.ebuild:
-  Punt eradicators stuff from our stable ebuild and make a new version with
-  proper autoconf updates.
-
-  20 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  flex-2.5.4a-r5.ebuild:
-  Install to the proper libdir.
-
-  09 Nov 2004; <robmoss@gentoo.org> flex-2.5.4a-r5.ebuild:
-  Fixing a very silly typo. I meant "bigcheck", not "bigtest". Sorry. Fixes
-  bug #63697.
-
-  16 Sep 2004; <rmoss@gentoo.org> flex-2.5.4a-r5.ebuild:
-  flex-2.5.4a was using a broken, irritatingly short version of the testsuite.
-  Adding "make bigcheck" in the previously nonexistent src_test function fixes
-  this.
-
-  27 Jul 2004; Alexander Gabert <pappy@gentoo.org> flex-2.5.4a-r5.ebuild:
-  flex breaks when MAKEOPTS is set aggressively
-
-  19 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> flex-2.5.4a-r5.ebuild:
-  take out the emake || make bit.  Works for me with -j and no verified
-  bug reports exist; tidy
-
-
-*flex-2.5.4a-r5 (13 Oct 2002)
-
-  13 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
-  Add various Redhat patches to make it more gcc3 friendly.  Fix
-  form in a few places.
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
 
 *flex-2.5.4a-r4 (1 Feb 2002)
 
diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index cdac9c50b6a0..361037bd7866 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -1,13 +1,11 @@
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 5c2c4c7cbed85a483d0ede3096c7dcf7 ChangeLog 2651
-MD5 d511626c1fdd1b2689c6fcec7d333c81 flex-2.5.4a-r6.ebuild 1466
-MD5 3f4500ac9117f90f14a3a82e3a5dc488 flex-2.5.4a-r5.ebuild 1304
-MD5 cf90e86c1c8a99e3ff773d553479a6ea flex-2.5.31.ebuild 1124
-MD5 483b62e5eb13bbcf72e8ec7aaa34f554 files/digest-flex-2.5.4a-r6 137
-MD5 de46348f431a1b72e51b8f2253ebcaf3 files/flex-2.5.4a-gcc31.patch 3189
-MD5 4a29cdce8ed56930696e337c2aa81787 files/digest-flex-2.5.31 131
-MD5 2e16e2031744c71cd9cd1019ff0a1af3 files/flex-2.5.31-include.patch 387
-MD5 497470663c67fc14a2eb95b51f7f9614 files/flex-2.5.4a-gcc3.patch 277
-MD5 06f3fd21134a6d82073ce64e2ad60274 files/flex-2.5.4-glibc22.patch 2241
+MD5 098c11949cd9f5e8b450c35cd3fe8449 ChangeLog 1804
+MD5 d33927f202d9ef8b19df0dc6053136b7 flex-2.5.23.ebuild 915
+MD5 e024cc80647d44bbe9a75c304ebfeecc flex-2.5.4a-r5.ebuild 1234
+MD5 516295c8a29ca45cfef9999543616d1f flex-2.5.31.ebuild 925
+MD5 16e4a9013f877177d2fc9ba784ae9959 files/digest-flex-2.5.23 63
 MD5 a50411d58e9407414db98087253bdacd files/digest-flex-2.5.4a-r5 63
+MD5 06f3fd21134a6d82073ce64e2ad60274 files/flex-2.5.4-glibc22.patch 2241
+MD5 497470663c67fc14a2eb95b51f7f9614 files/flex-2.5.4a-gcc3.patch 277
+MD5 de46348f431a1b72e51b8f2253ebcaf3 files/flex-2.5.4a-gcc31.patch 3189
 MD5 28010d818ed73f21c9d37fd955c9f25b files/flex-2.5.4a-skel.patch 350
+MD5 46a5f0c3323bbf9d46b3682cf9b39263 files/digest-flex-2.5.31 64
diff --git a/sys-devel/flex/files/digest-flex-2.5.31 b/sys-devel/flex/files/digest-flex-2.5.31
index 7820d471ed9f..729b6cd03752 100644
--- a/sys-devel/flex/files/digest-flex-2.5.31
+++ b/sys-devel/flex/files/digest-flex-2.5.31
@@ -1,2 +1 @@
 MD5 363dcc4afc917dc51306eb9d3de0152f flex-2.5.31.tar.bz2 681792
-MD5 8c5f1675b57906038803d6747b4eaef6 flex_2.5.31-34.diff.gz 208253
diff --git a/sys-devel/flex/flex-2.5.31.ebuild b/sys-devel/flex/flex-2.5.31.ebuild
index 253cfb052c14..1914a72ba3fb 100644
--- a/sys-devel/flex/flex-2.5.31.ebuild
+++ b/sys-devel/flex/flex-2.5.31.ebuild
@@ -1,44 +1,45 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.31.ebuild,v 1.15 2005/09/15 05:33:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.31.ebuild,v 1.1 2003/04/17 22:53:29 mholzer Exp $
 
-inherit eutils flag-o-matic
-
-DEB_VER=34
+S=${WORKDIR}/${P}
 DESCRIPTION="GNU lexical analyser generator"
-HOMEPAGE="http://lex.sourceforge.net/"
-SRC_URI="mirror://sourceforge/lex/${P}.tar.bz2
-	mirror://debian/pool/main/f/flex/${PN}_${PV}-${DEB_VER}.diff.gz"
+SRC_URI="mirror://sourceforge/lex/${P}.tar.bz2"
+HOMEPAGE="http://www.gnu.org/software/flex/flex.html"
 
-LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="build nls static"
+LICENSE="FLEX"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND=""
+DEPEND="virtual/glibc
+	nls? ( sys-devel/gettext )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${PN}_${PV}-${DEB_VER}.diff
-	epatch "${FILESDIR}"/${P}-include.patch
-}
 
 src_compile() {
-	use static && append-ldflags -static
-	econf $(use_enable nls) || die
-	emake || die
+	myconf=""
+
+	use nls || myconf="--disable-nls"
+
+	econf ${myconf} || die
+
+	if [ -z "`use static`" ]
+	then
+		emake || make || die
+	else
+		emake LDFLAGS=-static || die
+	fi
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
-
-	if use build ; then
-		rm -r "${D}"/usr/{include,lib,share}
+	einstall || die
+	
+	if [ -z "`use build`" ]
+	then
+		dodoc AUTHORS COPYING ChangeLog NEWS ONEWS README* RoadMap THANKS TODO
 	else
-		dodoc AUTHORS ChangeLog NEWS ONEWS README* RoadMap THANKS TODO
+		rm -rf ${D}/usr/share ${D}/usr/include ${D}/usr/lib
 	fi
 
 	dosym flex /usr/bin/lex
 }
+
diff --git a/sys-devel/flex/flex-2.5.4a-r5.ebuild b/sys-devel/flex/flex-2.5.4a-r5.ebuild
index f6f13b1e1d6c..c18e0750479e 100644
--- a/sys-devel/flex/flex-2.5.4a-r5.ebuild
+++ b/sys-devel/flex/flex-2.5.4a-r5.ebuild
@@ -1,54 +1,54 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.4a-r5.ebuild,v 1.33 2005/05/22 02:02:15 vapier Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.4a-r5.ebuild,v 1.1 2002/10/13 02:34:35 azarah Exp $
 
+S=${WORKDIR}/flex-2.5.4
 DESCRIPTION="GNU lexical analyser generator"
-HOMEPAGE="http://lex.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+SRC_URI="ftp://ftp.gnu.org/gnu/non-gnu/flex/flex-2.5.4a.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/flex/flex.html"
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="build static"
-
-DEPEND=""
+KEYWORDS="~x86 ~ppc ~sparc ~sparc64 ~alpha"
 
-S=${WORKDIR}/${P/a/}
+DEPEND="virtual/glibc"
+RDEPEND="virtual/glibc"
 
 src_unpack() {
 	unpack ${A}
 
 	cd ${S}
 	# Some Redhat patches to fix various problems
-	epatch ${FILESDIR}/flex-2.5.4-glibc22.patch
-	epatch ${FILESDIR}/flex-2.5.4a-gcc3.patch
-	epatch ${FILESDIR}/flex-2.5.4a-gcc31.patch
-	epatch ${FILESDIR}/flex-2.5.4a-skel.patch
+	patch -p1 < ${FILESDIR}/flex-2.5.4-glibc22.patch || die
+	patch -p1 < ${FILESDIR}/flex-2.5.4a-gcc3.patch || die
+	patch -p1 < ${FILESDIR}/flex-2.5.4a-gcc31.patch || die
+	patch -p1 < ${FILESDIR}/flex-2.5.4a-skel.patch || die
 }
 
 src_compile() {
-	export CC="$(tc-getCC)"
-	./configure --prefix=/usr --host=${CHOST} || die "configure failed"
-	use static && append-ldflags -static
-	emake -j1 LDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	make bigcheck || die "Test phase failed"
+    ./configure --prefix=/usr \
+		--host=${CHOST} || die
+
+    if [ -z "`use static`" ]
+    then
+        emake || die
+    else
+        emake LDFLAGS=-static || die
+    fi
 }
 
 src_install() {
-	make -j1 prefix=${D}/usr \
+    make prefix=${D}/usr \
 		mandir=${D}/usr/share/man/man1 \
-		install || die "make install failed"
-
-	if use build ; then
-		rm -r "${D}"/usr/{include,lib,share}
-	else
-		dodoc NEWS README
-	fi
+		install || die
+	
+    if [ -z "`use build`" ]
+    then
+        dodoc COPYING NEWS README
+    else
+        rm -rf ${D}/usr/share ${D}/usr/include ${D}/usr/lib
+    fi
 
 	dosym flex /usr/bin/lex
 }
+
diff --git a/sys-devel/flex/flex-2.5.4a-r6.ebuild b/sys-devel/flex/flex-2.5.4a-r6.ebuild
index d437ee7bc9ad..fd9694f95447 100644
--- a/sys-devel/flex/flex-2.5.4a-r6.ebuild
+++ b/sys-devel/flex/flex-2.5.4a-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-devel/flex/flex-2.5.4a-r6.ebuild,v 1.9 2005/09/16 11:19:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.4a-r6.ebuild,v 1.1 2005/01/21 00:07:04 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -12,25 +12,25 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc-macos ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="build static"
 
-DEPEND=""
+RDEPEND="virtual/libc"
 
 S=${WORKDIR}/${P/a/}
 
 src_unpack() {
 	unpack ${A}
 
-	cd "${S}"
+	cd ${S}
 	# Some Redhat patches to fix various problems
-	epatch "${FILESDIR}"/flex-2.5.4-glibc22.patch
-	epatch "${FILESDIR}"/flex-2.5.4a-gcc3.patch
-	epatch "${FILESDIR}"/flex-2.5.4a-gcc31.patch
-	epatch "${FILESDIR}"/flex-2.5.4a-skel.patch
+	epatch ${FILESDIR}/flex-2.5.4-glibc22.patch
+	epatch ${FILESDIR}/flex-2.5.4a-gcc3.patch
+	epatch ${FILESDIR}/flex-2.5.4a-gcc31.patch
+	epatch ${FILESDIR}/flex-2.5.4a-skel.patch
 
 	# included autotools are crusty, lets polish em up
-	epatch "${WORKDIR}"/${P}-autoconf.patch
+	epatch ${WORKDIR}/${P}-autoconf.patch
 }
 
 src_compile() {
diff --git a/sys-devel/flex/metadata.xml b/sys-devel/flex/metadata.xml
index 96a2d586367d..f093d416cbb1 100644
--- a/sys-devel/flex/metadata.xml
+++ b/sys-devel/flex/metadata.xml
@@ -1,3 +1,5 @@
+ [32;01m*[0m Generated metadata.xml:
+
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/sys-devel/gcc-apple/ChangeLog b/sys-devel/gcc-apple/ChangeLog
index 8eae24cc8cc0..6707fb914bad 100644
--- a/sys-devel/gcc-apple/ChangeLog
+++ b/sys-devel/gcc-apple/ChangeLog
@@ -1,9 +1,6 @@
 # ChangeLog for sys-devel/gcc-apple
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/ChangeLog,v 1.2 2005/02/19 23:57:24 swegener Exp $
-
-  20 Feb 2005; Sven Wegener <swegener@gentoo.org> gcc-apple-1762.ebuild:
-  Fixed invalid atoms in *DEPEND.
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/ChangeLog,v 1.1 2005/02/19 18:46:02 kito Exp $
 
 *gcc-apple-1762 (19 Feb 2005)
 
diff --git a/sys-devel/gcc-apple/Manifest b/sys-devel/gcc-apple/Manifest
index 0c5364cf2a16..816e0bbeb31a 100644
--- a/sys-devel/gcc-apple/Manifest
+++ b/sys-devel/gcc-apple/Manifest
@@ -1,4 +1,2 @@
-MD5 e0bd1771e5df98bd4bdf3b3437831756 ChangeLog 542
-MD5 fa396712a769e3d8895d3a382332f57d gcc-apple-1762.ebuild 1030
-MD5 ad43b9d82abfe6d24b8f3a282ac0ac67 metadata.xml 216
+MD5 a47953af80ad25ce9de498b0c1a4231b gcc-apple-1762.ebuild 913
 MD5 7fa514d0f03a62a64a75d80ab2b222a2 files/digest-gcc-apple-1762 62
diff --git a/sys-devel/gcc-apple/gcc-apple-1762.ebuild b/sys-devel/gcc-apple/gcc-apple-1762.ebuild
index 7714d1ec4cf7..a02f2808ed5d 100644
--- a/sys-devel/gcc-apple/gcc-apple-1762.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-1762.ebuild
@@ -1,44 +1,45 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-1762.ebuild,v 1.3 2005/03/18 16:49:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-1762.ebuild,v 1.1 2005/02/19 18:46:02 kito Exp $
 
-DESCRIPTION="Apple branch of the GNU compiler (based on gcc-3.5.0-tree-ssa)"
-HOMEPAGE="http://darwinsource.opendarwin.org/"
+S=${WORKDIR}/gcc-${PV}
+
+DESCRIPTION="Apple branch of the GNU compiler based on gcc version 3.5.0-tree-ssa"
+WEBPAGE="http://darwinsource.opendarwin.org/"
 SRC_URI="http://darwinsource.opendarwin.org/tarballs/other/gcc-${PV}.tar.gz"
 
 LICENSE="APSL-2 GPL-2"
+
 SLOT="0"
 KEYWORDS="-* ~ppc-macos"
 IUSE="build nls"
 
 RDEPEND="virtual/libc
-	sys-libs/zlib
-	!build? (
-		nls? ( sys-devel/gettext )
-		sys-libs/ncurses
-	)"
-DEPEND="sys-apps/texinfo
-	sys-devel/bison
-	sys-devel/cctools-extras
-	sys-libs/csu"
+		>=sys-libs/zlib
+		!build? (
+			nls? ( sys-devel/gettext )
+			sys-libs/ncurses
+		)"
 
-S=${WORKDIR}/gcc-${PV}
+DEPEND=">=sys-apps/texinfo
+		sys-devel/bison
+		sys-devel/cctools-extras
+		sys-libs/csu"
 
 src_compile() {
 	:
 }
 
 src_install() {
-	mkdir -p "${S}"/build/obj "${S}"/build/sym
-	gnumake \
-		RC_OS=macos RC_ARCHS=ppc TARGETS=ppc \
-		SRCROOT="${S}" OBJROOT="${S}"/build/obj \
-		DSTROOT="${D}" SYMROOT="${S}"/build/sym \
-		install \
-		|| die
-
-	if use build ; then
-		rm -r "${D}"/Developer
-		rm -r "${D}"/usr/share
+	mkdir -p ${S}/build/obj ${S}/build/sym
+	cd ${S}
+	gnumake RC_OS=macos RC_ARCHS=ppc TARGETS=ppc \
+		SRCROOT=${S} OBJROOT=${S}/build/obj \
+		DSTROOT=${D} SYMROOT=${S}/build/sym\
+		install|| die
+
+	if use build; then
+		rm -rf ${D}/Developer
+		rm -rf ${D}/usr/share
 	fi
 }
diff --git a/sys-devel/gcc-apple/metadata.xml b/sys-devel/gcc-apple/metadata.xml
index fbf1f0be9860..a65e8c2fdf72 100644
--- a/sys-devel/gcc-apple/metadata.xml
+++ b/sys-devel/gcc-apple/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>osx</herd>
+<herd>no-herd</herd>
 <maintainer>
   <email>kito@gentoo.org</email>
 </maintainer>
diff --git a/sys-devel/gcc-compat/ChangeLog b/sys-devel/gcc-compat/ChangeLog
index 1c6cc03a0b08..efbd9e6017e4 100644
--- a/sys-devel/gcc-compat/ChangeLog
+++ b/sys-devel/gcc-compat/ChangeLog
@@ -1,13 +1,8 @@
 # ChangeLog for sys-devel/gcc-compat
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-compat/ChangeLog,v 1.7 2004/08/08 00:42:18 slarti Exp $
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-compat/ChangeLog,v 1.1 2002/09/19 17:40:31 carpaski Exp $
 
-  08 Aug 2004; Tom Martin <slarti@gentoo.org> gcc-compat-1.4.ebuild:
-  Typo in DESCRIPTION: compatability -> compatibility. Bug 59717.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*gcc-compat-1.4 (19 Sep 2002)
+*sys-lib/gcc-compat-1.4 (19 Sep 2002)
 
   19 Sep 2002; Nicholas Jones <carpaski@gentoo.org> :
   Created the ebuild. $PV == PROFILE TO ATTAIN
diff --git a/sys-devel/gcc-compat/Manifest b/sys-devel/gcc-compat/Manifest
index 6e34c820f0b6..2f5e6288dfed 100644
--- a/sys-devel/gcc-compat/Manifest
+++ b/sys-devel/gcc-compat/Manifest
@@ -1,4 +1,2 @@
-MD5 c1dba1fd1f516777e4b92eba675ab2d1 gcc-compat-1.4.ebuild 900
-MD5 ee9036019716741159f8a29fbebd5ec4 ChangeLog 563
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-compat-1.4 0
+MD5 38ba4409361662ce329fc475f5e580b8 ChangeLog 444
+MD5 fb6379fbb5fc41df1e3008a5e9d51b56 gcc-compat-1.4.ebuild 902
diff --git a/sys-devel/gcc-compat/gcc-compat-1.4.ebuild b/sys-devel/gcc-compat/gcc-compat-1.4.ebuild
index 89810f5780e1..a3f26c677420 100644
--- a/sys-devel/gcc-compat/gcc-compat-1.4.ebuild
+++ b/sys-devel/gcc-compat/gcc-compat-1.4.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-compat/gcc-compat-1.4.ebuild,v 1.8 2004/08/08 00:42:18 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-compat/gcc-compat-1.4.ebuild,v 1.1 2002/09/19 17:40:31 carpaski Exp $
 
-DESCRIPTION="This is a compatibility layer for use when upgrading to profile $PV"
+DESCRIPTION="This is a compatability layer for use when upgrading to profile $PV"
 HOMEPAGE="http://www.gentoo.org"
 SRC_URI=""
-LICENSE="GPL-2"
+LICENSE="gpl-2"
 
 # Only ONE version of this should exist on a system
 # This is ABSOLUTELY Machine non-specific
 SLOT="0"
-KEYWORDS="x86 ppc sparc "
-IUSE=""
+KEYWORDS="x86 ppc sparc sparc64"
 
 DEPEND=""
 RDEPEND=""
@@ -24,8 +23,8 @@ src_compile() {
 }
 
 src_install () {
-	cd $ROOT || die "Failed to chdir to root: $ROOT"
-	tar cvf ${WORKDIR}/gcc-libs.tar $(find /usr/lib/gcc-lib/ -type f -name '*.so*') || die "failed to create tarball"
-	cd ${D} || die "failed to enter \$D: $D"
-	tar -mxvf ${WORKDIR}/gcc-libs.tar || die "failed to extract tarball"
+	cd /
+	tar cvf ${WORKDIR}/gcc-libs.tar $(find /usr/lib/gcc-lib/ -type f -name '*.so*')
+	cd ${D}
+	tar -mxvf ${WORKDIR}/gcc-libs.tar
 }
diff --git a/sys-devel/gcc-compat/metadata.xml b/sys-devel/gcc-compat/metadata.xml
index 96a2d586367d..f093d416cbb1 100644
--- a/sys-devel/gcc-compat/metadata.xml
+++ b/sys-devel/gcc-compat/metadata.xml
@@ -1,3 +1,5 @@
+ [32;01m*[0m Generated metadata.xml:
+
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog
index 4d4618d60437..5486d64b5df3 100644
--- a/sys-devel/gcc-config/ChangeLog
+++ b/sys-devel/gcc-config/ChangeLog
@@ -1,596 +1,8 @@
 # ChangeLog for sys-devel/gcc-config
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.111 2005/11/19 05:23:08 vapier Exp $
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.1 2002/10/27 22:38:11 azarah Exp $
 
-*gcc-config-1.3.12-r4 (19 Nov 2005)
-
-  19 Nov 2005; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.3.12,
-  +gcc-config-1.3.12-r4.ebuild:
-  Add support for selecting profiles by version only.
-
-*gcc-config-1.3.12-r3 (01 Nov 2005)
-
-  01 Nov 2005; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.3.12,
-  +gcc-config-1.3.12-r3.ebuild:
-  Make sure we set env vars before trying to use them #111022 by Attila Stehr.
-
-*gcc-config-2.0.0_beta2 (02 Oct 2005)
-
-  02 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  -gcc-config-2.0.0_beta1.ebuild, +gcc-config-2.0.0_beta2.ebuild:
-  Version bump with more backwards compat support (-B, -L, and -X).
-
-*gcc-config-2.0.0_beta1 (01 Oct 2005)
-
-  01 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  +gcc-config-2.0.0_beta1.ebuild:
-  Added gcc-config wrapper for beta version of eselect-compiler. It still
-  needs to be cleaned up a bit, but it's functional, so putting it into
-  portage (package.mask still of course).
-
-  18 Sep 2005; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.3.12:
-  Add support for spaces in make.conf settings #105855.
-
-  16 Sep 2005; Aron Griffis <agriffis@gentoo.org>
-  gcc-config-1.3.12-r2.ebuild:
-  Mark 1.3.12-r2 stable on alpha
-
-  13 Sep 2005; <dang@gentoo.org> gcc-config-1.3.12-r2.ebuild:
-  Marked stable on amd64
-
-  07 Sep 2005; Aaron Walker <ka0ttic@gentoo.org>
-  gcc-config-1.3.12-r2.ebuild:
-  Stable on mips.
-
-  03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
-  gcc-config-1.3.12-r2.ebuild:
-  Stable on ppc.
-
-  03 Sep 2005; Markus Rothe <corsair@gentoo.org>
-  gcc-config-1.3.12-r2.ebuild:
-  Stable on ppc64
-
-  01 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  gcc-config-1.3.12-r2.ebuild:
-  Stable on sparc
-
-  25 Aug 2005; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.3.12:
-  Update list output to show the active version for all targets.
-
-  09 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  -files/gcc-config-1.4.0, -gcc-config-1.4.0.ebuild:
-  Killing 1.4.0.  Working on gcc-config-2.0 in gentoo/src/toolchain/gcc-config.
-
-*gcc-config-1.3.12-r2 (05 Aug 2005)
-
-  05 Aug 2005; Martin Schlemmer <azarah@gentoo.org> files/gcc-config-1.3.12,
-  +gcc-config-1.3.12-r2.ebuild:
-  Fix long option for -S (--split-profile).
-
-*gcc-config-1.3.12-r1 (04 Aug 2005)
-
-  04 Aug 2005; Mike Frysinger <vapier@gentoo.org> +files/wrapper-1.4.7.c,
-  +gcc-config-1.3.12-r1.ebuild:
-  Clean up the wrapper a bit.
-
-*gcc-config-1.3.12 (09 Jul 2005)
-
-  09 Jul 2005; Mike Frysinger <vapier@gentoo.org> +files/gcc-config-1.3.12,
-  +gcc-config-1.3.12.ebuild:
-  Add support for parsing profile names so we can use it in toolchain.eclass.
-
-*gcc-config-1.3.11-r4 (07 Jul 2005)
-
-  07 Jul 2005; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.3.11,
-  files/wrapper-1.4.6.c, +gcc-config-1.3.11-r4.ebuild:
-  Make sure the f77 wrapper is installed/run properly for g77 #97437 by John
-  C. Vernaleo.
-
-  17 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  gcc-config-1.3.10-r1.ebuild, gcc-config-1.3.10-r2.ebuild,
-  gcc-config-1.3.11-r3.ebuild, gcc-config-1.4.0.ebuild:
-  Removed portage from deps, as this solves a perl/openssl circular dependency.
-
-*gcc-config-1.3.11-r3 (13 Jun 2005)
-
-  13 Jun 2005; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.3.11,
-  +gcc-config-1.3.11-r3.ebuild:
-  Make sure that -c errors out if given an invalid TARGET.
-
-*gcc-config-1.3.11-r2 (07 Jun 2005)
-
-  07 Jun 2005; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.3.11,
-  -gcc-config-1.3.11-r1.ebuild, +gcc-config-1.3.11-r2.ebuild:
-  Make sure we support funky version strings (beta823942) and custom specs
-  (hardened).
-
-*gcc-config-1.3.11-r1 (07 Jun 2005)
-
-  07 Jun 2005; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.3.11,
-  -gcc-config-1.3.11.ebuild, +gcc-config-1.3.11-r1.ebuild:
-  Cleanup the CHOST-GCCVER parsing so it isnt so fragile (and works with BSD
-  hosts).
-
-*gcc-config-1.3.11 (06 Jun 2005)
-
-  06 Jun 2005; Mike Frysinger <vapier@gentoo.org> +files/gcc-config-1.3.11,
-  +gcc-config-1.3.11.ebuild:
-  If python is broken due to libstdc++ changes or whatever, make sure
-  gcc-config still works somewhat sanely.
-
-  10 Apr 2005; Joseph Jezak <josejx@gentoo.org> gcc-config-1.3.10-r2.ebuild:
-  Marked ppc stable.
-
-  09 Apr 2005; Markus Rothe <corsair@gentoo.org>
-  gcc-config-1.3.10-r2.ebuild:
-  Stable on ppc64
-
-  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> gcc-config-1.3.10-r2.ebuild:
-  stable on ia64
-
-*gcc-config-1.3.10-r2 (31 Mar 2005)
-
-  31 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  +gcc-config-1.3.10-r2.ebuild:
-  Don't spit out -m64 warnings.  Closes bug #87130.
-
-  19 Mar 2005; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.3.8,
-  files/gcc-config-1.3.10, files/gcc-config-1.4.0:
-  Make sure we copy libunwind in addition to libgcc_s (for ia64 and such).
-  Also dont copy internal gcc libs while portage is calling us (causes python
-  to segfault and crap).
-
-  17 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  gcc-config-1.3.10-r1.ebuild:
-  Stable on sparc so the stable sparc gcc doesn't give the (ignorable) warning
-  about the config being broken.
-
-  04 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  files/gcc-config-1.4.0:
-  Changing CTARGET_ALIASES to FAKE_TARGETS for consistency with binutils.
-
-  04 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  -files/fake-ctarget.sh, files/gcc-config-1.4.0, gcc-config-1.4.0.ebuild:
-  Cleaned up 1.4.0 a bit. Got rid of the stupid fake-ctarget.sh stuff and
-  added smarter logic for that into the gcc-config script. Still in
-  package.mask as it hits a sandbox bug.
-
-*gcc-config-1.4.0 (19 Feb 2005)
-
-  19 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  +files/fake-ctarget.sh, -files/gcc-config-1.3.9, +files/gcc-config-1.4.0,
-  -files/wrapper-1.4.4.c, +files/wrapper-1.4.6.c,
-  gcc-config-1.3.10-r1.ebuild, -gcc-config-1.3.9.ebuild,
-  +gcc-config-1.4.0.ebuild:
-  1.3.10-r1 stable on amd64. Removing 1.3.9. Adding 1.4.0 which adds support
-  for creating ctarget aliases based on the GCC_CTARGET_ALIASES variable in
-  the /etc/env.d/gcc/ config file. This is setup automatically on multilib
-  profiles with recent gcc emerges.
-
-  01 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  gcc-config-1.3.10-r1.ebuild:
-  Done testing.  Releasing into ~arch.
-
-*gcc-config-1.3.10-r1 (31 Jan 2005)
-
-  31 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  files/gcc-config-1.3.10, +gcc-config-1.3.10-r1.ebuild,
-  -gcc-config-1.3.10.ebuild:
-  Make gcc-config support gcc version strings containing '-'.  This allows for
-  wider multislot support.
-
-*gcc-config-1.3.10 (30 Jan 2005)
-
-  30 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  +files/gcc-config-1.3.10, +files/wrapper-1.4.5.c,
-  +gcc-config-1.3.10.ebuild:
-  Multilib fixes. Copies libgcc_s.so* to the correct location for all abis.
-  Allows command line args to override ${ABI}. This should resolve bugs #78306
-  and #78652.
-
-  23 Jan 2005; Mike Frysinger <vapier@gentoo.org>
-  gcc-config-1.3.8-r4.ebuild, gcc-config-1.3.9.ebuild:
-  Make sure old gcc-configs dont exist #79062.
-
-  20 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  gcc-config-1.3.9.ebuild:
-  Stable on amd64 ahead of everyone else because its multilib goodies are
-  required for 2005.0.
-
-*gcc-config-1.3.8-r4 (05 Jan 2005)
-
-  05 Jan 2005; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.3.8,
-  -gcc-config-1.3.8-r3.ebuild, +gcc-config-1.3.8-r4.ebuild:
-  Make sure that when we switch compilers, we dont accidently invalidate all
-  of our ccache data #70548.
-
-  03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-*gcc-config-1.3.9 (27 Dec 2004)
-
-  27 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  files/gcc-config-1.3.9, +files/wrapper-1.4.4.c, +gcc-config-1.3.9.ebuild:
-  Rolling in support for CFLAGS_${ABI}. Rolling g{cc,++}{32,64} support into
-  the wrapper.
-
-*gcc-config-1.3.8-r3 (24 Dec 2004)
-*gcc-config-1.3.8-r2 (24 Dec 2004)
-*gcc-config-1.3.8-r1 (24 Dec 2004)
-
-  24 Dec 2004; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.3.8,
-  +gcc-config-1.3.8-r1.ebuild, -gcc-config-1.3.8.ebuild:
-  Seems people still have outdated gcc versions installed which break with
-  GCC_SPECS="". Add a warning if their gcc is broken so they know they have to
-  re-emerge gcc.
-
-*gcc-config-1.3.8 (23 Dec 2004)
-
-  23 Dec 2004; Mike Frysinger <vapier@gentoo.org>:
-  Make sure GCC_SPECS doesn't hang around when switching between profiles. 
-  Copy libgcc_s.so to /lib (since some systems link files in /bin against it). 
-  Make sure the wrapper can locate cross-compilers via /etc/env.d files when 
-  the active environment is empty.
-
-*gcc-config-1.3.7-r6 (08 Dec 2004)
-
-  08 Dec 2004; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.3.7,
-  files/wrapper-1.4.2.c, -gcc-config-1.3.7-r5.ebuild,
-  +gcc-config-1.3.7-r6.ebuild:
-  Portability patch #73617 by Sunil.
-
-*gcc-config-1.3.7-r5 (05 Dec 2004)
-
-  05 Dec 2004; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.3.7,
-  -gcc-config-1.3.7-r4.ebuild, +gcc-config-1.3.7-r5.ebuild:
-  Err, we want to handle GCC_SPECS, not GCC_CONFIG. Also make sure duplicate
-  paths arent duplicated in LDPATH now that gcc is exporting multiple spec
-  files per ebuild.
-
-*gcc-config-1.3.7-r4 (03 Dec 2004)
-
-  03 Dec 2004; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.3.7,
-  -gcc-config-1.3.7-r3.ebuild, +gcc-config-1.3.7-r4.ebuild:
-  Make sure GCC_CONFIG is taken only from the selected profile.
-
-*gcc-config-1.3.7-r3 (02 Dec 2004)
-
-  02 Dec 2004; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.3.7,
-  -gcc-config-1.3.7-r2.ebuild, +gcc-config-1.3.7-r3.ebuild:
-  Version bump to add a lot of cross-compile fixes. Also perform sanity
-  checking on GCC_SPECS #68799, dont create wrappers in the ebuild #72745, and
-  dont install /lib/cpp unless the system supports C++.
-
-*gcc-config-1.3.7-r2 (28 Nov 2004)
-
-  28 Nov 2004; Travis Tilley <lv@gentoo.org> files/gcc-config-1.3.6,
-  files/gcc-config-1.3.7, -gcc-config-1.3.6-r3.ebuild,
-  +gcc-config-1.3.6-r4.ebuild, -gcc-config-1.3.7-r1.ebuild,
-  +gcc-config-1.3.7-r2.ebuild:
-  Fixed Bug 72557, where gcc-config would get very confused with non-gcc-lib
-  ldpaths
-
-  26 Oct 2004; Martin Schlemmer <azarah@gentoo.org> +files/wrapper-1.4.3.c:
-  Add GCCBITS support to wrapper.
-
-*gcc-config-1.3.7-r1 (25 Oct 2004)
-
-  25 Oct 2004; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.3.7:
-  Make sure umask doesn't screw up the install #68699.  Run gcc-config from 
-  $S instead of expecting $PATH to contain something functional #68700.  
-  Move the 32bit/64bit wrapper logic out of toolchain.eclass and into 
-  gcc-config via GCCBITS.
-
-*gcc-config-1.3.7 (13 Oct 2004)
-
-  13 Oct 2004; Mike Frysinger <vapier@gentoo.org> +files/gcc-config-1.3.7,
-  +gcc-config-1.3.7.ebuild:
-  Better invalid arg handling, list profiles even if you dont have a current
-  one, support $ROOT, dont export CC/CXX, create g77 wrappers alongside f77,
-  and general touchups.
-
-  10 Oct 2004; Tom Gall <tgall@gentoo.org> gcc-config-1.3.6-r3.ebuild:
-  stable on ppc64
-
-*gcc-config-1.3.6-r3 (05 Oct 2004)
-
-  05 Oct 2004; Travis Tilley <lv@gentoo.org> files/gcc-config-1.3.6,
-  -gcc-config-1.3.6-r2.ebuild, +gcc-config-1.3.6-r3.ebuild:
-  fixed the handling of GCC_SPECS-specific gcc configs
-
-  02 Oct 2004; Bryan Østergaard <kloeri@gentoo.org>
-  gcc-config-1.3.6-r2.ebuild:
-  Stable on alpha.
-
-*gcc-config-1.3.6-r2 (02 Oct 2004)
-
-  02 Oct 2004; Travis Tilley <lv@gentoo.org> files/gcc-config-1.3.6,
-  files/gcc-config-1.4, files/gcc-config-1.4.1, -gcc-config-1.3.6-r1.ebuild,
-  +gcc-config-1.3.6-r2.ebuild:
-  added the fix for bug 63973
-
-  28 Sep 2004; Sven Wegener <swegener@gentoo.org> files/wrapper-1.4.c,
-  files/wrapper.c:
-  Gentoo Technologies, Inc. -> Gentoo Foundation
-
-  25 Sep 2004; Joshua Kinard <kumba@gentoo.org> gcc-config-1.3.6-r1.ebuild:
-  Marked stable on mips.
-
-  31 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org>
-  gcc-config-1.3.6-r1.ebuild:
-  Stable on sparc
-
-  26 Aug 2004; Travis Tilley <lv@gentoo.org> gcc-config-1.3.6-r1.ebuild:
-  stable on amd64
-
-  25 Aug 2004; <solar@gentoo.org> gcc-config-1.3.6-r1.ebuild:
-  marked gcc-config-1.3.6-r1 stable on x86 and arm
-
-*gcc-config-1.3.6-r1 (24 Jul 2004)
-
-  24 Jul 2004; Martin Schlemmer <azarah@gentoo.org> files/gcc-config-1.3.6,
-  +gcc-config-1.3.6-r1.ebuild:
-  Some cleanup that remove use of which from ferret <james.noble@worc.ox.ac.uk>,
-  bug #55262.
-
-  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  gcc-config-1.3.3-r1.ebuild, gcc-config-1.3.3-r2.ebuild,
-  gcc-config-1.3.4.ebuild, gcc-config-1.3.5-r1.ebuild,
-  gcc-config-1.3.5.ebuild, gcc-config-1.3.6.ebuild:
-  virtual/glibc -> virtual/libc
-
-  19 Jun 2004; Martin Schlemmer <azarah@gentoo.org> gcc-config-1.3.5.ebuild:
-  Mark stable for all.
-
-*gcc-config-1.3.6 (19 Jun 2004)
-
-  19 Jun 2004; Martin Schlemmer <azarah@gentoo.org> +files/gcc-config-1.3.6,
-  +gcc-config-1.3.6.ebuild:
-  Make sure we cleanup stale wrappers, bug #36388.
-
-  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org>
-  gcc-config-1.3.5-r1.ebuild:
-  Stable on alpha.
-
-  02 Jun 2004; Travis Tilley <lv@gentoo.org> gcc-config-1.3.5-r1.ebuild:
-  stable on amd64
-
-  10 May 2004; Michael McCabe <randy@gentoo.org> gcc-config-1.3.5-r1.ebuild:
-  Stable on s390
-
-*gcc-config-1.3.5-r1 (06 May 2004)
-
-  06 May 2004; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.3.5,
-  files/gcc-config-1.3.5-multi-ldpath, gcc-config-1.3.5.ebuild,
-  +gcc-config-1.3.5-r1.ebuild:
-  Clean up the help output, add support for -v|--version and -h|--help options,
-  and then add the version to the gcc-config after installing.
-  Unify the multi-ldpath crap since there are no real differences between
-  the two to fix #29950 by Brad House.
-  Add environment printing fix #48492 by splite.
-
-*gcc-config-1.3.5 (08 Feb 2004)
-
-  08 Feb 2004; Martin Schlemmer <azarah@gentoo.org> gcc-config-1.3.5.ebuild,
-  files/gcc-config-1.3.5, files/wrapper-1.4.2.c:
-  Update wrapper to also treat symlinks as valid targets - this fixes a problem
-  where $CHOST-gcc called the symlink, and not the proper binary. Also fix a few
-  issues where we used data->tmp as they can cause possible corruption when used
-  in recursive calls and child functions.  Closes bug #39162.
-
-*gcc-config-1.3.4 (18 Nov 2003)
-
-  18 Nov 2003; Martin Schlemmer <azarah@gentoo.org> gcc-config-1.3.4.ebuild,
-  files/gcc-config-1.3.4, files/gcc-config-1.3.4-multi-ldpath:
-  I did not use REAL_CHOST in all cases, ending up with /usr/bin/-gcc, etc
-  files, as CHOST was not set.
-
-*gcc-config-1.3.3-r2 (18 Oct 2003)
-
-  18 Oct 2003; Brad House <brad_mssw@gentoo.org> gcc-config-1.3.3-r2.ebuild,
-  files/gcc-config-1.3.3-multi-ldpath:
-  necessary gcc-config changes made for amd64 and 3.3.1-r5. Marked -* ~amd64
-
-  11 May 2003; Martin Schlemmer <azarah@gentoo.org> gcc-config-1.3.3-r1 :
-  Mark stable for all, as if fixes a few bugs.
-
-*gcc-config-1.3.3-r1 (28 Apr 2003)
-
-  28 Apr 2003; Martin Schlemmer <azarah@gentoo.org> gcc-config-1.3.3-r1,
-  gcc-config-1.3.3 :
-  Update gcc-config-1.3.3 to use the absolute path to portageq, else it
-  breaks things.  Thanks to Spider <spider@gentoo.org> for noticing this.
-
-  12 Apr 2003; Martin Schlemmer <azarah@gentoo.org> files/wrapper-1.4.1.c :
-  Update wrapper as I suggested in bug #18933 to be able to handle cross
-  compiler frontends ...
-
-*gcc-config-1.3.3 (12 Apr 2003)
-
-  12 Apr 2003; Martin Schlemmer <azarah@gentoo.org> gcc-config-1.3.3.ebuild,
-  files/gcc-config-1.3.3, files/wrapper-1.4.1.c :
-  New version:
-  - Update the wrapper to scan /etc/env.d/05gcc for PATH, and then append this
-    to caller name if successful.  This should improve speed much if PATH is
-    not setup properly, as we do not have to run gcc-config ...  This is a
-    much better solution for bug #18766.
-  - Add short options to gcc-config, closing bug #13005.
-  - Add the ability to choose the profile by a number, as listed by running
-    'gcc-config --list-profiles', closing bug #13005.
-
-*gcc-config-1.3.2 (08 Apr 2003)
-
-  08 Apr 2003; Martin Schlemmer <azarah@gentoo.org> gcc-config-1.3.2.ebuild,
-  files/gcc-config-1.3.2, files/gcc-config-1.4.1 :
-  Add speed optimization patch from Aron Griffis <agriffis@gentoo.org>. 
-  Basically we only get the CHOST from portage if needed ... closes bug #18766.
-  Use wrapper-1.4.c ...
-
-*gcc-config-1.3.1-r1 (06 Apr 2003)
-
-  06 Apr 2003; Zach Welch <zwelch@gentoo.org> gcc-config-1.3.1-r1.ebuild,
-  gcc-config-1.3.1.ebuild, files/gcc-config-1.3.1, files/gcc-config-1.4.1 :
-  change return to exit in gcc-config script, and minor fix for distcc
-   and cross-compiling compatibility.
-  Note: The latest gcc-config-1.4 is almost ready for production, but
-   these changes are still too experimental to commit an ebuild.  Even
-   so, I am also updating the gcc-config script to reflect the latest
-   status.  Still no ebuild for now.
-
-  23 Feb 2003; Martin Schlemmer <azarah@gentoo.org> gcc-config-1.4,
-                                                    wrapper-1.4.c :
-  - Add gcc-config-1.4 with '--install-toolchain' support written by
-    Zach Welch <zwelch@gentoo.org>.  I am not 100% sure on the status
-    on this, so not adding a ebuild for now.
-  - Add wrapper-1.4.c that is borken up in functions.  This is also
-    thanks to Zach Welch <zwelch@gentoo.org>.  I also tweaked it to
-    modify PATH by appending gcc's bin path to it ... this should
-    speed up calls gcc does to its tools.  I also fixed a few possible
-    memory leaks.
-
-  19 Feb 2003; Guy Martin <gmsoft@gneoot.org> gcc-config-1.3.1.ebuild :
-  Changed ~hppa to hppa.
-
-*gcc-config-1.3.1 (19 Jan 2003)
-
-  28 Mar 2003; Christian Birchinger <joker@gentoo.org>
-  gcc-config-1.3.1.ebuild:
-  Added stable sparc keyword
-
-  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> gcc-config-1.3.1.ebuild :
-  Changed mips keyword to stable.
-
-  21 Feb 2003; Aron Griffis <agriffis@gentoo.org> gcc-config-1.3.1.ebuild :
-  Mark stable on alpha
-
-  18 Feb 2003;  Zach Welch <zwelch@gentoo.org> gcc-config-1.3.1.ebuild :
-  Add stable for arm
-  
-  18 Feb 2003;  Seemant <seemant@gentoo.org> gcc-config-1.3.1.ebuild :
-  moved to stable for x86
-
-  19 Feb 2003; Martin Schlemmer <azarah@gentoo.org> gcc-config-1.3.1 :
-
-  Some tweaks to try minimize subshells.
-
-  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> gcc-config-1.2.7.ebuild :
-  
-  Added hppa keyword to gcc-config-1.2.7.ebuild and ~hppa keyword on
-  latests versions up to gcc-config-1.3.1.ebuild.
-
-  14 Feb 2003; Mark Guertin <gerk@gentoo.org> gcc-config-1.3.1.ebuild :
-  added ppc to keywords
-
-  19 Jan 2003; Martin Schlemmer <azarah@gentoo.org> gcc-config-1.3.1.ebuild :
-
-  Use the 'which' command to find commands if present to give a bit of a
-  speedup.  Display a warning about sourcing /etc/profile if you change the
-  default profile to stop confusion.
-
-  Fix a segfault in wrapper.c if $PATH is not set.  Many thanks to
-  Eric Andresen <ndiin1@cox.net> for reporting this.
-
-  19 Jan 2003; Martin Schlemmer <azarah@gentoo.org> wrapper.c :
-
-  Fix to check if '/gcc-bin/' in full name of called gcc, once again thanks
-  to feedback from Eric Andresen <ndiin1@cox.net>.
-
-*gcc-config-1.3.0 (16 Jan 2003)
-
-  16 Jan 2003; Martin Schlemmer <azarah@gentoo.org> gcc-config-1.3.0.ebuild :
-
-  Set argv[0] to the correct binary, else gcc do not find internal
-  headers, etc (bug #8132).  Fixed files/wrapper.c for this.
-
-*gcc-config-1.2.9 (15 Jan 2003)
-
-  15 Jan 2003; Martin Schlemmer <azarah@gentoo.org> gcc-config-1.2.9.ebuild :
-
-  Fix wrapper calling cc-config.
-
-*gcc-config-1.2.8 (15 Jan 2003)
-
-  15 Jan 2003; Martin Schlemmer <azarah@gentoo.org> gcc-config-1.2.8.ebuild :
-
-  Add C wrapper to call the real binaries.
-
-  02 Jan 2003; Martin Schlemmer <azarah@gentoo.org> gcc-config-1.2.7.ebuild :
-
-  Update usage screen to be more compact.  Also should be more consistant
-  with other unix tools.  Bug #13005.
-
-*gcc-config-1.2.7 (25 Dec 2002)
-
-  06 Jan 2003; Jan Seidel <tuxus@gentoo.org> gcc-config-1.2.7.ebuild :
-  Added mips to keywords.
-
-  25 Dec 2002; Martin Schlemmer <azarah@gentoo.org> gcc-config-1.2.7.ebuild :
-
-  Add colorgcc support, partly a fix for bug #12689.
-
-*gcc-config-1.2.6 (23 Dec 2002)
-
-  24 Dec 2002; Martin Schlemmer <azarah@gentoo.org> gcc-config-1.2.6.ebuild :
-
-  In some cases we have an old /usr/bin/cpp binary that was not unmerged from
-  non multi arch/version scheme gcc's.  If so, backup it, and replace with a
-  wrapper script.
-
-*gcc-config-1.2.5 (23 Dec 2002)
-
-  23 Dec 2002; Martin Schlemmer <azarah@gentoo.org> gcc-config-1.2.5.ebuild :
-
-  Add --print-environ switch.  Add /usr/bin/cpp wrapper.  Fix the wrapper
-  to setup PATH if it cannot find cpp, or if 'which cpp' give /usr/bin/cpp.
-
-  17 Dec 2002; Martin Schlemmer <azarah@gentoo.org> gcc-config-1.2.4 :
-
-  Do not add a LDPATH if the directory do not exist.
-
-*gcc-config-1.2.4 (16 Dec 2002)
-
-  16 Dec 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  More fixes for wrappers.
-
-*gcc-config-1.2.3 (16 Dec 2002)
-
-  16 Dec 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  Regenerate /lib/cpp and /usr/bin/cc if they do not exist, or
-  are symlinks ..  Run gcc-config in pkg_postinst().
-
-*gcc-config-1.2.2 (16 Dec 2002)
-
-  16 Dec 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  Update to handle wrappers used for /lib/cpp and /usr/bin/cc in
-  new gcc ebuilds.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*gcc-config-1.2.1 (27 Nov 2002)
-
-  27 Nov 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  Update to only biatch about not being root if the user
-  tries to change the system profile, thanks rphillips!
-
-*gcc-config-1.2 (10 Nov 2002)
-
-  10 Nov 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  Include all LDPATH's for this CHOST in /etc/ld.so.conf.
-  Add --use-portage-chost option so that it will only change
-  gcc profile if CHOST is same as that of make.conf.
-
-*gcc-config-1.1 (10 Nov 2002)
-
-  10 Nov 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  New version with lots of options, and help.
-
-*gcc-config-1.0 (28 Oct 2002)
+*gcc-config (28 Oct 2002)
 
   28 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
 
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index ad23d2eed7eb..5cb39ab3fe52 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,18 +1,26 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 68d7c52689871082544aeb69f4022805 ChangeLog 22219
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.12-r4 0
-MD5 c7cf3a3617d90adfaacc7c2c012ddfb0 files/digest-gcc-config-2.0.0_beta2 79
-MD5 643fbfcd540ed13702f68543c7527467 files/gcc-config-1.3.12 17269
-MD5 1b19cf481e2777dff9722f36698c3b24 files/wrapper-1.4.7.c 9837
-MD5 c9487fb4c13f7250b9dc782f6e8f5358 gcc-config-1.3.12-r4.ebuild 1379
-MD5 35fee17d74ce037258c00f8d9e9dd820 gcc-config-2.0.0_beta2.ebuild 781
-MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDfrcXgIKl8Uu19MoRApOJAJ9W5fCiNzwMSAtnT75DNfSRckdz1gCfY9wk
-ZtHzaP52oarGFYzLYeYCmRY=
-=4k4x
------END PGP SIGNATURE-----
+MD5 c91fc4e0f5e15bdb18fc1a22d36d3d64 ChangeLog 6808
+MD5 0933e6187cc0f10fa79b8504e7a3bd0e gcc-config-1.3.0.ebuild 2110
+MD5 bf152d57fe541758440ba7cbb075a48b gcc-config-1.3.3.ebuild 2227
+MD5 237a7e0aff8c90471ebe138056a1bf39 gcc-config-1.2.7.ebuild 1151
+MD5 bd5d1a41047e3190e7f3697af110a4ca gcc-config-1.3.1.ebuild 2116
+MD5 6452b1b7e2965406699a68f155e2f09e gcc-config-1.2.9.ebuild 2110
+MD5 1fcaa8baac08be099a2e9a6db575101b gcc-config-1.3.2.ebuild 2187
+MD5 089a5bea5fb05ee899513e43703d1013 gcc-config-1.3.1-r1.ebuild 2118
+MD5 9b87bd79f5c7f42b0a93e944c79a89b2 files/gcc-config-1.3.0 7131
+MD5 a4fe6c2cc89bb24276a53da0fb4def9e files/wrapper.c 3527
+MD5 98ae7460e20ff7907863052a863ab8ff files/gcc-config-1.3.1 8106
+MD5 40100df067977032972172e4eb5cab05 files/gcc-config-1.2.7 8674
+MD5 74b64ed0357aac8ab553b55674ea6856 files/wrapper-1.4.1.c 7529
+MD5 ee11abc1908b09d4ef5613f365202047 files/digest-gcc-config-1.3.0 192
+MD5 44cb03b926702bd77bb7bbe84499348e files/gcc-config-1.4 11992
+MD5 dbc7a76dc0e32a1b8734a44c00aa9abe files/digest-gcc-config-1.3.1 585
+MD5 27740a9a29d5fa3a86a48a49da0c6a5c files/wrapper-1.4.c 5643
+MD5 d67caec5e784562eeb88f280275e37b6 files/gcc-config-1.3.3 8724
+MD5 5c9af84b60b56c0d51946122de783fc8 files/digest-gcc-config-1.2.7 133
+MD5 8fe8bc98220d370e07b824abb03a1431 files/gcc-config-1.2.9 7131
+MD5 38cdf2331e78ec65c5a18c6a73f2dc1a files/gcc-config-1.4.1 12952
+MD5 940b44dc4f88a8a66c5358a2def4e10d files/digest-gcc-config-1.3.1-r1 195
+MD5 25f549ddaa5e6a0bc727eeeb780160a7 files/digest-gcc-config-1.2.9 192
+MD5 db27b57ff02fb5409cbc1b96c7e66f71 files/digest-gcc-config-1.3.2 196
+MD5 9487c159095950beeae4efd6adc4217f files/gcc-config-1.3.2 8145
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.3 0
diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.12 b/sys-devel/gcc-config/files/gcc-config-1.3.12
index 3105577d8e15..926ac6554f6a 100755
--- a/sys-devel/gcc-config/files/gcc-config-1.3.12
+++ b/sys-devel/gcc-config/files/gcc-config-1.3.12
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.12,v 1.9 2005/11/19 05:23:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.12,v 1.1 2005/07/09 16:52:24 vapier Exp $
 
 trap ":" INT QUIT TSTP
 
@@ -81,24 +81,6 @@ cmd_setup() {
 	ENV_UPDATE=$(find_path env-update)
 }
 
-cheap_portageq_envvar() {
-	local varname=$1
-	local conf=${ROOT}/etc/make.conf
-	local ret=$(source "${conf}" 2>/dev/null ; echo ${!varname})
-	if [[ -z ${ret} ]] ; then
-		# newer portage supports spaces between the var and =
-		# CHOST     =  "this-is-retarded"
-		ret=$(eval $(
-			${SED} -n \
-				-e 's:[[:space:]]::g' \
-				-e '/^CHOST=/p' \
-				"${conf}"
-			) ; echo ${!varname}
-		)
-	fi
-	echo ${ret}
-}
-
 get_real_chost() {
 	[[ -n ${REAL_CHOST} ]] && return 0
 
@@ -106,15 +88,12 @@ get_real_chost() {
 	if ${PYTHON} -V &>/dev/null ; then
 		export REAL_CHOST=$(${ENV} -i ${PORTAGEQ} envvar CHOST 2>/dev/null)
 	else
-		export REAL_CHOST=$(cheap_portageq_envvar CHOST)
+		export REAL_CHOST=$(source "${ROOT}"/etc/make.conf ; echo ${CHOST})
 	fi
 
 	if [[ -z ${REAL_CHOST} ]] ; then
 		eerror "$0: Could not get portage CHOST!"
-		eerror "$0: You should verify that CHOST is set in one of these places:"
-		eerror "$0:  - ${ROOT}/etc/make.conf"
-		eerror "$0:  - active environment"
-		exit 1
+		return 1
 	fi
 }
 
@@ -134,11 +113,7 @@ switch_profile() {
 		exit 1
 	fi
 
-	if is_cross_compiler ; then
-		ebegin "Switching cross-compiler to ${CC_COMP}"
-	else
-		ebegin "Switching native-compiler to ${CC_COMP}"
-	fi
+	ebegin "Switching to ${CC_COMP} compiler"
 
 	# Sourcing /etc/env.d/gcc/${CC_COMP} is going to mess up
 	# PATH among things...
@@ -321,7 +296,7 @@ get_current_profile() {
 	local conf="${GCC_ENV_D}/config"
 	if [[ -n ${CTARGET} ]] ; then
 		conf="${conf}-${CTARGET}"
-	elif [[ -n ${CC_COMP} ]] && is_cross_compiler ; then
+	elif [[ -f ${GCC_ENV_D}/config-${CC_COMP} ]] ; then
 		conf="${conf}-${CC_COMP}"
 	fi
 
@@ -345,35 +320,21 @@ get_current_profile() {
 list_profiles() {
 	local i=1
 
-	if [[ ${ROOT} != "/" ]] ; then
-		echo "Using gcc-config info in ${ROOT}"
-	fi
-
 	if [[ ! -f ${GCC_ENV_D}/config ]] ; then
 		eerror "$0: No gcc profile is active; please select one!"
+	else
+		get_current_profile >/dev/null
 	fi
 
-	eval $(grep ^CURRENT= "${GCC_ENV_D}"/config)
-	CURRENT_NATIVE=${CURRENT}
-	local target=
+	if [[ ${ROOT} != "/" ]] ; then
+		echo "Using gcc-config info in ${ROOT}"
+	fi
 	for x in "${GCC_ENV_D}"/* ; do
 		if [[ -f ${x} ]] && [[ ${x/\/config} == ${x} ]] ; then
-			source "${x}"
-			if [[ ${target} != ${CTARGET} ]] ; then
-				[[ -n ${target} ]] && echo
-				target=${CTARGET}
-				CTARGET=""
-			fi
-
 			x=${x##*/}
-			if [[ ${x} == ${CURRENT_NATIVE} ]] ; then
-				x="${x} ${GOOD}*${NORMAL}"
-			elif [[ -e ${GCC_ENV_D}/config-${target} ]] ; then
-				source "${GCC_ENV_D}/config-${target}"
-				[[ ${x} == ${CURRENT} ]] && x="${x} ${HILITE}*${NORMAL}"
-			fi
-			echo " [${i}] ${x}"
-			((++i))
+			[[ ${x} == ${CURRENT} ]] && x="${x} *"
+			echo "[${i}] ${x}"
+			i=$((i + 1))
 		fi
 	done
 }
@@ -502,9 +463,6 @@ for x in "$@" ; do
 		-O|--use-old)
 			if get_current_profile &>/dev/null ; then
 				CC_COMP="$(get_current_profile)"
-			else
-				eerror "No profile selected, unable to utilize --use-old"
-				exit 1
 			fi
 			;;
 		-f|--force)
@@ -526,7 +484,7 @@ for x in "$@" ; do
 			fi
 			;;
 		-S|--split-profile)
-			if [[ ( $1 != "-S" && $1 != "--split-profile" ) || $# -eq 1 ]] ; then
+			if [[ $1 != "-S" || $# -eq 1 ]] ; then
 				usage 1
 			fi
 			shift # push -S out
@@ -579,10 +537,10 @@ for x in "$@" ; do
 						[[ ${y/\/config} != ${y} ]] && continue
 
 						if [[ -f ${y} ]] && [[ ${x} == ${i} ]] ; then
-							CC_COMP=${y##*/}
+							CC_COMP="${y##*/}"
 							break
 						fi
-						((++i))
+						i=$((i + 1))
 					done
 				else
 					# User gave us a full HOST-gccver
@@ -590,16 +548,10 @@ for x in "$@" ; do
 					if [[ ${DOIT} == "get_current_profile" && -z $(ls "${GCC_ENV_D}"/${x}-* 2>/dev/null) ]] || \
 					   [[ ${DOIT} != "get_current_profile" && ! -f ${GCC_ENV_D}/${x} ]]
 					then
-						# Maybe they just gave us a gccver ...
-						get_real_chost
-						if [[ -f ${GCC_ENV_D}/${REAL_CHOST}-${x} ]] ; then
-							x=${REAL_CHOST}-${x}
-						else
-							eerror "$0: Could not locate '$x' in '${GCC_ENV_D}/' !"
-							exit 1
-						fi
+						eerror "$0: Could not locate '$x' in '${GCC_ENV_D}/' !"
+						exit 1
 					fi
-					CC_COMP=${x}
+					CC_COMP="${x}"
 				fi
 			else
 				eerror "$0: Too many arguments!  Run $0 without parameters for help."
@@ -613,10 +565,9 @@ if [[ ${DOIT} == "switch_profile" ]] && [[ -z ${CC_COMP} ]] ; then
 	usage 1
 fi
 
-cmd_setup
-
 if [[ -z ${CC_COMP} ]] ; then
-	if get_current_profile &>/dev/null ; then
+	if get_current_profile &>/dev/null
+	then
 		CC_COMP="$(get_current_profile)"
 	else
 		list_profiles
@@ -627,6 +578,7 @@ fi
 if [[ ${DOIT} != "get_current_profile" ]] ; then
 	GCC_LIB=$(
 		source "${GCC_ENV_D}/${CC_COMP}"
+		cmd_setup
 		echo ${LDPATH} | ${AWK} -F/ '{ print  "/"$2"/"$3"/"$4"/" }'
 	)
 
diff --git a/sys-devel/gcc-config/metadata.xml b/sys-devel/gcc-config/metadata.xml
index fb4199eb7afe..f093d416cbb1 100644
--- a/sys-devel/gcc-config/metadata.xml
+++ b/sys-devel/gcc-config/metadata.xml
@@ -1,5 +1,7 @@
+ [32;01m*[0m Generated metadata.xml:
+
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>toolchain</herd>
+<herd>base-system</herd>
 </pkgmetadata>
diff --git a/sys-devel/gcc-hppa64/ChangeLog b/sys-devel/gcc-hppa64/ChangeLog
index f11505bde607..3e008b63bd92 100644
--- a/sys-devel/gcc-hppa64/ChangeLog
+++ b/sys-devel/gcc-hppa64/ChangeLog
@@ -1,34 +1,8 @@
 # ChangeLog for sys-devel/gcc-hppa64
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-hppa64/ChangeLog,v 1.8 2004/07/02 09:32:39 eradicator Exp $
-
-  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  gcc-hppa64-3.3.2-r1.ebuild, gcc-hppa64-3.3.2.ebuild,
-  gcc-hppa64-3.4.0.ebuild:
-  virtual/glibc -> virtual/libc
-
-*gcc-hppa64-3.3.2-r1 (23 Jun 2004)
-
-  23 Jun 2004; Guy Martin <gmsoft@gentoo.org> gcc-hppa64-3.3.2-r1.ebuild:
-  Fixed rtl-optimization for gcc 3.3.2 as well.
-
-*gcc-hppa64-3.4.0 (22 Jun 2004)
-
-  22 Jun 2004; Guy Martin <gmsoft@gentoo.org> gcc-hppa64-3.4.0.ebuild,
-  files/gcc-3.4.0-gentoo-branding.patch,
-  files/gcc-3.4.0-rtl-optimization.patch:
-  New gcc-3.4.0. Hardmasked for now. needs testing.
-
-  13 May 2004; Guy Martin <gmsoft@gentoo.org> gcc-hppa64-3.3.2.ebuild:
-  Marked stable on hppa.
-
-  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> gcc-hppa64-3.3.2.ebuild:
-  Add inherit eutils
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-hppa64/ChangeLog,v 1.1 2004/01/03 18:49:19 gmsoft Exp $
 
 *gcc-hppa64-3.3.2 (03 Jan 2004)
 
-  07 Jan 2004; Guy Martin <gmsoft@gentoo.org> gcc-hppa64-3.3.2.ebuild :
-  Added DEPEND >=binutils-hppa64-2.14.90.0.7.
-
-  03 Jan 2004; Guy Martin <gmsoft@gentoo.org> gcc-hppa64-3.3.2.ebuild :
+  03 Jan 2004; Guy Martin <gmsoft@gentoo.org> gcc-hppa64-3.3.2 :
   First commit of gcc for hppa64. This one will compile 64 bit kernels.
diff --git a/sys-devel/gcc-hppa64/Manifest b/sys-devel/gcc-hppa64/Manifest
index ee1383510728..e878a6f86304 100644
--- a/sys-devel/gcc-hppa64/Manifest
+++ b/sys-devel/gcc-hppa64/Manifest
@@ -1,12 +1,4 @@
-MD5 83ef63e1e7d02336c0ebba43fa81aef5 gcc-hppa64-3.3.2.ebuild 2264
-MD5 1a1f047bfa2fd2e0b477ed8ce1a1d90c gcc-hppa64-3.4.0.ebuild 2352
-MD5 fd281452f7ed3759922fd322e26bfecc gcc-hppa64-3.3.2-r1.ebuild 2320
-MD5 ab3eb16034aefb4171b66565e38d5195 ChangeLog 1278
-MD5 016028badcf024e3ef4688435ffbce58 metadata.xml 223
-MD5 dcdd2cf7d57f6edf2fbe8c2063f76376 files/gcc-3.3.2-rtl-optimization.patch 6624
-MD5 23e11b0b1e3621760d3e4d831d000161 files/gcc-3.4.0-gentoo-branding.patch 843
-MD5 d9ae122db2768f8e504dfef256d4991f files/gcc-3.3.2-gentoo-branding.patch 874
-MD5 006481ae255582fae4fa22107dfb359e files/digest-gcc-hppa64-3.3.2-r1 64
+MD5 001233c3709b6668d9a2201e9dbc02c6 ChangeLog 397
+MD5 5fd341e522651617875c363183278b96 gcc-hppa64-3.3.2.ebuild 2228
 MD5 006481ae255582fae4fa22107dfb359e files/digest-gcc-hppa64-3.3.2 64
-MD5 c18300f698a8fd5c824c1ddb4d0685dd files/digest-gcc-hppa64-3.4.0 64
-MD5 b859dad4b64217f98ba18423c059e30f files/gcc-3.4.0-rtl-optimization.patch 5681
+MD5 d9ae122db2768f8e504dfef256d4991f files/gcc-3.3.2-gentoo-branding.patch 874
diff --git a/sys-devel/gcc-hppa64/gcc-hppa64-3.3.2-r1.ebuild b/sys-devel/gcc-hppa64/gcc-hppa64-3.3.2-r1.ebuild
index 92364d44d829..a6215ae0a111 100644
--- a/sys-devel/gcc-hppa64/gcc-hppa64-3.3.2-r1.ebuild
+++ b/sys-devel/gcc-hppa64/gcc-hppa64-3.3.2-r1.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-hppa64/gcc-hppa64-3.3.2-r1.ebuild,v 1.4 2004/07/15 03:23:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-hppa64/gcc-hppa64-3.3.2-r1.ebuild,v 1.1 2004/06/23 15:34:57 gmsoft Exp $
 
 inherit eutils
 
 
-# Variables
+# Variables 
 MYARCH="$(echo ${PN} | cut -d- -f2)"
 TMP_P="${P/-${MYARCH}/}"
 TMP_PN="${PN/-${MYARCH}/}"
 I="/usr"
+S="${WORKDIR}/${P}"
 
 
 DESCRIPTION="Gcc for 64bit hppa kernels"
@@ -19,14 +20,13 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 
 KEYWORDS="-* hppa"
-IUSE="build"
 
-DEPEND="virtual/libc
+DEPEND="virtual/glibc
 	>=sys-devel/binutils-hppa64-2.14.90.0.7
 	>=sys-devel/binutils-2.14.90.0.7
 	>=sys-devel/gcc-config-1.3.1"
 
-RDEPEND="virtual/libc
+RDEPEND="virtual/glibc
 	>=sys-devel/gcc-config-1.3.1
 	>=sys-libs/zlib-1.1.4
 	>=sys-apps/texinfo-4.2-r4
diff --git a/sys-devel/gcc-hppa64/gcc-hppa64-3.3.2.ebuild b/sys-devel/gcc-hppa64/gcc-hppa64-3.3.2.ebuild
index a0cb8a931107..4ed820c86f91 100644
--- a/sys-devel/gcc-hppa64/gcc-hppa64-3.3.2.ebuild
+++ b/sys-devel/gcc-hppa64/gcc-hppa64-3.3.2.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-hppa64/gcc-hppa64-3.3.2.ebuild,v 1.7 2004/07/15 03:23:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-hppa64/gcc-hppa64-3.3.2.ebuild,v 1.1 2004/01/03 18:49:19 gmsoft Exp $
 
-inherit eutils
 
-
-# Variables
+# Variables 
 MYARCH="$(echo ${PN} | cut -d- -f2)"
 TMP_P="${P/-${MYARCH}/}"
 TMP_PN="${PN/-${MYARCH}/}"
 I="/usr"
+S="${WORKDIR}/${P}"
 
 
 DESCRIPTION="Gcc for 64bit hppa kernels"
@@ -18,15 +17,13 @@ SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${TMP_P}/${TMP_P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="-* hppa"
-IUSE="build"
+KEYWORDS="-* ~hppa"
 
-DEPEND="virtual/libc
-	>=sys-devel/binutils-hppa64-2.14.90.0.7
+DEPEND="virtual/glibc
 	>=sys-devel/binutils-2.14.90.0.7
 	>=sys-devel/gcc-config-1.3.1"
 
-RDEPEND="virtual/libc
+RDEPEND="virtual/glibc
 	>=sys-devel/gcc-config-1.3.1
 	>=sys-libs/zlib-1.1.4
 	>=sys-apps/texinfo-4.2-r4
diff --git a/sys-devel/gcc-hppa64/gcc-hppa64-3.4.0.ebuild b/sys-devel/gcc-hppa64/gcc-hppa64-3.4.0.ebuild
index 7497ceb390fa..eba324044201 100644
--- a/sys-devel/gcc-hppa64/gcc-hppa64-3.4.0.ebuild
+++ b/sys-devel/gcc-hppa64/gcc-hppa64-3.4.0.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-hppa64/gcc-hppa64-3.4.0.ebuild,v 1.4 2004/07/15 03:23:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-hppa64/gcc-hppa64-3.4.0.ebuild,v 1.1 2004/06/22 13:13:16 gmsoft Exp $
 
 inherit eutils
 
 
-# Variables
+# Variables 
 MYARCH="$(echo ${PN} | cut -d- -f2)"
 TMP_P="${P/-${MYARCH}/}"
 TMP_PN="${PN/-${MYARCH}/}"
 I="/usr"
+S="${WORKDIR}/${P}"
 
 
 DESCRIPTION="Gcc for 64bit hppa kernels"
@@ -19,14 +20,13 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 
 KEYWORDS="-* -hppa"
-IUSE="build"
 
-DEPEND="virtual/libc
+DEPEND="virtual/glibc
 	>=sys-devel/binutils-hppa64-2.14.90.0.7
 	>=sys-devel/binutils-2.14.90.0.7
 	>=sys-devel/gcc-config-1.3.1"
 
-RDEPEND="virtual/libc
+RDEPEND="virtual/glibc
 	>=sys-devel/gcc-config-1.3.1
 	>=sys-libs/zlib-1.1.4
 	>=sys-apps/texinfo-4.2-r4
diff --git a/sys-devel/gcc-mips64/ChangeLog b/sys-devel/gcc-mips64/ChangeLog
index e85228c8f6e0..cad1dc94c8e6 100644
--- a/sys-devel/gcc-mips64/ChangeLog
+++ b/sys-devel/gcc-mips64/ChangeLog
@@ -1,69 +1,9 @@
 # ChangeLog for sys-devel/gcc-mips64
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-mips64/ChangeLog,v 1.13 2005/10/16 04:42:00 kumba Exp $
+# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-mips64/ChangeLog,v 1.1 2003/11/17 02:03:26 kumba Exp $
 
-*gcc-mips64-3.4.4 (16 Oct 2005)
-
-  16 Oct 2005; Joshua Kinard <kumba@gentoo.org>
-  +files/gcc-3.4.2-mips-ip28_cache_barriers-v2.patch,
-  +files/gcc-3.4.x-mips-add-march-r10k.patch, -gcc-mips64-3.3.4.ebuild,
-  +gcc-mips64-3.4.4.ebuild:
-  Import a gcc-3.4.4 kernel compiler for mips64.
-
-  06 Feb 2005; Joshua Kinard <kumba@gentoo.org> gcc-mips64-3.4.3-r1.ebuild:
-  Marked stable on mips.
-
-*gcc-mips64-3.4.3-r1 (09 Jan 2005)
-
-  09 Jan 2005; Joshua Kinard <kumba@gentoo.org>
-  +files/gcc-3.4.2-mips-ip28_cache_barriers.patch,
-  +gcc-mips64-3.4.3-r1.ebuild, -gcc-mips64-3.4.3.ebuild:
-  Add ip28 cache barrier patch for gcc-mips64. Anyone using this probably has an
-  inkling of what it does. Only used in this case for kernels. The system gcc
-  can use it for other things is absolutely needed.
-
-  09 Dec 2004; Joshua Kinard <kumba@gentoo.org>
-  -files/gcc-3.3.1-gentoo-branding.patch,
-  -files/gcc-3.3.2-gentoo-branding.patch,
-  -files/gcc-3.3.3-gentoo-branding.patch, -gcc-mips64-3.3.1.ebuild,
-  -gcc-mips64-3.3.2.ebuild, -gcc-mips64-3.3.3.ebuild, gcc-mips64-3.3.4.ebuild,
-  gcc-mips64-3.4.3.ebuild:
-  Fix message in postinst to give correct commands for 2.4.x and 2.6.x builds,
-  and remove old versions.
-
-*gcc-mips64-3.4.3 (11 Nov 2004)
-
-  11 Nov 2004; Joshua Kinard <kumba@gentoo.org> +gcc-mips64-3.4.3.ebuild:
-  Added ebuild for gcc-mips64-3.4.3.
-
-  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> gcc-mips64-3.3.1.ebuild,
-  gcc-mips64-3.3.2.ebuild, gcc-mips64-3.3.3.ebuild, gcc-mips64-3.3.4.ebuild:
-  Switch to use epause and ebeep, bug #62950
-
-*gcc-mips64-3.3.4 (22 Jul 2004)
-
-  22 Jul 2004; Joshua Kinard <kumba@gentoo.org>
-  +files/gcc-3.3.4-gentoo-branding.patch, +gcc-mips64-3.3.4.ebuild:
-  Added ebuild for 3.3.4 version of mips64 compiler.
-
-  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  gcc-mips64-3.3.1.ebuild, gcc-mips64-3.3.2.ebuild, gcc-mips64-3.3.3.ebuild:
-  virtual/glibc -> virtual/libc
-
-  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> gcc-mips64-3.3.1.ebuild,
-  gcc-mips64-3.3.2.ebuild:
-  Add inherit eutils
-
-*gcc-mips64-3.3.3 (18 Feb 2004)
-
-  18 Feb 2004; Joshua Kinard <kumba@gentoo.org> gcc-mips64-3.3.1.ebuild,
-  gcc-mips64-3.3.2.ebuild, gcc-mips64-3.3.3.ebuild,
-  files/gcc-3.3.3-gentoo-branding.patch:
-  New gcc-3.3.3 release (on 20040214) and also includes a 20040217 branch update
-  to match the system compiler.
 
 *gcc-mips64-3.3.2 (16 Nov 2003)
-*gcc-mips64-3.3.1 (16 Nov 2003)
 
   16 Nov 2003; Joshua Kinard <kumba@gentoo.org> gcc-mips64-3.3.1.ebuild,
   gcc-mips64-3.3.2.ebuild, files/gcc-3.3.1-gentoo-branding.patch,
diff --git a/sys-devel/gcc-mips64/Manifest b/sys-devel/gcc-mips64/Manifest
index 79cdca9615a5..1bac11ddf5ee 100644
--- a/sys-devel/gcc-mips64/Manifest
+++ b/sys-devel/gcc-mips64/Manifest
@@ -1,10 +1,8 @@
-MD5 a11b6eb55349d1f0889e35cbee226817 ChangeLog 2906
-MD5 2ca380cbcf0547fb5d2a671c1c0296de files/digest-gcc-mips64-3.4.3-r1 64
-MD5 4b8b4306f268900392bbd0319bdfdf65 files/digest-gcc-mips64-3.4.4 64
-MD5 e411938ca2908079a2359fed5cb3b442 files/gcc-3.3.4-gentoo-branding.patch 874
-MD5 1134e9dabbd6dfba1d91015851f02a2b files/gcc-3.4.2-mips-ip28_cache_barriers-v2.patch 14118
-MD5 f3a1b668077c6486c542dcef1cdd9672 files/gcc-3.4.2-mips-ip28_cache_barriers.patch 12545
-MD5 b2922cfe76692e7d2b373a0a255f405e files/gcc-3.4.x-mips-add-march-r10k.patch 14248
-MD5 e4b8145c02cf6a3eaa55f97f715d9677 gcc-mips64-3.4.3-r1.ebuild 3578
-MD5 3a64be2614c445cb7fb807a2b4d97b7f gcc-mips64-3.4.4.ebuild 3651
+MD5 19773e5c3aad1564738f06810cb12776 gcc-mips64-3.3.2.ebuild 2709
+MD5 19773e5c3aad1564738f06810cb12776 gcc-mips64-3.3.1.ebuild 2709
 MD5 efda60760635b5f29e31a8f730a73086 metadata.xml 364
+MD5 4e31abf94a8f523ceadc66c9354ea197 ChangeLog 435
+MD5 d3e53318166d71a05d2b51bd44502270 files/gcc-3.3.1-gentoo-branding.patch 874
+MD5 12e3974934d4a83bf4540c3e0592b226 files/digest-gcc-mips64-3.3.1 64
+MD5 006481ae255582fae4fa22107dfb359e files/digest-gcc-mips64-3.3.2 64
+MD5 d9ae122db2768f8e504dfef256d4991f files/gcc-3.3.2-gentoo-branding.patch 874
diff --git a/sys-devel/gcc-mips64/gcc-mips64-3.4.3-r1.ebuild b/sys-devel/gcc-mips64/gcc-mips64-3.4.3-r1.ebuild
index 2c8416853a45..d651862d9566 100644
--- a/sys-devel/gcc-mips64/gcc-mips64-3.4.3-r1.ebuild
+++ b/sys-devel/gcc-mips64/gcc-mips64-3.4.3-r1.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-mips64/gcc-mips64-3.4.3-r1.ebuild,v 1.4 2005/07/10 00:48:52 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-mips64/gcc-mips64-3.4.3-r1.ebuild,v 1.1 2005/01/09 19:14:57 kumba Exp $
 
-inherit eutils flag-o-matic
 
 # Variables 
+inherit eutils flag-o-matic
 MYARCH="$(echo ${PN} | cut -d- -f2)"
 TMP_P="${P/-${MYARCH}/}"
 TMP_PN="${PN/-${MYARCH}/}"
 I="/usr"
+S="${WORKDIR}/${P}"
 IUSE="ip28"
 BRANCH_UPDATE=""
 
@@ -21,7 +22,7 @@ SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${TMP_P}/${TMP_P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="mips"
+KEYWORDS="~mips"
 
 DEPEND="virtual/libc
 	>=sys-devel/binutils-2.14.90.0.7
@@ -117,18 +118,18 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo
+	einfo ""
 	einfo "To facilitate an easier kernel build, you may wish to add the following line to your profile:"
-	einfo
+	einfo ""
 	einfo "For 2.4.x kernel builds:"
 	einfo "alias ${MYARCH}make=\"make ARCH=${MYARCH} CROSS_COMPILE=${MYARCH}-unknown-linux-gnu-\""
-	einfo
+	einfo ""
 	einfo "For 2.6.x kernel builds:"
 	einfo "alias ${MYARCH}make=\"make ARCH=${MYARCH/64/} CROSS_COMPILE=${MYARCH}-unknown-linux-gnu-\""
-	einfo
+	einfo ""
 	einfo "Then to compile a kernel, simply goto the kernel source directory, and issue:"
 	einfo "${MYARCH}make <target>"
 	einfo "Where <target> is one of the usual kernel targets"
-	einfo
+	einfo ""
 	epause 10
 }
diff --git a/sys-devel/gcc-powerpc64/ChangeLog b/sys-devel/gcc-powerpc64/ChangeLog
index 9e0496c02696..82670540bc85 100644
--- a/sys-devel/gcc-powerpc64/ChangeLog
+++ b/sys-devel/gcc-powerpc64/ChangeLog
@@ -1,6 +1,6 @@
-# ChangeLog for sys-devel/gcc-powerpc64
+# ChangeLog for sys-devel/gcc-mips64
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-powerpc64/ChangeLog,v 1.2 2005/07/02 12:48:35 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-powerpc64/ChangeLog,v 1.1 2005/07/02 04:58:08 dostrow Exp $
 
 *gcc-powerpc64-3.4.4 (02 Jul 2005)
 
diff --git a/sys-devel/gcc-powerpc64/Manifest b/sys-devel/gcc-powerpc64/Manifest
index 6bd66b04d83f..12bd00aa9842 100644
--- a/sys-devel/gcc-powerpc64/Manifest
+++ b/sys-devel/gcc-powerpc64/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 fad162de8c9442c6924fb06cc3b24f92 ChangeLog 411
-MD5 4b8b4306f268900392bbd0319bdfdf65 files/digest-gcc-powerpc64-3.4.4 64
-MD5 b8cb4b2e29d1b9eba51fc7bfe5268e97 gcc-powerpc64-3.4.4.ebuild 3294
 MD5 b7f9c085d68ee4d2c8aaab58ef574457 metadata.xml 365
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC0G/oI1lqEGTUzyQRAuJxAKCAHQZT5J90BYAv0mnj/DE00UtOmACfQlFR
-qxnELL3++pLlaq4IwjuVwzg=
-=MaVO
------END PGP SIGNATURE-----
+MD5 ef68a6745c9cd8e7b266c60bab97d574 ChangeLog 311
+MD5 eab87bc61d32eb0707fe037223e0d61d gcc-powerpc64-3.4.4.ebuild 3200
+MD5 4b8b4306f268900392bbd0319bdfdf65 files/digest-gcc-powerpc64-3.4.4 64
diff --git a/sys-devel/gcc-powerpc64/gcc-powerpc64-3.4.4.ebuild b/sys-devel/gcc-powerpc64/gcc-powerpc64-3.4.4.ebuild
index 14f31ad1c522..f25266b6490d 100644
--- a/sys-devel/gcc-powerpc64/gcc-powerpc64-3.4.4.ebuild
+++ b/sys-devel/gcc-powerpc64/gcc-powerpc64-3.4.4.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-powerpc64/gcc-powerpc64-3.4.4.ebuild,v 1.2 2005/07/10 00:46:18 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-powerpc64/gcc-powerpc64-3.4.4.ebuild,v 1.1 2005/07/02 04:58:08 dostrow Exp $
 
-inherit eutils flag-o-matic
 
 # Variables 
+inherit eutils flag-o-matic
 MYARCH="$(echo ${PN} | cut -d- -f2)"
 TMP_P="${P/-${MYARCH}/}"
 TMP_PN="${PN/-${MYARCH}/}"
 I="/usr"
+S="${WORKDIR}/${P}"
 BRANCH_UPDATE=""
 
 DESCRIPTION="PPC64 Kernel Compiler (Experimental)"
diff --git a/sys-devel/gcc-sparc64/ChangeLog b/sys-devel/gcc-sparc64/ChangeLog
index 096b12cb7841..0bd809c7d2bf 100644
--- a/sys-devel/gcc-sparc64/ChangeLog
+++ b/sys-devel/gcc-sparc64/ChangeLog
@@ -1,117 +1,8 @@
 # ChangeLog for sys-devel/gcc-sparc64
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-sparc64/ChangeLog,v 1.24 2005/08/23 20:25:32 gustavoz Exp $
-
-*gcc-sparc64-3.4.4 (23 Aug 2005)
-
-  23 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  +gcc-sparc64-3.4.4.ebuild:
-  Revbump to match userland gcc
-
-*gcc-sparc64-3.3.6 (08 Jun 2005)
-
-  08 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  +files/gcc-3.3.6-gentoo-branding.patch, +gcc-sparc64-3.3.6.ebuild:
-  New and shiny release
-
-  23 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  -files/gcc-3.2.3-gentoo-branding.patch,
-  -files/gcc-3.3.1-gentoo-branding.patch,
-  -files/gcc-3.3.2-gentoo-branding.patch,
-  -files/gcc-3.3.3-gentoo-branding.patch, -gcc-sparc64-3.2.3.ebuild,
-  -gcc-sparc64-3.3.1.ebuild, -gcc-sparc64-3.3.2.ebuild,
-  -gcc-sparc64-3.3.3.ebuild:
-  Old version cleanup
-
-  23 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  gcc-sparc64-3.3.4.ebuild, gcc-sparc64-3.3.5.ebuild:
-  Removing Experimental wording lefover from egcs since it scares users like
-  chance2105
-
-  11 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  gcc-sparc64-3.3.5.ebuild:
-  Stable on sparc
-
-  29 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  gcc-sparc64-3.3.5.ebuild:
-  Back in ~sparc.
-
-  27 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  gcc-sparc64-3.3.5.ebuild:
-  -sparc until we figure out the source of the gcc-3.3.5 weirdness... chances
-  are this package is safe as I believe it's in the pie patch in
-  sys-devel/gcc, but this package is too critical to guess about.
-
-*gcc-sparc64-3.3.5 (26 Nov 2004)
-
-  26 Nov 2004; Joshua Kinard <kumba@gentoo.org>
-  +files/gcc-3.3.5-gentoo-branding.patch, +gcc-sparc64-3.3.5.ebuild:
-  New rev of gcc-sparc64 the sparc64 kernel compile.
-
-*gcc-sparc64-3.4.3 (11 Nov 2004)
-
-  11 Nov 2004; Joshua Kinard <kumba@gentoo.org> +gcc-sparc64-3.4.3.ebuild:
-  Added ebuild for gcc-sparc64-3.4.3.
-
-  04 Oct 2004; Joshua Kinard <kumba@gentoo.org> gcc-sparc64-3.2.3.ebuild,
-  gcc-sparc64-3.3.1.ebuild, gcc-sparc64-3.3.2.ebuild,
-  gcc-sparc64-3.3.3.ebuild, gcc-sparc64-3.3.4.ebuild:
-  I need more coffee.  Edited the wrong package.  Rolling back changes.
-
-  04 Oct 2004; Joshua Kinard <kumba@gentoo.org> gcc-sparc64-3.2.3.ebuild,
-  gcc-sparc64-3.3.1.ebuild, gcc-sparc64-3.3.2.ebuild,
-  gcc-sparc64-3.3.3.ebuild, gcc-sparc64-3.3.4.ebuild:
-  Added sys-devel/gcc-sparc64 to DEPEND.
-
-  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> gcc-sparc64-3.2.3.ebuild,
-  gcc-sparc64-3.3.1.ebuild, gcc-sparc64-3.3.2.ebuild,
-  gcc-sparc64-3.3.3.ebuild, gcc-sparc64-3.3.4.ebuild:
-  Switch to use epause and ebeep, bug #62950
-
-  31 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org>
-  gcc-sparc64-3.3.4.ebuild:
-  Stable on sparc
-
-  12 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org>
-  gcc-sparc64-3.3.4.ebuild:
-  Keyworded ~sparc
-
-*gcc-sparc64-3.3.4 (22 Jul 2004)
-
-  22 Jul 2004; Joshua Kinard <kumba@gentoo.org>
-  +files/gcc-3.3.4-gentoo-branding.patch, +gcc-sparc64-3.3.4.ebuild:
-  Added ebuild for 3.3.4 version of sparc64 compiler.
-
-  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  gcc-sparc64-3.2.3.ebuild, gcc-sparc64-3.3.1.ebuild,
-  gcc-sparc64-3.3.2.ebuild, gcc-sparc64-3.3.3.ebuild:
-  virtual/glibc -> virtual/libc
-
-  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> gcc-sparc64-3.2.3.ebuild,
-  gcc-sparc64-3.3.1.ebuild, gcc-sparc64-3.3.2.ebuild:
-  Add inherit eutils
-
-  26 Mar 2004; Jason Wever <weeve@gentoo.org> gcc-sparc64-3.3.3.ebuild:
-  Stable for sparcenstein.
-
-*gcc-sparc64-3.3.3 (18 Feb 2004)
-
-  18 Feb 2004; Joshua Kinard <kumba@gentoo.org> gcc-sparc64-3.3.3.ebuild,
-  files/gcc-3.3.3-gentoo-branding.patch:
-  New gcc-3.3.3 release (on 20040214) and also includes a 20040217 branch update
-  to match the system compiler.
-
-  07 Jan 2004; Jason Wever <weeve@gentoo.org> gcc-sparc64-3.2.3.ebuild,
-  gcc-sparc64-3.3.1.ebuild, gcc-sparc64-3.3.2.ebuild:
-  Marked stable on sparc.
-
-  15 Dec 2003; Joshua Kinard <kumba@gentoo.org> gcc-sparc64-3.2.3.ebuild,
-  gcc-sparc64-3.3.1.ebuild, gcc-sparc64-3.3.2.ebuild:
-  Tweaked DEPEND to depend on binutils-2.14.90.0.7 or greater
+# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-sparc64/ChangeLog,v 1.1 2003/11/17 02:02:33 kumba Exp $
 
 *gcc-sparc64-3.3.2 (16 Nov 2003)
-*gcc-sparc64-3.2.3 (16 Nov 2003)
-*gcc-sparc64-3.3.1 (16 Nov 2003)
 
   16 Nov 2003; Joshua Kinard <kumba@gentoo.org> gcc-sparc64-3.2.3.ebuild,
   gcc-sparc64-3.3.1.ebuild, gcc-sparc64-3.3.2.ebuild,
diff --git a/sys-devel/gcc-sparc64/Manifest b/sys-devel/gcc-sparc64/Manifest
index 17a93003864c..f64f415ee15f 100644
--- a/sys-devel/gcc-sparc64/Manifest
+++ b/sys-devel/gcc-sparc64/Manifest
@@ -1,25 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 22972697e964b6a6e3074c831d47e5b6 gcc-sparc64-3.4.3.ebuild 3221
-MD5 e6840b2edd483d96b07baa56e313af4c gcc-sparc64-3.3.6.ebuild 3002
-MD5 374d4b109ffdf8a453c1400cd4ae92bb gcc-sparc64-3.3.5.ebuild 3001
+MD5 3f83750c9a41e2e7359ae655a969bfd0 gcc-sparc64-3.2.3.ebuild 2711
+MD5 3f83750c9a41e2e7359ae655a969bfd0 gcc-sparc64-3.3.1.ebuild 2711
+MD5 3f83750c9a41e2e7359ae655a969bfd0 gcc-sparc64-3.3.2.ebuild 2711
 MD5 f826fcca414fc0c05030db1f99e479d8 metadata.xml 360
-MD5 59debd5a0e1859a4413b867600761f2c gcc-sparc64-3.4.4.ebuild 3152
-MD5 cbde0f50936a6d3559b523740b571912 gcc-sparc64-3.3.4.ebuild 3006
-MD5 0e4276f6a4a04a5c7b93379c11f9750c ChangeLog 4580
-MD5 79ef0db9c6e9750aa92334dded832283 files/digest-gcc-sparc64-3.3.6 64
-MD5 2ca380cbcf0547fb5d2a671c1c0296de files/digest-gcc-sparc64-3.4.3 64
-MD5 595fc5d3e417d76d1f7e7f0a8439535a files/digest-gcc-sparc64-3.3.5 64
-MD5 e411938ca2908079a2359fed5cb3b442 files/gcc-3.3.4-gentoo-branding.patch 874
-MD5 af241dd07c46bc5b0c2d54eac803f1f3 files/digest-gcc-sparc64-3.3.4 151
-MD5 4b8b4306f268900392bbd0319bdfdf65 files/digest-gcc-sparc64-3.4.4 64
-MD5 bffc563ab83f8025f3e477286ece2e65 files/gcc-3.3.6-gentoo-branding.patch 874
-MD5 5f8835c8de8d96466954796d2512a29b files/gcc-3.3.5-gentoo-branding.patch 874
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDC4ZjKRy60XGEcJIRAs9lAJwIvPYlhaTgruPw1UlCXqw4y0gQFwCfbxsh
-MOjRN647Z30axz+pa2UEhd4=
-=ES+E
------END PGP SIGNATURE-----
+MD5 9c13381a1d3ccdba062ea23e42ce82f8 ChangeLog 508
+MD5 d3e53318166d71a05d2b51bd44502270 files/gcc-3.3.1-gentoo-branding.patch 874
+MD5 d9ae122db2768f8e504dfef256d4991f files/gcc-3.3.2-gentoo-branding.patch 874
+MD5 098c115531e90608348818f9bdb3faac files/digest-gcc-sparc64-3.2.3 64
+MD5 12e3974934d4a83bf4540c3e0592b226 files/digest-gcc-sparc64-3.3.1 64
+MD5 006481ae255582fae4fa22107dfb359e files/digest-gcc-sparc64-3.3.2 64
+MD5 99db7c1a41babe024f0c6859c30a87ee files/gcc-3.2.3-gentoo-branding.patch 2058
diff --git a/sys-devel/gcc-sparc64/gcc-sparc64-3.3.4.ebuild b/sys-devel/gcc-sparc64/gcc-sparc64-3.3.4.ebuild
index ecf7edd71a7b..4c0a1dc15eba 100644
--- a/sys-devel/gcc-sparc64/gcc-sparc64-3.3.4.ebuild
+++ b/sys-devel/gcc-sparc64/gcc-sparc64-3.3.4.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-sparc64/gcc-sparc64-3.3.4.ebuild,v 1.10 2005/07/10 00:47:40 swegener Exp $
-
-inherit eutils flag-o-matic
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-sparc64/gcc-sparc64-3.3.4.ebuild,v 1.1 2004/07/22 08:07:17 kumba Exp $
 
 # Variables 
+inherit eutils flag-o-matic
 MYARCH="$(echo ${PN} | cut -d- -f2)"
 TMP_P="${P/-${MYARCH}/}"
 TMP_PN="${PN/-${MYARCH}/}"
 I="/usr"
+S="${WORKDIR}/${P}"
 BRANCH_UPDATE="20040623"
 
-DESCRIPTION="Sparc64 Kernel Compiler"
+DESCRIPTION="Sparc64 Kernel Compiler (Experimental)"
 HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
 SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${TMP_P}/${TMP_P}.tar.bz2
 	mirror://gentoo/${TMP_P}-branch-update-${BRANCH_UPDATE}.patch.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="sparc"
+KEYWORDS="-*"
 
 DEPEND="virtual/libc
 	>=sys-devel/binutils-2.14.90.0.7
@@ -111,14 +111,14 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo
+	einfo ""
 	einfo "To facilitate an easier kernel build, you may wish to add the following line to your profile:"
-	einfo
+	einfo ""
 	einfo "alias ${MYARCH}make=\"make ARCH=${MYARCH} CROSS_COMPILE=${MYARCH}-unknown-linux-gnu-\""
-	einfo
+	einfo ""
 	einfo "Then to compile a kernel, simply goto the kernel source directory, and issue:"
 	einfo "${MYARCH}make <target>"
 	einfo "Where <target> is one of the usual kernel targets"
-	einfo
-	epause 10
+	einfo ""
+	sleep 10
 }
diff --git a/sys-devel/gcc-sparc64/gcc-sparc64-3.3.5.ebuild b/sys-devel/gcc-sparc64/gcc-sparc64-3.3.5.ebuild
index 5f60df0fbb3d..21fc54d93d97 100644
--- a/sys-devel/gcc-sparc64/gcc-sparc64-3.3.5.ebuild
+++ b/sys-devel/gcc-sparc64/gcc-sparc64-3.3.5.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-sparc64/gcc-sparc64-3.3.5.ebuild,v 1.7 2005/07/10 00:47:40 swegener Exp $
-
-inherit eutils flag-o-matic
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-sparc64/gcc-sparc64-3.3.5.ebuild,v 1.1 2004/11/27 01:26:36 kumba Exp $
 
 # Variables 
+inherit eutils flag-o-matic
 MYARCH="$(echo ${PN} | cut -d- -f2)"
 TMP_P="${P/-${MYARCH}/}"
 TMP_PN="${PN/-${MYARCH}/}"
 I="/usr"
+S="${WORKDIR}/${P}"
 BRANCH_UPDATE=""
 
-DESCRIPTION="Sparc64 Kernel Compiler"
+DESCRIPTION="Sparc64 Kernel Compiler (Experimental)"
 HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
 SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${TMP_P}/${TMP_P}.tar.bz2"
 #	mirror://gentoo/${TMP_P}-branch-update-${BRANCH_UPDATE}.patch.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="sparc"
+KEYWORDS="~sparc"
 
 DEPEND="virtual/libc
 	>=sys-devel/binutils-2.14.90.0.7
@@ -111,14 +111,14 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo
+	einfo ""
 	einfo "To facilitate an easier kernel build, you may wish to add the following line to your profile:"
-	einfo
+	einfo ""
 	einfo "alias ${MYARCH}make=\"make ARCH=${MYARCH} CROSS_COMPILE=${MYARCH}-unknown-linux-gnu-\""
-	einfo
+	einfo ""
 	einfo "Then to compile a kernel, simply goto the kernel source directory, and issue:"
 	einfo "${MYARCH}make <target>"
 	einfo "Where <target> is one of the usual kernel targets"
-	einfo
+	einfo ""
 	epause 10
 }
diff --git a/sys-devel/gcc-sparc64/gcc-sparc64-3.3.6.ebuild b/sys-devel/gcc-sparc64/gcc-sparc64-3.3.6.ebuild
index 194feea5045e..abd2edd12c5a 100644
--- a/sys-devel/gcc-sparc64/gcc-sparc64-3.3.6.ebuild
+++ b/sys-devel/gcc-sparc64/gcc-sparc64-3.3.6.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/sys-devel/gcc-sparc64/gcc-sparc64-3.3.6.ebuild,v 1.3 2005/07/10 00:47:40 swegener Exp $
-
-inherit eutils flag-o-matic
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-sparc64/gcc-sparc64-3.3.6.ebuild,v 1.1 2005/06/08 00:46:55 gustavoz Exp $
 
 # Variables 
+inherit eutils flag-o-matic
 MYARCH="$(echo ${PN} | cut -d- -f2)"
 TMP_P="${P/-${MYARCH}/}"
 TMP_PN="${PN/-${MYARCH}/}"
 I="/usr"
+S="${WORKDIR}/${P}"
 BRANCH_UPDATE=""
 
 DESCRIPTION="Sparc64 Kernel Compiler"
@@ -111,14 +111,14 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo
+	einfo ""
 	einfo "To facilitate an easier kernel build, you may wish to add the following line to your profile:"
-	einfo
+	einfo ""
 	einfo "alias ${MYARCH}make=\"make ARCH=${MYARCH} CROSS_COMPILE=${MYARCH}-unknown-linux-gnu-\""
-	einfo
+	einfo ""
 	einfo "Then to compile a kernel, simply goto the kernel source directory, and issue:"
 	einfo "${MYARCH}make <target>"
 	einfo "Where <target> is one of the usual kernel targets"
-	einfo
+	einfo ""
 	epause 10
 }
diff --git a/sys-devel/gcc-sparc64/gcc-sparc64-3.4.3.ebuild b/sys-devel/gcc-sparc64/gcc-sparc64-3.4.3.ebuild
index f9cf37aa4272..19f0740638bc 100644
--- a/sys-devel/gcc-sparc64/gcc-sparc64-3.4.3.ebuild
+++ b/sys-devel/gcc-sparc64/gcc-sparc64-3.4.3.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-sparc64/gcc-sparc64-3.4.3.ebuild,v 1.4 2005/07/10 00:47:40 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-sparc64/gcc-sparc64-3.4.3.ebuild,v 1.1 2004/11/11 09:19:04 kumba Exp $
 
-inherit eutils flag-o-matic
 
 # Variables 
+inherit eutils flag-o-matic
 MYARCH="$(echo ${PN} | cut -d- -f2)"
 TMP_P="${P/-${MYARCH}/}"
 TMP_PN="${PN/-${MYARCH}/}"
 I="/usr"
+S="${WORKDIR}/${P}"
 BRANCH_UPDATE=""
 
 DESCRIPTION="Sparc64 Kernel Compiler"
@@ -111,14 +112,14 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo
+	einfo ""
 	einfo "To facilitate an easier kernel build, you may wish to add the following line to your profile:"
-	einfo
+	einfo ""
 	einfo "alias ${MYARCH}make=\"make ARCH=${MYARCH} CROSS_COMPILE=${MYARCH}-unknown-linux-gnu-\""
-	einfo
+	einfo ""
 	einfo "Then to compile a kernel, simply goto the kernel source directory, and issue:"
 	einfo "${MYARCH}make <target>"
 	einfo "Where <target> is one of the usual kernel targets"
-	einfo
+	einfo ""
 	epause 10
 }
diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index a603ffac2511..abc7458b577c 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,2406 +1,7 @@
 # ChangeLog for sys-devel/gcc
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.468 2005/11/26 04:05:09 halcy0n Exp $
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
 
-*gcc-4.1.0_beta20051125 (26 Nov 2005)
-
-  26 Nov 2005; Mark Loeser <halcy0n@gentoo.org>
-  +files/4.1.0/gcc-4.1.0-pr22313.patch, -gcc-4.1.0_beta20051112.ebuild,
-  +gcc-4.1.0_beta20051125.ebuild:
-  GCC-4.1 snapshot bump.  Also add a patch to fix building on amd64.
-
-  13 Nov 2005; Mark Loeser <halcy0n@gentoo.org> gcc-4.0.1.ebuild,
-  gcc-4.0.2-r1.ebuild, gcc-4.1.0_beta20051112.ebuild:
-  Fix depends for gcc-4 ebuilds so we depend on >=glibc-2.3.6 now
-
-*gcc-4.1.0_beta20051112 (12 Nov 2005)
-
-  12 Nov 2005; Mark Loeser <halcy0n@gentoo.org>
-  -gcc-4.1.0_beta20051105.ebuild, +gcc-4.1.0_beta20051112.ebuild:
-  GCC-4.1 snapshot bump
-
-  10 Nov 2005; Mark Loeser <halcy0n@gentoo.org> gcc-4.0.1.ebuild,
-  gcc-4.0.2-r1.ebuild, gcc-4.1.0_beta20051105.ebuild:
-  Adding dev-libs/mpfr to deps, as it is needed to build fortran for gcc-4
-
-  05 Nov 2005; Mark Loeser <halcy0n@gentoo.org>
-  gcc-4.1.0_beta20051105.ebuild:
-  Fix deps to match those from the gcc-4.0 ebuilds
-
-*gcc-4.1.0_beta20051105 (05 Nov 2005)
-
-  05 Nov 2005; Mark Loeser <halcy0n@gentoo.org>
-  +gcc-4.1.0_beta20051105.ebuild:
-  Adding back the gcc-4.1 snapshots. The installation should be fixed now; bug
-  #100679
-
-  31 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> gcc-3.4.4-r1.ebuild:
-  Stable on alpha.
-
-  31 Oct 2005; Mark Loeser <halcy0n@gentoo.org> gcc-4.0.2-r1.ebuild:
-  Adding 28_all_gcc4-pr19520.patch to GENTOO_PATCH_EXCLUDE due to it causing
-  ICEs in a few packages. I will remove it from the patchset in the next
-  revision
-
-  10 Oct 2005; Mark Loeser <halcy0n@gentoo.org> gcc-4.0.2-r1.ebuild:
-  Remove SPLIT_SPECS for now, until we have a better complete solution; bug
-  #106690
-
-  07 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  gcc-2.95.3-r9.ebuild, gcc-3.2.3-r4.ebuild, gcc-3.3.2-r7.ebuild,
-  gcc-3.3.5-r1.ebuild, gcc-3.3.5.20050130-r1.ebuild,
-  gcc-3.3.5.20050130-r2.ebuild, gcc-3.3.6.ebuild, gcc-3.4.1-r3.ebuild,
-  gcc-3.4.3-r1.ebuild, gcc-3.4.3.20050110-r2.ebuild, gcc-3.4.4-r1.ebuild,
-  gcc-4.0.1.ebuild, gcc-4.0.2-r1.ebuild:
-  Let eselect-compiler be an option instead of sys-devel/gcc-config in DEPEND.
-
-  06 Oct 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/gcc-configure-LANG.patch:
-  Patch to fix LANG issues in older autotools #105485.
-
-*gcc-4.0.2-r1 (04 Oct 2005)
-
-  04 Oct 2005; Mark Loeser <halcy0n@gentoo.org> -gcc-4.0.2.ebuild,
-  +gcc-4.0.2-r1.ebuild:
-  New patchset with a lot of patches from Fedora, as well as patches to fix
-  -fvisibility problems with KDE.
-
-*gcc-4.0.2 (28 Sep 2005)
-
-  28 Sep 2005; Mark Loeser <halcy0n@gentoo.org>
-  -gcc-4.0.2_pre20050917.ebuild, +gcc-4.0.2.ebuild:
-  Bump to 4.0.2
-
-*gcc-4.0.2_pre20050917 (18 Sep 2005)
-
-  18 Sep 2005; Mark Loeser <halcy0n@gentoo.org>
-  -gcc-4.0.2_pre20050913.ebuild, +gcc-4.0.2_pre20050917.ebuild:
-  Bump to gcc-4.0.2_rc2
-
-  15 Sep 2005; Mark Loeser <halcy0n@gentoo.org>
-  gcc-4.0.2_pre20050913.ebuild:
-  Enable split spec files.
-
-*gcc-4.0.2_pre20050913 (14 Sep 2005)
-
-  14 Sep 2005; Mark Loeser <halcy0n@gentoo.org>
-  +gcc-4.0.2_pre20050913.ebuild:
-  Bump to gcc-4.0.2_rc1
-
-  11 Sep 2005; Mark Loeser <halcy0n@gentoo.org>
-  -gcc-4.1.0_beta20050902.ebuild:
-  Removing the gcc-4.1 ebuilds for the time being.  When they get to release
-  candidates, I'll add them back.  At this point in time they are way too
-  unstable though.  You can easily continue to use them in your overlay by just
-  renaming the ebuild.
-
-  05 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org> gcc-3.3.6.ebuild:
-  Moving 3.3.6 into stable on x86.
-
-*gcc-4.1.0_beta20050902 (03 Sep 2005)
-
-  03 Sep 2005; Mark Loeser <halcy0n@gentoo.org>
-  -gcc-4.1.0_beta20050826.ebuild, +gcc-4.1.0_beta20050902.ebuild:
-  GCC 4.1 snapshot bump
-
-*gcc-3.4.4-r1 (27 Aug 2005)
-
-  27 Aug 2005; Mike Frysinger <vapier@gentoo.org> +gcc-3.4.4-r1.ebuild:
-  Push out cumulative changes (especially #87631).
-
-*gcc-4.1.0_beta20050826 (26 Aug 2005)
-
-  26 Aug 2005; Mark Loeser <halcy0n@gentoo.org>
-  -gcc-4.1.0_beta20050819.ebuild, +gcc-4.1.0_beta20050826.ebuild:
-  GCC 4.1 snapshot bump
-
-  20 Aug 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/3.2.2/gcc-3.2.2-cross-compile.patch,
-  +files/3.2.2/gcc-3.2.2-no-COPYING-cross-compile.patch, gcc-3.2.2.ebuild:
-  Fix cross-compile support for Playstation 2 targets (ee/iop).
-
-*gcc-4.1.0_beta20050819 (20 Aug 2005)
-
-  20 Aug 2005; Mark Loeser <halcy0n@gentoo.org>
-  -gcc-4.1.0_beta20050813.ebuild, +gcc-4.1.0_beta20050819.ebuild:
-  Bump to newest gcc-4.1 snapshot
-
-  17 Aug 2005; Mike Frysinger <vapier@gentoo.org> gcc-3.3.6.ebuild,
-  gcc-3.4.4.ebuild:
-  Add a patch for arm and one for m68k, a fix for an infinite loop in gcc
-  #102244, and fixes for canadian cross-compiling a native compiler.
-
-  16 Aug 2005; Mark Loeser <halcy0n@gentoo.org> gcc-4.0.1.ebuild:
-  Update 4.0.1's patchset.  Dropped a patch that caused issues on PPC.  Fixes
-  bug #97939
-
-  16 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org> gcc-3.4.4.ebuild:
-  Stable amd64.
-
-*gcc-4.1.0_beta20050813 (13 Aug 2005)
-
-  13 Aug 2005; Mark Loeser <halcy0n@gentoo.org>
-  -gcc-4.1.0_beta20050730.ebuild, +gcc-4.1.0_beta20050813.ebuild:
-  GCC 4.1 snapshot bump
-
-  05 Aug 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/3.4.4/gcc-3.4.4-softfloat.patch, gcc-3.4.4.ebuild:
-  Merge soft-float support by Yuri Vasilevski #75585.
-
-*gcc-4.1.0_beta20050730 (30 Jul 2005)
-
-  30 Jul 2005; Mark Loeser <halcy0n@gentoo.org>
-  -gcc-4.1.0_beta20050723.ebuild, +gcc-4.1.0_beta20050730.ebuild:
-  GCC-4.1 snapshot bump
-
-*gcc-4.1.0_beta20050723 (23 Jul 2005)
-
-  23 Jul 2005; Mark Loeser <halcy0n@gentoo.org>
-  -gcc-4.1.0_beta20050716.ebuild, +gcc-4.1.0_beta20050723.ebuild:
-  Bump to newest gcc-4.1 snapshot
-
-*gcc-4.1.0_beta20050716 (16 Jul 2005)
-
-  16 Jul 2005; Mark Loeser <halcy0n@gentoo.org>
-  -gcc-4.1.0_beta20050709.ebuild, +gcc-4.1.0_beta20050716.ebuild:
-  GCC 4.1 snapshot bump
-
-  10 Jul 2005; Mike Frysinger <vapier@gentoo.org> gcc-3.3.5-r1.ebuild,
-  gcc-3.3.5.20050130-r1.ebuild, gcc-3.3.5.20050130-r2.ebuild,
-  gcc-3.3.6.ebuild, gcc-3.4.3-r1.ebuild, gcc-3.4.3.20050110-r2.ebuild,
-  gcc-3.4.4.ebuild:
-  Dont apply spec-env patch to cross-compilers otherwise native hardened users
-  can screw up their cross-compilers real quick #96162 by Kevin F. Quinn.
-
-*gcc-4.1.0_beta20050709 (10 Jul 2005)
-
-  10 Jul 2005; Mark Loeser <halcy0n@gentoo.org>
-  -gcc-4.1.0_beta20050702.ebuild, +gcc-4.1.0_beta20050709.ebuild:
-  Bumping gcc-4.1 snapshot
-
-  08 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  -gcc-2.95.3-r8.ebuild, -gcc-3.3.2.ebuild, -gcc-3.3.2-r5.ebuild,
-  -gcc-3.3.5.20050130.ebuild, -gcc-3.4.3.20050110-r1.ebuild,
-  -files/3.3/gcc33-coreutils-compat.patch.bz2,
-  -files/3.3/gcc33-gentoo-branding-1.patch,
-  -files/3.3/gcc33-gentoo-branding.patch,
-  -files/3.3/gcc33-no-multilib-amd64.patch,
-  -files/3.3/gcc33-propolice-version.patch,
-  -files/3.3.1/gcc331-gentoo-branding.patch,
-  -files/3.3.3/gcc-3.3.3-libiberty-pic.patch,
-  -files/3.3.3/gcc333-gentoo-branding.patch,
-  -files/3.3.3/gcc333-pr15693.patch,
-  -files/3.3.3/gcc333-ssp-3.3.2_1-fixup.patch,
-  -files/3.3.3/gcc333-ssp-3.3_7-fixup.patch,
-  -files/3.3.3/gcc333_pre20040215-gentoo-branding.patch,
-  -files/3.3.3/gcc333_pre20040322-gentoo-branding.patch,
-  -files/3.3.3/gcc333_pre20040408-gentoo-branding.patch,
-  -files/3.3.3/gcc333_pre20040426-gentoo-branding.patch,
-  -files/3.3.4/gcc334-gentoo-branding.patch,
-  -files/3.4.0/gcc-3.4.0-move-propolice-into-glibc.patch,
-  -files/3.4.0/gcc-3.4.0-r6-gentoo-branding.patch,
-  -files/3.4.0/gcc34-ia64-lib64.patch, -files/3.4.0/gcc34-ice-hack.patch,
-  -files/3.4.0/gcc34-multi32-hack.patch,
-  -files/3.4.0/gcc34-ppc64-m32-m64-multilib-only.patch,
-  -files/3.4.1/gcc-3.4.1-gentoo-branding.patch,
-  -files/3.4.1/gcc341-ppc64-mozilla-ICE-fix.patch,
-  -files/3.4.2/gcc-3.4.2-mips-ip28_cache_barriers.patch,
-  -files/3.4.3/35_all_pr18987-fix.patch:
-  Removing old ebuilds and cleaned out unused old patches.
-
-*gcc-4.0.1 (08 Jul 2005)
-
-  08 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> -gcc-4.0.0.ebuild,
-  -gcc-4.0.1_pre20050702.ebuild, +gcc-4.0.1.ebuild:
-  gcc4 version bump.
-
-  05 Jul 2005; Joshua Kinard <kumba@gentoo.org> gcc-3.4.3.20050110-r2.ebuild,
-  gcc-3.4.4.ebuild:
-  Make 3.4.3.20050110-r2 stable on mips, and bump 3.4.4 into unstable.
-
-*gcc-4.0.1_pre20050702 (03 Jul 2005)
-*gcc-4.1.0_beta20050702 (03 Jul 2005)
-
-  03 Jul 2005; Mark Loeser <halcy0n@gentoo.org>
-  -gcc-4.0.1_pre20050616.ebuild, -gcc-4.1.0_beta20050625.ebuild,
-  +gcc-4.0.1_pre20050702.ebuild, +gcc-4.1.0_beta20050702.ebuild:
-  Bump to newest gcc4 snapshots.
-
-  28 Jun 2005; Markus Rothe <corsair@gentoo.org> gcc-3.4.4.ebuild:
-  Stable on ppc64
-
-*gcc-4.1.0_beta20050625 (25 Jun 2005)
-
-  25 Jun 2005; Mark Loeser <halcy0n@gentoo.org>
-  -gcc-4.1.0_beta20050618.ebuild, +gcc-4.1.0_beta20050625.ebuild:
-  Bump GCC-4.1 snapshot
-
-  23 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  +files/3.4.4/gcc-3.4_x-avr-news-devs2.patch, gcc-3.4.4.ebuild:
-  Added new avr target device support with blessing from spanky
-
-*gcc-4.1.0_beta20050618 (18 Jun 2005)
-
-  18 Jun 2005; Mark Loeser <halcy0n@gentoo.org>
-  -gcc-4.1.0_beta20050611.ebuild, +gcc-4.1.0_beta20050618.ebuild:
-  GCC 4.1 snapshot bump
-
-*gcc-4.0.1_pre20050616 (18 Jun 2005)
-
-  18 Jun 2005; Mark Loeser <halcy0n@gentoo.org>
-  -gcc-4.0.1_pre20050607.ebuild, +gcc-4.0.1_pre20050616.ebuild:
-  Bump to the gcc-4.0.1_rc2 snapshot
-
-  13 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> gcc-3.3.6.ebuild:
-  ~sparc happy
-
-*gcc-4.1.0_beta20050611 (11 Jun 2005)
-
-  11 Jun 2005; Mark Loeser <halcy0n@gentoo.org>
-  -gcc-4.1.0_beta20050604.ebuild, +gcc-4.1.0_beta20050611.ebuild:
-  Bump to new GCC 4.1 snapshot
-
-  11 Jun 2005; Luca Barbato <lu_zero@gentoo.org> gcc-3.4.4.ebuild:
-  BAD typo in gcc-3.4.4 . It is stable, but got wrongly marked stable before
-  time. Since it would be a problem to the early updaters I keep it stable.
-
-*gcc-4.0.1_pre20050607 (09 Jun 2005)
-
-  09 Jun 2005; Mark Loeser <halcy0n@gentoo.org>
-  -gcc-4.0.1_beta20050602.ebuild, +gcc-4.0.1_pre20050607.ebuild:
-  Committing gcc-4.0.1_rc1 snapshot, and my first gcc4 patchset (thanks Azarah)
-
-  07 Jun 2005; Luca Barbato <lu_zero@gentoo.org> gcc-3.4.4.ebuild:
-  Marked ~ppc
-
-*gcc-4.1.0_beta20050604 (05 Jun 2005)
-
-  05 Jun 2005; <halcyon@gentoo.org> -gcc-4.1.0_beta20050528.ebuild,
-  +gcc-4.1.0_beta20050604.ebuild:
-  Bump to the newest gcc-4.1 snapshot.
-
-*gcc-4.1.0_beta20050528 (03 Jun 2005)
-
-  03 Jun 2005; Mark Loeser <halcy0n@gentoo.org>
-  +gcc-4.1.0_beta20050528.ebuild:
-  Initial commit of a GCC-4.1 snapshot, for all those that want to be on the
-  bleeding edge
-
-*gcc-4.0.1_beta20050602 (03 Jun 2005)
-
-  03 Jun 2005; Mark Loeser <halcy0n@gentoo.org>
-  -gcc-4.0.1_beta20050526.ebuild, +gcc-4.0.1_beta20050602.ebuild:
-  GCC4 snapshot bump
-
-  01 Jun 2005; Markus Rothe <corsair@gentoo.org> gcc-3.4.4.ebuild:
-  Added ~ppc64 to KEYWORDS
-
-*gcc-3.2.2 (28 May 2005)
-
-  28 May 2005; Mike Frysinger <vapier@gentoo.org> +gcc-3.2.2.ebuild:
-  Add gcc for PS2.
-
-*gcc-4.0.1_beta20050526 (28 May 2005)
-
-  28 May 2005; Mark Loeser <halcy0n@gentoo.org>
-  -gcc-4.0.1_beta20050521.ebuild, +gcc-4.0.1_beta20050526.ebuild:
-  GCC4 snapshot bump
-
-*gcc-3.4.4 (24 May 2005)
-
-  24 May 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/3.4.4/gcc-3.4.4-cross-compile.patch, +gcc-3.4.4.ebuild:
-  Version bumpage.
-
-*gcc-3.3.6 (24 May 2005)
-
-  24 May 2005; Mike Frysinger <vapier@gentoo.org>
-  +gcc-3.3.6.ebuild:
-  Version bumpage.
-
-*gcc-4.0.1_beta20050521 (22 May 2005)
-
-  22 May 2005; Mark Loeser <halcy0n@gentoo.org>
-  -gcc-4.0.1_beta20050514.ebuild, +gcc-4.0.1_beta20050521.ebuild:
-  GCC4 snapshot bump
-
-*gcc-2.95.3-r9 (21 May 2005)
-
-  21 May 2005; Mike Frysinger <vapier@gentoo.org> +gcc-2.95.3-r9.ebuild:
-  Add patches from Debian/crosstool and try to make more cross-compile friendly.
-
-*gcc-4.0.1_beta20050514 (15 May 2005)
-
-  15 May 2005; Mark Loeser <halcy0n@gentoo.org>
-  -gcc-4.0.1_beta20050507.ebuild, +gcc-4.0.1_beta20050514.ebuild:
-  Bump gcc4 ebuild to the newest snapshot
-
-  11 May 2005; Martin Schlemmer <azarah@gentoo.org>
-  gcc-4.0.1_beta20050507.ebuild:
-  Fix depends to actually depend on glibc/binutils that sorda makes things
-  work (glibc I only depend on something we can build against, not build at
-  this stage). Remove my patching crud that got included by mistake.
-
-  11 May 2005; Diego Pettenò <flameeyes@gentoo.org>
-  gcc-3.4.3.20050110-r2.ebuild, gcc-4.0.1_beta20050507.ebuild:
-  Make latest gcc (3.4 and 4) depend on glibc just for glibc systems.
-
-  10 May 2005; Martin Schlemmer <azarah@gentoo.org>
-  files/awk/fixlafiles.awk, gcc-4.0.0.ebuild, gcc-4.0.1_beta20050507.ebuild:
-  Fixup fixlafiles.awk detecting of gcc CHOST.
-
-*gcc-4.0.1_beta20050507 (08 May 2005)
-
-  08 May 2005; Mark Loeser <halcy0n@gentoo.org>
-  -gcc-4.0.0_beta20050416.ebuild, +gcc-4.0.1_beta20050507.ebuild:
-  Version bump to the newest GCC4 snapshot.
-
-  23 Apr 2005; Joshua Kinard <kumba@gentoo.org>
-  +files/3.4.2/gcc-3.4.2-mips-ip28_cache_barriers-v2.patch,
-  gcc-3.4.3-r1.ebuild, gcc-3.4.3.20050110-r1.ebuild,
-  gcc-3.4.3.20050110-r2.ebuild:
-  Update the gcc-3.4.3 ebuilds to use a newer IP28 cache barrier patch. Won't
-  affect mainstream Mips systems.
-
-*gcc-4.0.0 (21 Apr 2005)
-
-  21 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org> +gcc-4.0.0.ebuild:
-  Adding ebuild for gcc-4.0.0 release.  This doesn't mean it's supported yet!
-
-*gcc-4.0.0_beta20050416 (17 Apr 2005)
-
-  17 Apr 2005; Mark Loeser <halcy0n@gentoo.org>
-  -gcc-4.0.0_beta20050409.ebuild, +gcc-4.0.0_beta20050416.ebuild:
-  Bump to newest weekly snapshot.
-
-*gcc-4.0.0_beta20050409 (12 Apr 2005)
-
-  12 Apr 2005; Mark Loeser <halcy0n@gentoo.org>
-  -gcc-4.0.0_beta20050402.ebuild, +gcc-4.0.0_beta20050409.ebuild:
-  Updating GCC4 ebuild to the newest snapshot
-
-*gcc-3.3.5.20050130-r2 (08 Apr 2005)
-
-  08 Apr 2005; Mike Frysinger <vapier@gentoo.org>
-  +gcc-3.3.5.20050130-r2.ebuild:
-  Add a patch from Debian and the patch to prevent gcc from unlinking /dev/null.
-
-*gcc-3.4.3.20050110-r2 (08 Apr 2005)
-
-  08 Apr 2005; Mike Frysinger <vapier@gentoo.org>
-  +gcc-3.4.3.20050110-r2.ebuild:
-  Add fix for PR/16625 from upstream #88022 by Ed Catmur. Patch to prevent
-  /dev/null from being deleted #79836 by David Wood. Also add a patch for arm
-  PR/16201 and a patch from Debian for m68k.
-
-*gcc-4.0.0_beta20050402 (03 Apr 2005)
-
-  03 Apr 2005; Mark Loeser <halcy0n@gentoo.org>
-  -gcc-4.0.0_beta20050326.ebuild, +gcc-4.0.0_beta20050402.ebuild:
-  Version bump to the newest GCC4 snapshot
-
-*gcc-4.0.0_beta20050326 (28 Mar 2005)
-
-  28 Mar 2005; Mark Loeser <halcy0n@gentoo.org>
-  -gcc-4.0.0_beta20050305.ebuild, +gcc-4.0.0_beta20050326.ebuild:
-  Version bump to newest GCC4 snapshot
-
-  27 Mar 2005; Hardave Riar <hardave@gentoo.org> gcc-3.4.3-r1.ebuild:
-  Stable on mips.
-
-  21 Mar 2005; <solar@gentoo.org> gcc-3.4.3-r1.ebuild,
-  gcc-3.4.3.20050110-r1.ebuild:
-  - mark ppc pp64 stable for pie/ssp use
-
-*gcc-3.4.3.20050110-r1 (20 Mar 2005)
-
-  20 Mar 2005; Mike Frysinger <vapier@gentoo.org>
-  +gcc-3.4.3.20050110-r1.ebuild:
-  Fix visibility patches #78720, update uclibc support, and add support for
-  arm bigendian.
-
-  19 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  gcc-3.4.3-r1.ebuild, gcc-3.4.3.20050110.ebuild:
-  use_multilib -> is_multilib
-
-*gcc-3.3.5.20050130-r1 (19 Mar 2005)
-
-  19 Mar 2005; Mike Frysinger <vapier@gentoo.org>
-  +gcc-3.3.5.20050130-r1.ebuild:
-  Update uclibc patches and split them off into a sep tarball.
-
-  17 Mar 2005; Luca Barbato <lu_zero@gentoo.org> gcc-3.4.3-r1.ebuild:
-  Marked ppc
-
-  15 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  gcc-3.3.5.20050130.ebuild:
-  Stable sparc.
-
-  14 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  gcc-2.95.3-r8.ebuild:
-  Patched to compile usilg gcc-3.4.
-
-*gcc-4.0.0_beta20050305 (07 Mar 2005)
-
-  07 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  +gcc-4.0.0_beta20050305.ebuild:
-  Version bump of gcc-4 for bleeding edge masochists.
-
-*gcc-4.0.0_alpha20050213 (17 Feb 2005)
-
-  17 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  gcc-3.3.5-r1.ebuild, gcc-3.3.5.20050130.ebuild, gcc-3.4.3-r1.ebuild,
-  gcc-3.4.3.20050110.ebuild, -gcc-4.0.0_alpha20050123.ebuild,
-  -gcc-4.0.0_alpha20050130.ebuild, +gcc-4.0.0_alpha20050213.ebuild:
-  Only apply libffi-without-libgcj.patch if we're -build. Bump the gcc-4
-  version and make a note to report bugs upstream.
-
-  12 Feb 2005; <plasmaroo@gentoo.org> gcc-3.3.5.20050130.ebuild:
-  Mark -ia64 as bootstrapping fails with this version.
-
-  12 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  gcc-3.3.5-r1.ebuild, gcc-3.3.5.20050130.ebuild, gcc-3.4.3-r1.ebuild,
-  gcc-3.4.3.20050110.ebuild, gcc-4.0.0_alpha20050123.ebuild,
-  gcc-4.0.0_alpha20050130.ebuild:
-  Added DEPEND for cross-compilation.
-
-  12 Feb 2005; <plasmaroo@gentoo.org> gcc-3.4.3-r1.ebuild,
-  gcc-3.4.3.20050110.ebuild:
-  Mask 3.4 series -ia64; PINE fails horribly with it but works on 3.3.2...
-
-  10 Feb 2005; Markus Rothe <corsair@gentoo.org> gcc-3.4.3-r1.ebuild:
-  Stable on ppc64
-
-  02 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  gcc-3.3.5.20050130.ebuild, gcc-3.4.3-r1.ebuild:
-  Fix bug #80434.
-
-  02 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  gcc-3.3.5.20050130.ebuild:
-  Pushing into ~arch.  Re-adds support for tls on sparc.
-
-  01 Feb 2005; Sven Wegener <swegener@gentoo.org>
-  gcc-4.0.0_alpha20050123.ebuild, gcc-4.0.0_alpha20050130.ebuild:
-  Added missing ? in PDEPEND.
-
-*gcc-3.3.5.20050130 (01 Feb 2005)
-
-  01 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  gcc-3.3.5-r1.ebuild, +gcc-3.3.5.20050130.ebuild, gcc-3.4.3-r1.ebuild,
-  gcc-3.4.3.20050110.ebuild, +gcc-4.0.0_alpha20050123.ebuild,
-  +gcc-4.0.0_alpha20050130.ebuild:
-  Adding gcc4 alpha ebuilds for development and testing. Fix ordering of data
-  in ebuilds so DESCRIPTION, etc comes after inherit toolchain. Bump gcc-3.3
-  to reintroduce patchs from fedora which got dropped from 3.3.5 and
-  3.3.5-r1. This should fix tls issues on sparc (bug #78320), but it is still
-  in 'KEYWORDS=-*' until the PIE patches get updated.
-
-  31 Jan 2005; <plasmaroo@gentoo.org> gcc-3.3.5-r1.ebuild,
-  gcc-3.4.3-r1.ebuild:
-  GCC 3.3.5 eats fluffy bunnies for breakfast and kills IA64 bootstraps, so
-  3.4.3-r1 is going stable as it works. Marking 3.3.5-r1 "-ia64".
-
-  25 Jan 2005; Rob Holland <tigger@gentoo.org> :
-  Don't break the description line by overriding it in the eclass.
-
-  19 Jan 2005; Joshua Kinard <kumba@gentoo.org> gcc-3.4.3-r1.ebuild,
-  gcc-3.4.3.20050110.ebuild:
-  Typo tweaks in some comments in src_unpack.
-
-  19 Jan 2005; Brandon Hale <tseng@gentoo.org> gcc-3.4.3.20050110.ebuild:
-  Re-masking by request, see bug #78666. This GCC is failing with ICE, and 
-  some users report that it cannot even build itself. Hopefully the 
-  SSE2/3 fixes can be sanely backported to a released toolchain instead of 
-  unleashing a random, busted CVS checkout on ~arch.
-
-  16 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  gcc-3.4.3.20050110.ebuild:
-  Pushing into ~arch from -*.  This fixes bugs #57602 and #75067.
-
-  11 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> gcc-3.3.5-r1.ebuild:
-  Stable on sparc
-
-*gcc-3.4.3.20050110 (10 Jan 2005)
-
-  10 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  +gcc-3.4.3.20050110.ebuild:
-  Bump to a newer version of the 3.4 branch from upstream. This should resolve
-  alot of SIMD issues people are hsving with -msse and others. Should resolve
-  bug #57602, hopefully bug #75067, and all of its kin.
-
-  10 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  gcc-3.3.5-r1.ebuild, gcc-3.4.3-r1.ebuild:
-  Moved src_install, pkg_preinst, and pkg_postinst into eclass using
-  gcc-3.3.5-r1 and gcc-3.4.3-r1 as a base. Made env.d script creation more
-  abstract. Fixed up multilib support. Fixed some problems moving libs to
-  incorrect destinations or not moving some libs. Fixed a few
-  cross-compilation problems (but not all yet). Closes bug #76884. Updated
-  src_unpack to do patches based on ${CTARGET} instead of ${ARCH}.
-
-  09 Jan 2005; Joshua Kinard <kumba@gentoo.org>
-  +files/3.4.2/gcc-3.4.2-mips-ip28_cache_barriers.patch, gcc-3.4.3-r1.ebuild:
-  Added patch that introduces cache barriers to be used when building SGI IP28
-  kernels. Only enabled by passing -mip28-cache-barriers. Only patched in if USE
-  ip28 is set, so non-ip28 mips systems will never see this option.
-
-  06 Jan 2005; Mike Frysinger <vapier@gentoo.org> gcc-3.3.5-r1.ebuild:
-  Update pie patches to fix order #72665.
-
-  30 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  +files/3.3.5/gcc-3.3.5-ffecom_gfrt_basictype-prototype.patch,
-  gcc-3.3.5-r1.ebuild:
-  Fixing bad function prototype which causes compilation to fail on some
-  configurations.
-
-  24 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  gcc-3.4.3-r1.ebuild:
-  Make sure ${CTARGET}-g77 is created.
-
-  21 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  gcc-3.4.3-r1.ebuild:
-  sparc64 multilib fixes... /lib is 32bit which confused the ebuild.
-
-*gcc-3.3.5-r1 (04 Dec 2004)
-
-  04 Dec 2004; Travis Tilley <lv@gentoo.org>
-  +files/3.3.4/libffi-without-libgcj.patch, +gcc-3.3.5-r1.ebuild,
-  -gcc-3.3.5.ebuild:
-  added libffi-without-gcj fix, fixed another libpath bug, and updated the pie
-  patches so that sparc works again. the ebuilds and pie patch revisions for
-  the latest 3.3 and 3.4 ebuilds are now in sync. re-keyworded as testing on
-  sparc
-
-  03 Dec 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.3-r1.ebuild:
-  keyworded as testing on previously supported archs, as well as ia64 which
-  works now, yay
-
-  29 Nov 2004; Rob Holland <tigger@gentoo.org> files/gcc-spec-env.patch:
-  fixup gcc_specs patch to handle empty string
-
-  27 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> gcc-3.3.5.ebuild:
-  -sparc because of weirdness
-
-  26 Nov 2004; Sven Wegener <swegener@gentoo.org> :
-  Added missing digest entries.
-
-  27 Nov 2004; Travis Tilley <lv@gentoo.org>
-  +files/3.4.3/libffi-without-libgcj.patch, gcc-3.4.3-r1.ebuild:
-  1) added a patch that will allow building libffi without gcj. This
-     should make gnustep users happy. ;)
-  2) fixed a few more issues with libraries ending up outside the gcc
-     ${LIBPATH}
-  3) fixed the libtool archive libdir fixing thingie, which has apparently
-     been broken for quite some time without anyone noticing
-
-*gcc-3.4.3-r1 (25 Nov 2004)
-
-  25 Nov 2004; Travis Tilley <lv@gentoo.org> +gcc-3.4.3-r1.ebuild:
-  added a 20041125 branch update. made the logic for controlling
-  {PIE,SSP}-by-default logic even more fine grained, and updated the pie
-  patches to the latest version.
-
-  21 Nov 2004; Travis Tilley <lv@gentoo.org> -gcc-3.1.1-r2.ebuild,
-  -gcc-3.3.1-r5.ebuild, -gcc-3.3.2-r1.ebuild, gcc-3.3.2-r2.ebuild,
-  -gcc-3.3.2-r3.ebuild, -gcc-3.3.2-r4.ebuild, gcc-3.3.2-r5.ebuild,
-  gcc-3.3.2-r7.ebuild, gcc-3.3.2.ebuild, gcc-3.3.3-r3.ebuild,
-  -gcc-3.3.3-r5.ebuild, gcc-3.3.3-r6.ebuild, -gcc-3.3.3.ebuild,
-  gcc-3.3.4-r1.ebuild, gcc-3.3.4-r2.ebuild, -gcc-3.3.ebuild:
-  removed unused versions and changed the SLOT for all gcc 3.3 ebuilds to be
-  3.3 instead of 3.2
-
-  21 Nov 2004; Travis Tilley <lv@gentoo.org> gcc-3.3.5.ebuild:
-  updated manpages and pie patches
-
-  20 Nov 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.3.ebuild:
-  stable on amd64
-
-  20 Nov 2004; Travis Tilley <lv@gentoo.org> gcc-3.3.5.ebuild:
-  added in bounds checking support, fixed some multilib path oddities, and
-  made the ebuild use the newish should_we_gcc_config check for deciding
-  whether or not we should run gcc-config during postinst.
-  NOTE: at the moment 3.3.5 will not compile xgcc when using gcc 3.4
-
-  18 Nov 2004; Ilya A. Volynets-Evenbach <iluxa@gentoo.org> gcc-3.4.3.ebuild:
-  We don't need no stinky libstdc++-v3 on MIPS. Not to mention that 3.4.3 can't
-  compile it anyways
-
-*gcc-3.3.5 (17 Nov 2004)
-
-  17 Nov 2004; Mike Frysinger <vapier@gentoo.org> +gcc-3.3.5.ebuild:
-  Version bump.
-
-  14 Nov 2004; Sven Wegener <swegener@gentoo.org> :
-  Added missing ? after !build in PDEPEND.
-
-  09 Nov 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.3.ebuild:
-  add back in bounds checking support and fix a silly libdir bug (70481)
-
-  07 Nov 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.3.ebuild:
-  updated the pie patch tarball to version 8.7.6.6. this fixes a bug with
-  using the patches on alpha without a binutils that supports -pie. since
-  alpha is not currently keyworded for this ebuild, the revision has not been
-  bumped for this fix.
-
-  07 Nov 2004; Travis Tilley <lv@gentoo.org> gcc-3.3.3-r3.ebuild,
-  gcc-3.3.3-r5.ebuild, gcc-3.3.3-r6.ebuild, gcc-3.3.4-r1.ebuild,
-  gcc-3.3.4-r2.ebuild, gcc-3.4.1-r2.ebuild, gcc-3.4.1-r3.ebuild,
-  gcc-3.4.1.ebuild, gcc-3.4.2-r2.ebuild, gcc-3.4.3.ebuild:
-  changed the f77 USE flag to just plain old fortran
-
-*gcc-3.4.3 (07 Nov 2004)
-
-  07 Nov 2004; Travis Tilley <lv@gentoo.org> -gcc-3.4.2-r3.ebuild,
-  +gcc-3.4.3.ebuild:
-  version bumped. only generate specs-specific gcc configs if hardened gcc is
-  known to work on your arch. updated a few patches from redhat, and added the
-  arm/cross patches to the gcc patch tarball. removed gcc 3.4.2-r3 since the
-  branch update used was made just before the 3.4.3 freeze (dont worry sparc
-  users, this ebuild is keyworded as testing on sparc).
-
-  06 Nov 2004; Joshua Kinard <kumba@gentoo.org> gcc-3.4.2-r3.ebuild:
-  Marked unstable on sparc (Needs cascaded sparc64/gcc34 testing profile).
-
-  31 Oct 2004; Joshua Kinard <kumba@gentoo.org> gcc-3.4.1-r3.ebuild:
-  Marked stable on mips.
-
-  28 Oct 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.2-r3.ebuild:
-  fixed the ppc logic in toolchain.eclass and keyworded 3.4.2-r3 as testing on
-  ppc
-
-  26 Oct 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.2-r3.ebuild:
-  keyword as testing on amd64, mips, ppc64, and x86
-
-  26 Oct 2004; Mike Frysinger <vapier@gentoo.org>
-  +files/3.4.2/400-mips-pr17565.patch, +files/3.4.2/401-ppc-eabi-typo.patch,
-  +files/3.4.2/600-gcc34-arm-ldm-peephole.patch,
-  +files/3.4.2/601-gcc34-arm-ldm.patch,
-  +files/3.4.2/602-sdk-libstdc++-includes.patch,
-  +files/3.4.2/700-pr15068-fix.patch, +files/3.4.2/800-arm-bigendian.patch,
-  +files/3.4.2/810-arm-bigendian-uclibc.patch, gcc-3.4.2-r3.ebuild:
-  Import a bunch of patches from uclibc and merge a bunch of misc
-  cross-compiling fixes.
-
-*gcc-3.4.2-r3 (25 Oct 2004)
-
-  25 Oct 2004; Travis Tilley <lv@gentoo.org> +gcc-3.4.2-r3.ebuild:
-  any patches borrowed from fedora that are no longer in the latest fedora gcc
-  3.4 src rpm have been removed, except for the symbol visibility patches. added
-  20041025 branch update. a few GCC_SPECS and gcc-config related bugs in
-  toolchain.eclass have also been fixed.
-
-  18 Oct 2004; Tom Gall <tgall@gentoo.org> gcc-3.4.1-r3.ebuild:
-  stable on ppc64
-
-  06 Oct 2004; Alexander Gabert <pappy@gentoo.org> gcc-3.4.2-r2.ebuild:
-  added bounds checking by H.T. Brugge to gcc-3.4.2-r2 and toolchain.eclass,
-  notice that PIE+SSP is turned off when boundschecking is active
-
-  05 Oct 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.2-r2.ebuild:
-  made 3.4.2-r2 rdep on gcc-config-1.3.6-r3 to fix the new specs-specific config
-  switching and marked stable on amd64
-
-  05 Oct 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.2-r2.ebuild:
-  revert the multilib-by-default changes, since this seems to be causing
-  problems with hardened, and we havent yet completely figured out how to handle
-  mips' three ABIs.
-  Note: the multilib problem with hardened on amd64 will soon be fixed in
-  hardened-dev-sources, and this will no longer be an issue.
-
-  03 Oct 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.2-r2.ebuild:
-  use create_gcc_env_entry from toolchain.eclass to create gcc-config entries
-  for using the hardened/vanilla specs files
-
-  25 Sep 2004; Travis Tilley <lv@gentoo.org> gcc-3.3.3-r3.ebuild,
-  gcc-3.3.3-r5.ebuild, gcc-3.3.3-r6.ebuild, gcc-3.3.4-r1.ebuild,
-  gcc-3.3.4-r2.ebuild:
-  update uclibc patched ebuilds to work properly with recent libtool eclass
-  changes
-
-  22 Sep 2004; Joshua Kinard <kumba@gentoo.org>
-  +files/3.4.2/gcc-3.4.x-mips-add-march-r10k.patch, gcc-3.4.2-r2.ebuild:
-  Added a patch for mips that adds -march=r10000 and -mtune=r10000 support to
-  gcc.
-
-*gcc-3.4.2-r2 (21 Sep 2004)
-
-  21 Sep 2004; Travis Tilley <lv@gentoo.org>
-  +files/3.4.2/gcc34-fix-sse2_pinsrw.patch,
-  +files/3.4.2/gcc34-m32-no-sse2.patch, -gcc-3.4.2-r1.ebuild,
-  +gcc-3.4.2-r2.ebuild:
-  moved libgcc stuff back into the versioned directory, the libgcc_s-only stuff
-  will be broken out into a seperate ebuild. fixed broken libtool archives.
-  added an sse2 fix from Scott "I also own lv" Ladd, and a workaround that
-  disables sse2 by default for 32bit on both x86 and amd64 until the rest of the
-  wrong-code bugs are fixed. the workaround can be disabled completely by using
-  the -msse2 flag.
-
-  19 Sep 2004; <solar@gentoo.org> files/3.3.4/gcc-3.3.4-spec-env.patch,
-  files/3.4.1/gcc-3.4.1-spec-env.patch:
-  update robs patches from GCC_SPEC to GCC_SPECS so names are consistent in all
-  gcc versions
-
-  19 Sep 2004; <solar@gentoo.org> :
-  restore changelog
-
-*gcc-3.4.1-r3 (19 Sep 2004)
-
-  19 Sep 2004; Rob Holland <tigger@gentoo.org>
-  +files/3.3.4/gcc-3.3.4-spec-env.patch,
-  +files/3.4.1/gcc-3.4.1-spec-env.patch, +gcc-3.3.4-r2.ebuild,
-  +gcc-3.4.1-r3.ebuild:
-  added GCC_SPEC environment variable support
-
-  14 Sep 2004; Luca Barbato <lu_zero@gentoo.org> gcc-3.4.2-r1.ebuild:
-  Marked -ppc
-
-  13 Sep 2004; Travis Tilley <lv@gentoo.org> +files/gcc-spec-env.patch,
-  gcc-3.4.2-r1.ebuild:
-  added a patch from Rob "I own lv" Holland that allows you to switch specs
-  files based on an environment variable (GCC_SPECS) and made gcc build both a
-  vanilla and hardened specs file by default. Eventually this will mean being
-  able to switch between gcc and hardened gcc on the fly. Since neither
-  gcc-config nor portage support this yet, I'm not bumping the revision number.
-
-*gcc-3.4.2-r1 (12 Sep 2004)
-
-  12 Sep 2004; Travis Tilley <lv@gentoo.org> +gcc-3.4.2-r1.ebuild,
-  -gcc-3.4.2.ebuild:
-  re-added uclibc patches and masked for testing
-
-  10 Sep 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.2.ebuild:
-  updated ssp patch to 3.4.1-1. this version includes it's own documentation and
-  will define _SSP_ when stack protection code is being built.
-
-  08 Sep 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.2.ebuild:
-  made gcc default to using multilib on supported archs. add nomultilib to USE
-  to disable.
-
-*gcc-3.4.2 (07 Sep 2004)
-
-  07 Sep 2004; Travis Tilley <lv@gentoo.org> +gcc-3.4.2.ebuild,
-  -gcc-3.4.2_pre20040902.ebuild:
-  version bump. disabled building libjava multilib. this release is masked until
-  the uclibc patches are done, bootstrapping is tested, and the toolchain.eclass
-  changes are tested on ppc and ppc64.
-
-  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> gcc-3.4.1-r2.ebuild,
-  gcc-3.4.1.ebuild, gcc-3.4.2_pre20040902.ebuild:
-  Switch to use epause and ebeep, bug #62950
-
-  06 Sep 2004; Luca Barbato <lu_zero@gentoo.org> gcc-3.4.1-r2.ebuild:
-  Marked ppc
-
-*gcc-3.4.2_pre20040902 (05 Sep 2004)
-
-  05 Sep 2004; Travis Tilley <lv@gentoo.org> +gcc-3.4.2_pre20040902.ebuild:
-  - added 3.4.2_pre20040902 for testing and working on the new toolchain.eclass
-  - updated the gcc symbol visibility patch
-  - removed uclibc patches temporarily, they break every time I update gcc
-  - added a hack to make gcj not build multilib
-  - made libgcc_s.so install to /lib{,32,64}
-  - added a potential cross-compile fix that should run the correct target
-    when CCHOST != CHOST
-  - added java gui backport
-
-  31 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> gcc-3.3.4-r1.ebuild:
-  Stable on sparc
-
-  28 Aug 2004; <solar@gentoo.org> gcc-3.4.1-r2.ebuild, gcc-3.4.1.ebuild:
-  We don't want a PDEPEND of libstd++v3 on uclibc.
-
-  26 Aug 2004; Jon Portnoy <avenj@gentoo.org> gcc-3.3.4-r1.ebuild :
-  Stable on x86
-
-  26 Aug 2004; Travis Tilley <lv@gentoo.org> gcc-3.3.4-r1.ebuild:
-  stable on amd64
-
-  26 Aug 2004; <solar@gentoo.org> -gcc-3.3.2-r6.ebuild, -gcc-3.3.3-r1.ebuild,
-  -gcc-3.3.4.ebuild, -gcc-3.4.0-r6.ebuild:
-  pruned a few more ebuilds
-
-  25 Aug 2004; <solar@gentoo.org> -gcc-3.3-r1.ebuild, -gcc-3.3.3-r4.ebuild,
-  -gcc-3.3.3_pre20040130.ebuild, -gcc-3.3.3_pre20040215.ebuild,
-  -gcc-3.3.3_pre20040322.ebuild, gcc-3.3.4-r1.ebuild, gcc-3.4.1-r2.ebuild:
-  removed old/stale ebuilds, marked gcc-3.3.4-r1 stable on arm, keep gcc from
-  scanning for guard symbols when environment variable is set
-
-  25 Aug 2004; Mike Frysinger <vapier@gentoo.org> gcc-2.95.3-r8.ebuild,
-  gcc-3.2.3-r4.ebuild, gcc-3.3-r1.ebuild, gcc-3.3.1-r5.ebuild,
-  gcc-3.3.2-r1.ebuild, gcc-3.3.2-r2.ebuild, gcc-3.3.2-r3.ebuild,
-  gcc-3.3.2-r4.ebuild, gcc-3.3.2-r5.ebuild, gcc-3.3.2-r6.ebuild,
-  gcc-3.3.2-r7.ebuild, gcc-3.3.2.ebuild, gcc-3.3.3-r1.ebuild,
-  gcc-3.3.3-r3.ebuild, gcc-3.3.3-r4.ebuild, gcc-3.3.3-r5.ebuild,
-  gcc-3.3.3-r6.ebuild, gcc-3.3.3.ebuild, gcc-3.3.3_pre20040130.ebuild,
-  gcc-3.3.3_pre20040215.ebuild, gcc-3.3.3_pre20040322.ebuild,
-  gcc-3.3.3_pre20040408-r1.ebuild, gcc-3.3.3_pre20040426.ebuild,
-  gcc-3.3.4-r1.ebuild, gcc-3.3.4.ebuild, gcc-3.3.ebuild, gcc-3.4.0-r6.ebuild,
-  gcc-3.4.1-r2.ebuild, gcc-3.4.1.ebuild:
-  Rip out $COMPILER since it isnt used in such a way that matters.
-
-  20 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> gcc-3.3.4-r1.ebuild:
-  Enabled -O2 for sparc: safe and good
-
-  17 Aug 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.1-r2.ebuild,
-  gcc-3.4.1.ebuild:
-  made gcc depend on media-libs/libart_lgpl when gcj is in USE
-
-  17 Aug 2004; Luca Barbato <lu_zero@gentoo.org> gcc-3.4.1-r2.ebuild:
-  Marked ~ppc
-
-  14 Aug 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.0-r6.ebuild,
-  gcc-3.4.1-r2.ebuild, gcc-3.4.1.ebuild:
-  -mcpu is deprecated on amd64 and x86
-
-  14 Aug 2004; Ilya A. Volynets-Evenbach <iluxa@gentoo.org>
-  files/3.4.1/gcc-3.4.1-mips-n32only.patch,
-  files/3.4.1/gcc-3.4.1-mips-n64only.patch, gcc-3.4.1-r2.ebuild:
-  Make sure all gcc libraries go into version-specific dir on n32-only and
-  n64-only systems
-
-  13 Aug 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.1-r2.ebuild:
-  stable on amd64 :)
-
-  11 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> gcc-3.3.4-r1.ebuild:
-  Keyworded ~sparc
-
-  11 Aug 2004; Travis Tilley <lv@gentoo.org>
-  +files/3.4.1/gcc-3.4.1-glibc-is-native.patch, gcc-3.4.1-r2.ebuild,
-  gcc-3.4.1.ebuild:
-  added a fix for bug 55108, where enabling multilib caused gcc to fail
-  compiling with "Link tests are not allowed after GCC_NO_EXECUTABLES"
-
-  08 Aug 2004; Tom Martin <slarti@gentoo.org> gcc-3.3.3-r3.ebuild,
-  gcc-3.3.3-r4.ebuild, gcc-3.3.3-r5.ebuild, gcc-3.3.3-r6.ebuild,
-  gcc-3.3.4-r1.ebuild, gcc-3.3.4.ebuild, gcc-3.4.0-r6.ebuild,
-  gcc-3.4.1-r2.ebuild, gcc-3.4.1.ebuild:
-  Typo in DESCRIPTION: extentions -> extensions. Bug 59717.
-
-  06 Aug 2004; Mike Frysinger <vapier@gentoo.org>
-  +files/pro-police-docs.patch, gcc-3.3.4-r1.ebuild, gcc-3.4.0-r6.ebuild,
-  gcc-3.4.1-r2.ebuild, gcc-3.4.1.ebuild:
-  Add the pro-police doc patch.
-
-  05 Aug 2004; Ilya A. Volynets-Evenbach <iluxa@gentoo.org>
-  gcc-3.4.1-r2.ebuild:
-  Disable PDEPEND on libstdc++-v3 for n32/n64 systems. gcc-3.3 didn't work on
-  them ever. Not to mention that libstdc++-v3 simply doesn't build as n32.
-  Also add $ABI variable. It should be set in profile for multi-abi capable arches
-
-*gcc-3.4.1-r2 (03 Aug 2004)
-
-  03 Aug 2004; Travis Tilley <lv@gentoo.org>
-  +files/3.4.1/gcc-3.4.1-r2-gentoo-branding.patch, -gcc-3.4.1-r1.ebuild,
-  +gcc-3.4.1-r2.ebuild, gcc-3.4.1.ebuild:
-  new snapshot, among other things it contains an enum fix that's needed to work
-  on porting openoffice to gcc 3.4. removed the old experimental ebuild and
-  keyworded 3.4.1 stable on ppc64 since it also has the ICE fix for mozilla.
-  updated piepatch version to 8.7.6.5
-
-  03 Aug 2004; Tom Gall <tgall@gentoo.org> gcc-3.4.1-r1.ebuild:
-  stable on ppc64
-
-  29 Jul 2004; Alexander Gabert <pappy@gentoo.org> gcc-3.3.4-r1.ebuild:
-  adding hardened dependency for sparc, still not keyworded, but yet to come
-
-  26 Jul 2004; Travis Tilley <lv@gentoo.org>
-  +files/3.4.1/gcc341-ppc64-mozilla-ICE-fix.patch, gcc-3.4.1-r1.ebuild,
-  gcc-3.4.1.ebuild:
-  added a patch that should fix a ppc64 specific internal compiler error that
-  shows up when compiling mozilla
-
-  25 Jul 2004; Daniel Goller <morfic@gentoo.org> gcc-3.4.1.ebuild:
-  Marking ~x86 for gcc 3.4 profile
-
-  25 Jul 2004; Guy Martin <gmsoft@gentoo.org> gcc-3.4.1.ebuild:
-  Marked -hppa. It b0rks glibc and co.
-
-*gcc-3.3.3-r1 (22 Jul 2004)
-
-  22 Jul 2004; Martin Schlemmer <azarah@gentoo.org>
-  +files/3.3.3/gcc333-pr15693.patch, +gcc-3.3.3-r1.ebuild:
-  Bug #57182.  This is sparc only fixup.
-
-  22 Jul 2004; Alexander Gabert <pappy@gentoo.org> gcc-3.3.4-r1.ebuild:
-  fire up hardened changes for sparc and hppa, though still leaving keyworded on
-  sparc
-
-  22 Jul 2004; Alexander Gabert <pappy@gentoo.org> gcc-3.4.1.ebuild:
-  added hppa logic and note for glibc
-
-  20 Jul 2004; Alexander Gabert <pappy@gentoo.org> gcc-3.3.3-r6.ebuild:
-  added hardened auto PIE SSP for sparc
-
-  19 Jul 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.0-r6.ebuild,
-  gcc-3.4.1-r1.ebuild, gcc-3.4.1.ebuild:
-  changed use of gtk2 USE flag to gtk
-
-  14 Jul 2004; <solar@gentoo.org> gcc-3.3.4-r1.ebuild:
-  gcc-3.3.4-r1 marked -hppa ~x86 ~amd64 ~mips ~arm, ~sparc desired
-
-  13 Jul 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.1.ebuild:
-  marking 3.4.1 stable on amd64. fixes bug 56864
-
-  13 Jul 2004; Travis Tilley <lv@gentoo.org> files/awk/fixlafiles.awk:
-  added Martin Schlemmer's new fixlafiles.awk with support for gcc 3.4 lib paths
-
-  11 Jul 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.0-r6.ebuild,
-  gcc-3.4.1-r1.ebuild, gcc-3.4.1.ebuild:
-  xlib peers are deprecated in libjava 3.4.0, switching gcc 3.4 ebuilds to gtk2
-
-*gcc-3.4.1-r1 (10 Jul 2004)
-
-  10 Jul 2004; Travis Tilley <lv@gentoo.org> +gcc-3.4.1-r1.ebuild:
-  now that i've tested it a bit locally, i'm committing a -* masked ebuild with
-  the GCC symbol visibility patch
-  (http://www.nedprod.com/programs/gccvisibility.html) for further testing by
-  hardened + uclibc devs. it should eventually lead to speed increases for
-  hardened, smaller libs for uclibc, and improved load times for everybody. this
-  ebuild also has a few readability cleanups for my own personal sanity.
-
-  07 Jul 2004; Joshua Kinard <kumba@gentoo.org> gcc-3.3.3-r6.ebuild:
-  Marked stable on mips.
-
-*gcc-3.4.1 (05 Jul 2004)
-
-  05 Jul 2004; Travis Tilley <lv@gentoo.org>
-  +files/3.4.1/gcc-3.4.1-gentoo-branding.patch, +gcc-3.4.1.ebuild:
-  new version. please see http://gcc.gnu.org/gcc-3.4/changes.html#3.4.1 for more
-  information.
-
-*gcc-3.3.4-r1 (04 Jul 2004)
-
-  04 Jul 2004; Martin Schlemmer <azarah@gentoo.org> +gcc-3.3.4-r1.ebuild:
-  Update from 3_3-rhl branch.  Add PIE support back.
-
-  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gcc-2.95.3-r8.ebuild,
-  gcc-3.0.4-r6.ebuild, gcc-3.1.1-r2.ebuild, gcc-3.3-r1.ebuild,
-  gcc-3.3.1-r5.ebuild, gcc-3.3.2-r1.ebuild, gcc-3.3.2-r2.ebuild,
-  gcc-3.3.2-r4.ebuild, gcc-3.3.2-r5.ebuild, gcc-3.3.2-r6.ebuild,
-  gcc-3.3.2-r7.ebuild, gcc-3.3.2.ebuild, gcc-3.3.3-r3.ebuild,
-  gcc-3.3.3-r4.ebuild, gcc-3.3.3-r5.ebuild, gcc-3.3.3-r6.ebuild,
-  gcc-3.3.3.ebuild, gcc-3.3.3_pre20040130.ebuild,
-  gcc-3.3.3_pre20040215.ebuild, gcc-3.3.3_pre20040322.ebuild,
-  gcc-3.3.3_pre20040408-r1.ebuild, gcc-3.3.3_pre20040426.ebuild,
-  gcc-3.3.4.ebuild, gcc-3.3.ebuild, gcc-3.4.0-r6.ebuild:
-  virtual/glibc -> virtual/libc
-
-  29 Jun 2004; <solar@gentoo.org> gcc-3.3.3-r6.ebuild, gcc-3.3.4.ebuild,
-  gcc-3.4.0-r6.ebuild, files/3.3.3/gcc-3.3.3-norelro.patch:
-  add norelro patch for uclibc
-
-  28 Jun 2004; <solar@gentoo.org> gcc-3.4.0-r6.ebuild:
-  fwdport uclibc updates from 3.3.4
-
-  27 Jun 2004; Luca Barbato <lu_zero@gentoo.org> :
-  Minor ppc/altivec related fix
-
-  24 Jun 2004; <solar@gentoo.org> gcc-3.3.3-r6.ebuild:
-  backport uclibc updates from 3.3.4
-
-  24 Jun 2004; Aron Griffis <agriffis@gentoo.org> gcc-3.3-r1.ebuild,
-  gcc-3.3.2-r1.ebuild, gcc-3.3.2-r2.ebuild, gcc-3.3.2-r3.ebuild,
-  gcc-3.3.2-r4.ebuild, gcc-3.3.2-r5.ebuild, gcc-3.3.2-r6.ebuild,
-  gcc-3.3.2-r7.ebuild, gcc-3.3.2.ebuild, gcc-3.3.3-r3.ebuild,
-  gcc-3.3.3-r4.ebuild, gcc-3.3.3-r5.ebuild, gcc-3.3.3-r6.ebuild,
-  gcc-3.3.3.ebuild, gcc-3.3.3_pre20040130.ebuild,
-  gcc-3.3.3_pre20040215.ebuild, gcc-3.3.3_pre20040322.ebuild,
-  gcc-3.3.3_pre20040408-r1.ebuild, gcc-3.3.3_pre20040426.ebuild,
-  gcc-3.3.4.ebuild, gcc-3.3.ebuild, gcc-3.4.0-r6.ebuild:
-  Fix use invocation and regenerate broken manifest
-
-*gcc-3.3.4 (20 Jun 2004)
-
-  20 Jun 2004; Martin Schlemmer <azarah@gentoo.org>
-  +files/3.3.4/gcc334-gentoo-branding.patch, +gcc-3.3.4.ebuild:
-  Update version. Add uclibc changes as from Ned Ludd (not sure who they from).
-  PIE support is for the moment disabled, and thus the '-*' in KEYWORDS.
-  Closes bug #54321.
-
-  09 Jun 2004; Alexander Gabert <pappy@gentoo.org> gcc-3.3.3-r6.ebuild:
-  removing the hardened PIE SSP logic for sparc - it breaks glibc compiling with
-  a hardened gcc and until this is sorted out we cannot support it on sparc
-  anyway
-
-  08 Jun 2004; Travis Tilley <lv@gentoo.org> gcc-3.3.3-r6.ebuild:
-  stable on amd64
-
-  08 Jun 2004; <solar@gentoo.org> gcc-3.3.3-r6.ebuild:
-  gcc-3.3.3-r6.ebuild marked stable for upcoming release
-
-  08 Jun 2004; Brandon Hale <tseng@gentoo.org> gcc-3.3.3-r6.ebuild:
-  Start wider testing for 3.3.3-r6, marked ~x86.
-
-*gcc-3.1.1-r2 (07 Jun 2004)
-
-  07 Jun 2004; Mike Frysinger <vapier@gentoo.org> -gcc-3.1.1-r1.ebuild,
-  +gcc-3.1.1-r2.ebuild:
-  Fix long standing env bug #30849 and use epatch instead of patch.
-
-  05 Jun 2004; Travis Tilley <lv@gentoo.org>
-  +files/3.4.0/reiser4-why-do-you-hate-me.patch, gcc-3.4.0-r6.ebuild:
-  added fix for compiling on reiser4 filesystems
-
-  04 Jun 2004; Travis Tilley <lv@gentoo.org>
-  +files/3.4.0/gcc-3.4.0-cc1-no-stack-protector.patch,
-  +files/3.4.0/gcc34-ice-hack.patch, gcc-3.4.0-r6.ebuild:
-  updated the ice hack patch and added a stack protector fix for cc1
-
-  04 Jun 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.0-r6.ebuild:
-  stable on amd64
-
-  04 Jun 2004; Brandon Hale <tseng@gentoo.org>
-  +files/3.3.3/gcc-3.3.3-libiberty-pic.patch, gcc-3.3.3-r6.ebuild:
-  Readd missing libiberty-pic patch for gcc-3.3.3-r6
-
-  03 Jun 2004; Tom Gall <tgall@gentoo.org> gcc-3.4.0-r6.ebuild:
-  stable on ppc64
-
-  02 Jun 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> gcc-3.3.3_pre20040408-r1.ebuild:
-  Masked stable on ppc
-
-  02 Jun 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.0-r6.ebuild:
-  lib64 fix for libgcc_s on ppc64
-
-  02 Jun 2004; Joshua Kinard <kumba@gentoo.org> gcc-3.4.0-r6.ebuild:
-  Added ~mips back to KEYWORDS.
-
-  02 Jun 2004; Travis Tilley <lv@gentoo.org>
-  +files/3.4.0/gcc34-ia64-lib64.patch, +files/3.4.0/gcc34-multi32-hack.patch,
-  +files/3.4.0/gcc34-ppc64-m32-m64-multilib-only.patch, gcc-3.4.0-r6.ebuild:
-  added some last minute multilib fixes for ppc64, ia64, and sparc
-
-*gcc-3.4.0-r6 (01 Jun 2004)
-
-  01 Jun 2004; Travis Tilley <lv@gentoo.org>
-  -files/3.4.0/gcc-3.4-libiberty-pic.patch,
-  -files/3.4.0/gcc-3.4.0-mips-pcrel.diff,
-  -files/3.4.0/gcc-3.4.0-r3-gentoo-branding.patch,
-  +files/3.4.0/gcc-3.4.0-r6-gentoo-branding.patch,
-  -files/3.4.0/gcc34-ppc64-typo-fix.patch, -gcc-3.4.0-r4.ebuild,
-  -gcc-3.4.0-r5.ebuild, +gcc-3.4.0-r6.ebuild:
-  branch update. this release should fix most of the unit-at-a-time problems
-  people have been seeing.
-
-  30 May 2004; Travis Tilley <lv@gentoo.org>
-  +files/3.4.0/gcc34-ppc64-typo-fix.patch, gcc-3.4.0-r5.ebuild:
-  added a typo fix patch for ppc64
-
-  30 May 2004; Ilya A. Volynets-Evenbach <iluxa@gentoo.org>
-  +files/3.4.0/gcc-3.4.0-mips-pcrel.diff, gcc-3.4.0-r5.ebuild:
-  Add n32 & n64 use flags
-  Add n32/n64 patches and build options
-  Allow multilibs on all arches
-
-  28 May 2004; Tom Gall <tgall@gentoo.org> gcc-3.3.3_pre20040408-r1.ebuild:
-  marked as stable for ppc64
-
-  27 May 2004; Aron Griffis <agriffis@gentoo.org> gcc-3.3.2-r5.ebuild:
-  Fix bug 52147: gcc-3.3.2-r5 used to build on ia64, now it doesn't. Demote
-  stable version to 3.3.2-r2, which still builds.
-
-*gcc-3.3.3-r6 (27 May 2004)
-
-  27 May 2004; Alexander Gabert <pappy@gentoo.org>
-  +files/3.3.3/gcc333-ssp-3.3.2_1-fixup.patch, +gcc-3.3.3-r6.ebuild:
-  added preliminary gcc 3.3.3 -r6 version, this one will fix the problems with
-  bug 51386, removing guard from libgcc even UNResolved symbols
-
-*gcc-3.4.0-r5 (26 May 2004)
-
-  26 May 2004; Travis Tilley <lv@gentoo.org> +gcc-3.4.0-r5.ebuild:
-  uclibc related updates and fixes from Peter Mazinger
-
-  26 May 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.0-r4.ebuild:
-  adding ~amd64 keyword. this shouldnt have an effect on most users, as gcc 3.4
-  is profile masked. please switch to the gcc34-amd64-2004.1 profile if you want
-  to install this package on amd64.
-
-  21 May 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.0-r4.ebuild:
-  updated piepatches from Peter Mazinger to 8.7.6.2. the 3.4.0 version should
-  now be as complete as the 3.3.x version. Thanks Peter, you rock! :)
-
-  20 May 2004; <solar@gentoo.org> gcc-3.3.3-r5.ebuild:
-  marked gcc-3.3.3-r5 -* -hppa arm ~x86 ~sparc ~amd64
-
-*gcc-3.4.0-r4 (21 May 2004)
-
-  21 May 2004; Travis Tilley <lv@gentoo.org> -gcc-3.4.0-r3.ebuild,
-  +gcc-3.4.0-r4.ebuild:
-  3.4.0-r3 was horribly broken, so i am doing a revision bump to encourage all
-  users who installed this version to upgrade. i have also removed backwards
-  compatibility support because it was horribly broken on a few archs other than
-  x86 and amd64. please keep gcc 3.3.x or 3.2.x around if you need the older
-  libstdc++ for running binary-only c++ apps.
-
-*gcc-3.4.0-r3 (20 May 2004)
-
-  20 May 2004; Travis Tilley <lv@gentoo.org>
-  +files/3.4.0/gcc-3.4-libiberty-pic.patch,
-  -files/3.4.0/gcc-3.4.0-fno-for-scope.patch,
-  -files/3.4.0/gcc-3.4.0-gentoo-branding.patch,
-  +files/3.4.0/gcc-3.4.0-r3-gentoo-branding.patch, -gcc-3.4.0-r1.ebuild,
-  -gcc-3.4.0-r2.ebuild, +gcc-3.4.0-r3.ebuild:
-  updated gcc 3.4 to a 20040519 snapshot and removed the fno-for-scope and
-  stack-size patches, as they"ve been merged upstream. updated to the latest
-  piessp patches from Peter Mazinger, only with the arm patches temporarily
-  disabled. removed SSP exclusion patch... it should no longer be needed. amd64
-  users beware: this release breaks the ABI slightly, and has a small chance of
-  causing problems. for more information on this ABI break, see
-  http://gcc.gnu.org/ml/gcc/2004-05/msg00911.html
-
-  17 May 2004; Travis Tilley <lv@gentoo.org> gcc-3.3.3-r5.ebuild:
-  added amd64 to the (short) list of archs that can enable automatic PIE + SSP
-
-*gcc-3.3.3-r5 (14 May 2004)
-
-  14 May 2004; Alexander Gabert <pappy@gentoo.org> +gcc-3.3.3-r5.ebuild:
-  added preliminary version for gcc-3.3.3-r5 with latest Mazinger patches and
-  sparc define fix, testing proceeds on intel and sparc
-
-  13 May 2004; Travis Tilley <lv@gentoo.org>
-  +files/3.4.0/gcc-3.4.0-move-propolice-into-glibc.patch, gcc-3.4.0-r2.ebuild:
-  it seems that the new SSP doesnt honor _LIBC_PROVIDES_SSP_, so i've included a
-  patch that adds this functionality back in
-
-*gcc-3.4.0-r2 (12 May 2004)
-
-  12 May 2004; Travis Tilley <lv@gentoo.org> +gcc-3.4.0-r2.ebuild,
-  -gcc-3.4.0.ebuild:
-  added SSP support and updated the piessp patches (mostly) to 8.7.4. note that
-  the piessp patches arent yet as complete as the 3.3.3 version on archs other
-  than x86 and amd64.
-
-  08 May 2004; <solar@gentoo.org> gcc-3.3.3-r4.ebuild:
-  patch updates
-
-  06 May 2004; Travis Tilley <lv@gentoo.org> gcc-3.3.3-r3.ebuild,
-  gcc-3.3.3.ebuild, gcc-3.4.0-r1.ebuild:
-  made the compatibility check look for the actual .so instead of just the
-  versioned directory that contains it because there may or may not be any
-  shared objects to back up... The PPC-specific gcc 3.3.3 ebuilds for some
-  reason install libstdc++ directly to /usr/lib/ on PPC64, so this change should
-  allow gcc 3.4.0-r1 to install on this arch without tar failing.
-
-  06 May 2004; Travis Tilley <lv@gentoo.org> gcc-3.3.3-r3.ebuild,
-  gcc-3.3.3.ebuild, gcc-3.4.0-r1.ebuild:
-  copied the sed magick from 3.3.3-r4 that should fix building gcc with binutils
-  2.15.90.0.3 and then downgrading to a previous version. it disables the
-  --as-needed support that only gets compiled in when using binutils 2.15.90.0.2
-  or higher (proper support of which has been moved back to a gcc 3.5 target)
-
-  06 May 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.0-r1.ebuild:
-  added gcc333_pre20040408-stack-size.patch for testing on ppc64
-
-  04 May 2004; Ilya A. Volynets-Evenbaks <iluxa@gentoo.org> gcc-3.4.0.ebuild:
-  gcc reqires glibc-2.3.3_pre20040420, primarily because of bunch of missing
-  sgidefs.h includes, patch for which is included there.
-
-*gcc-3.4.0-r1 (04 May 2004)
-
-  04 May 2004; Travis Tilley <lv@gentoo.org> +gcc-3.4.0-r1.ebuild:
-  added a compatibility function that backs up your older libstdc++ so that
-  binary applications wont break if/when you uninstall your old compiler
-
-  04 May 2004; <solar@gentoo.org> files/3.3.3/gcc-uclibc-3.3-loop.patch:
-  added gcc-uclibc-3.3-loop.patch
-
-  04 May 2004; <solar@gentoo.org> gcc-3.3.3-r4.ebuild:
-  fixed typo's and limit USE hardened piessp by default to x86 only for now
-
-  03 May 2004; <solar@gentoo.org> gcc-3.3.3-r4.ebuild,
-  files/3.3.3/gcc-3.3.3-uclibc-add-ssp.patch:
-  disable -as-needed from being compiled into gcc specs natively when using
-  >=sys-devel/binutils-2.15.90.0.3. This is done to keep our gcc backwards
-  compatible with binutils. misc pie updates for misc arches
-
-*gcc-3.3.3-r4 (02 May 2004)
-
-  02 May 2004; <solar@gentoo.org> gcc-3.3.3-r3, gcc-3.3.3-r4.ebuild:
-  ARM is having issues with static linking as the spec file calls for
-  crtbeginT.o vs crtbeginS.o so we disable improved handling patch till we can
-  take a closer look. FIXME
-
-  01 May 2004; <solar@gentoo.org> gcc-3.3.3-r4.ebuild:
-  piessp version 8.6.4 from Peter S. Mazinger. Additional patches added redhat
-  ice-hack updated and more uclibc updates
-
-  30 Apr 2004; Tom Gall <tgall@gentoo.org> gcc-3.3.3_pre20040322.ebuild,
-  gcc-3.3.3_pre20040408-r1.ebuild, gcc-3.3.3_pre20040426.ebuild:
-  mark these as ~ppc64. DO NOT MARK stable for ppc64 without talking to me please.
-
-  29 Apr 2004; Mike Frysinger <vapier@gentoo.org> gcc-3.3.3-r3.ebuild,
-  +files/3.3.3/gcc333-debian-arm-getoff.patch,
-  +files/3.3.3/gcc333-debian-arm-ldm.patch:
-  Take two patches from debian gcc-3.3.3 so that it works nicely on arm.
-
-  28 Apr 2004; Travis Tilley <lv@gentoo.org>
-  +files/3.4.0/gcc-3.4.0-fno-for-scope.patch, gcc-3.4.0.ebuild:
-  added fix for bug 49174
-
-  28 Apr 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.0.ebuild:
-  fixed things up a bit and added a check that changes the deprecated -mcpu
-  option to -mtune so that libiberty wont break anymore for people with -mcpu in
-  CFLAGS
-
-  28 Apr 2004; <solar@gentoo.org> gcc-3.3.3-r3.ebuild:
-  More updates for uClibc, cross compiling fixes and addition of
-  --disable-libunwind-exceptions for use with glibc
-
-  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> gcc-3.0.4-r6.ebuild:
-  Add flag-o-matic for bug 49179
-
-*gcc-3.3.3_pre20040426 (27 Apr 2004)
-
-  27 Apr 2004; Luca Barbato <lu_zero@gentoo.org>
-  +files/3.3.3/gcc333_pre20040426-gentoo-branding.patch,
-  +gcc-3.3.3_pre20040426.ebuild:
-  New snapshot
-
-  27 Apr 2004; Mike Frysinger <vapier@gentoo.org> gcc-3.4.0.ebuild:
-  cleanup flag stuff and remove CHOST setting with hppa gcc-3.4.0.ebuild
-
-  27 Apr 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.0.ebuild:
-  re-added manpages and made the ebuild automatically die if gcj or multilib are
-  in USE, as these are sure to make gcc 3.4.0 fail at this point...
-
-  26 Apr 2004; Tom Gall <tgall@gentoo.org> gcc-3.4.0.ebuild:
-  fix bug 49111, appears to work quite well on ppc64
-
-  27 Apr 2004; Michael McCabe <randy@gentoo.org> gcc-3.3.3-r3.ebuild:
-  Marked stable on s390
-
-  26 Apr 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.0.ebuild:
-  fix bug where the ebuild tries to nuke libiberty from outside the sandbox
-
-  26 Apr 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.0.ebuild:
-  change settings for mips again... arch set to mips3 and tune set to r4600
-
-  26 Apr 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.0.ebuild:
-  changed mips default arch settings so that march defaults to r4k and not
-  mips3. also removed default mtune setting. thanks for the heads up geoman
-
-*gcc-3.4.0 (26 Apr 2004)
-
-  26 Apr 2004; Travis Tilley <lv@gentoo.org>
-  +files/3.4.0/gcc-3.4.0-gentoo-branding.patch,
-  -files/3.4.0/gcc-3.4.0_pre20040416-gentoo-branding.patch,
-  gcc-3.3.3-r3.ebuild, +gcc-3.4.0.ebuild, -gcc-3.4.0_pre20040416.ebuild:
-  added ebuild for gcc 3.4.0 final, and removed ada from the IUSE of gcc 3.3.3-r3
-
-*gcc-3.3.3-r3 (25 Apr 2004)
-
-  25 Apr 2004; Martin Schlemmer <azarah@gentoo.org> +gcc-3.3.3-r3.ebuild:
-  Update snapshot. Fix objc doc install. Do not build ada until we resolve if we
-  should or not.
-
-  24 Apr 2004; Joshua Kinard <kumba@gentoo.org> gcc-3.3.3.ebuild:
-  Marking gcc-3.3.3 stable on mips, as stages and GRPs are built with it, and
-  it's run fine with no issues.
-
-  22 Apr 2004; Mike Frysinger <vapier@gentoo.org> gcc-3.3.3-r2.ebuild:
-  Change the nogcj flag to gcj.
-
-  21 Apr 2004; Mike Frysinger <vapier@gentoo.org> gcc-3.2-r5 gcc-3.1-r8:
-  These were never released so lets prune them.
-
-  21 Apr 2004; Mike Frysinger <vapier@gentoo.org> gcc-3.2.3-r2 gcc-3.2.3-r3
-  gcc-3.2.3-r4:
-  Bump r4 to stable and clean it up so we can force out r2 and r3 in the future.
-
-  21 Apr 2004; Mike Frysinger <vapier@gentoo.org> gcc-2.95.3-r7 gcc-2.95.3-r8:
-  Clean up ebuilds (filter-flags and similar) and bump r8 to stable for ppc/sparc/alpha
-  so we can trim out r7 in the future.
-
-  21 Apr 2004; Mike Frysinger <vapier@gentoo.org> gcc-3.0.4 gcc-3.1.1-r1:
-  Clean up the ebuild (filter-flags and similar).
-
-  20 Apr 2004; <solar@gentoo.org> gcc-3.3.3-r2.ebuild:
-  add s390 gcc-3.3.3 patch from bug #47915, added USE flags for f77, objc from
-  bug #23171.
-
-*gcc-3.4.0_pre20040416 (19 Apr 2004)
-
-  19 Apr 2004; Travis Tilley <lv@gentoo.org>
-  +files/3.4.0/gcc-3.4.0_pre20040416-gentoo-branding.patch,
-  +gcc-3.4.0_pre20040416.ebuild:
-  initial commit for gcc 3.4.0 pre-release. currently only amd64 is tested well
-  with gcc 3.4, gcj is broken, and some things dont compile properly.
-  PIE-by-default support has been added, but propolice has yet to be ported.
-
-  18 Apr 2004; <solar@gentoo.org> :
-  ChangeLog correction.. instructions on unmasking can be found in
-  /usr/portage/profiles/package.mask
-
-*gcc-3.3.3-r2 (18 Apr 2004)
-
-  18 Apr 2004; <solar@gentoo.org> gcc-3.3.3-r1.ebuild, gcc-3.3.3-r2.ebuild:
-  long awaited piessp functionality in here after alot of local testing.. Many
-  many thanks go to the PaX Team, Peter S. Mazinger (who helped tremendously),
-  and all those who helped getting this version ready.. This gcc-3.3.3-r2.ebuild
-  is currently package.masked but instructions on unmasking can be found in
-  /usr/portage/package.unmask, please test. Note: USE=uclibc might still need a
-  little more work, which we intend to address to before unmasking
-
-*gcc-3.3.3_pre20040408-r1 (15 Apr 2004)
-
-  15 Apr 2004; Luca Barbato <lu_zero@gentoo.org>
-  gcc-3.3.3_pre20040408-r1.ebuild,
-  files/3.3.3/gcc333_pre20040408-gentoo-branding.patch,
-  files/3.3.3/gcc333_pre20040408-stack-size.patch:
-  New Snapshot
-
-  05 Apr 2004; Brian Jackson <iggy@gentoo.org> gcc-3.3.3.ebuild:
-  add s390 to keywords
-
-  04 Apr 2004; Travis Tilley <lv@gentoo.org> gcc-3.3.3.ebuild:
-  added avenjs amd64 fixes to gcc-3.3.3.ebuild
-
-  03 Apr 2004; Jon Portnoy <avenj@gentoo.org> gcc-3.3.3-r1.ebuild :
-  Yanked unnecessary amd64-related construct for finding libc.
-  Bug #46697.
-
-  26 Mar 2004; Jason Wever <weeve@gentoo.org> gcc-3.3.3.ebuild:
-  And on the 5th date, gcc-3.3.3 was stable for sparc, and it was good.
-
-  25 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> gcc-3.2.2-r2.ebuild,
-  gcc-3.2.2.ebuild, gcc-3.2.3-r2.ebuild, gcc-3.2.3-r3.ebuild,
-  gcc-3.2.3-r4.ebuild, gcc-3.3.ebuild:
-  don't use deprecated ? : use syntax
-
-  24 Mar 2004; Luca Barbato <lu_zero@gentoo.org> gcc-3.3.3_pre20040322.ebuild:
-  Fixed SRC_URI
-
-*gcc-3.3.3_pre20040322 (23 Mar 2004)
-
-  23 Mar 2004; Luca Barbato <lu_zero@gentoo.org> gcc-3.3.3_pre20040322.ebuild,
-  files/3.3.3/gcc333_pre20040322-gentoo-branding.patch:
-  New snapshot from the hammer branch.
-
-  22 Mar 2004; Luca Barbato <lu_zero@gentoo.org> gcc-3.3.3_pre20040215.ebuild:
-  Marked again -ppc since it is still too much problematic.
-
-  15 Mar 2004; Joshua Kinard <kumba@gentoo.org> gcc-3.3.2-r5.ebuild,
-  gcc-3.3.2-r6.ebuild:
-  Removed bogus comment from -r6; marked -r5 stable on mips
-
-  09 Mar 2004; <agriffis@gentoo.org> gcc-3.3.2-r5.ebuild:
-  stable on alpha and ia64
-
-  06 Mar 2004; Alexander Gabert <pappy@gentoo.org> :
-  patch updates to let pie-ssp-bounds-check work with propolice patch during the
-  ebuild patching
-
-  06 Mar 2004; Alexander Gabert <pappy@gentoo.org> gcc-3.3.3-r1.ebuild:
-  added support for bug 6148 to the pie-ssp patch, the bounds checker fails with
-  some hunks but coupled with the pie-ssp patch it applies good
-
-  06 Mar 2004; Alexander Gabert <pappy@gentoo.org> gcc-3.3.3-r1.ebuild:
-  added v5 version for hardened pie ssp patch, this will be the release version
-  when testing shows no problems
-
-  01 Mar 2004; Martin Schlemmer <azarah@gentoo.org> files/awk/scanforssp.awk:
-  Add support to detect corrupted filesystem/bad hardware, patch by
-  Carter Smithhart <derheld42@derheld.net>.
-
-  26 Feb 2004; Alexander Gabert <pappy@gentoo.org> gcc-3.3.3-r1.ebuild:
-  added IUSE hardened flag (thx swtaylor)
-
-  26 Feb 2004; Alexander Gabert <pappy@gentoo.org> gcc-3.3.3-r1.ebuild:
-  changed typo in FVER of SSP, fixed up release_version logic a bit
-
-  26 Feb 2004; Alexander Gabert <pappy@gentoo.org> gcc-2.95.3-r7.ebuild,
-  gcc-2.95.3-r8.ebuild, gcc-3.0.4-r6.ebuild, gcc-3.1-r8.ebuild,
-  gcc-3.1.1-r1.ebuild, gcc-3.2.1-r7.ebuild, gcc-3.2.3-r3.ebuild,
-  gcc-3.3-r1.ebuild, gcc-3.3.1-r1.ebuild, gcc-3.3.2-r3.ebuild,
-  gcc-3.3.2.ebuild, gcc-3.3.3-r1.ebuild:
-  changed brackets in SRC_URI for pie-ssp patch, fixed copyright ebuild headers
-  to 2004
-
-  26 Feb 2004; Alexander Gabert <pappy@gentoo.org> gcc-2.95.3-r7.ebuild,
-  gcc-2.95.3-r8.ebuild, gcc-3.0.4-r6.ebuild, gcc-3.1-r8.ebuild,
-  gcc-3.1.1-r1.ebuild, gcc-3.2.1-r7.ebuild, gcc-3.2.3-r3.ebuild,
-  gcc-3.3-r1.ebuild, gcc-3.3.1-r1.ebuild, gcc-3.3.2-r3.ebuild,
-  gcc-3.3.2.ebuild, gcc-3.3.3-r1.ebuild:
-  changed brackets in SRC_URI for pie-ssp patch, fixed copyright ebuild headers
-  to 2004
-
-  26 Feb 2004; Alexander Gabert <pappy@gentoo.org> gcc-3.3.3-r1.ebuild:
-  implemented easier patch logic for SSP and PIE support with Azarah
-
-*gcc-3.3.3-r1 (26 Feb 2004)
-
-  26 Feb 2004; Alexander Gabert <pappy@gentoo.org> gcc-3.3.3-r1.ebuild:
-  changed version_patch logic to use a single variable for assigning the string
-  to the different patch situations
-
-  26 Feb 2004; Alexander Gabert <pappy@gentoo.org> :
-  added preliminary version with hardened support
-
-  22 Feb 2004; Luca Barbato <lu_zero@gentoo.org> gcc-3.3.3_pre20040215.ebuild:
-  Marked ~ppc since seems to build altivec code correctly
-
-  21 Feb 2004; Brad House <brad_mssw@gentoo.org> gcc-3.3.3.ebuild:
-  mark stable for amd64 2004.0 release
-
-*gcc-3.3.3 (18 Feb 2004)
-
-  18 Feb 2004; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.3.ebuild,
-  files/3.3.3/gcc333-gentoo-branding.patch,
-  files/3.3.3/gcc333-ssp-3.3_7-fixup.patch:
-  New release.
-
-*gcc-3.3.3_pre20040215 (16 Feb 2004)
-
-  15 Feb 2004; Tom Gall <tgall@gentoo.org> gcc-3.3.3_pre20040215.ebuild,
-  gcc-3.3.3_pre20040130:
-  Remove gcc-3.3.3_pre20040130, add gcc-3.3.3_pre20040215.ebuild
-  ppc64 prerelease, fixes a rather anoying set of ICEs. 
-  gcc-3.3.2-r6.ebuild was the reference.
-
-  12 Feb 2004; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.2-r5.ebuild,
-  gcc-3.3.2-r7.ebuild:
-  Add nogcj USE flag to turn off building of gcj.
-
-  12 Feb 2004; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.2-r5.ebuild,
-  gcc-3.3.2-r7.ebuild:
-  Add -Os to previous fixup, bug #41322.
-
-  11 Feb 2004; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.2-r5.ebuild,
-  gcc-3.3.2-r7.ebuild:
-  Fix tweaking of -O gcc flag, bug #40863.
-
-  10 Feb 2004; Seemant Kulleen <seemant@gentoo.org>
-  files/fix_libtool_files.sh:
-  spelling correction: Scannig to Scanning
-
-  09 Feb 2004; Bartosch Pixa <darkspecter@gentoo.org> gcc-3.2.3-r4.ebuild:
-  set ppc in keywords
-
-*gcc-3.3.3_pre20040130 (09 Feb 2004)
-
-  09 Feb 2004; Brad House <brad_mssw@gentoo.org> gcc-3.3.3_pre20040130.ebuild,
-  files/gcc333-gentoo-branding.patch:
-  GCC 3.3.3 prerelease as required for PPC64. This ebuild has been based off the
-  gcc-3.3.2-r6.ebuild for reference
-
-  08 Feb 2004; Luca Barbato <lu_zero@gentoo.org>
-  files/3.3.2/gcc332-altivec-fix.patch:
-  Updated the altivec fix for gcc-3.3.2-r7
-
-*gcc-3.3.2-r7 (08 Feb 2004)
-
-  08 Feb 2004; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.2-r7.ebuild:
-  Update snapshot to 20040119. Tweak SSP stuff to scan *before* unpacking and
-  patching.
-
-  07 Feb 2004; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.2-r6.ebuild:
-  Mask again, as it have some issues, bug #40603.
-
-  07 Feb 2004; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.2-r5.ebuild:
-  Bump to stable for x86.
-
-  03 Feb 2004; Joshua Kinard <kumba@gentoo.org> gcc-3.3.2-r4.ebuild:
-  Marked 3.3.2-r4 stable for mips. Stages are built for this, and no problems
-  have been reported so far.
-
-*gcc-3.2.3-r4 (27 Jan 2004)
-
-  27 Jan 2004; Luca Barbato <lu_zero@gentoo.org> gcc-3.2.3-r4.ebuild:
-  Removes the fixinclude headers, fix backported from the 3.3.2 series
-
-*gcc-3.3.2-r6 (21 Jan 2004)
-
-  21 Jan 2004; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.2-r6.ebuild,
-  files/3.3.2/gcc332-altivec-fix.patch:
-  Update snapshot to 20040108; fix SSP scanning to only scan when not already
-  done so, or when libgcc have __guard symbols; add altivec patch from Luca
-  Barbato <lu_zero@gentoo.org>.
-
-  08 Jan 2004; Aron Griffis <agriffis@gentoo.org> gcc-3.2-r5.ebuild,
-  gcc-3.2.2-r2.ebuild, gcc-3.2.2.ebuild, gcc-3.2.3-r2.ebuild,
-  gcc-3.3-r1.ebuild, gcc-3.3.1-r5.ebuild, gcc-3.3.2-r1.ebuild,
-  gcc-3.3.2-r2.ebuild:
-  Lots of keyword updates for ia64. I haven't tested anything past 3.3.2-r2, so
-  I didn't mark them ~ia64 yet
-
-  01 Jan 2004; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.2-r5.ebuild:
-  Unmask again, as scanforssp.awk was fixed (bug #36792).
-
-  31 Dec 2003; <solar@gentoo.org> files/awk/scanforssp.awk:
-  Fix bug that causes awk script to fail when pipe is not closed. Closes bug
-  #36792
-
-  30 Dec 2003; Brad House <brad_mssw@gentoo.org> gcc-3.3.2-r5.ebuild:
-  marking -* bug affects all arches
-
-  30 Dec 2003; Brad House <brad_mssw@gentoo.org> gcc-3.3.2-r5.ebuild:
-  Problems with -r5 on a fresh install of gentoo, I commented
-  inside the ebuild above the KEYWORDS= for more information, marked -amd64, but
-  other arches are probably affected too
-
-  29 Dec 2003; Seemant Kulleen <seemant@gentoo.org> gcc-3.3.2-r5.ebuild,
-  files/scan_libgcc_linked_ssp.sh:
-  spelling fixes, thanks to: Scott Taylor <scott@303underground.com> and Eric
-  Harney <eharney@clemson.edu> in bug #36772
-
-*gcc-3.3.2-r5 (29 Dec 2003)
-
-  29 Dec 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.2-r5.ebuild:
-  Update snapshot to 20031218; update SSP to 3.3-7. Rework guard detection in
-  glibc a bit (fix it to use scan_libgcc_linked_ssp.sh to detect ELF images
-  linked to __guard@GCC and add support for new _LIBC_PROVIDES_SSP_ instead
-  of patch to use __guard and co symbols from glibc).  Thanks to the hardened
-  team, especially Ned Ludd <solar@gentoo.org> for help on the SSP stuff.
-
-*gcc-3.3.2-r4 (14 Dec 2003)
-
-  14 Dec 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.2-r4.ebuild:
-  Update snapshot to 20031201. Remove 'fixed' headers, as they tend to break
-  some builds. Fix DEPEND on glibc for NPTL. Remove some stale sections.
-
-  30 Nov 2003; Alexander Gabert <pappy@gentoo.org> gcc-3.2.3-r3.ebuild,
-  gcc-3.3.2-r3.ebuild:
-  added ccache warnings to the ebuilds, thanks to Strider for pointing this out
-  and providing the workaround
-
-  29 Nov 2003; Brad House <brad_mssw@gentoo.org> gcc-3.3.2-r2.ebuild:
-  mark stable on amd64
-
-  28 Nov 2003; Alexander Gabert <pappy@gentoo.org> gcc-3.2.3-r3.ebuild,
-  gcc-3.3.2-r3.ebuild:
-  added logic for false positives hitting gcc library with guard in it
-
-*gcc-3.2.3-r3 (27 Nov 2003)
-*gcc-3.3.2-r3 (27 Nov 2003)
-
-  10 Dec 2003; Guy Martin <gmsoft@gentoo.org> gcc-3.3.2-r3.ebuild,
-  gcc-3.3.2.ebuild :
-  Fixed little type unkown -> unknown.
-
-  08 Dec 2003; Guy Martin <gmsoft@gentoo.org> gcc-3.3.2-r3.ebuild,
-  gcc-3.3.2.ebuild :
-  Force CHOST="hppa-unknown-linux-gnu" on hppa for stability.
-
-  27 Nov 2003; Alexander Gabert <pappy@gentoo.org> gcc-3.2.3-r3.ebuild,
-  gcc-3.3.2-r3.ebuild, files/3.2.3/gcc-3.2.3-move-propolice-into-glibc.patch:
-  adding bumpee versions of gcc-3.3.2 and gcc-3.2.3 for proper migration of the
-  propolice functions to the glibc, this updated is needed because of bugs like
-  25299 and other related -static -fstack-protector building in the current
-  2.3.2-r3 glibc
-
-  21 Nov 2003; Aron Griffis <agriffis@gentoo.org> gcc-3.3.2-r2.ebuild:
-  Add ~ia64
-
-  20 Nov 2003; Aron Griffis <agriffis@gentoo.org> gcc-3.3.2-r2.ebuild:
-  Mark stable on alpha
-
-  04 Nov 2003; Brad House <brad_mssw@gentoo.org> gcc-3.3.1-r5.ebuild:
-  mark as stable on amd64
-
-  01 Nov 2003; Aron Griffis <agriffis@gentoo.org> gcc-3.3.2-r2.ebuild:
-  Add ~alpha to KEYWORDS
-
-*gcc-3.3.2-r2 (27 Oct 2003)
-
-  19 Nov 2003; Guy Martin <gmsoft@gentoo.org> gcc-3.3.2-r2.ebuild :
-  Added --enable-sjlj-exceptions to ${myconf} on hppa.
-
-  02 Nov 2003, Guy Martin <gmsoft@gentoo.org> gcc-3.3.2-r2.ebuild,
-  gcc-3.3.2-r1.ebuild, gcc-3.3.2.ebuild :
-  Marking gcc-3.3.2-r1 and -r2 -hppa due to a problem with binutils.
-  Marking gcc-3.3.2 as ~hppa which does not suffert of this problem.
-
-  27 Oct 2003; Guy Martin <gmsoft@gentoo.org> gcc-3.3.2-r2.ebuild :
-  Added ~hppa to KEYWORDS.
-
-  27 Oct 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.2-r2.ebuild:
-  Update protector patch to 3.3-5.
-
-*gcc-3.3.2-r1 (26 Oct 2003)
-
-  26 Oct 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.2-r1.ebuild:
-  New snapshot of gcc-3_3-rhl-branch CVS branch that fixes the visibility issues
-  for x86 at least.
-
-  21 Oct 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.2.ebuild:
-  Mask this puppy again until I figure out why it breaks visibility attribute
-  support (and thus NPTL, possibly TLS as well).
-
-*gcc-3.3.2 (21 Oct 2003)
-
-  08 Dec 2003; Guy Martin <gmsoft@gentoo.org> gcc-3.3.2.ebuild :
-  Marked stable on hppa.
-
-  19 Nov 2003; Guy Martin <gmsoft@gentoo.org> gcc-3.3.2.ebuild :
-  Added --enable-sjlj-exceptions to ${myconf} on hppa.
-
-  21 Oct 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.2.ebuild,
-  files/3.3.2/gcc332-gentoo-branding.patch:
-  New version.
-
-  18 Oct 2003; Brad House <brad_mssw@gentoo.org> gcc-3.3.1-r5.ebuild,
-  files/gcc331_use_multilib.amd64.patch:
-  add appropriate changes for amd64, and set ~amd64 in flags
-
-*gcc-3.3.1-r5 (14 Oct 2003)
-
-  15 Oct 2003; Joshua Kinard <kumba@gentoo.org> gcc-3.3.1-r4.ebuild,
-  gcc-3.3.1-r5.ebuild, gcc-3.3.1.ebuild:
-  Added ~sparc to KEYWORDS
-  This will only affect sparc64 users using the gcc33-sparc64 profile
-
-  14 Oct 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.1-r5.ebuild,
-  files/3.3.1/gcc331-pp-fixup.patch:
-  Actually add gcc331-pp-fixup.patch for public use.
-
-  14 Oct 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.1-r5.ebuild:
-  Update CVS snapshot.
-
-  09 Oct 2003; <tuxus@gentoo.org> gcc-3.3.1-r4.ebuild:
-  Added ~mips to Keywords
-
-  04 Oct 2003; Matthew Rickard <frogger@gentoo.org> gcc-3.2.3-r2.ebuild:
-  Marked stable for x86, ppc, sparc, alpha, and mips.
-
-  03 Oct 2003; Brad House <brad_mssw@gentoo.org> gcc-3.3.1-r1.ebuild:
-  mark as stable for amd64
-
-  28 Sep 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.3-r1.ebuild,
-  gcc-3.3.1-r1.ebuild, gcc-3.3.1-r2.ebuild, gcc-3.3.1-r3.ebuild,
-  gcc-3.3.1.ebuild:
-  Exclude PPC mergel miscompilation workaround, as it is fixed in apps according
-  to lu_zero.
-
-*gcc-3.3.1-r4 (28 Sep 2003)
-
-  28 Sep 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.1-r4.ebuild:
-  Update revision. Update ProPolice to 3.3-4. I also took the time and reaped
-  a few of non applied pr fixes for gcc-3_3-branch that is not yet applied to
-  gcc-3_3-rhl-branch we use. I also ported a few fixes that was fixed only 3.4
-  side, and testing my side at least shows no regressions.
-
-  25 Sep 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.1-r3.ebuild:
-  Add gcc-unsharing_lhs.patch resolving bug #29467.  Also marked this ~x86.
-  More info on this bug can be found at:
-  
-    http://gcc.gnu.org/ml/gcc-patches/2003-09/msg00853.html
-
-*gcc-3.3.1-r3 (20 Sep 2003)
-
-  20 Sep 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.1-r3.ebuild:
-  Update CVS snapshot to 20030916 - this should fix the static linking problem
-  with some packages without the hack that broke things for a few people ...
-
-*gcc-3.3.1-r2 (15 Sep 2003)
-
-  15 Sep 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.1-r2.ebuild:
-  Backout to an earlier cvs snapshot (20030815) to fix preprocessor issues (for
-  instance lilo not compiling, bug #28266). Change libgcc.a to a linker script
-  to fix problems with not linking to libc.a when linking static.
-
-*gcc-3.3.1-r1 (07 Sep 2003)
-
-  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> gcc-3.3.1-r1.ebuild :
-  ia64 keywords.
-
-  12 Sep 2003; Joshua Kinard <kumba@gentoo.org> gcc-3.3.1.ebuild:
-  Added ~sparc to Keywords, should only affect users using the gcc33-sparc64-1.4
-  testing profile.  Yell if otherwise.
-
-  09 Sep 2003; George Shapovalov <george@gentoo.org> gcc-3.3.1.ebuild, gcc-3.3.1-r1.ebuild, gcc-3.2.1-r7.ebuild, gcc-3.2.2.ebuild, gcc-3.2.2-r2.ebuild: :
-  Removed "ada" from gcc_lang as month ago for previous versions.
-  Also removed gcc32-ada-make.patch and corresponding epatch invocations
-
-  07 Sep 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.1-r1.ebuild:
-  Update snapshot to 20030904. Fix coreutils patch - it did not catch all broken
-  tail calls.
-
-  24 Aug 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.2.3-r1.ebuild,
-  gcc-3.2.3-r2.ebuild, gcc-3.3-r1.ebuild, gcc-3.3.1.ebuild, gcc-3.3.ebuild:
-  Add hardened-gcc support, bug #26305.
-
-  24 Aug 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.2.2-r2.ebuild,
-  gcc-3.2.2.ebuild, gcc-3.2.3-r1.ebuild, gcc-3.2.3-r2.ebuild,
-  gcc-3.3-r1.ebuild, gcc-3.3.1.ebuild, gcc-3.3.ebuild,
-  files/fix_libtool_files.sh, files/awk/fixlafiles.awk:
-  Fix_libtool_files.sh did not catch a user changing CHOST. Updated
-  fixlafiles.awk and the latest ebuilds to support a fix for this, bug #23466.
-
-*gcc-3.3.1 (10 Aug 2003)
-
-  10 Aug 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.1.ebuild,
-  files/3.3.1/gcc331-gentoo-branding.patch:
-  New version.
-
-  09 Aug 2003; George Shapovalov <george@gentoo.org> gcc-2.95.3-r7.ebuild,gcc-2.95.3-r8.ebuild,gcc-3.0.4-r6.ebuild,gcc-3.1.1-r1.ebuild,gcc-3.1-r8.ebuild,gcc-3.2.3-r1.ebuild,gcc-3.2.3-r2.ebuild,gcc-3.2-r5.ebuild,gcc-3.3.ebuild,gcc-3.3-r1.ebuild
-  Removed "ada" from gcc_lang on listed ebuilds (did not touch three which do some patches,
-  will do them later myself or leave to azarah).
-  See #25178 for details. In short, having ada in --enable-languages does not make gcc build
-  ada support properly (there is more involved, see for example #11204) and makes gcc build fail 
-  on users who have gnat installed.
-  
-  04 Aug 2003; Matthew Rickard <frogger@gentoo.org> gcc-3.3-r1.ebuild:
-  Update 3.3 ebuild to use the latest protector-3.  Also don't patch
-  in ProPolice on HPPA (consistent with the 3.2.x gcc ebuilds).
-
-*gcc-3.2.3-r2 (23 Jul 2003)
-
-  23 Jul 2003; Matthew Rickard <frogger@gentoo.org> gcc-3.2.3-r2.ebuild:
-  New revision includes updated ProPolice protector-10
-  patch.  This fixes the following issues:
-    - Regex functions cause m4 to seg fault
-    - Doesn't protect the 1st function argument when
-      CFLAGS="-O0".
-
-  24 Jul 2003; Martin Schlemmer <azarah@gentoo.org> files/fix_libtool_files.sh:
-  Fix fix_libtool_files.sh to first get the number of parameters, and $1, else
-  some odd settings in /etc/profile may cause $# to be overwritten.
-
-*gcc-3.3-r1 (20 Jul 2003)
-
-  20 Jul 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.3-r1.ebuild,
-  files/3.3/gcc33-coreutils-compat.patch.bz2,
-  files/3.3/gcc33-gentoo-branding-1.patch:
-  New version that rather use the gcc-3_3-rhl-branch branch.  Also add
-  gcc33-coreutils-compat.patch.bz2 to call head/tail corretly as needed
-  by coreutils-5.0.
-
-  20 Jul 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.ebulid,
-  files/3.3/gcc33-no-multilib-amd64.patch:
-  Cleanup amd64 support to rather use a patch.  From Olivier Crete
-  <tester@gentoo.org>.
-
-  20 Jul 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.2.3-r1.ebuild,
-  files/3.2.3/gcc-3.2.3-mergel-fix.patch:
-  There exists a bug in the ebuild patched gcc that prevents hppa from getting
-  build because of default_assemble_visibility is not compiled.  Patch done by
-  Alexander Gabert <pappy@nikita.ath.cx>.
-
-  18 Jul 2003; Will Woods <wwoods@gentoo.org> gcc-3.2.3-r1.ebuild:
-  Marked stable for alpha
-
-  16 Jul 2003; Jay Pfeifer <pfeifer@gentoo.org> gcc-3.2.3-r1.ebuild:
-  set stable on x86
-
-  14 Jul 2003; Matthew Rickard <frogger@gentoo.org> gcc-3.2.3-r1.ebuild:
-  ProPolice does not work on architectures where the stack
-  grows upward (such as HPPA).  Therefore, if the 
-  architecture is HPPA, do not apply the ProPolice patches.
-
-  09 Jul 2003; Matthew Rickard <frogger@gentoo.org> gcc-3.2.3-r1.ebuild:
-  Updated ProPolice to protector-8.  This includes minor
-  bugfixes on PPC that popped up in certain (rare) cases.
-
-  02 Jul 2003; Luca Barbato <lu_zero@gentoo.org> gcc-3.2.3-r1.ebuild:
-  set added the mergel workaround, G4 users should reemerge or change the
-  altivec.h include by hand
-
-  01 Jul 2003; Luca Barbato <lu_zero@gentoo.org> gcc-3.2.3-r1.ebuild:
-  set stable on ppc
-
-  01 Jul 2003; Todd Sunderlin <todd@gentoo.org> gcc-3.2.3-r1.ebuild:
-  set stable on sparc
-
-  14 Jun 2003; Joshua Kinard <kumba@gentoo.org> gcc-3.2.3-r1.ebuild:
-  Changed ~mips to mips in KEYWORDS
-
-  12 Jun 2003; <msterret@gentoo.org> gcc-3.1-r8.ebuild, gcc-3.1.1-r1.ebuild:
-  fix Header
-
-  10 Jun 2003; Tavis Ormandy,,, <taviso@gentoo.org> gcc-2.95.3-r8.ebuild,
-  files/gcc-2.95.3-alpha.diff:
-  new-atexit.diff is not finished for alpha, fixing #18626
-
-  19 May 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.ebuild :
-  Only compile gcj AWT/Swing support if we have the Xlib.h header, else
-  it borks during bootstrap.
-
-*gcc-3.3 (17 May 2003)
-
-  17 May 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.ebuild,
-  gcc33-gentoo-branding.patch, gcc33-propolice-version.patch :
-  New version:
-  - Merge cleanups from Spider <spider@gentoo.org>.
-  - Add the manpages (required during bootstrap, as we do not have perl),
-    with some more cleanups.
-  - Add a nice collection of patches from Suse/Debian, thanks to
-    Nicholas Wourms <dragon@gentoo.org> for filtering these.
-  - Add an branch update from the Hammer 3.3 branch with lots of Athlon
-    and Hammer fixes/optimizations.  This also includes the DFA scheduler
-    and profiler updates that should improve things accross the board.
-    Once again, many thanks to Nicholas Wourms <dragon@gentoo.org>.
-  - Add gcj AWT/Swing for people with X and java in USE (thanks again
-    Nicholas =).
-	
-  NOTE:  I urge the faint of heart to leave this for now, as it have
-         deprecated many features, and a lot of packages will have to
-		 be fixed first.
-
-  16 May 2003; Matthew Rickard <frogger@gentoo.org> gcc-3.2.2-r3.ebuild:
-  - Updated ProPolice to Protector-3.2.2-7, fixing the PPC bug and
-      parallel make bug - again we no longer need to apply these
-      separately.
-    - Converted to the new patch implementation as used in the 
-      gcc-3.2.3-r1 ebuild making for easier patch management.  Thanks
-      to Martin Schlemmer <azarah@gentoo.org> for this cleanup.
-
-  16 May 2003; Matthew Rickard <frogger@gentoo.org> gcc-3.2.3-r1.ebuild:
-  Updated ProPolice to Protector-3.2.2-7. This revision includes the PPC bug fix
-  and the parallel make fix, so these no longer need to be applied separately.
-
-*gcc-3.2.3-r1 (29 Apr 2003)
-
-  14 Jun 2003; Guy Martin <gmsoft@gentoo.org> gcc-3.2.3-r1.ebuild :
-  Changed ~hppa to -hppa in KEYWORDS. Too many crazy users are using ~hppa.
-
-  29 Apr 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.2.3-r1.ebuild :
-  Manpages gets regenerated, and as we do not have perl at bootstrap, we need
-  to use a tarball with updated manpages again.  Also fix the build to gzip
-  manpages and info pages.  Fix the build to actually remove man/info pages
-  if 'build' in USE .. this got broken during the gcc-config changes.
-
-*gcc-3.2.3 (28 Apr 2003)
-
-  28 Apr 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.2.3.ebuild,
-  gcc-323-propolice-version.patch, gcc32-c++-classfn-member-template.patch,
-  gcc32-mklibgcc-serialize-crtfiles.patch, gcc323-gentoo-branding.patch,
-  protector-3.2.2-6-PPC.patch :
-  Update version
-  - Add gcc323-gentoo-branding.patch and gcc-3.2.3-tls-update.patch.bz2 thanks
-    to Nicholas Wourms <dragon@gentoo.org>.  He did a great job at porting
-    gcc-3.2.3-tls-update.patch.bz2 from 3.2.2!
-  - Add two patches from Mandrake;  gcc32-c++-classfn-member-template.patch and
-    gcc32-mklibgcc-serialize-crtfiles.patch.
-  - Cleanup the ProPolice stuff.  Also rather use the patch tarball from its
-    homepage then adding the files to cvs.
-  - Get the version patches (gcc323-gentoo-branding.patch and
-    gcc-323-propolice-version.patch) to be more generic to ebuild revisions;
-    added version_patch() for this.
-  - Fix awk/fixlafiles.awk to not change files in /usr/lib/gcc-lib.  This got
-    broken with my previous recursion fix.
-
-  28 Apr 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.2-r5.ebuild :
-  Remove message and 'die' in pkg_setup().
-
-  28 Apr 2003; Luca Barbato <lu_zero@gentoo.org> gcc-3.2.2-r2.ebuild :
-  Unmasked on ppc
-
-  24 Mar 2003; Martin Schlemmer <azarah@gentoo.org> :
-  - Fix latest ebuild to only build static if we are just building the C
-    frontend, else some C++ packages fails when trying to link to libstdc++.so,
-    bug #18050.
-  - One more effort to try and fix the corner cases where an upgrade borks
-    python, and thus portage, resulting in /etc/ld.so.conf not being updated.
-
-*gcc-3.2.2-r2 (21 Mar 2003)
-
-  21 Mar 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.2.2-r2.ebuild,
-  gcc32-pr7768.patch, gcc32-pr8213.patch, gcc32-pr9732.patch,
-  gcc322-pr8746.patch, gcc322-pr9888.patch, gcc322-ggc_page-speedup.patch,
-  gcc-3.2.2-branch-update-20030322.patch, gcc-3.2.2-tls-update2.patch :
-  
-  - Update to gcc-3_2 branch 2003-03-22 (gcc-3.2.2-branch-update-20030322.patch)
-  - Update TLS patch (gcc-3.2.2-tls-update2.patch) for 2003-03-22 CVS branch.
-  - Add gcc322-pr9888.patch to fix a out of range 'loop' instructions for the
-    K6 family of processors.  Many thanks to Jim Bray <jb@as220.org> for his
-    work in getting this resolved with the gcc devs, and bringing it to my
-    attention (included in branch-update).
-  - Add gcc322-pr8746.patch to fix corner cases of miscompilation on K6 arch.
-  - Get gcc to decreases the number of times the collector has to be run
-    by increasing its memory workspace, bug #16548, thanks to
-    Garen <garen@garen.net>, patch gcc322-ggc_page-speedup.patch.
-  - Also added some other PR bugfixes.
-
-  09 Mar 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.2.2*.ebuild :
-  Fix handling of fix_libtool_files.sh to be more $FILESDIR independant.
-  We basically install it to /sbin now, and then call it from there.  Also
-  export LD_LIBRARY_PATH with new gcc library path in it to prevent gcc-config
-  from borking when run.  This will hopefully fix bugs #15288, #16632, #16797.
-
-*gcc-3.2.2-r3 (03 Mar 2003)
-
-  25 Apr 2003; Matthew Rickard <frogger@gentoo.org> gcc-3.2.2-r3.ebuild:
-  Added files/3.2.2/protector_parallel_make.patch which
-  fixes the errors we've been seeing when using >= -j2
-  as addressed in bug 18091.
-
-  24 Apr 2003; Matthew Rickard <frogger@gentoo.org> gcc-3.2.2-r3.ebuild,
-  files/3.2.2/protector.c:
-  Fixed the ProPolice PPC segfault issue on certain packages.
-  Thanks to Hiroaki Etoh <ETOH@jp.ibm.com> for the quick fix
-  for this problem.
-
-  20 Apr 2003; Matthew Rickard <frogger@gentoo.org> gcc-3.2.2-r3.ebuild,
-  files/3.2.2/protector.patch:
-  Updated to the latest ProPolice patch, Protector-6.  This should resolve the
-  problems experienced with the Protector-5 patch.  This was due to a bug in the
-  patch enabling the protection by default.
-
-  11 Apr 2003; Matthew Rickard <frogger@gentoo.org> gcc-3.2.2-r3.ebuild,
-  manifest, files/3.2.2/protector.patch:
-  Downgraded ProPolice to protector-4.  With Protector-5 GCC seems to
-  die on bootstrap with 1.4-rc4.  It also seems to be the source of the
-  unresolved symbols seen previously.  We'll stay with -4 for now.
-
-  10 Apr 2003; Matthew Rickard <frogger@gentoo.org> gcc-3.2.2-r3.ebuild,
-  manifest:
-  Removing -fstack-protector from ALLOWED_FLAGS.  This leads
-  to unresolved symbols in builds of certain packages.
-
-  09 Apr 2003; Matthew Rickard <frogger@gentoo.org> gcc-3.2.2-r3.ebuild,
-  files/3.2.2/protector.patch:
-  Updated ProPolice to protector-3.2.2-5
-
-  31 Mar 2003; Matthew Rickard <frogger@gentoo.org> gcc-3.2.2-r3.ebuild:
-  Moved ProPolice related files from $FILEDIR/3.2 to $FILESDIR/3.2.2
-
-  26 Mar 2003; Matthew Rickard <frogger@gentoo.org> gcc-3.2.2-r3.ebuild,
-  files/3.2/protector.patch:
-  - Updated ProPolice patch to protector-3.2.2-4.tar.gz
-  - Removed unneeded comments in ebuild about a patch we aren't applying anymore.
-  - Added gcc-322-r3-propolice-version.patch which will add propolice to the
-    gcc version string.  This is necessary for xfree to build correctly with
-    stack protection.
-  - Added -fstack-protector to the list of known good CFLAGS
-
-  05 Mar 2003; Joshua Brindle <method@gentoo.org> gcc-3.2.2-r3.ebuild :
-  replace-flags for pentium4 for bug #16867, add optimizations for x86 only  
-
-  03 Mar 2003; Joshua Brindle <method@gentoo.org> gcc-3.2.2-r3.ebuild :
-  Fixed strip-flags to allow certain known stable optimizations including:
-  -O -O1 -O2 -Os -O3 -mcpu -march -pipe -g -freorder-blocks -fprefetch-loop-arrays
-
-*gcc-3.2.2-r1 (23 Feb 2003)
-
-  25 Feb 2003; Nicholas Wourms <dragon@gentoo.org> gcc-3.2.2-r1.ebuild :
-  Fix mips depends so they actually work.
-
-  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> gcc-3.2.2-r1.ebuild :
-  Mark testing for mips.  Changed DEPENDS to a lower binutils *only* for mips,
-  since .18 generates really b0rked asm and tests prove that .16 works just fine.
-
-  23 Feb 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.2.2-r1.ebuild :
-  Update from cvs to add __thread support.
-
-*gcc-3.2.2 (06 Feb 2003)
-
-  27 May 2003; Guy Martin <gmsoft@gentoo.org> gcc-3.2.2.ebuild :
-  Downgrading DEPEND to binutils >=2.13.90.0.16 for hppa.
-
-  29 Mar 2003; Christian Birchinger <joker@gentoo.org> gcc-3.2.2.ebuild:
-  Added sparc stable keyword
-
-  25 Feb 2003; Nicholas Wourms <dragon@gentoo.org> gcc-3.2.2.ebuild :
-  Fix mips depends so they actually work.
-
-  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> gcc-3.2.2.ebuild :
-  Mark stable for mips.  Changed DEPENDS to a lower binutils *only* for mips,
-  since .18 generates really b0rked asm and tests prove that .16 works just fine.
-
-  24 Feb 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.2.2.ebuild :
-  Mark stable for x86.
-
-  22 Feb 2003; Guy Martin <gmsoft@gentoo.org> gcc-3.2.2.ebuild :
-  Commited stable for hppa.
-
-  22 Feb 2003; Zach Welch <zwelch@gentoo.org> gcc-3.2.2.ebuild :
-  Added patch for arm to disable floating point math
-
-  21 Feb 2003; Zach Welch <zwelch@gentoo.org> gcc-3.2.2.ebuild :
-  Added patch for arm to fix incorrect code generation
-
-  21 Feb 2003; Aron Griffis <agriffis@gentoo.org> gcc-3.2.2.ebuild :
-  Mark 3.2.2 stable on alpha -- it's the best we've got so far!
-
-  18 Feb 2003; Zach Welch <zwelch@gentoo.org> gcc-3.2.2.ebuild :
-  Added arm to keywords.
-
-  08 Feb 2003; Guy Martin <gmsoft@gentoo.org> gcc-3.2.2.ebuild :
-  Added hppa to keywords.
-
-  06 Feb 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.2.2.ebuild :
-  Update version.
-
-*gcc-3.2.2_pre20030131 (02 Feb 2003)
-
-  02 Feb 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.2.2_pre20030131.ebuild :
-  New snapshot.  This should close bug #14699.
-
-*gcc-3.2.1-r7 (18 Jan 2003)
-
-  18 Jan 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.2.1-r7.ebuild :
-  Add some patches from Mandrake/Suse.
-
-*gcc-3.2.1-r6 (16 Dec 2002)
-
-  13 Feb 2003; Mark Guertin <gerk@gentoo.org> gcc-3.2.1-r6.ebuild :
-  set ppc in keywords
-
-  19 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
-  Added mips to keywords
-
-  08 Jan 2003; Seemant Kulleen <seemant@gentoo.org> gcc-3.2.1-r6.ebuild :
-
-  Stable for sparc.
-
-  08 Jan 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.2.1-r6.ebuild :
-  Mark stable for x86.  Do not merge with C[XX]FLAGS="-march=k6[-2]", as
-  it causes problems, bug #12791.
-
-  28 Dec 2002; Jack Morgan <jmorgan@gentoo.org> gcc-3.2.1.ebuild :
-  Changing ~sparc to sparc
-
-  23 Dec 2002; Martin Schlemmer <azarah@gentoo.org> :
-  Fix to use get_number_of_jobs to set -j.
-  
-  16 Dec 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.2.1*.ebuild :
-  Fix to set CC and CXX properly.
-
-  16 Dec 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.2.1-r1.ebuild,
-  gcc-3.2.1-r6.ebuild, gcc-2.95.3-r7.ebuild gcc-3.2.1*.ebuild :
-
-  Install and touch manpages if we do not have perl, as they started to
-  use perl to generate the manpages ...  If we do not do this, gcc fails
-  to build during bootstrap.
-
-  Install the /lib/cpp and /usr/bin/cc wrappers for other common used gcc's.
-
-*gcc-3.2.1-r1 (16 Dec 2002)
-
-  16 Dec 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.2.1-r1.ebuild,
-  gcc-3.2.1-r6.ebuild :
-
-  Update with patches from Redhat, and also update with patch against 2002-12-08
-  CVS branch.  For -r6, changed the /lib/cpp and /usr/bin/cc symlinks to wrapper
-  scripts, which is more generic if we do not fisically switch gcc profiles.
-
-  15 Dec 2002; Martin Schlemmer <azarah@gentoo.org> gcc-2.95.3-r*.ebuild :
-  Fix CXX to equal 'g++'.  For some reason I was under the impression that
-  gcc3 was the only gcc that needed this.  This should close bugs #11589
-  and #12169.  Ill figure some way to get this fixed painlessly for
-  most users ...
-
-  13 Dec 2002; Mark Guertin <gerk@gentoo.org> gcc-3.2.1.ebuild :
-  Marked stable for ppc.
-
-  12 Dec 2002; Jan Seidel <tuxus@gentoo.org> gcc-3.2.1.ebuild :
-  Added mips to keywords.
-
-  10 Dec 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.2.1.ebuild :
-  Mark as stable for x86.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> :
-  Changed sparc ~sparc keywords.
- 
-  03 Dec 2002; Martin Schlemmer <azarah@gentoo.org> :
-  Also set CC and CXX in /etc/env.d/05gcc.
-
-  01 Dec 2002; Olivier Reisch <doctomoe@gentoo.org> gcc-3.2-r4.ebuild :
-  Definitely fine now, marking it ppc stable. Moving on to 3.2.1 :)
-
-  25 Nov 2002; Olivier Reisch <doctomoe@gentoo.org> gcc-3.2-r4.ebuild :
-  Changed -ppc to ~ppc, we have been able to make it compile fine on a few
-  test machines. Will test further before marking it ppc stable eventually.
-
-  24 Nov 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.2.1.ebuild,
-  gcc-3.2.1-r5.ebuild :
-
-  Get these to run ${FILESDIR}/fix_libtool_files.sh, and thus fix libtool
-  linker scripts to reference the right gcc version ...  This should close
-  bug #11094.
-
-*gcc-3.2.1 (21 Nov 2002)
-*gcc-3.2.1-r5 (21 Nov 2002)
-
-  21 Nov 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.2.1.ebuild,
-  gcc-3.2.1-r5.ebuild :
-
-  Update to new version.  Multi arch version is -r5.
-
-  21 Nov 2002; Olivier Reisch <doctomoe@gentoo.org> gcc-3.2-r4.ebuild :
-  
-  Added -ppc, it does not compile on PPC test machine.
-
-  20 Nov 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.2-r4.ebuild :
-
-  Mark as stable.
-
-*gcc-3.2-r5 (10 Oct 2002)
-
-  10 Nov 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  New multi version/arch version.  Updated with patches
-  from Mandrake/Redhat/Suse.  Have SLOT=$PV if CCHOST=CHOST.
-
-*gcc-3.2-r4 (10 Oct 2002)
-
-  10 Nov 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  Updated with patches from Mandrake/Redhat/Suse.
-
-*gcc-2.95.3-r8 (10 Oct 2002)
-
-  03 Arp 2003; Martin Holzer <mholzer@gentoo.org> gcc-2.95.3-r8.ebuild :
-  Filtering out -ggdb. Closes #8229.
-
-  08 Jan 2003; Seemant Kulleen <seemant@gentoo.org> gcc-2.95.3-r8.ebuild :
-
-  Marked stable for x86
-
-  10 Nov 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  New multi version/arch version.
-
-*gcc-3.2-r3 (28 Oct 2002)
-
-  28 Oct 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.2-r3.ebuild :
-
-  Initial version that support alpha version of new multi version/arch
-  scheme.  Very ALPHA, so use at your own risk!!
-
-*gcc-3.2-r2 (20 Oct 2002)
-
-  20 Oct 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.2-r2.ebuild :
-
-  Add patches to compile under glibc-2.3.1.
-
-*gcc-3.2-r1 (27 Aug 2002)
-
-  9 Sep 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.2-r1.ebuild :
-
-  Remove symlinks that are installed to /usr/lib/gcc-lib/$CHOST/$PV/include,
-  as it may cause the build to fail.
-
-  27 Aug 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.2-r1.ebuild :
-
-  Update the "misconstruct function call frame" bug patches.  This resolves
-  bug #7071, thanks to Steven Wong <wongs15@tartarus.uwa.edu.au>.  Updated
-  info can be found at:
-
-    http://archive.linuxfromscratch.org/mail-archives/lfs-dev/2002/08/0588.html
-
-  Good patch site to keep in mind (reminder to myself):
-
-    http://www.zipworld.com.au/~gschafer/lfs-tweaks.html
-
-  21 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
-
-  Filter -fomit-frame-pointer flag, which causes problems as reported in
-  bug #6641.
-
-  15 Aug 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.2.ebuild :
-
-  Add back gcc-3-deopt.patch.  Also add gcc-3-deopt-doc.patch.  Update
-  the docs that gets installed, as well as added html pages for libstdc++-v3.
-
-*gcc-3.2 (15 Aug 2002)
-
-  15 Aug 2002; Daniel Robbins <drobbins@gentoo.org> gcc-3.2.ebuild :
-
-  Update to latest version
-
-*gcc-3.2_pre-r1 (15 Aug 2002)
-
-  15 Aug 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.2_pre-r1 :
-  
-  New snapshot.
-
-  Fixes a bug in gcc-3.1 and above ... -maccumulate-outgoing-args flag (added
-  in gcc-3.1) causes gcc to misconstruct the function call frame in many cases.
-  Thanks to Ronald Hummelink <ronald@hummelink.xs4all.nl> for bringing it to
-  our attention.
-  
-    http://archive.linuxfromscratch.org/mail-archives/lfs-dev/2002/08/
-    http://archive.linuxfromscratch.org/mail-archives/lfs-dev/2002/08/0319.html
-    http://archive.linuxfromscratch.org/mail-archives/lfs-dev/2002/08/0350.html
-    http://archive.linuxfromscratch.org/mail-archives/lfs-dev/2002/08/0410.html
-    http://gcc.gnu.org/ml/gcc/2002-08/msg00731.html
-
-  NOTE to myself: I still have to apply the patch to the manpage *after*
-  compile.
-
-  Add --enable-__cxa_atexit to ./configure, fixing bug #6430.
-
-*gcc-3.1.1-r1 (30 Jul 2002)
-
-  30 Jul 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.1.1-r1 :
-
-  Gcc-3.1.1 final.  Also fixed it to be able to disable java.
-  Major cleanups from 3.1.1.
-
-*gcc-3.2_pre (28 Jul 2002)
-
-  30 Jul 2002; Mark Guertin <gerk@gentoo.org> gcc-3.2_pre :
-  Added ppc to keywords
-
-  30 Jul 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.2_pre :
-
-  Some cleanups.  Use the "java" USE flag to enable/disable java
-  as it add a bit to compile time.
-
-  28 Jul 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.2_pre :
-
-  Add CVS version of gcc-3.2.
-
-*gcc-3.1.1 (07 Jul 2002)
-
-  7 Jul 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.1.1 :
-
-  Add snapshot for gcc-3.1.1.  This fixes the internal compiler
-  errors with "-march=pentium4" for me at least (had with gcc-3.1).
-
-*gcc-3.1-r8 (03 Jul 2002)
-
-  6 Jul 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.1-r8 :
-
-  Update the fix for bug #4411, as the old caused ncurses, among things
-  not to link properly if an older version was installed.  The sed
-  rule is now:
-
-  sed -e "s:%{L\*} %(link_libgcc):%{L\*} -L/lib %(link_libgcc):" specs
-
-
-  3 Jul 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.1-r8 :
-
-  Move all the libs to the version specific directory.  Add a fix for
-  bug #4411, which should be considered *very* experimental.
-
-  3 Jul 2002; Martin Schlemmer <azarah@gentoo.org> :
-  Add the /usr/bin/$CHOST-g++ symlink, as it is needed now for
-  some weird reason.
-
-*gcc-2.95.3-r7 (29 Jun 2002)
-
-  29 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
-  Remove texinfo as we have an ebuild again. 
-
-  This new patch for the atexit problem occured with glibc-2.2.3 should
-  work with glibc-2.2.4.  This closes bug #3987 and #4004.
-  
-    http://archive.linuxfromscratch.org/mail-archives/lfs-dev/2001/08/0476.html
-    http://archive.linuxfromscratch.org/mail-archives/lfs-dev/2001/08/0589.html
-  
-  Something to note, is that this patch makes gcc crash if its given
-  the "-mno-ieee-fp" flag ... libvorbis is an good example of this.
-  This however is on of those which one we want fixed most cases :/
-  
-  Also fix bug #3527, which was caused by a stray symlink on downgrading from
-  gcc-3.x.
-
-*gcc-3.1-r7 (29 June 2002)
-
-  29 June 2002; Brandon Low <lostlogic@gentoo.org> gcc-3.1-r6.ebuild :
-
-  Make sure that static linking against gcc libraries works with a little
-  sed magic :).
-
-  25 Jun 2002; Martin Schlemmer <azarah@gentoo.org> texinfo providing ebuilds :
-  Add ibiblio to SRC_URI for all texinfo providing ebuilds (2.95.3 and 3.0.4);
-  resolve bug #1777.
-
-*gcc-3.1-r6 (10 June 2002)
-
-  11 June 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.1-r6.ebuild :
-
-  Update version checking.
-
-  10 June 2002; Bart Verwilst <verwilst@gentoo.org> Changelog:
- 
-  Remove curses.h and ncurses.h from the installation, so it doesn't 
-  conflict with our ncurses package.
-
-
-*gcc-3.1-r5 (29 May 2002)
-
-  29 May 2002; Matthew Kennedy <azarah@gentoo.org> gcc-3.1-r5.ebuild,
-  ChangeLog, files/digest-gcc-3.1-r5 :
-
-  Fixes how we check for already install gcc's.
-
-*gcc-3.1-r4 (25 May 2002)
-
-  25 May 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.1-r4.ebuild :
-
-  Fix some more files that got installed in the wrong location.  From
-  gcc-3.1, locales is installed in $datadir, so we should not set that
-  to a custom dir, and since libgcj.jar now have the version appended,
-  it should not be a problem with multiple version installs anymore.
-
-*gcc-3.1-r3 (25 May 2002)
-
-  25 May 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.1-r3.ebuild :
-
-  Added some Redhat/Suse/Mandrake patches.
-
-*gcc-3.1-r2 (24 May 2002)
-
-  24 May 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.1-r2.ebuild :
-
-  Use the correct library versions in src_install().
-
-*gcc-3.1-r1 (20 May 2002) 
-  20 May 2002; Spider <spider@gentoo.org> gcc-3.1-r1.ebuild :
-  removed all texinfo references in gcc 3.1 ebuild. 
-  
-*gcc-3.1 (17 May 2002)
-
-  17 May 2002; Preston Elder <prez@gentoo.org> gcc-3.1 :
-
-  Added the 3.1 ebuild.
-
-*gcc-3.0.4-r6 (2 May 2002)
-
-  3 May 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.0.4-r6 :
-
-  Fix some typo's thanks to Jared H. Hudson.
-
-*gcc-3.0.4-r5 (2 May 2002)
-
-  2 May 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.0.4-r5 :
-
-  Only move .la files for parallel builds, else some packages (KDE *grin*)
-  fails to build.
-
-*gcc-2.95.3-r6 (30 Apr 2002)
-
-  30 Apr 2002; Daniel Robbins <drobbins@gentoo.org>: removed libiberty.a as
-  binutils installs it.  This closes bug #2266.
-
-*gcc-3.0.4-r4 (25 Apr 2002)
-
-  25 Apr 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.0.4-r4 :
-
-  Only apply the gcc3-program-transform.patch patch if building 
-  a multiple install of gcc.
-
-  17 Apr 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.0.4-r3 :
-
-  Move .la files to gcc internal dir to fix gcc2+libtool problems
-  of trying to link /usr/lib/libstdc++.so.
-
-*gcc-3.0.4-r3 (16 Apr 2002)
-
-  16 Apr 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  Moved the manpages to version spesific ones.  More cleanups.
-  Moved libgcj.jar to /usr/lib/gcc-$PV.
-
-*gcc-3.0.4-r2 (15 Apr 2002)
-
-  15 Apr 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  This build enables us to have multiple versions of gcc
-  installed.
-
-*gcc-3.0.4 (1 Mar 2002)
-
-  1 Mar 2002; Grant Goodyear <g2boojum@gentoo.org> :
-
-  Added 3.0.4.  It looks like using the --disable-checks
-  command fixes most of the sandbox violations that we had
-  with 3.0.3 (or 3.0.4 no longer tries to update system
-  headers; I'm not sure which).
-  
 *gcc-2.95.3-r5 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 86d8924cf4e7..f02561e99874 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,109 +1,104 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 722ce80ef49b72abb0d14c7c7700f16f ChangeLog 96448
+MD5 45a43daa1cd05b459a4d7e9417d7c902 ChangeLog 18184
+MD5 63530786ea42df2b5ca6e52999f586f2 gcc-2.95.3-r7.ebuild 5464
+MD5 5a4475fa7fe0b65b070ad173457878d5 gcc-2.95.3-r8.ebuild 9170
+MD5 feb010a6cb97e65c1d201a5796e92942 gcc-3.0.4-r6.ebuild 8766
+MD5 d3372114b2ca713bf263d00cfe6cfbb1 gcc-3.1-r7.ebuild 10379
+MD5 396808683bbe6fe294fe6f803ec4e7a2 gcc-3.1-r8.ebuild 9803
+MD5 b8162a884971199cc4a538d2e484cdfe gcc-3.1.1-r1.ebuild 9636
+MD5 0f6c0dba6ea8d5c3ee9dcc6af366a499 gcc-3.2-r1.ebuild 11630
+MD5 099fb0860ec5d485f3026cbcac20e5e2 gcc-3.2-r4.ebuild 12179
+MD5 da9e936766a9c4650965f9edabbc618d gcc-3.2-r5.ebuild 13126
+MD5 31eaf707d3524543fefb3ff3d1f8af30 gcc-3.2.1-r1.ebuild 13025
+MD5 a3aa85a5c9fc11d7f9038bb69e4bbffa gcc-3.2.1.ebuild 11615
+MD5 924ed75969d118195bcee1a77be642c5 gcc-3.2.2.ebuild 15270
+MD5 f9175af774e1db0faa4e306ad987659b gcc-3.2.1-r5.ebuild 12965
+MD5 213fa084bcb3d01b649dee51bc47e5dd manifest 7096
+MD5 4ca314ddb4dc31959140fa45137e4ec0 gcc-3.2.1-r6.ebuild 14406
+MD5 19347b20e7b3386b4c8bc0770529176a gcc-3.2.1-r7.ebuild 14845
+MD5 2b59f24f760e05edb222b5a9e6c17b4c gcc-3.2.2-r1.ebuild 14724
+MD5 4431edabea8fcc17dca189a6d4c153f1 gcc-3.2.2-r2.ebuild 15119
+MD5 b0cbb9747819e795aff5e65c3d9c8f16 gcc-3.2.2-r1.ebuild~ 14631
+MD5 301b79d21088de1a434729137dcf80e6 gcc-3.2.2-r2.ebuild~ 15026
+MD5 adf32e74c27b5865d5424820e6d2d75b gcc-3.2.2-r3.ebuild~ 15889
+MD5 8d0a9294f2373a5052e38bec92c0e1ef gcc-3.2.1-r6.ebuild~ 14207
+MD5 626465ad215f1f1934a8f332dd59a81b gcc-3.2.1-r7.ebuild~ 14648
+MD5 a816931d4efd6b69d07f24316068f079 gcc-3.2.2-r3.ebuild 15988
+MD5 3213bd50acdbbd71ce7dd3e40710e30e files/digest-gcc-2.95.3-r7 64
+MD5 3213bd50acdbbd71ce7dd3e40710e30e files/digest-gcc-2.95.3-r8 64
+MD5 4a4be6eb294e00da7fef14ec597dcf13 files/digest-gcc-3.0.4-r6 128
+MD5 f0b73e4542862243a43920fd6fd0cb99 files/digest-gcc-3.1-r7 62
+MD5 f0b73e4542862243a43920fd6fd0cb99 files/digest-gcc-3.1-r8 62
+MD5 0d683280daf95e6bb9712549352a200c files/digest-gcc-3.1.1-r1 140
+MD5 897bea3302a0c9bea29aecfe03391d90 files/digest-gcc-3.2-r1 62
+MD5 cd65d39a64a53d74db2ad18611e18a27 files/digest-gcc-3.2-r4 134
+MD5 cd65d39a64a53d74db2ad18611e18a27 files/digest-gcc-3.2-r5 134
+MD5 26092d5777e63013b9e28e2175b1a93c files/digest-gcc-3.2.1 64
+MD5 26092d5777e63013b9e28e2175b1a93c files/digest-gcc-3.2.1-r5 64
+MD5 7ce23f6fb5adf84f6e8ff293c4e7c4dd files/fix_libtool_files.sh 1048
+MD5 2d5af6fe0b03d39a94cb4c4d4b03e226 files/gcc-2.95.3-atexit.diff 1731
+MD5 73da03a8bd40327709e7850d9e2158e6 files/gcc-2.95.3-destructor-atexit.diff 3890
+MD5 523970c128b929fe7c7cf36508ebd1d5 files/gcc-2.95.3-new-atexit.diff 13604
+MD5 385267d11aa8b32522d1585b2d520476 files/gcc-3-deopt-doc.patch 819
+MD5 a84561f46d573c1c835b1c4d2510cc07 files/gcc-3-deopt.patch 588
+MD5 9c13e6b0d5770979430b76c578afa22c files/gcc3-program-transform.patch 9771
+MD5 e3193bdffb435b77a21bfb504ff6f591 files/mkinfodir 7324
+MD5 33df162e1767e168f4f39442785071af files/texinfo-4.0-no-ncurses-gentoo.diff 51748
+MD5 dcf3646d19d351cc4d95a8096c6eaf58 files/cpp 20
+MD5 d70bcc196f1d68275346f067efcb9373 files/cc 20
+MD5 3853f5e3fdf34c40e6f45ae35a845c99 files/digest-gcc-3.2.1-r6 223
+MD5 3853f5e3fdf34c40e6f45ae35a845c99 files/digest-gcc-3.2.1-r1 223
+MD5 3853f5e3fdf34c40e6f45ae35a845c99 files/digest-gcc-3.2.1-r7 223
+MD5 b23ddcb5f3c07162d650dadff752a4d1 files/digest-gcc-3.2.2-r1 139
+MD5 a71b08c7e35abe2526586874801de12e files/digest-gcc-3.2.2-r3 226
+MD5 cd99b576d23043d02ee0b47a63c0c95e files/digest-gcc-3.2.2 64
+MD5 a71b08c7e35abe2526586874801de12e files/digest-gcc-3.2.2-r2 226
+MD5 aa7a1e8bbe618c0d88368e69caeb7653 files/3.1/gcc31-attr-visibility.patch.bz2 3671
+MD5 8b4c6af1c730dcdd843a77e8095d312b files/3.1/gcc31-attr-visibility2.patch.bz2 2341
+MD5 98f539e65ab7e21994e5d378537a5506 files/3.1/gcc31-boehm-gc-libs.patch.bz2 1921
+MD5 9495fab2aa4388693856b2c52f5ac363 files/3.1/gcc31-c++-diagnostic-no-line-wrapping.patch.bz2 562
+MD5 ea61b0ff2db11805fb0778c63b51f43b files/3.1/gcc31-c++-null-pm-init.patch.bz2 4434
+MD5 24642b902b9937cdebeb14063859135f files/3.1/gcc31-c++-tsubst-asm.patch.bz2 703
+MD5 f7274feec78a2dc4ce9233880804ed0f files/3.1/gcc31-dwarf2-pr6381.patch.bz2 1059
+MD5 87f7be372b23072220fbceed8a127474 files/3.1/gcc31-dwarf2-pr6436-test.patch.bz2 336
+MD5 9ea8c34a980997a0d89744cb2ddf941a files/3.1/gcc31-fdata-sections.patch.bz2 2676
+MD5 d3250673494682fa71cb3760e6de257b files/3.1/gcc31-fde-merge-compat.patch.bz2 634
+MD5 a235188ad8a8ac2bb3dc8fcd51603225 files/3.1/gcc31-fold-const.patch.bz2 1867
+MD5 637b53059fa127746952cbffe1e8d403 files/3.1/gcc31-fold-const2.patch.bz2 368
+MD5 734e98009983615eff4814f671d83679 files/3.1/gcc31-i386-expand-clrstr.patch.bz2 527
+MD5 2aadf0591cbf8a4e04235f5fb415f974 files/3.1/gcc31-i386-malign-double-doc.patch.bz2 526
+MD5 f3818c997439d173ac11322c08f2f2c8 files/3.1/gcc31-libstdc++-pr6594.patch.bz2 635
+MD5 981171de6a3f8d53741f77c12c221469 files/3.1/gcc31-libstdc++-pr6648.patch.bz2 770
+MD5 2f1d2c02b99aa182f1fd9b6328c8b77a files/3.1/gcc31-libstdc++-setrlim.patch.bz2 584
+MD5 df404bbcc95193a2591895758915e74e files/3.1/gcc31-pr6643.patch.bz2 421
+MD5 386ffd7fc3ca4a8af55155fe57871dc4 files/3.1/gcc31-test-rotate.patch.bz2 1060
+MD5 7f4bc242692c8e5a2ea0e3e865433d94 files/3.1/gcc31-trunc_int_for_mode.patch.bz2 826
+MD5 2b3b3b8637dc17eedce3b1ca1b68f1f1 files/3.2/gcc-3.2-glibc-2.3-compat.diff 5511
+MD5 a97a78f90c372855823b9facf1ba57b6 files/3.2/gcc-3.2.ctype.patch 3500
+MD5 7f884a426afe182c10d2a5fad94c73cc files/3.2/gcc-3.2.fix-copy.patch 2185
+MD5 f0d236f86eaa66efd429fdac632e0ae2 files/3.2/gcc-3.2.fix-var.patch 1577
+MD5 f0261a99a420d6b533014b95c0a7d00c files/3.2.1/gcc32-ada-make.patch 957
+MD5 f8505ae264a0fe9557382b7c96a13461 files/3.2.1/gcc32-shared-pthread.patch 3637
+MD5 7978d1aaf6bae19163e83c110dec1b38 files/3.2.1/gcc32-sparc32-hack.patch 2192
+MD5 c113c3352ad365b8a35d2b0c21e69256 files/3.2.1/gcc32-testsuite.patch 650
+MD5 444d0885eecc638ed3ca644d96323422 files/3.2.1/gcc32-tls-reload-fix.patch 6660
+MD5 7e8381ddac68428122ee2b186e3e7c5b files/3.2.1/gcc-3.2.1-bug-url.patch 537
 MD5 8ec9b0352d226e4693cabffe0fa5bba6 files/3.2.1/gcc31-loop-load-final-value.patch 3324
-MD5 5e8f2122ef7f9ce187b0a0d50ac9d24a files/3.2.1/gcc32-arm-disable-mathf.patch 2229
-MD5 044a164462d9392aa67cde6f9fd5c1bc files/3.2.1/gcc32-arm-reload1-fix.patch 932
 MD5 38131a537835873acb08c415d27a013e files/3.2.1/gcc32-athlon-alignment.patch 509
-MD5 7978d1aaf6bae19163e83c110dec1b38 files/3.2.1/gcc32-sparc32-hack.patch 2192
+MD5 2c18cb2004c626adf634823713582738 files/3.2.1/gcc32-fix-sixtrack.patch 2001
+MD5 43442dbe4412f751605f1597815b5671 files/3.2.1/gcc32-libjava-x86_64-biarch-sigaction.patch 445
+MD5 9f5b59d7567b90894d8d32cf99f910cc files/3.2.1/gcc32-pr8213.patch 2036
+MD5 62e1cc1d310d74e97080b10802263791 files/3.2.1/gcc32-pr8988.patch 2070
 MD5 51719a174883702ef1851fac4cc79398 files/3.2.1/gcc32-strip-dotdot.patch 2071
-MD5 ed5b074a1d34f4b30a0b1d3928be57e3 files/3.2.2/gcc-3.2.2-cross-compile.patch 479
-MD5 9a67d782b2a574f77714b29675cbda62 files/3.2.2/gcc-3.2.2-no-COPYING-cross-compile.patch 1001
+MD5 5e8f2122ef7f9ce187b0a0d50ac9d24a files/3.2.1/gcc32-arm-disable-mathf.patch 2229
+MD5 044a164462d9392aa67cde6f9fd5c1bc files/3.2.1/gcc32-arm-reload1-fix.patch 932
+MD5 05ef1bcb37d16a9a9a9f702701b088e7 files/awk/fixlafiles.awk 2559
 MD5 17f15202b98a8dd84d0f4b67eff2d868 files/3.2.2/gcc32-pr7768.patch 1789
+MD5 f055e4ef28077477e8d64c6a985b1ad4 files/3.2.2/gcc322-pr9888.patch 9771
 MD5 9f5b59d7567b90894d8d32cf99f910cc files/3.2.2/gcc32-pr8213.patch 2036
+MD5 0760a0992d24384d13b7e160614c54ac files/3.2.2/gcc32-pr9732.patch 5534
+MD5 ccb007933a794eb661ee3b742189f285 files/3.2.2/gcc322-pr8746.patch 2816
 MD5 465eeaf6008c25dc69ff502dc2a9d8e0 files/3.2.2/gcc322-ggc_page-speedup.patch 872
-MD5 52ef1426cb70a472182503502b768058 files/3.2.3/gcc-3.2.3-mergel-fix.patch 2749
-MD5 a3315d69ba1be0bc1518a75027896bf3 files/3.2.3/gcc-3.2.3-move-propolice-into-glibc.patch 3534
-MD5 1f4f8ca52d2dda4a5dc3a9b8f130841c files/3.2.3/gcc-323-propolice-version.patch 700
-MD5 c9c45dab64bab25e716859626ad7f94f files/3.2.3/gcc32-c++-classfn-member-template.patch 3219
-MD5 494d917cc15c81c9cead4a8c17d4d00d files/3.2.3/gcc32-mklibgcc-serialize-crtfiles.patch 926
-MD5 99db7c1a41babe024f0c6859c30a87ee files/3.2.3/gcc323-gentoo-branding.patch 2058
-MD5 869b9a1ea49bf8b07c8405d2f1d76270 files/3.2.3/gcc323-hppa-default_assemble_visibility.patch 571
-MD5 b398b7415b93423ff04952c6e69bdb4d files/3.3.1/gcc331-pp-fixup.patch 407
-MD5 9e7ed6184a1cdcb69db29f1de26c2d18 files/3.3.2/gcc332-altivec-fix.patch 1607
-MD5 d9ae122db2768f8e504dfef256d4991f files/3.3.2/gcc332-gentoo-branding.patch 874
-MD5 ee700275f341541af37d56bd15dcf863 files/3.3.3/gcc-3.3.3-norelro.patch 606
-MD5 ff6d7b5082c5e39fab8a5d8932c1a8b7 files/3.3.3/gcc-3.3.3-uclibc-add-ssp.patch 461
-MD5 308a0e53f03e9cb74b3d12c2633cbee2 files/3.3.3/gcc-uclibc-3.3-loop.patch 433
-MD5 9ba0bd0b103cf9535927ad7c482fe780 files/3.3.3/gcc333-debian-arm-getoff.patch 3501
-MD5 25eda9981106a55c413d1df3d3a87db5 files/3.3.3/gcc333-debian-arm-ldm.patch 3383
-MD5 3210d5fd70806c44d4426c3dceebd480 files/3.3.3/gcc333_pre20040408-stack-size.patch 653
-MD5 5fb5b49f3f16cc9e7e27e582c92ffa2f files/3.3.4/libffi-without-libgcj.patch 890
-MD5 7c29f54dd8d50385ac42fae65459c744 files/3.3.5/gcc-3.3.5-ffecom_gfrt_basictype-prototype.patch 538
-MD5 184cb0a87ee2fa0197dec6f4902ef4c8 files/3.3.5/gcc-3.3.5-no-COPYING-cross-compile.patch 1192
-MD5 d0f69e3626da1a439356a270e3bb8a20 files/3.3.6/gcc-3.3.6-cross-compile.patch 2202
-MD5 17b3190d64e34ed7709d022b326d08ae files/3.4.0/gcc-3.4.0-cc1-no-stack-protector.patch 563
-MD5 4edccdf0b4f6dbbc9f7bc9370c255e0c files/3.4.0/gcc34-reiser4-fix.patch 587
-MD5 cd770c23ece7458db5e6c5067f262ce0 files/3.4.1/gcc-3.4.1-glibc-is-native.patch 760
-MD5 7cb2138ac2df6f8674d19974e966a45b files/3.4.1/gcc-3.4.1-mips-n32only.patch 614
-MD5 aa8e15a63d797df37bbd4e489ed0267f files/3.4.1/gcc-3.4.1-mips-n64only.patch 614
-MD5 14fec2000fc63536d4cf22195e88e14f files/3.4.1/gcc-3.4.1-r2-gentoo-branding.patch 781
-MD5 a720c913b78bcfbd7f63319130fadd4a files/3.4.2/810-arm-bigendian-uclibc.patch 1139
-MD5 1134e9dabbd6dfba1d91015851f02a2b files/3.4.2/gcc-3.4.2-mips-ip28_cache_barriers-v2.patch 14118
-MD5 b2922cfe76692e7d2b373a0a255f405e files/3.4.2/gcc-3.4.x-mips-add-march-r10k.patch 14248
-MD5 f2395cf0f72d870e263d0dcec18fdd67 files/3.4.2/gcc34-fix-sse2_pinsrw.patch 1268
-MD5 2c1ce849de55d8c81af4e081dbb2f5e4 files/3.4.2/gcc34-m32-no-sse2.patch 1058
-MD5 e2b16f5452dd71980b158b2c0fda319c files/3.4.3/gcc-3.4.3-cross-compile.patch 3103
-MD5 3f6d070c2a4a899e7d879fdb55eecba4 files/3.4.3/libffi-nogcj-lib-path-fix.patch 1691
-MD5 007c62d92efd70fd44c4d2e6a326036b files/3.4.3/libffi-without-libgcj.patch 1658
-MD5 7434140298091f759eba5e9706264130 files/3.4.3/libssp.patch 2029
-MD5 520c8e6799b5c4bff0fdcb81e81fbe88 files/3.4.4/gcc-3.4.4-cross-compile.patch 1912
-MD5 2c355d808b490994c6566b10f3c0ba27 files/3.4.4/gcc-3.4.4-softfloat.patch 5242
-MD5 0acb1229f47bbb9e254a9824db17c25b files/4.0.2/gcc-4.0.2-cross-compile.patch 505
-MD5 6c3e9176aff0f29e30a356970e8fa307 files/4.1.0/gcc-4.1.0-pr22313.patch 2292
-MD5 fed3620378df7a876d6709ddf3f7bbec files/awk/fixlafiles.awk 7865
-MD5 c672adb59a1f452475ab0a864b9d1bd1 files/awk/scanforssp.awk 5830
-MD5 4ecf0f5cb735c81ca4b61a9c6db74269 files/digest-gcc-2.95.3-r9 139
-MD5 0d683280daf95e6bb9712549352a200c files/digest-gcc-3.1.1-r2 140
-MD5 9bf3066b08fcf3297eb76fbfd33d18ee files/digest-gcc-3.2.2 137
-MD5 40e6872c09149a81973f01a78c80bbb7 files/digest-gcc-3.2.3-r4 279
-MD5 e58b6c1f3122b79a5d0d273acc3c008c files/digest-gcc-3.3.2-r7 361
-MD5 a3edf5e9d8bb500178f8dd29c1f9eadd files/digest-gcc-3.3.5-r1 442
-MD5 b29f3bde3e23f17cd9a9bb4a5b026ea1 files/digest-gcc-3.3.5.20050130-r1 620
-MD5 9e216fb231a24884fe548b31864296b8 files/digest-gcc-3.3.5.20050130-r2 620
-MD5 bc84418435b24e5c06f80f819e35b6fb files/digest-gcc-3.3.6 453
-MD5 c6ea8a92bac6d2638c54c011f98bc5b8 files/digest-gcc-3.4.1-r3 442
-MD5 b756cafc55e6590c804a20976e6ebc6e files/digest-gcc-3.4.3-r1 607
-MD5 ba7469d4f191ff1baa00b9dd45e3dc6b files/digest-gcc-3.4.3.20050110-r2 616
-MD5 fa32cd40c637c54b4e3b89dd4ed4c573 files/digest-gcc-3.4.4-r1 450
-MD5 f0c74f849066ffaefe7d364d69a71961 files/digest-gcc-4.0.1 380
-MD5 935eea1ace4e13688f89c88d75b38dbc files/digest-gcc-4.0.2-r1 381
-MD5 44fa94e1d895254002b7cfae7b4f20e4 files/digest-gcc-4.1.0_beta20051125 71
-MD5 1acd56209164ab837c5f91723434464e files/fix_libtool_files.sh 1712
-MD5 e0ebf10eb8bf4542ae57ba591daa68a4 files/gcc-configure-LANG.patch 1686
-MD5 f80fd6ebeeea00d3e1649dfccdd85062 files/gcc-spec-env.patch 893
-MD5 8baffb486c75efe253bd2daa88daa7d6 files/gcc331_use_multilib.amd64.patch 352
-MD5 e3193bdffb435b77a21bfb504ff6f591 files/mkinfodir 7324
-MD5 ea2cf3df0d89a26d5fdc1a531176e395 files/pro-police-docs.patch 3287
-MD5 07b57d62aa1a8cd4d1cd37984ebe2053 files/scan_libgcc_linked_ssp.sh 861
-MD5 0f8035bc5ae6126fd9380ba9dcdcc271 files/stubs/gcc-3.3-htb-stub.patch 2195
-MD5 cb27bc36a5b9a1175a5f3bdf38647814 files/stubs/gcc-3.3-ssp-stub.patch 1735
-MD5 053b213d6994cef2ad995aa516ed937a files/stubs/gcc-3.4-htb-stub.patch 722
-MD5 d71c91009df788366867cb67fc875d6d files/stubs/gcc-3.4-ssp-stub.patch 1068
-MD5 37e756238508fe9f9e2b9ba6a7ca67ca files/stubs/gcc-4.0-htb-stub.patch 722
-MD5 d71c91009df788366867cb67fc875d6d files/stubs/gcc-4.0-ssp-stub.patch 1068
-MD5 1c3582bb4238e245158cdb6efff44318 gcc-2.95.3-r9.ebuild 7578
-MD5 37f3db1694d592dc3a3db07507390b76 gcc-3.1.1-r2.ebuild 9270
-MD5 c76df140331f7e3f907c329ee85d9477 gcc-3.2.2.ebuild 767
-MD5 50a28b5bf54b833ca3bb3bfbf31d4ac9 gcc-3.2.3-r4.ebuild 19947
-MD5 6a290233a7c7a2759b09c3f590449e69 gcc-3.3.2-r7.ebuild 21863
-MD5 36e4fc99adb1677e85e10ae4ec36ceb7 gcc-3.3.5-r1.ebuild 3849
-MD5 e745147dc2058a8cafc25bba7e3f916b gcc-3.3.5.20050130-r1.ebuild 3281
-MD5 809734eb8668d83f43b77b6a24018795 gcc-3.3.5.20050130-r2.ebuild 3281
-MD5 14e2073340ca1c2c3853e3a8d11a75f3 gcc-3.3.6.ebuild 3220
-MD5 307b46ee9b86bb1d182824303c4b01f3 gcc-3.4.1-r3.ebuild 31283
-MD5 71e25d702be3dd13ee277b7383345fad gcc-3.4.3-r1.ebuild 5477
-MD5 769273e24a52732ce892d08ebeb4bbeb gcc-3.4.3.20050110-r2.ebuild 5240
-MD5 253f0aec6dfc46f27e5f08b85f6f32a1 gcc-3.4.4-r1.ebuild 5202
-MD5 c2611e7e7fdf69e451da52b22ef78815 gcc-4.0.1.ebuild 1889
-MD5 a22e515b45be82f72ecb9442d5d0b865 gcc-4.0.2-r1.ebuild 2347
-MD5 6befa37cb0bf8e8e6e69db580a1539d1 gcc-4.1.0_beta20051125.ebuild 2166
-MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDi8XngIKl8Uu19MoRAg7KAJ4/su/1QpyXcLRLpZk5u7I2JiCqWQCfU02G
-y83XZZFKjliVaZ9BQgetWMo=
-=RBm7
------END PGP SIGNATURE-----
+MD5 203daadba73857e4a55377c24c4e447d files/3.2.2/gcc-322-r3-propolice-version.patch 715
+MD5 645ef8d7bf58fafa0175335a670bec89 files/3.2.2/protector.c 65015
+MD5 59319f59b0b7391e5a5ce5ff64bcc7de files/3.2.2/protector.h 1666
+MD5 789c47cf841afe9bfc49fd49da7a03a1 files/3.2.2/protector.patch 36232
diff --git a/sys-devel/gcc/files/3.2.3/gcc-3.2.3-mergel-fix.patch b/sys-devel/gcc/files/3.2.3/gcc-3.2.3-mergel-fix.patch
index bc763ae54939..a12a63f7e8dd 100644
--- a/sys-devel/gcc/files/3.2.3/gcc-3.2.3-mergel-fix.patch
+++ b/sys-devel/gcc/files/3.2.3/gcc-3.2.3-mergel-fix.patch
@@ -1,7 +1,7 @@
 diff -ruN gcc-3.2.3.orig/gcc/config/rs6000/altivec.h gcc-3.2.3/gcc/config/rs6000/altivec.h
---- gcc-3.2.3.orig/gcc/config/rs6000/altivec.h	2003-07-03 02:47:36.000000000 +0200
-+++ gcc-3.2.3/gcc/config/rs6000/altivec.h	2003-07-03 02:49:17.000000000 +0200
-@@ -8535,4 +8535,57 @@
+--- gcc-3.2.3.orig/gcc/config/rs6000/altivec.h	2002-05-18 07:40:16.000000000 +0200
++++ gcc-3.2.3/gcc/config/rs6000/altivec.h	2003-07-02 10:11:35.000000000 +0200
+@@ -8535,4 +8535,51 @@
  
  #endif /* __cplusplus */
  
@@ -35,10 +35,6 @@ diff -ruN gcc-3.2.3.orig/gcc/config/rs6000/altivec.h gcc-3.2.3/gcc/config/rs6000
 +    };
 +    return vec_perm (A, B, lowword);
 +}
-+/*#define my_vmrglb my_vmrglb 
-+#define my_vmrglh my_vmrglh 
-+#define my_vmrglw my_vmrglw 
-+*/
 +#undef vec_mergel
 +
 +#define vec_mergel(a1, a2) \
@@ -56,6 +52,4 @@ diff -ruN gcc-3.2.3.orig/gcc/config/rs6000/altivec.h gcc-3.2.3/gcc/config/rs6000
 +      ((vector signed int) my_vmrglw ((vector signed int) (a1), (vector signed int) (a2))), \
 +__ch (__bin_args_eq (vector unsigned int, (a1), vector unsigned int, (a2)), \
 +      ((vector unsigned int) my_vmrglw ((vector signed int) (a1), (vector signed int) (a2))), \
-+    __altivec_link_error_invalid_argument ())))))))
-+
  #endif /* _ALTIVEC_H */
diff --git a/sys-devel/gcc/files/3.3.2/gcc332-altivec-fix.patch b/sys-devel/gcc/files/3.3.2/gcc332-altivec-fix.patch
index 57ac8c5786b5..80ff5b7da18d 100644
--- a/sys-devel/gcc/files/3.3.2/gcc332-altivec-fix.patch
+++ b/sys-devel/gcc/files/3.3.2/gcc332-altivec-fix.patch
@@ -1,6 +1,6 @@
 diff -ruN gcc-3.3.2.orig/gcc/config/rs6000/rs6000.c gcc-3.3.2/gcc/config/rs6000/rs6000.c
---- gcc-3.3.2.orig/gcc/config/rs6000/rs6000.c	2004-02-08 18:04:23.813276392 +0100
-+++ gcc-3.3.2/gcc/config/rs6000/rs6000.c	2004-02-08 18:12:22.310533752 +0100
+--- gcc-3.3.2.orig/gcc/config/rs6000/rs6000.c	2004-01-19 16:56:02.000000000 +0100
++++ gcc-3.3.2/gcc/config/rs6000/rs6000.c	2004-01-20 01:06:46.352118856 +0100
 @@ -264,7 +264,7 @@
  static void is_altivec_return_reg PARAMS ((rtx, void *));
  static rtx generate_set_vrsave PARAMS ((rtx, rs6000_stack_t *, int));
@@ -20,15 +20,24 @@ diff -ruN gcc-3.3.2.orig/gcc/config/rs6000/rs6000.c gcc-3.3.2/gcc/config/rs6000/
       rtx op;
  {
 diff -ruN gcc-3.3.2.orig/gcc/config/rs6000/rs6000.h gcc-3.3.2/gcc/config/rs6000/rs6000.h
---- gcc-3.3.2.orig/gcc/config/rs6000/rs6000.h	2004-02-08 18:04:24.071237176 +0100
-+++ gcc-3.3.2/gcc/config/rs6000/rs6000.h	2004-02-08 18:13:51.506973832 +0100
-@@ -1997,7 +1997,8 @@
-     || zero_constant (X, GET_MODE (X)))				\
-    && (GET_CODE (X) != CONST_DOUBLE || GET_MODE (X) == VOIDmode	\
-        || (TARGET_POWERPC64 && GET_MODE (X) == DImode)		\
--       || easy_fp_constant (X, GET_MODE (X)))			\
-+       || easy_fp_constant (X, GET_MODE (X))			\
-+       || easy_vector_constant (X, GET_MODE (X)))		\
-    && !rs6000_tls_referenced_p (X))
+--- gcc-3.3.2.orig/gcc/config/rs6000/rs6000.h	2004-01-19 16:56:03.000000000 +0100
++++ gcc-3.3.2/gcc/config/rs6000/rs6000.h	2004-01-20 01:06:46.390113080 +0100
+@@ -1993,11 +1993,13 @@
+    acceptable.  */
  
+ #define LEGITIMATE_CONSTANT_P(X)				\
+-  ((GET_CODE (X) != CONST_DOUBLE || GET_MODE (X) == VOIDmode	\
+-    || (TARGET_POWERPC64 && GET_MODE (X) == DImode)		\
+-    || easy_fp_constant (X, GET_MODE (X)))			\
+-   && !rs6000_tls_referenced_p (X))
+-
++   (((GET_CODE (X) != CONST_DOUBLE				\
++      && GET_CODE (X) != CONST_VECTOR)				\
++      || GET_MODE (X) == VOIDmode					\
++      || (TARGET_POWERPC64 && GET_MODE (X) == DImode)		\
++      || easy_fp_constant (X, GET_MODE (X))			\
++      || easy_vector_constant (X, GET_MODE (X)))			\
++      && !rs6000_tls_referenced_p (X))
  /* The macros REG_OK_FOR..._P assume that the arg is a REG rtx
+    and check its validity for a certain class.
+    We have two alternate definitions for each of them.
diff --git a/sys-devel/gcc/files/3.3.6/gcc-3.3.6-cross-compile.patch b/sys-devel/gcc/files/3.3.6/gcc-3.3.6-cross-compile.patch
index ff9b42bf96c9..064bc8dd08eb 100644
--- a/sys-devel/gcc/files/3.3.6/gcc-3.3.6-cross-compile.patch
+++ b/sys-devel/gcc/files/3.3.6/gcc-3.3.6-cross-compile.patch
@@ -1,7 +1,3 @@
-Some notes on the 'bootstrap with or without libc headers' debate:
-http://linuxfromscratch.org/pipermail/lfs-dev/2005-July/052409.html
-http://gcc.gnu.org/ml/gcc/2005-07/msg01195.html
-
 --- gcc/configure.in
 +++ gcc/configure.in
 @@ -1276,8 +1276,9 @@
@@ -45,18 +41,3 @@ http://gcc.gnu.org/ml/gcc/2005-07/msg01195.html
      goto SUCCESS;							\
    } while (0)
 +#endif /* inhibit_libc */
---- gcc/config/i386/linux.h
-+++ gcc/config/i386/linux.h
-@@ -240,6 +240,7 @@
- /* Do code reading to identify a signal frame, and set the frame
-    state data appropriately.  See unwind-dw2.c for the structs.  */
- 
-+#ifndef inhibit_libc
- #ifdef IN_LIBGCC2
- /* There's no sys/ucontext.h for some (all?) libc1, so no
-    signal-turned-exceptions for them.  There's also no configure-run for
-@@ -304,3 +305,4 @@
-   } while (0)
- #endif /* not USE_GNULIBC_1 */
- #endif /* IN_LIBGCC2 */
-+#endif /* inhibit_libc */
diff --git a/sys-devel/gcc/files/3.4.1/gcc-3.4.1-mips-n32only.patch b/sys-devel/gcc/files/3.4.1/gcc-3.4.1-mips-n32only.patch
index 6fba12b78a44..4e459afd5f55 100644
--- a/sys-devel/gcc/files/3.4.1/gcc-3.4.1-mips-n32only.patch
+++ b/sys-devel/gcc/files/3.4.1/gcc-3.4.1-mips-n32only.patch
@@ -10,8 +10,8 @@ diff -u -r1.3 t-linux64
 -MULTILIB_DIRNAMES = o32 32 64
 -MULTILIB_OSDIRNAMES = ../lib ../lib32 ../lib64
 +MULTILIB_OPTIONS = mabi=n32
-+MULTILIB_DIRNAMES =
-+MULTILIB_OSDIRNAMES =
++MULTILIB_DIRNAMES = 32
++MULTILIB_OSDIRNAMES = ../lib
  
  EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
  
diff --git a/sys-devel/gcc/files/3.4.1/gcc-3.4.1-mips-n64only.patch b/sys-devel/gcc/files/3.4.1/gcc-3.4.1-mips-n64only.patch
index 81baf62ec62a..bd6bf8b2d092 100644
--- a/sys-devel/gcc/files/3.4.1/gcc-3.4.1-mips-n64only.patch
+++ b/sys-devel/gcc/files/3.4.1/gcc-3.4.1-mips-n64only.patch
@@ -10,8 +10,8 @@ diff -u -r1.3 t-linux64
 -MULTILIB_DIRNAMES = o32 32 64
 -MULTILIB_OSDIRNAMES = ../lib ../lib32 ../lib64
 +MULTILIB_OPTIONS = mabi=n64
-+MULTILIB_DIRNAMES =
-+MULTILIB_OSDIRNAMES =
++MULTILIB_DIRNAMES = 64
++MULTILIB_OSDIRNAMES = ../lib
  
  EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
  
diff --git a/sys-devel/gcc/files/3.4.2/gcc-3.4.2-mips-ip28_cache_barriers-v2.patch b/sys-devel/gcc/files/3.4.2/gcc-3.4.2-mips-ip28_cache_barriers-v2.patch
index d91c9f2738d5..1c85e05ff389 100644
--- a/sys-devel/gcc/files/3.4.2/gcc-3.4.2-mips-ip28_cache_barriers-v2.patch
+++ b/sys-devel/gcc/files/3.4.2/gcc-3.4.2-mips-ip28_cache_barriers-v2.patch
@@ -1,458 +1,458 @@
---- gcc-3.4.2/gcc/config/mips/mips.h	Thu Jul 15 02:42:47 2004
-+++ gcc-3.4.2/gcc/config/mips/mips.h	Sat Sep 18 00:41:48 2004
-@@ -122,6 +122,7 @@
- extern const char *mips_isa_string;	/* for -mips{1,2,3,4} */
- extern const char *mips_abi_string;	/* for -mabi={32,n32,64} */
- extern const char *mips_cache_flush_func;/* for -mflush-func= and -mno-flush-func */
-+extern const char *mips_ip28_cache_barrier;/* for -mip28-cache-barrier */
- extern int mips_string_length;		/* length of strings for mips16 */
- extern const struct mips_cpu_info mips_cpu_info_table[];
- extern const struct mips_cpu_info *mips_arch_info;
-@@ -333,6 +334,7 @@
- #define TARGET_MIPS9000             (mips_arch == PROCESSOR_R9000)
- #define TARGET_SB1                  (mips_arch == PROCESSOR_SB1)
- #define TARGET_SR71K                (mips_arch == PROCESSOR_SR71000)
-+#define TARGET_IP28                 (mips_ip28_cache_barrier != 0)
- 
- /* Scheduling target defines.  */
- #define TUNE_MIPS3000               (mips_tune == PROCESSOR_R3000)
-@@ -752,6 +754,8 @@
-       N_("Don't call any cache flush functions"), 0},			\
-   { "flush-func=", &mips_cache_flush_func,				\
-       N_("Specify cache flush function"), 0},				\
-+  { "ip28-cache-barrier", &mips_ip28_cache_barrier,			\
-+      N_("Generate special cache barriers for SGI Indigo2 R10k"), 0},	\
- }
- 
- /* This is meant to be redefined in the host dependent files.  */
-@@ -3448,3 +3452,11 @@
- 	" TEXT_SECTION_ASM_OP);
- #endif
- #endif
-+
-+#define ASM_OUTPUT_R10K_CACHE_BARRIER(STREAM)		\
-+  fprintf (STREAM, "\tcache 0x14,0($sp)\t%s Cache Barrier\n", ASM_COMMENT_START)
-+
-+/*
-+ * mips.h	Thu Jul 15 02:42:47 2004
-+ * mips.h	Fri Sep 17 23:18:19 2004	ip28
-+ */
---- gcc-3.4.2/gcc/config/mips/mips.c	Wed Jul  7 21:21:10 2004
-+++ gcc-3.4.2/gcc/config/mips/mips.c	Fri Sep 17 23:33:44 2004
-@@ -502,6 +502,11 @@
- 
- const char *mips_cache_flush_func = CACHE_FLUSH_FUNC;
- 
-+/* Nonzero means generate special cache barriers to inhibit speculative
-+   stores which might endanger cache coherency or reference invalid
-+   addresses (especially on SGI's Indigo2 R10k (IP28)).  */
-+const char *mips_ip28_cache_barrier;
-+
- /* If TRUE, we split addresses into their high and low parts in the RTL.  */
- int mips_split_addresses;
- 
-@@ -9676,3 +9681,7 @@
- #endif /* TARGET_IRIX */
- 
- #include "gt-mips.h"
-+/*
-+ * mips.c	Wed Jul  7 21:21:10 2004
-+ * mips.c	Fri Sep 17 23:25:53 2004	ip28
-+ */
---- gcc-3.4.2/gcc/final.c	Sun Jan 18 23:39:57 2004
-+++ gcc-3.4.2/gcc/final.c	Thu Apr  7 00:00:05 2005
-@@ -146,6 +146,13 @@
- 
- static rtx last_ignored_compare = 0;
- 
-+/* Flag indicating this insn is the start of a new basic block.  */
-+
-+#define NEW_BLOCK_LABEL  1
-+#define NEW_BLOCK_BRANCH 2
-+
-+static int new_block = NEW_BLOCK_LABEL;
-+
- /* Assign a unique number to each insn that is output.
-    This can be used to generate unique local labels.  */
- 
-@@ -235,6 +242,7 @@
- #ifdef HAVE_ATTR_length
- static int align_fuzz (rtx, rtx, int, unsigned);
- #endif
-+static int output_store_cache_barrier (FILE *, rtx);
- 
- /* Initialize data in final at the beginning of a compilation.  */
- 
-@@ -1505,6 +1513,7 @@
-   int seen = 0;
- 
-   last_ignored_compare = 0;
-+  new_block = NEW_BLOCK_LABEL;
- 
- #ifdef SDB_DEBUGGING_INFO
-   /* When producing SDB debugging info, delete troublesome line number
-@@ -1571,6 +1580,7 @@
- 
-       insn = final_scan_insn (insn, file, optimize, prescan, 0, &seen);
-     }
-+  new_block = 0;
- }
- 
- const char *
-@@ -1851,6 +1861,7 @@
- #endif
-       if (prescan > 0)
- 	break;
-+      new_block = NEW_BLOCK_LABEL;
- 
-       if (LABEL_NAME (insn))
- 	(*debug_hooks->label) (insn);
-@@ -2009,6 +2020,26 @@
- 
- 	    break;
- 	  }
-+
-+#ifdef TARGET_IP28
-+	if (new_block)
-+	  {
-+	    /* .reorder: not really in the branch-delay-slot. */
-+	    if (! set_noreorder)
-+	      new_block = NEW_BLOCK_LABEL;
-+
-+	    if (new_block == NEW_BLOCK_BRANCH)
-+	      /* Not yet, only *after* the branch-delay-slot ! */
-+	      new_block = NEW_BLOCK_LABEL;
-+	    else
-+	      {
-+	        if (TARGET_IP28)
-+	          output_store_cache_barrier (file, insn);
-+	        new_block = 0;
-+	      }
-+	  }
-+#endif
-+
- 	/* Output this line note if it is the first or the last line
- 	   note in a row.  */
- 	if (notice_source_line (insn))
-@@ -2132,8 +2163,29 @@
- 	       clobbered by the function.  */
- 	    if (GET_CODE (XVECEXP (body, 0, 0)) == CALL_INSN)
- 	      {
-+#ifdef TARGET_IP28
-+	        if (TARGET_IP28)
-+	          new_block = NEW_BLOCK_LABEL;
-+#endif
- 		CC_STATUS_INIT;
- 	      }
-+#ifdef TARGET_IP28
-+	    /* Following a conditional branch sequence, we have a new basic
-+	       block.  */
-+	    if (TARGET_IP28)
-+	      {
-+		rtx insn = XVECEXP (body, 0, 0);
-+		rtx body = PATTERN (insn);
-+
-+		if ((GET_CODE (insn) == JUMP_INSN && GET_CODE (body) == SET
-+		     && GET_CODE (SET_SRC (body)) != LABEL_REF)
-+		    || (GET_CODE (insn) == JUMP_INSN
-+			&& GET_CODE (body) == PARALLEL
-+			&& GET_CODE (XVECEXP (body, 0, 0)) == SET
-+			&& GET_CODE (SET_SRC (XVECEXP (body, 0, 0))) != LABEL_REF))
-+		  new_block = NEW_BLOCK_LABEL;
-+	      }
-+#endif
- 	    break;
- 	  }
- 
-@@ -2188,6 +2240,20 @@
- 	  }
- #endif
- 
-+#ifdef TARGET_IP28
-+	/* Following a conditional branch, we have a new basic block.
-+	   But if we are inside a sequence, the new block starts after the
-+	   last insn of the sequence.  */
-+	if (TARGET_IP28 && final_sequence == 0
-+	    && (GET_CODE (insn) == CALL_INSN
-+	        || (GET_CODE (insn) == JUMP_INSN && GET_CODE (body) == SET
-+	            && GET_CODE (SET_SRC (body)) != LABEL_REF)
-+	        || (GET_CODE (insn) == JUMP_INSN && GET_CODE (body) == PARALLEL
-+	            && GET_CODE (XVECEXP (body, 0, 0)) == SET
-+	            && GET_CODE (SET_SRC (XVECEXP (body, 0, 0))) != LABEL_REF)))
-+	      new_block = NEW_BLOCK_BRANCH;
-+#endif
-+
- #ifndef STACK_REGS
- 	/* Don't bother outputting obvious no-ops, even without -O.
- 	   This optimization is fast and doesn't interfere with debugging.
-@@ -2402,6 +2468,7 @@
- 
- 	    if (prev_nonnote_insn (insn) != last_ignored_compare)
- 	      abort ();
-+	    new_block = 0;
- 
- 	    /* We have already processed the notes between the setter and
- 	       the user.  Make sure we don't process them again, this is
-@@ -2435,6 +2502,7 @@
- 	    abort ();
- #endif
- 
-+	    new_block = 0;
- 	    return new;
- 	  }
- 
-@@ -3866,3 +3934,254 @@
-       symbol_queue_size = 0;
-     }
- }
-+
-+
-+#ifdef TARGET_IP28
-+
-+/* Check, whether an instruction is a possibly harmful store instruction,
-+   i.e. a store which might cause damage, if speculatively executed. */
-+
-+static rtx
-+find_mem_expr (rtx xexp)
-+{
-+  if (xexp)
-+    {
-+      const char *fmt;
-+      int i, j, lng;
-+      rtx x;
-+      RTX_CODE code = GET_CODE (xexp);
-+
-+      if (MEM == code)
-+        return xexp;
-+
-+      fmt = GET_RTX_FORMAT (code);
-+      lng = GET_RTX_LENGTH (code);
-+
-+      for (i = 0; i < lng; ++i)
-+        switch (fmt[i])
-+          {
-+          case 'e':
-+            x = find_mem_expr (XEXP (xexp, i));
-+            if (x)
-+              return x;
-+            break;
-+          case 'E':
-+            if (XVEC (xexp, i))
-+              for (j = 0; j < XVECLEN (xexp, i); ++j)
-+                {
-+                  x = find_mem_expr (XVECEXP (xexp, i, j));
-+                  if (x)
-+                    return x;
-+                }
-+          }
-+    }
-+  return 0;
-+}
-+
-+static int
-+check_mem_expr (rtx memx)
-+{
-+  /* Check the expression `memx' (with type GET_CODE(memx) == MEM)
-+     for the most common stackpointer-addressing modes.
-+     It's not worthwile to avoid a cache barrier also on the
-+     remaining unfrequently used modes.  */
-+  rtx x = XEXP (memx, 0);
-+  switch (GET_CODE (x))
-+    {
-+    case REG:
-+      if (REGNO (x) == STACK_POINTER_REGNUM)
-+        return 0;
-+    default:
-+      break;
-+    case PLUS: case MINUS: /* always `SP + const' ? */
-+      if (GET_CODE (XEXP (x, 1)) == REG
-+          && REGNO (XEXP (x, 1)) == STACK_POINTER_REGNUM)
-+        return 0;
-+    case NEG: case SIGN_EXTEND: case ZERO_EXTEND:
-+      if (GET_CODE (XEXP (x, 0)) == REG
-+          && REGNO (XEXP (x, 0)) == STACK_POINTER_REGNUM)
-+        return 0;
-+    }
-+
-+  /* Stores/Loads to/from constant addresses can be considered
-+     harmless, since:
-+     1)  the address is always valid, even when taken speculatively.
-+     2a) the location is (hopefully) never used as a dma-target, thus
-+         there is no danger of cache-inconsistency.
-+     2b) uncached loads/stores are guaranteed to be non-speculative. */
-+  if ( CONSTANT_P(x) )
-+    return 0;
-+
-+  return 1;
-+}
-+
-+/* inline */ static int
-+check_pattern_for_store (rtx body)
-+{
-+  /* Check for (set (mem:M (non_stackpointer_address) ...)).  Here we
-+     assume, that addressing with the stackpointer accesses neither
-+     uncached-aliased nor invalid memory.  (May be, this applies to the
-+     global pointer and frame pointer also, but its saver not to assume
-+     it. And probably it's not worthwile to regard these registers)
-+
-+     Speculative loads from invalid addresses also cause bus errors...
-+     So check for (set (reg:M ...) (mem:M (non_stackpointer_address)))
-+     too. */
-+
-+  if (body && GET_CODE (body) == SET)
-+    {
-+      rtx x = find_mem_expr (body);
-+
-+      if (x && check_mem_expr (x))
-+        return 1;
-+    }
-+  return 0;
-+}
-+
-+static int
-+check_insn_for_store (int state, rtx insn)
-+{
-+  /* Check for (ins (set (mem:M (dangerous_address)) ...)) or end of the
-+     current basic block.
-+     Criteria to recognize end-of/next basic-block are reduplicated here
-+     from final_scan_insn. */
-+
-+  rtx body;
-+  int code;
-+
-+  if (INSN_DELETED_P (insn))
-+    return 0;
-+
-+  switch (code = GET_CODE (insn))
-+    {
-+    case CODE_LABEL:
-+      return -1;
-+    case CALL_INSN:
-+    case JUMP_INSN:
-+    case INSN:
-+      body = PATTERN (insn);
-+      if (GET_CODE (body) == SEQUENCE)
-+        {
-+          /* A delayed-branch sequence */
-+          rtx ins0 = XVECEXP (body, 0, 0);
-+          rtx pat0 = PATTERN (ins0);
-+          int i;
-+          for (i = 0; i < XVECLEN (body, 0); i++)
-+            {
-+              rtx insq = XVECEXP (body, 0, i);
-+              if (! INSN_DELETED_P (insq))
-+                {
-+                  int j = check_insn_for_store (state|1, insq);
-+                  if (j)
-+                    return j;
-+                }
-+            }
-+          /* Following a conditional branch sequence, we have a new
-+             basic block.  */
-+          if (GET_CODE (ins0) == JUMP_INSN)
-+            if ((GET_CODE (pat0) == SET
-+                 && GET_CODE (SET_SRC (pat0)) != LABEL_REF)
-+                || (GET_CODE (pat0) == PARALLEL
-+                    && GET_CODE (XVECEXP (pat0, 0, 0)) == SET
-+                    && GET_CODE (SET_SRC (XVECEXP (pat0, 0, 0))) != LABEL_REF))
-+              return -1;
-+          /* Handle a call sequence like a conditional branch sequence */
-+          if (GET_CODE (ins0) == CALL_INSN)
-+            return -1;
-+          break;
-+        }
-+      if (GET_CODE (body) == PARALLEL)
-+        {
-+          int i;
-+          for (i = 0; i < XVECLEN (body, 0); i++)
-+            if (check_pattern_for_store (XVECEXP (body, 0, i)))
-+              return 1;
-+        }
-+      /* Now, only a `simple' INSN or JUMP_INSN remains to be checked. */
-+      if (code == INSN)
-+        {
-+          /* Since we don't know, what's inside, we must take inline
-+             assembly to be dangerous */
-+          if (GET_CODE (body) == ASM_INPUT)
-+            return 1;
-+
-+          if (check_pattern_for_store (body))
-+            return 1;
-+        }
-+      /* Handle a CALL_INSN instruction like a conditional branch */
-+      if (code == JUMP_INSN || code == CALL_INSN)
-+        {
-+          /* Following a conditional branch, we have a new basic block. */
-+          int ckds = 0;
-+          if (code == CALL_INSN)
-+            ckds = 1;
-+          else
-+            {
-+              code = GET_CODE (body);
-+              if ((code == SET
-+                   && GET_CODE (SET_SRC (body)) != LABEL_REF)
-+                  || (code == PARALLEL
-+                      && GET_CODE (XVECEXP (body, 0, 0)) == SET
-+                      && GET_CODE (SET_SRC (XVECEXP (body, 0, 0))) != LABEL_REF))
-+                ckds = 1;
-+            }
-+          if (ckds)
-+            {
-+              /* But check insn(s) in delay-slot first.  If we could know in
-+                 advance that this jump is in `.reorder' mode, where gas will
-+                 insert a `nop' into the delay-slot, we could skip this test.
-+                 Since we don't know, always assume `.noreorder', sometimes
-+                 emitting a cache-barrier, that isn't needed.  */
-+              /* But if we are here recursively, already checking a (pseudo-)
-+                 delay-slot, we are done.  */
-+              if ( !(state & 2) )
-+                for (insn = NEXT_INSN (insn); insn; insn = NEXT_INSN (insn))
-+                  switch (GET_CODE (insn))
-+                    {
-+                    case INSN:
-+                      if (check_insn_for_store (state|1|2, insn) > 0)
-+                        return 1;
-+                    case CODE_LABEL:
-+                    case CALL_INSN:
-+                    case JUMP_INSN:
-+                      return -1;
-+                    default:
-+                      /* skip NOTE,... */;
-+                    }
-+              return -1;
-+            }
-+        }
-+      /*break*/
-+    }
-+  return 0;
-+}
-+
-+/* Scan a basic block, starting with `insn', for a possibly harmful store
-+   instruction.  If found, output a cache barrier at the start of this
-+   block.  */
-+
-+static int
-+output_store_cache_barrier (FILE *file, rtx insn)
-+{
-+  for (; insn; insn = NEXT_INSN (insn))
-+    {
-+      int found = check_insn_for_store (0, insn);
-+      if (found < 0)
-+        break;
-+      if (found > 0)
-+        {
-+          /* found critical store instruction */
-+          ASM_OUTPUT_R10K_CACHE_BARRIER(file);
-+          return 1;
-+        }
-+    }
-+  fprintf(file, "\t%s Cache Barrier omitted.\n", ASM_COMMENT_START);
-+  return 0;
-+}
-+
-+#endif /* TARGET_IP28 */
-+
-+/*
-+ * final.c	Sun Jan 18 23:39:57 2004
-+ * final.c	Sat Sep 18 00:23:34 2004	ip28
-+ */
+--- gcc-3.4.2/gcc/config/mips/mips.h	Thu Jul 15 02:42:47 2004
++++ gcc-3.4.2/gcc/config/mips/mips.h	Sat Sep 18 00:41:48 2004
+@@ -122,6 +122,7 @@
+ extern const char *mips_isa_string;	/* for -mips{1,2,3,4} */
+ extern const char *mips_abi_string;	/* for -mabi={32,n32,64} */
+ extern const char *mips_cache_flush_func;/* for -mflush-func= and -mno-flush-func */
++extern const char *mips_ip28_cache_barrier;/* for -mip28-cache-barrier */
+ extern int mips_string_length;		/* length of strings for mips16 */
+ extern const struct mips_cpu_info mips_cpu_info_table[];
+ extern const struct mips_cpu_info *mips_arch_info;
+@@ -333,6 +334,7 @@
+ #define TARGET_MIPS9000             (mips_arch == PROCESSOR_R9000)
+ #define TARGET_SB1                  (mips_arch == PROCESSOR_SB1)
+ #define TARGET_SR71K                (mips_arch == PROCESSOR_SR71000)
++#define TARGET_IP28                 (mips_ip28_cache_barrier != 0)
+ 
+ /* Scheduling target defines.  */
+ #define TUNE_MIPS3000               (mips_tune == PROCESSOR_R3000)
+@@ -752,6 +754,8 @@
+       N_("Don't call any cache flush functions"), 0},			\
+   { "flush-func=", &mips_cache_flush_func,				\
+       N_("Specify cache flush function"), 0},				\
++  { "ip28-cache-barrier", &mips_ip28_cache_barrier,			\
++      N_("Generate special cache barriers for SGI Indigo2 R10k"), 0},	\
+ }
+ 
+ /* This is meant to be redefined in the host dependent files.  */
+@@ -3448,3 +3452,11 @@
+ 	" TEXT_SECTION_ASM_OP);
+ #endif
+ #endif
++
++#define ASM_OUTPUT_R10K_CACHE_BARRIER(STREAM)		\
++  fprintf (STREAM, "\tcache 0x14,0($sp)\t%s Cache Barrier\n", ASM_COMMENT_START)
++
++/*
++ * mips.h	Thu Jul 15 02:42:47 2004
++ * mips.h	Fri Sep 17 23:18:19 2004	ip28
++ */
+--- gcc-3.4.2/gcc/config/mips/mips.c	Wed Jul  7 21:21:10 2004
++++ gcc-3.4.2/gcc/config/mips/mips.c	Fri Sep 17 23:33:44 2004
+@@ -502,6 +502,11 @@
+ 
+ const char *mips_cache_flush_func = CACHE_FLUSH_FUNC;
+ 
++/* Nonzero means generate special cache barriers to inhibit speculative
++   stores which might endanger cache coherency or reference invalid
++   addresses (especially on SGI's Indigo2 R10k (IP28)).  */
++const char *mips_ip28_cache_barrier;
++
+ /* If TRUE, we split addresses into their high and low parts in the RTL.  */
+ int mips_split_addresses;
+ 
+@@ -9676,3 +9681,7 @@
+ #endif /* TARGET_IRIX */
+ 
+ #include "gt-mips.h"
++/*
++ * mips.c	Wed Jul  7 21:21:10 2004
++ * mips.c	Fri Sep 17 23:25:53 2004	ip28
++ */
+--- gcc-3.4.2/gcc/final.c	Sun Jan 18 23:39:57 2004
++++ gcc-3.4.2/gcc/final.c	Thu Apr  7 00:00:05 2005
+@@ -146,6 +146,13 @@
+ 
+ static rtx last_ignored_compare = 0;
+ 
++/* Flag indicating this insn is the start of a new basic block.  */
++
++#define NEW_BLOCK_LABEL  1
++#define NEW_BLOCK_BRANCH 2
++
++static int new_block = NEW_BLOCK_LABEL;
++
+ /* Assign a unique number to each insn that is output.
+    This can be used to generate unique local labels.  */
+ 
+@@ -235,6 +242,7 @@
+ #ifdef HAVE_ATTR_length
+ static int align_fuzz (rtx, rtx, int, unsigned);
+ #endif
++static int output_store_cache_barrier (FILE *, rtx);
+ 
+ /* Initialize data in final at the beginning of a compilation.  */
+ 
+@@ -1505,6 +1513,7 @@
+   int seen = 0;
+ 
+   last_ignored_compare = 0;
++  new_block = NEW_BLOCK_LABEL;
+ 
+ #ifdef SDB_DEBUGGING_INFO
+   /* When producing SDB debugging info, delete troublesome line number
+@@ -1571,6 +1580,7 @@
+ 
+       insn = final_scan_insn (insn, file, optimize, prescan, 0, &seen);
+     }
++  new_block = 0;
+ }
+ 
+ const char *
+@@ -1851,6 +1861,7 @@
+ #endif
+       if (prescan > 0)
+ 	break;
++      new_block = NEW_BLOCK_LABEL;
+ 
+       if (LABEL_NAME (insn))
+ 	(*debug_hooks->label) (insn);
+@@ -2009,6 +2020,26 @@
+ 
+ 	    break;
+ 	  }
++
++#ifdef TARGET_IP28
++	if (new_block)
++	  {
++	    /* .reorder: not really in the branch-delay-slot. */
++	    if (! set_noreorder)
++	      new_block = NEW_BLOCK_LABEL;
++
++	    if (new_block == NEW_BLOCK_BRANCH)
++	      /* Not yet, only *after* the branch-delay-slot ! */
++	      new_block = NEW_BLOCK_LABEL;
++	    else
++	      {
++	        if (TARGET_IP28)
++	          output_store_cache_barrier (file, insn);
++	        new_block = 0;
++	      }
++	  }
++#endif
++
+ 	/* Output this line note if it is the first or the last line
+ 	   note in a row.  */
+ 	if (notice_source_line (insn))
+@@ -2132,8 +2163,29 @@
+ 	       clobbered by the function.  */
+ 	    if (GET_CODE (XVECEXP (body, 0, 0)) == CALL_INSN)
+ 	      {
++#ifdef TARGET_IP28
++	        if (TARGET_IP28)
++	          new_block = NEW_BLOCK_LABEL;
++#endif
+ 		CC_STATUS_INIT;
+ 	      }
++#ifdef TARGET_IP28
++	    /* Following a conditional branch sequence, we have a new basic
++	       block.  */
++	    if (TARGET_IP28)
++	      {
++		rtx insn = XVECEXP (body, 0, 0);
++		rtx body = PATTERN (insn);
++
++		if ((GET_CODE (insn) == JUMP_INSN && GET_CODE (body) == SET
++		     && GET_CODE (SET_SRC (body)) != LABEL_REF)
++		    || (GET_CODE (insn) == JUMP_INSN
++			&& GET_CODE (body) == PARALLEL
++			&& GET_CODE (XVECEXP (body, 0, 0)) == SET
++			&& GET_CODE (SET_SRC (XVECEXP (body, 0, 0))) != LABEL_REF))
++		  new_block = NEW_BLOCK_LABEL;
++	      }
++#endif
+ 	    break;
+ 	  }
+ 
+@@ -2188,6 +2240,20 @@
+ 	  }
+ #endif
+ 
++#ifdef TARGET_IP28
++	/* Following a conditional branch, we have a new basic block.
++	   But if we are inside a sequence, the new block starts after the
++	   last insn of the sequence.  */
++	if (TARGET_IP28 && final_sequence == 0
++	    && (GET_CODE (insn) == CALL_INSN
++	        || (GET_CODE (insn) == JUMP_INSN && GET_CODE (body) == SET
++	            && GET_CODE (SET_SRC (body)) != LABEL_REF)
++	        || (GET_CODE (insn) == JUMP_INSN && GET_CODE (body) == PARALLEL
++	            && GET_CODE (XVECEXP (body, 0, 0)) == SET
++	            && GET_CODE (SET_SRC (XVECEXP (body, 0, 0))) != LABEL_REF)))
++	      new_block = NEW_BLOCK_BRANCH;
++#endif
++
+ #ifndef STACK_REGS
+ 	/* Don't bother outputting obvious no-ops, even without -O.
+ 	   This optimization is fast and doesn't interfere with debugging.
+@@ -2402,6 +2468,7 @@
+ 
+ 	    if (prev_nonnote_insn (insn) != last_ignored_compare)
+ 	      abort ();
++	    new_block = 0;
+ 
+ 	    /* We have already processed the notes between the setter and
+ 	       the user.  Make sure we don't process them again, this is
+@@ -2435,6 +2502,7 @@
+ 	    abort ();
+ #endif
+ 
++	    new_block = 0;
+ 	    return new;
+ 	  }
+ 
+@@ -3866,3 +3934,254 @@
+       symbol_queue_size = 0;
+     }
+ }
++
++
++#ifdef TARGET_IP28
++
++/* Check, whether an instruction is a possibly harmful store instruction,
++   i.e. a store which might cause damage, if speculatively executed. */
++
++static rtx
++find_mem_expr (rtx xexp)
++{
++  if (xexp)
++    {
++      const char *fmt;
++      int i, j, lng;
++      rtx x;
++      RTX_CODE code = GET_CODE (xexp);
++
++      if (MEM == code)
++        return xexp;
++
++      fmt = GET_RTX_FORMAT (code);
++      lng = GET_RTX_LENGTH (code);
++
++      for (i = 0; i < lng; ++i)
++        switch (fmt[i])
++          {
++          case 'e':
++            x = find_mem_expr (XEXP (xexp, i));
++            if (x)
++              return x;
++            break;
++          case 'E':
++            if (XVEC (xexp, i))
++              for (j = 0; j < XVECLEN (xexp, i); ++j)
++                {
++                  x = find_mem_expr (XVECEXP (xexp, i, j));
++                  if (x)
++                    return x;
++                }
++          }
++    }
++  return 0;
++}
++
++static int
++check_mem_expr (rtx memx)
++{
++  /* Check the expression `memx' (with type GET_CODE(memx) == MEM)
++     for the most common stackpointer-addressing modes.
++     It's not worthwile to avoid a cache barrier also on the
++     remaining unfrequently used modes.  */
++  rtx x = XEXP (memx, 0);
++  switch (GET_CODE (x))
++    {
++    case REG:
++      if (REGNO (x) == STACK_POINTER_REGNUM)
++        return 0;
++    default:
++      break;
++    case PLUS: case MINUS: /* always `SP + const' ? */
++      if (GET_CODE (XEXP (x, 1)) == REG
++          && REGNO (XEXP (x, 1)) == STACK_POINTER_REGNUM)
++        return 0;
++    case NEG: case SIGN_EXTEND: case ZERO_EXTEND:
++      if (GET_CODE (XEXP (x, 0)) == REG
++          && REGNO (XEXP (x, 0)) == STACK_POINTER_REGNUM)
++        return 0;
++    }
++
++  /* Stores/Loads to/from constant addresses can be considered
++     harmless, since:
++     1)  the address is always valid, even when taken speculatively.
++     2a) the location is (hopefully) never used as a dma-target, thus
++         there is no danger of cache-inconsistency.
++     2b) uncached loads/stores are guaranteed to be non-speculative. */
++  if ( CONSTANT_P(x) )
++    return 0;
++
++  return 1;
++}
++
++/* inline */ static int
++check_pattern_for_store (rtx body)
++{
++  /* Check for (set (mem:M (non_stackpointer_address) ...)).  Here we
++     assume, that addressing with the stackpointer accesses neither
++     uncached-aliased nor invalid memory.  (May be, this applies to the
++     global pointer and frame pointer also, but its saver not to assume
++     it. And probably it's not worthwile to regard these registers)
++
++     Speculative loads from invalid addresses also cause bus errors...
++     So check for (set (reg:M ...) (mem:M (non_stackpointer_address)))
++     too. */
++
++  if (body && GET_CODE (body) == SET)
++    {
++      rtx x = find_mem_expr (body);
++
++      if (x && check_mem_expr (x))
++        return 1;
++    }
++  return 0;
++}
++
++static int
++check_insn_for_store (int state, rtx insn)
++{
++  /* Check for (ins (set (mem:M (dangerous_address)) ...)) or end of the
++     current basic block.
++     Criteria to recognize end-of/next basic-block are reduplicated here
++     from final_scan_insn. */
++
++  rtx body;
++  int code;
++
++  if (INSN_DELETED_P (insn))
++    return 0;
++
++  switch (code = GET_CODE (insn))
++    {
++    case CODE_LABEL:
++      return -1;
++    case CALL_INSN:
++    case JUMP_INSN:
++    case INSN:
++      body = PATTERN (insn);
++      if (GET_CODE (body) == SEQUENCE)
++        {
++          /* A delayed-branch sequence */
++          rtx ins0 = XVECEXP (body, 0, 0);
++          rtx pat0 = PATTERN (ins0);
++          int i;
++          for (i = 0; i < XVECLEN (body, 0); i++)
++            {
++              rtx insq = XVECEXP (body, 0, i);
++              if (! INSN_DELETED_P (insq))
++                {
++                  int j = check_insn_for_store (state|1, insq);
++                  if (j)
++                    return j;
++                }
++            }
++          /* Following a conditional branch sequence, we have a new
++             basic block.  */
++          if (GET_CODE (ins0) == JUMP_INSN)
++            if ((GET_CODE (pat0) == SET
++                 && GET_CODE (SET_SRC (pat0)) != LABEL_REF)
++                || (GET_CODE (pat0) == PARALLEL
++                    && GET_CODE (XVECEXP (pat0, 0, 0)) == SET
++                    && GET_CODE (SET_SRC (XVECEXP (pat0, 0, 0))) != LABEL_REF))
++              return -1;
++          /* Handle a call sequence like a conditional branch sequence */
++          if (GET_CODE (ins0) == CALL_INSN)
++            return -1;
++          break;
++        }
++      if (GET_CODE (body) == PARALLEL)
++        {
++          int i;
++          for (i = 0; i < XVECLEN (body, 0); i++)
++            if (check_pattern_for_store (XVECEXP (body, 0, i)))
++              return 1;
++        }
++      /* Now, only a `simple' INSN or JUMP_INSN remains to be checked. */
++      if (code == INSN)
++        {
++          /* Since we don't know, what's inside, we must take inline
++             assembly to be dangerous */
++          if (GET_CODE (body) == ASM_INPUT)
++            return 1;
++
++          if (check_pattern_for_store (body))
++            return 1;
++        }
++      /* Handle a CALL_INSN instruction like a conditional branch */
++      if (code == JUMP_INSN || code == CALL_INSN)
++        {
++          /* Following a conditional branch, we have a new basic block. */
++          int ckds = 0;
++          if (code == CALL_INSN)
++            ckds = 1;
++          else
++            {
++              code = GET_CODE (body);
++              if ((code == SET
++                   && GET_CODE (SET_SRC (body)) != LABEL_REF)
++                  || (code == PARALLEL
++                      && GET_CODE (XVECEXP (body, 0, 0)) == SET
++                      && GET_CODE (SET_SRC (XVECEXP (body, 0, 0))) != LABEL_REF))
++                ckds = 1;
++            }
++          if (ckds)
++            {
++              /* But check insn(s) in delay-slot first.  If we could know in
++                 advance that this jump is in `.reorder' mode, where gas will
++                 insert a `nop' into the delay-slot, we could skip this test.
++                 Since we don't know, always assume `.noreorder', sometimes
++                 emitting a cache-barrier, that isn't needed.  */
++              /* But if we are here recursively, already checking a (pseudo-)
++                 delay-slot, we are done.  */
++              if ( !(state & 2) )
++                for (insn = NEXT_INSN (insn); insn; insn = NEXT_INSN (insn))
++                  switch (GET_CODE (insn))
++                    {
++                    case INSN:
++                      if (check_insn_for_store (state|1|2, insn) > 0)
++                        return 1;
++                    case CODE_LABEL:
++                    case CALL_INSN:
++                    case JUMP_INSN:
++                      return -1;
++                    default:
++                      /* skip NOTE,... */;
++                    }
++              return -1;
++            }
++        }
++      /*break*/
++    }
++  return 0;
++}
++
++/* Scan a basic block, starting with `insn', for a possibly harmful store
++   instruction.  If found, output a cache barrier at the start of this
++   block.  */
++
++static int
++output_store_cache_barrier (FILE *file, rtx insn)
++{
++  for (; insn; insn = NEXT_INSN (insn))
++    {
++      int found = check_insn_for_store (0, insn);
++      if (found < 0)
++        break;
++      if (found > 0)
++        {
++          /* found critical store instruction */
++          ASM_OUTPUT_R10K_CACHE_BARRIER(file);
++          return 1;
++        }
++    }
++  fprintf(file, "\t%s Cache Barrier omitted.\n", ASM_COMMENT_START);
++  return 0;
++}
++
++#endif /* TARGET_IP28 */
++
++/*
++ * final.c	Sun Jan 18 23:39:57 2004
++ * final.c	Sat Sep 18 00:23:34 2004	ip28
++ */
diff --git a/sys-devel/gcc/files/3.4.2/gcc34-fix-sse2_pinsrw.patch b/sys-devel/gcc/files/3.4.2/gcc34-fix-sse2_pinsrw.patch
index 10aba38756c4..33b1ecfce570 100644
--- a/sys-devel/gcc/files/3.4.2/gcc34-fix-sse2_pinsrw.patch
+++ b/sys-devel/gcc/files/3.4.2/gcc34-fix-sse2_pinsrw.patch
@@ -1,18 +1,5 @@
-This is just a workaround rather than a real fix.  The real fix
-has been ported to the gcc 3.4.4 ebuild.
-
-
-Tested on i686-pc-linux and x86_64-pc-linux
-2004-09-20 Scott Robert Ladd <scott.ladd@coyotegulch.com>
-     PR 14631
-     * config/i386/i386.md (sse2_pinsrw): Changing the pattern of
-     sse2_pinsrw from vector_merge to unspec.
-
-http://gcc.gnu.org/ml/gcc-patches/2004-09/msg01949.html
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14631
-
---- gcc-3.4.2/gcc/config/i386/i386.md
-+++ gcc-3.4.2/gcc/config/i386/i386.md
+--- gcc-3.4.2.old/gcc/config/i386/i386.md	2004-09-21 17:08:59.654841672 +0000
++++ gcc-3.4.2/gcc/config/i386/i386.md	2004-09-21 17:10:57.386943672 +0000
 @@ -105,6 +105,7 @@
     (UNSPEC_MFENCE		59)
     (UNSPEC_LFENCE		60)
diff --git a/sys-devel/gcc/files/3.4.3/gcc-3.4.3-cross-compile.patch b/sys-devel/gcc/files/3.4.3/gcc-3.4.3-cross-compile.patch
index c3cc0787b890..ad4c128209da 100644
--- a/sys-devel/gcc/files/3.4.3/gcc-3.4.3-cross-compile.patch
+++ b/sys-devel/gcc/files/3.4.3/gcc-3.4.3-cross-compile.patch
@@ -1,9 +1,5 @@
-Some notes on the 'bootstrap with or without libc headers' debate:
-http://linuxfromscratch.org/pipermail/lfs-dev/2005-July/052409.html
-http://gcc.gnu.org/ml/gcc/2005-07/msg01195.html
-
---- gcc/config/sh/linux.h
-+++ gcc/config/sh/linux.h
+--- gcc/config/sh/linux.h.orig	2004-12-08 23:59:43.001668912 -0500
++++ gcc/config/sh/linux.h	2004-12-09 00:00:22.244703064 -0500
 @@ -154,6 +154,7 @@
  /* Do code reading to identify a signal frame, and set the frame
     state data appropriately.  See unwind-dw2.c for the structs.  */
@@ -16,98 +12,7 @@ http://gcc.gnu.org/ml/gcc/2005-07/msg01195.html
  
  #endif /* defined (__SH5__) */
  #endif /* IN_LIBGCC2 */
-+#endif /* inhibit_libc */
++#endif /* inhibit libc */
  
  /* For SH3 and SH4, we use a slot of the unwind frame which correspond
     to a fake register number 16 as a placeholder for the return address
---- gcc/config/rs6000/linux.h
-+++ gcc/config/rs6000/linux.h
-@@ -111,6 +111,7 @@
- /* Do code reading to identify a signal frame, and set the frame
-    state data appropriately.  See unwind-dw2.c for the structs.  */
- 
-+#ifndef inhibit_libc
- #ifdef IN_LIBGCC2
- #include <signal.h>
- 
-@@ -194,3 +195,4 @@
-     (FS)->retaddr_column = CR0_REGNO;					\
-     goto SUCCESS;							\
-   } while (0)
-+#endif /* inhibit_libc */
---- gcc/config/i386/linux.h
-+++ gcc/config/i386/linux.h
-@@ -218,6 +218,7 @@
- /* Do code reading to identify a signal frame, and set the frame
-    state data appropriately.  See unwind-dw2.c for the structs.  */
- 
-+#ifndef inhibit_libc
- #ifdef IN_LIBGCC2
- /* There's no sys/ucontext.h for some (all?) libc1, so no
-    signal-turned-exceptions for them.  There's also no configure-run for
-@@ -282,3 +283,4 @@
-   } while (0)
- #endif /* not USE_GNULIBC_1 */
- #endif /* IN_LIBGCC2 */
-+#endif /* inhibit_libc */
---- gcc/config/alpha/linux.h
-+++ gcc/config/alpha/linux.h
-@@ -78,6 +78,7 @@
- /* Do code reading to identify a signal frame, and set the frame
-    state data appropriately.  See unwind-dw2.c for the structs.  */
- 
-+#ifndef inhibit_libc
- #ifdef IN_LIBGCC2
- #include <signal.h>
- #include <sys/ucontext.h>
-@@ -127,3 +128,4 @@
-     (FS)->retaddr_column = 64;						\
-     goto SUCCESS;							\
-   } while (0)
-+#endif /* inhibit_libc */
---- gcc/config/rs6000/linux64.h
-+++ gcc/config/rs6000/linux64.h
-@@ -561,13 +579,12 @@
- /* Do code reading to identify a signal frame, and set the frame
-    state data appropriately.  See unwind-dw2.c for the structs.  */
- 
-+#ifndef inhibit_libc
- #ifdef IN_LIBGCC2
- #include <signal.h>
- #ifdef __powerpc64__
- #include <sys/ucontext.h>
- 
--enum { SIGNAL_FRAMESIZE = 128 };
--
- #else
- 
- /* During the 2.5 kernel series the kernel ucontext was changed, but
-@@ -581,7 +598,6 @@
-   struct sigcontext_struct uc_mcontext;
-   sigset_t          uc_sigmask;
- };
--enum { SIGNAL_FRAMESIZE = 64 };
- #endif
- 
- #endif
-@@ -733,3 +731,9 @@
-   } while (0)
- 
- #endif
-+#endif /* inhibit_libc */
-+#ifdef __powerpc64__
-+enum { SIGNAL_FRAMESIZE = 128 };
-+#else
-+enum { SIGNAL_FRAMESIZE = 64 };
-+#endif
---- gcc/config.gcc
-+++ gcc/config.gcc
-@@ -295,7 +295,7 @@
- 	need_64bit_hwint=yes
- 	;;
- # Note the 'l'; we need to be able to match e.g. "shle" or "shl".
--sh[123456789l]*-*-*)
-+sh[123456789lbe]*-*-*)
- 	cpu_type=sh
- 	need_64bit_hwint=yes
- 	;;
diff --git a/sys-devel/gcc/files/3.4.4/gcc-3.4.4-cross-compile.patch b/sys-devel/gcc/files/3.4.4/gcc-3.4.4-cross-compile.patch
index 03895434d9ba..b9116996fc52 100644
--- a/sys-devel/gcc/files/3.4.4/gcc-3.4.4-cross-compile.patch
+++ b/sys-devel/gcc/files/3.4.4/gcc-3.4.4-cross-compile.patch
@@ -1,7 +1,3 @@
-Some notes on the 'bootstrap with or without libc headers' debate:
-http://linuxfromscratch.org/pipermail/lfs-dev/2005-July/052409.html
-http://gcc.gnu.org/ml/gcc/2005-07/msg01195.html
-
 --- gcc/config/sh/linux.h
 +++ gcc/config/sh/linux.h
 @@ -145,6 +145,7 @@
diff --git a/sys-devel/gcc/files/4.0.2/gcc-4.0.2-cross-compile.patch b/sys-devel/gcc/files/4.0.2/gcc-4.0.2-cross-compile.patch
deleted file mode 100644
index 32c9a6e82856..000000000000
--- a/sys-devel/gcc/files/4.0.2/gcc-4.0.2-cross-compile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Some notes on the 'bootstrap with or without libc headers' debate:
-http://linuxfromscratch.org/pipermail/lfs-dev/2005-July/052409.html
-http://gcc.gnu.org/ml/gcc/2005-07/msg01195.html
-
---- gcc/unwind-dw2.c
-+++ gcc/unwind-dw2.c
-@@ -253,9 +253,11 @@
- }
- #endif
- 
-+#ifndef inhibit_libc
- #ifdef MD_UNWIND_SUPPORT
- #include MD_UNWIND_SUPPORT
- #endif
-+#endif
- 
- /* Extract any interesting information from the CIE for the translation
-    unit F belongs to.  Return a pointer to the byte after the augmentation,
diff --git a/sys-devel/gcc/files/4.1.0/gcc-4.1.0-pr22313.patch b/sys-devel/gcc/files/4.1.0/gcc-4.1.0-pr22313.patch
deleted file mode 100644
index 9787a204ae29..000000000000
--- a/sys-devel/gcc/files/4.1.0/gcc-4.1.0-pr22313.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Andrew Pinski
-
-ChangeLog:
-
-  * dwarf2out.c (dwarf2out_switch_text_section): Export.
-  * debug.h (dwarf2out_switch_text_section): Prototype.
-  * final.c (final_scan_insn): Call dwarf2out_switch_text_section
-    if we need to call it for dwarf2 unwind info.
-
-diff -ur gcc-4.1-20051105-orig/gcc/debug.h gcc-4.1-20051105/gcc/debug.h
---- gcc-4.1-20051105-orig/gcc/debug.h	2005-11-12 00:09:33.376787809 +0000
-+++ gcc-4.1-20051105/gcc/debug.h	2005-11-12 00:10:06.962349214 +0000
-@@ -160,6 +160,7 @@
- /* Decide whether we want to emit frame unwind information for the current
-    translation unit.  */
- extern int dwarf2out_do_frame (void);
-+void dwarf2out_switch_text_section (void);
- 
- extern void debug_flush_symbol_queue (void);
- extern void debug_queue_symbol (tree);
-diff -ur gcc-4.1-20051105-orig/gcc/dwarf2out.c gcc-4.1-20051105/gcc/dwarf2out.c
---- gcc-4.1-20051105-orig/gcc/dwarf2out.c	2005-11-12 00:09:26.948488952 +0000
-+++ gcc-4.1-20051105/gcc/dwarf2out.c	2005-11-12 00:10:06.962349214 +0000
-@@ -3520,7 +3520,6 @@
- static void dwarf2out_abstract_function (tree);
- static void dwarf2out_var_location (rtx);
- static void dwarf2out_begin_function (tree);
--static void dwarf2out_switch_text_section (void);
- 
- /* The debug hooks structure.  */
- 
-@@ -6866,7 +6865,7 @@
-   *d = new_loc_list (descr, begin, end, section, 0);
- }
- 
--static void
-+void
- dwarf2out_switch_text_section (void)
- {
-   dw_fde_ref fde;
-diff -ur gcc-4.1-20051105-orig/gcc/final.c gcc-4.1-20051105/gcc/final.c
---- gcc-4.1-20051105-orig/gcc/final.c	2005-11-12 00:09:26.912487279 +0000
-+++ gcc-4.1-20051105/gcc/final.c	2005-11-12 00:10:06.962349214 +0000
-@@ -1717,11 +1717,21 @@
- 	  if (last_text_section == in_text)
- 	    {
- 	      (*debug_hooks->switch_text_section) ();
-+#if defined (DWARF2_UNWIND_INFO)
-+	        if (write_symbols != DWARF2_DEBUG && write_symbols != VMS_AND_DWARF2_DEBUG
-+	 	    && dwarf2out_do_frame ())
-+	 	  dwarf2out_switch_text_section ();
-+#endif
- 	      unlikely_text_section ();
- 	    }
- 	  else
- 	    {
- 	      (*debug_hooks->switch_text_section) ();
-+#if defined (DWARF2_UNWIND_INFO)
-+	        if (write_symbols != DWARF2_DEBUG && write_symbols != VMS_AND_DWARF2_DEBUG
-+	 	    && dwarf2out_do_frame ())
-+	 	  dwarf2out_switch_text_section ();
-+#endif
- 	      text_section ();
- 	    }
- 	  break;
diff --git a/sys-devel/gcc/files/awk/fixlafiles.awk b/sys-devel/gcc/files/awk/fixlafiles.awk
index c4798f250836..c0b4de676835 100644
--- a/sys-devel/gcc/files/awk/fixlafiles.awk
+++ b/sys-devel/gcc/files/awk/fixlafiles.awk
@@ -1,309 +1,100 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/files/awk/fixlafiles.awk,v 1.14 2005/09/24 07:31:28 vapier Exp $
+# Author:  Martin Schlemmer <azarah@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/files/awk/fixlafiles.awk,v 1.1 2002/11/24 02:13:16 azarah Exp $
 
-#
-# Helper functions
-#
-function printn(string) {
-	system("echo -n \"" string "\"")
-}
-function einfo(string) {
+function einfo(string)
+{
 	system("echo -e \" \\e[32;01m*\\e[0m " string "\"")
 }
-function einfon(string) {
-	system("echo -ne \" \\e[32;01m*\\e[0m " string "\"")
-}
-function ewarn(string) {
+
+function ewarn(string)
+{
 	system("echo -e \" \\e[33;01m*\\e[0m " string "\"")
 }
-function ewarnn(string) {
-	system("echo -ne \" \\e[33;01m*\\e[0m " string "\"")
-}
-function eerror(string) {
-	system("echo -e \" \\e[31;01m*\\e[0m " string "\"")
-}
 
-#
-# assert(condition, errmsg)
-#   assert that a condition is true.  Otherwise exit.
-#
-function assert(condition, string) {
-	if (! condition) {
-		printf("%s:%d: assertion failed: %s\n",
-		       FILENAME, FNR, string) > "/dev/stderr"
-		_assert_exit = 1
-		exit 1
-	}
+function eerror(string)
+{
+	system("echo -e \" \\e[31;01m*\\e[0m " string "\"")
 }
 
-#
-# system(command, return)
-#   wrapper that normalizes return codes ...
-#
-function dosystem(command, ret) {
-	ret = 0
-	ret = system(command)
-	if (ret == 0)
-		return 1
-	else
-		return 0
-}
 
 BEGIN {
-	#
-	# Get our variables from environment
-	#
-	OLDVER = ENVIRON["OLDVER"]
-	OLDCHOST = ENVIRON["OLDCHOST"]
-
-	if (OLDVER == "") {
-		eerror("Could not get OLDVER!");
-		exit 1
-	}
 
-	# Setup some sane defaults
-	LIBCOUNT = 2
-	HAVE_GCC34 = 0
-	DIRLIST[1] = "/lib"
-	DIRLIST[2] = "/usr/lib"
-
-	#
-	# Walk /etc/ld.so.conf to discover all our library paths
-	#
-	pipe = "cat /etc/ld.so.conf | sort 2>/dev/null"
-	while(((pipe) | getline ldsoconf_data) > 0) {
-		if (ldsoconf_data !~ /^[[:space:]]*#/) {
-			if (ldsoconf_data == "") continue
+	while((getline ldsoconf_data < ("/etc/ld.so.conf")) > 0) {
 
-			# Remove any trailing comments
-			sub(/#.*$/, "", ldsoconf_data)
-			# Remove any trailing spaces
-			sub(/[[:space:]]+$/, "", ldsoconf_data)
+		if (ldsoconf_data !~ /[[:space:]]*#/) {
 
-			# If there's more than one path per line, split 
-			# it up as if they were sep lines
+			if (ldsoconf_data == "") continue
+	
 			split(ldsoconf_data, nodes, /[:,[:space:]]/)
 
-			# Now add the rest from ld.so.conf
+			DIRLIST[1] = "/lib"
+			DIRLIST[2] = "/usr/lib"
+
 			for (x in nodes) {
-				# wtf does this line do ?
+
 				sub(/=.*/, "", nodes[x])
-				# Prune trailing /
 				sub(/\/$/, "", nodes[x])
 
 				if (nodes[x] == "") continue
-
-				#
-				# Drop the directory if its a child directory of
-				# one that was already added ...
-				# For example, if we have:
-				#   /usr/lib /usr/libexec /usr/lib/mozilla /usr/lib/nss
-				# We really just want to save /usr/lib /usr/libexec
-				#
-				CHILD = 0
-				for (y in DIRLIST) {
-					if (nodes[x] ~ "^" DIRLIST[y] "(/|$)") {
-						CHILD = 1
-						break
-					}
-				}
-				if (CHILD) continue
-
-				DIRLIST[++LIBCOUNT] = nodes[x]
+		
+				DIRLIST[++i + 2] = nodes[x]
 			}
 		}
 	}
-	close(pipe)
 
-	#
-	# Get line from gcc's output containing CHOST
-	#
-	pipe = "gcc -print-file-name=libgcc.a 2>/dev/null"
-	if ((!((pipe) | getline TMP_CHOST)) || (TMP_CHOST == "")) {
-		close(pipe)
+	close("/etc/ld.so.conf")
 
-		# If we fail to get the CHOST, see if we can get the CHOST
-		# portage thinks we are using ...
-		pipe = "/usr/bin/portageq envvar 'CHOST'"
-		assert(((pipe) | getline CHOST), "(" pipe ") | getline CHOST")
-	} else {
-		# Check pre gcc-3.4.x versions
-		CHOST = gensub("^.+lib/gcc-lib/([^/]+)/[0-9]+.+$", "\\1", 1, TMP_CHOST)
-
-		if (CHOST == TMP_CHOST || CHOST == "") {
-			# Check gcc-3.4.x or later
-			CHOST = gensub("^.+lib/gcc/([^/]+)/[0-9]+.+$", "\\1", 1, TMP_CHOST);
-
-			if (CHOST == TMP_CHOST || CHOST == "")
-				CHOST = ""
-			else
-				HAVE_GCC34 = 1
-		}
-	}
+	pipe = "/usr/bin/python -c 'import portage; print portage.settings[\"CHOST\"];'"
+	(pipe) | getline CHOST
 	close(pipe)
 
-	if (CHOST == "") {
-		eerror("Could not get gcc's CHOST!")
-		exit 1
-	}
-
-	if (OLDCHOST != "")
-		if (OLDCHOST == CHOST)
-			OLDCHOST = ""
-
-	GCCLIBPREFIX_OLD = "/usr/lib/gcc-lib/"
-	GCCLIBPREFIX_NEW = "/usr/lib/gcc/"
-
-	if (HAVE_GCC34)
-		GCCLIBPREFIX = GCCLIBPREFIX_NEW
-	else
-		GCCLIBPREFIX = GCCLIBPREFIX_OLD
+	GCCLIB = "/usr/lib/gcc-lib/" CHOST
 
-	GCCLIB = GCCLIBPREFIX CHOST
+	sub(/\/$/, "",  GCCLIB)
 
-	if (OLDCHOST != "") {
-		OLDGCCLIB1 = GCCLIBPREFIX_OLD OLDCHOST
-		OLDGCCLIB2 = GCCLIBPREFIX_NEW OLDCHOST
-	}
-
-	# Get current gcc's version
 	pipe = "gcc -dumpversion"
-	assert(((pipe) | getline NEWVER), "(" pipe ") | getline NEWVER)")
+	(pipe) | getline NEWVER
 	close(pipe)
+	
+	for (x in DIRLIST) {
+		
+		if (DIRLIST[x] ~ GCCLIB) continue
 
-	if (NEWVER == "") {
-		eerror("Could not get gcc's version!")
-		exit 1
-	}
-
-	# Nothing to do ?
-	if ((OLDVER == NEWVER) && (OLDCHOST == ""))
-		exit 0
-
-	#
-	# Ok, now let's scan for the .la files and actually fix them up
-	#
-	for (x = 1; x <= LIBCOUNT; x++) {
-		# Do nothing if the target dir is gcc's internal library path
-		if (DIRLIST[x] ~ GCCLIBPREFIX_OLD ||
-		    DIRLIST[x] ~ GCCLIBPREFIX_NEW)
-			continue
+		einfo("Scanning " DIRLIST[x] "...")
 
-		einfo("  [" x "/" LIBCOUNT "] Scanning " DIRLIST[x] " ...")
-
-		pipe = "find " DIRLIST[x] "/ -name '*.la' 2>/dev/null"
+		pipe = "ls -1 " DIRLIST[x] "/*.la 2>/dev/null"
 		while (((pipe) | getline la_files) > 0) {
 
-			# Do nothing if the .la file is located in gcc's internal lib path
-			if (la_files ~ GCCLIBPREFIX_OLD ||
-			    la_files ~ GCCLIBPREFIX_NEW)
-				continue
-
 			CHANGED = 0
-			CHOST_CHANGED = 0
 
-			# See if we need to fix the .la file
 			while ((getline la_data < (la_files)) > 0) {
-				if (OLDCHOST != "") {
-					if ((gsub(OLDGCCLIB1 "[/[:space:]]+",
-					          GCCLIB, la_data) > 0) ||
-					    (gsub(OLDGCCLIB2 "[/[:space:]]+",
-					          GCCLIB, la_data) > 0)) {
-						CHANGED = 1
-						CHOST_CHANGED = 1
-					}
-				}
-				if (OLDVER != NEWVER) {
-					if ((gsub(GCCLIBPREFIX_OLD CHOST "/" OLDVER "[/[:space:]]*",
-					          GCCLIB "/" NEWVER, la_data) > 0) ||
-					    (gsub(GCCLIBPREFIX_NEW CHOST "/" OLDVER "[/[:space:]]*",
-					          GCCLIB "/" NEWVER, la_data) > 0))
-						CHANGED = 1
-				}
+
+				if (gsub(GCCLIB "/" OLDVER "/", GCCLIB "/" NEWVER "/", la_data) > 0)
+					CHANGED = 1
+
+				if (gsub(GCCLIB "/" OLDVER "[[:space:]]", GCCLIB "/" NEWVER " ", la_data) > 0)
+					CHANGED = 1
 			}
+
 			close(la_files)
 
-			# Do the actual changes in a second loop, as we can then
-			# verify that CHOST_CHANGED among things is correct ...
 			if (CHANGED) {
-				ewarnn("    FIXING: " la_files " ...")
-
-				if (CHANGED)
-					printn("[")
 
-				# Clear the temp file (removing rather than '>foo' is better
-				# out of a security point of view?)
-				dosystem("rm -f " la_files ".new")
+				ewarn("  FIXING: " la_files)
 
 				while ((getline la_data < (la_files)) > 0) {
-					if (OLDCHOST != "") {
-						tmpstr = gensub(OLDGCCLIB1 "([/[:space:]]+)",
-						                GCCLIB "\\1", "g", la_data)
-						tmpstr = gensub(OLDGCCLIB2 "([/[:space:]]+)",
-						                GCCLIB "\\1", "g", tmpstr)
-
-						if (la_data != tmpstr) {
-							printn("c")
-							la_data = tmpstr
-						}
-
-						if (CHOST_CHANGED > 0) {
-							# We try to be careful about CHOST changes outside
-							# the gcc library path (meaning we cannot match it
-							# via /GCCLIBPREFIX CHOST/) ...
-
-							# Catch:
-							#
-							#  dependency_libs=' -L/usr/CHOST/{bin,lib}'
-							#
-							gsub("-L/usr/" OLDCHOST "/",
-							     "-L/usr/" CHOST "/", la_data)
-							# Catch:
-							#
-							#  dependency_libs=' -L/usr/lib/gcc-lib/CHOST/VER/../../../../CHOST/lib'
-							#
-							la_data = gensub("(" GCCLIB "/[^[:space:]]+)/" OLDCHOST "/",
-							                 "\\1/" CHOST "/", "g", la_data)
-						}
-					}
-
-					if (OLDVER != NEWVER) {
-						# Catch:
-						#
-						#  dependency_libs=' -L/usr/lib/gcc/CHOST/VER'
-						#
-						tmpstr = gensub(GCCLIBPREFIX_OLD CHOST "/" OLDVER "([/[:space:]]+)",
-						                GCCLIB "/" NEWVER "\\1", "g", la_data)
-						tmpstr = gensub(GCCLIBPREFIX_NEW CHOST "/" OLDVER "([/[:space:]]+)",
-						                GCCLIB "/" NEWVER "\\1", "g", tmpstr)
-
-						if (la_data != tmpstr) {
-							# Catch:
-							#
-							#  dependency_libs=' -L/usr/lib/gcc-lib/../../CHOST/lib'
-							#
-							# in cases where we have gcc34
-							tmpstr = gensub(GCCLIBPREFIX_OLD "(../../" CHOST "/lib)",
-							                GCCLIBPREFIX "\\1", "g", tmpstr)
-							tmpstr = gensub(GCCLIBPREFIX_NEW "(../../" CHOST "/lib)",
-							                GCCLIBPREFIX "\\1", "g", tmpstr)
-							printn("v")
-							la_data = tmpstr
-						}
-					}
+
+					gsub(GCCLIB "/" OLDVER "/", GCCLIB "/" NEWVER "/", la_data)
+					gsub(GCCLIB "/" OLDVER "[[:space:]]", GCCLIB "/" NEWVER " ", la_data)
 
 					print la_data >> (la_files ".new")
 				}
 
-				if (CHANGED)
-					print "]"
-
 				close(la_files)
-				close(la_files ".new")
 
-				assert(dosystem("mv -f " la_files ".new " la_files),
-				       "dosystem(\"mv -f " la_files ".new " la_files "\")")
+				system("mv -f " la_files ".new " la_files)
 			}
 		}
 
@@ -311,4 +102,3 @@ BEGIN {
 	}
 }
 
-# vim:ts=4
diff --git a/sys-devel/gcc/files/awk/scanforssp.awk b/sys-devel/gcc/files/awk/scanforssp.awk
index e8a1fe8fc82a..a1ea2f54b1fb 100644
--- a/sys-devel/gcc/files/awk/scanforssp.awk
+++ b/sys-devel/gcc/files/awk/scanforssp.awk
@@ -1,65 +1,64 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Author:  Martin Schlemmer <azarah@gentoo.org>
-# Contributor: Ned Ludd <solar@gentoo.org>
-# Contributor: Natanael Copa  <nat@c2i.net>
-# Contributor: Carter Smithhart <derheld42@derheld.net>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/files/awk/scanforssp.awk,v 1.7 2004/07/15 00:59:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/files/awk/scanforssp.awk,v 1.1 2003/12/28 21:46:24 azarah Exp $
 
-
-# Does not seem to be used in this script.
 function printn(string)
 {
-	printf("%s", string)
+	system("echo -n \"" string "\"")
 }
 
 function einfo(string)
 {
-	printf(" %s %s%s", "\033[32;01m*\033[0m", string, "\n")
+	system("echo -e \" \\e[32;01m*\\e[0m " string "\"")
 }
 
-# Does not seem to be used in this script.
 function einfon(string)
 {
-	printf(" %s %s" , "\033[32;01m*\033[0m", string)
+	system("echo -ne \" \\e[32;01m*\\e[0m " string "\"")
 }
 
 function ewarn(string)
 {
-	printf(" %s %s%s" , "\033[33;01m*\033[0m", string, "\n")
+	system("echo -e \" \\e[33;01m*\\e[0m " string "\"")
 }
 
-# Does not seem to be used in this script.
 function ewarnn(string)
 {
-	printf("%s %s" , "\032[33;01m*\033[0m", string)
+	system("echo -ne \" \\e[33;01m*\\e[0m " string "\"")
 }
-
+	
 function eerror(string)
 {
-	printf(" %s %s%s" , "\033[31;01m*\033[0m", string, "\n")
+	system("echo -e \" \\e[31;01m*\\e[0m " string "\"")
 }
 
-								# These are private, else wierd things
-								# might happen ...
-function iself(scan_files,		scan_file_pipe, scan_data) {
-	# Can we open() a file and read() 4 bytes?
-	scan_file_pipe = ("head -c 4 " scan_files " 2>/dev/null | tail -c 3")
-	scan_file_pipe | getline scan_data
-	close(scan_file_pipe)
-	return ((scan_data == "ELF") ? 0 : 1)
+# assert --- assert that a condition is true. Otherwise exit.
+# This is from the gawk info manual.
+function assert(condition, string)
+{
+	if (! condition) {
+		printf("%s:%d: assertion failed: %s\n",
+			FILENAME, FNR, string) > "/dev/stderr"
+		_assert_exit = 1
+		exit 1
+	}
 }
 
-BEGIN {
-	# Do we have etcat ?
-	pipe = ("which etcat 2>/dev/null")
-	if ((((pipe) | getline etcat_data) > 0) && (etcat_data != ""))
-		auto_etcat = 1
+# system() wrapper that normalize return codes ...
+function dosystem(command,		ret)
+{
+	ret = 0
+ 
+	ret = system(command)
+	if (ret == 0)
+		return 1
 	else
-		auto_etcat = 0
+		return 0
+}
 
-	# Fix bug that causes script to fail when pipe is not closed. Closes bug #36792
-	close(pipe)
+
+BEGIN {
 
 	DIRCOUNT = 0
 	# Add the two default library paths
@@ -67,7 +66,7 @@ BEGIN {
 	DIRLIST[2] = "/usr/lib"
 
 	# Walk /etc/ld.so.conf line for line and get any library paths
-	pipe = ("cat /etc/ld.so.conf 2>/dev/null | sort")
+	pipe = "cat /etc/ld.so.conf 2>/dev/null | sort"
 	while(((pipe) | getline ldsoconf_data) > 0) {
 
 		if (ldsoconf_data !~ /^[[:space:]]*#/) {
@@ -109,14 +108,11 @@ BEGIN {
 		}
 	}
 
+	close(pipe)
+
 # We have no guarantee that ld.so.conf have more library paths than
 # the default, and its better scan files only in /lib and /usr/lib
-# than nothing at all ...
-#
-#	exit_val = close(pipe)
-#	if (exit_val != 0)
-#	print(exit_val " - " ERRNO)
-#
+# than not at all ...
 #	if (DIRCOUNT == 0) {
 #		eerror("Could not read from /etc/ld.so.conf!")
 #		exit 1
@@ -131,21 +127,18 @@ BEGIN {
 	for (x = 1;x <= count;x++) {
 
 		ADDED = 0
-
-		# Already added?
+	
 		for (dnode in DIRLIST)
 			if (PATHLIST[x] == DIRLIST[dnode])
 				ADDED = 1
 
 		if (ADDED)
 			continue
-
-		# Valid?  If so, add it ...
-		if (((PATHLIST[x] != "") && (PATHLIST[x] != "/") && (PATHLIST[x] != ".")))
-			DIRLIST[++DIRCOUNT] = PATHLIST[x]
-		
+			
+		DIRLIST[++DIRCOUNT] = PATHLIST[x]
 	}
 	
+	FOUND_SSP = 0
 	GCCLIBPREFIX = "/usr/lib/gcc-lib/"
 	
 	for (x = 1;x <= DIRCOUNT;x++) {
@@ -153,72 +146,40 @@ BEGIN {
 		# Do nothing if the target dir is gcc's internal library path
 		if (DIRLIST[x] ~ GCCLIBPREFIX) continue
 
-		einfo(" Scanning " ((x <= 9) ? "0"x : x)" of " DIRCOUNT " " DIRLIST[x] "...")
-		
-		pipe = ("find " DIRLIST[x] "/ -type f -perm -1 2>/dev/null")
-		while ( (pipe | getline scan_files) > 0) {
+		einfo("  Scanning " DIRLIST[x] "...")
+
+		FOUND = 0
 
-                    #print scan_files
-			# Do nothing if the file is located in gcc's internal lib path ...
+		pipe = "find " DIRLIST[x] "/ -type f -perm -1 -maxdepth 90 2>/dev/null"
+		while ((((pipe) | getline scan_files) > 0) && (!FOUND)) {
+
+			# Do nothing if the file is located in gcc's internal lib path
 			if (scan_files ~ GCCLIBPREFIX) continue
-			# Or if its hardend files ...
-			if (scan_files ~ "/lib/libgcc-3" ) continue
-			# Or not a elf image ...
-			if (iself(scan_files)) continue
-
-                        scan_file_pipe = ("readelf -s " scan_files " 2>&1")
-			while (((scan_file_pipe) | getline scan_data) > 0) {
-                            bad = 0;
-				if (scan_data ~ /__guard@GCC/ || scan_data ~ /__guard@@GCC/) {
-                                bad = 1;
-					print
-
-					# 194: 00000000    32 OBJECT  GLOBAL DEFAULT  UND __guard@GCC_3.0 (3)
-					# 59: 00008ee0    32 OBJECT  GLOBAL DEFAULT   22 __guard@@GCC_3.0
-					split(scan_data, scan_data_nodes)
-					ewarn("Found " scan_data_nodes[8] " in " scan_files "!")
-					print
-                            }
-                            if (scan_data ~ /readelf: Error: Unable to seek/) {
-                                bad = 1;
-                                print
-                                ewarn("Error executing readelf. Bad block? Filesystem error? in " scan_files)
-                                print
-                            }
-
-                            if (bad) {
-
-					if (auto_etcat) {
-					
-						# Use etcat that comes with gentoolkit if auto_etcat is true.
-						etcat_pipe = ("etcat belongs " scan_files)
-						(etcat_pipe) | getline etcat_belongs
-
-						while(((etcat_pipe) | getline etcat_belongs) > 0)
-							eerror(etcat_belongs != "" ? "Please emerge '>=" etcat_belongs "'": "")
-						close(etcat_pipe)
-					} else {
-					
-						eerror("You need to remerge package that above file belongs to!")
-						eerror("To find out what package it is, please emerge gentoolkit,")
-						eerror("and then run:")
-						print
-						print "    # etcat belongs " scan_files
-					}
 
-					print
-					
-					close(scan_file_pipe)
-					close(pipe)
-					exit(1)
+			scan_file_pipe = "readelf -s " scan_files " 2>/dev/null"
+#			while ((((scan_file_pipe) | getline scan_data) > 0) && (!FOUND)) {
+			while (((getline scan_data < (scan_files)) > 0) && (!FOUND)) {
+
+				if (scan_data ~ /__guard@GCC/) {
+
+					ewarn("    Found files containing '__guard@GCC'!")
+					FOUND = 1
+					FOUND_SSP = 1
+					break
 				}
 			}
-			close(scan_file_pipe)
+
+#			close(scan_file_pipe)
+			close(scan_files)
 		}
+
 		close(pipe)
 	}
 
-	exit(0)
+	if (FOUND_SSP)
+		exit(1)
+	else
+		exit(0)
 }
 
 
diff --git a/sys-devel/gcc/files/digest-gcc-3.2.2 b/sys-devel/gcc/files/digest-gcc-3.2.2
index 49a2641bcb3e..efdcdc9e401c 100644
--- a/sys-devel/gcc/files/digest-gcc-3.2.2
+++ b/sys-devel/gcc/files/digest-gcc-3.2.2
@@ -1,2 +1 @@
 MD5 962a2057a2572226bc99aaeba4255e9b gcc-3.2.2.tar.bz2 20311217
-MD5 52b07faf9431b9c06b929c0f2da9a9e3 gcc-3.2.2-patches-1.0.tar.bz2 41284
diff --git a/sys-devel/gcc/files/digest-gcc-3.3.5-r1 b/sys-devel/gcc/files/digest-gcc-3.3.5-r1
index aff7e8339c60..dfa8e09d1480 100644
--- a/sys-devel/gcc/files/digest-gcc-3.3.5-r1
+++ b/sys-devel/gcc/files/digest-gcc-3.3.5-r1
@@ -2,5 +2,5 @@ MD5 70ee088b498741bb08c779f9617df3a5 gcc-3.3.5.tar.bz2 23833856
 MD5 b8c1300bb08c4a63f572d9575025fd81 protector-3.3.2-3.tar.gz 28195
 MD5 aa0868ecce2185884c618de9a15eb40d gcc-3.3.5-manpages.tar.bz2 214965
 MD5 20072e557fa33a232206d365063a693e gcc-3.3.5-patches-1.0.tar.bz2 41378
-MD5 9ffa098b60ba4e6eadcbbe50900fa295 gcc-3.3.5-piepatches-v8.7.7.1.tar.bz2 25970
+MD5 c2150a78bbff66da0d3ec5ce9c89aaa8 gcc-3.3.5-piepatches-v8.7.7.tar.bz2 25939
 MD5 587b0821fa1e6557cba3e5a3712624a9 bounds-checking-gcc-3.3.5-1.00.patch.bz2 828893
diff --git a/sys-devel/gcc/files/digest-gcc-3.3.5.20050130-r1 b/sys-devel/gcc/files/digest-gcc-3.3.5.20050130-r1
index d3bc41a04ebf..1e76606d0319 100644
--- a/sys-devel/gcc/files/digest-gcc-3.3.5.20050130-r1
+++ b/sys-devel/gcc/files/digest-gcc-3.3.5.20050130-r1
@@ -3,6 +3,6 @@ MD5 a158a57134253df324270f99e5b4a612 gcc-3.3.5-branch-update-20050130.patch.bz2
 MD5 407883749eddbe6baae77f722c6e77d7 protector-3.3.5.20050130-1.tar.gz 24324
 MD5 3c9f7b2bd066afe2888289595ac07104 gcc-3.3.5-uclibc-patches-1.0.tar.bz2 27532
 MD5 aa0868ecce2185884c618de9a15eb40d gcc-3.3.5-manpages.tar.bz2 214965
-MD5 2caecf5d5339bf70fb20b594d7f6d490 gcc-3.3.5-patches-1.4.tar.bz2 41936
+MD5 8d439bcf30bcba960c1059666e255240 gcc-3.3.5-patches-1.3.tar.bz2 42611
 MD5 9ffa098b60ba4e6eadcbbe50900fa295 gcc-3.3.5-piepatches-v8.7.7.1.tar.bz2 25970
 MD5 f75ad40c0340ff23aba1dd4961285516 bounds-checking-gcc-3.3.5-1.00-r2.patch.bz2 827126
diff --git a/sys-devel/gcc/files/digest-gcc-3.3.6 b/sys-devel/gcc/files/digest-gcc-3.3.6
index 8f07101d2e9f..d69e2fb115fc 100644
--- a/sys-devel/gcc/files/digest-gcc-3.3.6
+++ b/sys-devel/gcc/files/digest-gcc-3.3.6
@@ -1,6 +1,5 @@
 MD5 6936616a967da5a0b46f1e7424a06414 gcc-3.3.6.tar.bz2 23972413
-MD5 4b96026430074a8da249db5adf14d171 gcc-3.3.6-ssp-1.0.tar.bz2 21355
 MD5 497f48d37cceae248f73289904b00b3e gcc-3.3.6-uclibc-patches-1.0.tar.bz2 28882
-MD5 a61b5045a33a7c1b179e0f4da7e16841 gcc-3.3.6-patches-1.3.tar.bz2 36948
+MD5 ee2d6fa08938e54f45ffddb766b35646 gcc-3.3.6-patches-1.0.tar.bz2 43769
 MD5 21d3630720af45934849c70f8ac9258a gcc-3.3.6-piepatches-v8.7.8.tar.bz2 27532
 MD5 44dcd5ed339c1d01fd1d8629ba36f7fb bounds-checking-gcc-3.3.6-1.00-r1.patch.bz2 829063
diff --git a/sys-devel/gcc/files/digest-gcc-3.4.3-r1 b/sys-devel/gcc/files/digest-gcc-3.4.3-r1
index df1ca82bd7c9..ceaad4aa1a94 100644
--- a/sys-devel/gcc/files/digest-gcc-3.4.3-r1
+++ b/sys-devel/gcc/files/digest-gcc-3.4.3-r1
@@ -1,8 +1,6 @@
-MD5 053703009fa258582ba0ceccfc63c7ab bounds-checking-gcc-3.4.3-1.00.patch.bz2 815705
-MD5 7e9f1e950d4d0bada222468b05624641 gcc-3.4.3-branch-update-20041125.patch.bz2 601828
-MD5 7e13ac1ac8a87cc5bffee82e0436230d gcc-3.4.3-manpages.tar.bz2 264998
-MD5 1fc7b653c29d5758a7c0c61cf8ba70b7 gcc-3.4.3-patches-1.7.tar.bz2 33773
-MD5 652429381625f8637c7a8957a98676a6 gcc-3.4.3-piepatches-v8.7.7.tar.bz2 14306
-MD5 42444520909f9b0438d12240534119ed gcc-3.4.3-uclibc-patches-1.1.tar.bz2 19799
 MD5 e744b30c834360fccac41eb7269a3011 gcc-3.4.3.tar.bz2 27425338
+MD5 7e9f1e950d4d0bada222468b05624641 gcc-3.4.3-branch-update-20041125.patch.bz2 601828
 MD5 6b8482fc1bd2663b1b54939f14090331 protector-3.4.3-0.tar.gz 32299
+MD5 7e13ac1ac8a87cc5bffee82e0436230d gcc-3.4.3-manpages.tar.bz2 264998
+MD5 3d7c6afee2e68f10c55f54ce87395876 gcc-3.4.3-patches-1.1.tar.bz2 91779
+MD5 70eb99d2eac647ce956eff950958f7fd gcc-3.4.3-piepatches-v8.7.6.7.tar.bz2 14296
diff --git a/sys-devel/gcc/files/digest-gcc-3.4.3.20050110-r2 b/sys-devel/gcc/files/digest-gcc-3.4.3.20050110-r2
index fc30f99c9910..b914de9e4f40 100644
--- a/sys-devel/gcc/files/digest-gcc-3.4.3.20050110-r2
+++ b/sys-devel/gcc/files/digest-gcc-3.4.3.20050110-r2
@@ -1,8 +1,8 @@
-MD5 053703009fa258582ba0ceccfc63c7ab bounds-checking-gcc-3.4.3-1.00.patch.bz2 815705
+MD5 e744b30c834360fccac41eb7269a3011 gcc-3.4.3.tar.bz2 27425338
 MD5 62c219356eebc464fedff69e922065ea gcc-3.4.3-branch-update-20050110.patch.bz2 737240
+MD5 43eb812f851d70b069a4e430c91f224a protector-3.4.3.20050110-0.tar.gz 32691
+MD5 82af29d6aed52ed609d57e261d7874eb gcc-3.4.3-uclibc-patches-1.0.tar.bz2 20755
 MD5 7e13ac1ac8a87cc5bffee82e0436230d gcc-3.4.3-manpages.tar.bz2 264998
-MD5 efa0eff244d820086c9c4322f706386d gcc-3.4.3-patches-2.0.tar.bz2 44916
+MD5 018f8fdc5e97f916ed8e72c44bcfc334 gcc-3.4.3-patches-1.3.tar.bz2 90009
 MD5 652429381625f8637c7a8957a98676a6 gcc-3.4.3-piepatches-v8.7.7.tar.bz2 14306
-MD5 42444520909f9b0438d12240534119ed gcc-3.4.3-uclibc-patches-1.1.tar.bz2 19799
-MD5 e744b30c834360fccac41eb7269a3011 gcc-3.4.3.tar.bz2 27425338
-MD5 43eb812f851d70b069a4e430c91f224a protector-3.4.3.20050110-0.tar.gz 32691
+MD5 b1040fff7d8cd069347080b8ec3e87b7 bounds-checking-gcc-3.4.2-1.00.patch.bz2 815369
diff --git a/sys-devel/gcc/files/digest-gcc-3.4.4-r1 b/sys-devel/gcc/files/digest-gcc-3.4.4-r1
index 0d0ec8dd4392..d2a465d3c32a 100644
--- a/sys-devel/gcc/files/digest-gcc-3.4.4-r1
+++ b/sys-devel/gcc/files/digest-gcc-3.4.4-r1
@@ -1,6 +1,6 @@
-MD5 d5da59b788f30b6e31488cdae51ca822 bounds-checking-gcc-3.4.4-1.00.patch.bz2 815608
-MD5 4b4c3c72a93236e6c57477a6ce04230b gcc-3.4.4-patches-1.7.tar.bz2 47234
-MD5 474718bd45586247a7937bed549d8562 gcc-3.4.4-piepatches-v8.7.8.tar.bz2 15514
-MD5 ca3387f40e4cfef56afe6f1f78f077e2 gcc-3.4.4-ssp-1.0.tar.bz2 31612
-MD5 e690d56214e4298513380ebb724bc834 gcc-3.4.4-uclibc-patches-1.2.tar.bz2 26333
 MD5 b594ff4ea4fbef4ba9220887de713dfe gcc-3.4.4.tar.bz2 27565872
+MD5 ca3387f40e4cfef56afe6f1f78f077e2 gcc-3.4.4-ssp-1.0.tar.bz2 31612
+MD5 6153ceae3294678072ce3afcfb249d5f gcc-3.4.4-uclibc-patches-1.1.tar.bz2 26760
+MD5 51fe835f47fb6efb87a66aa2f02d83e4 gcc-3.4.4-patches-1.5.tar.bz2 45788
+MD5 474718bd45586247a7937bed549d8562 gcc-3.4.4-piepatches-v8.7.8.tar.bz2 15514
+MD5 d5da59b788f30b6e31488cdae51ca822 bounds-checking-gcc-3.4.4-1.00.patch.bz2 815608
diff --git a/sys-devel/gcc/files/digest-gcc-4.0.1 b/sys-devel/gcc/files/digest-gcc-4.0.1
index 84738a1ae113..018e35cff00e 100644
--- a/sys-devel/gcc/files/digest-gcc-4.0.1
+++ b/sys-devel/gcc/files/digest-gcc-4.0.1
@@ -1,5 +1,2 @@
 MD5 947416e825a877a0d69489be1be43be1 gcc-4.0.1.tar.bz2 31744537
-MD5 a03c4495cae826ff7baa17eec943e533 gcc-4.0.0-uclibc-patches-1.0.tar.bz2 23241
-MD5 c955acc4f5a8cca63b87e49ea5294b31 gcc-4.0.1-patches-1.0.tar.bz2 8482
-MD5 bb04852dcebb5dc8a7b3ddfb5cbfdce9 gcc-4.0.0-piepatches-v8.7.8.tar.bz2 13334
-MD5 b1a0686eafc561d66a0afbbc6a861211 bounds-checking-gcc-4.0.1-1.00.patch.bz2 821923
+MD5 e0e4555a0463632f8a2ba9c0844da7f5 gcc-4.0.1_pre20050616-patches-1.0.tar.bz2 26426
diff --git a/sys-devel/gcc/files/digest-gcc-4.0.2-r1 b/sys-devel/gcc/files/digest-gcc-4.0.2-r1
index bf8336765c23..c7013bcb52ce 100644
--- a/sys-devel/gcc/files/digest-gcc-4.0.2-r1
+++ b/sys-devel/gcc/files/digest-gcc-4.0.2-r1
@@ -1,4 +1,4 @@
-MD5 e1deb50aababdffe7d46bfffa1725546 bounds-checking-gcc-4.0.2-1.00.patch.bz2 822351
+MD5 b1a0686eafc561d66a0afbbc6a861211 bounds-checking-gcc-4.0.1-1.00.patch.bz2 821923
 MD5 bb04852dcebb5dc8a7b3ddfb5cbfdce9 gcc-4.0.0-piepatches-v8.7.8.tar.bz2 13334
 MD5 a03c4495cae826ff7baa17eec943e533 gcc-4.0.0-uclibc-patches-1.0.tar.bz2 23241
 MD5 a34f05f0028cc5092dde916ad30ab1bc gcc-4.0.2-patches-1.2.tar.bz2 46474
diff --git a/sys-devel/gcc/files/digest-gcc-4.1.0_beta20051112 b/sys-devel/gcc/files/digest-gcc-4.1.0_beta20051112
new file mode 100644
index 000000000000..70c84c2f4767
--- /dev/null
+++ b/sys-devel/gcc/files/digest-gcc-4.1.0_beta20051112
@@ -0,0 +1 @@
+MD5 fc69d5b77c293724ce7bd527f7b0a888 gcc-4.1-20051112.tar.bz2 35920654
diff --git a/sys-devel/gcc/files/digest-gcc-4.1.0_beta20051125 b/sys-devel/gcc/files/digest-gcc-4.1.0_beta20051125
deleted file mode 100644
index 2e1c318d2f9a..000000000000
--- a/sys-devel/gcc/files/digest-gcc-4.1.0_beta20051125
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0b39d8af48f968613976f85a87f25722 gcc-4.1-20051125.tar.bz2 36373559
diff --git a/sys-devel/gcc/files/fix_libtool_files.sh b/sys-devel/gcc/files/fix_libtool_files.sh
index c144be22907a..e183f7086c4c 100644
--- a/sys-devel/gcc/files/fix_libtool_files.sh
+++ b/sys-devel/gcc/files/fix_libtool_files.sh
@@ -1,11 +1,16 @@
 #!/bin/bash
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/files/fix_libtool_files.sh,v 1.12 2005/01/30 18:45:22 vapier Exp $
+
+source /etc/init.d/functions.sh
+
+if [ "`id -u`" -ne 0 ]
+then
+        eerror "${0##*/}: Must be root."
+        exit 1
+fi
 
 usage() {
 cat << "USAGE_END"
-Usage: fix_libtool_files.sh <old-gcc-version> [--oldarch <old-CHOST>]
+Usage: fix_libtool_files.sh <old-gcc-version>
 
     Where <old-gcc-version> is the version number of the
     previous gcc version.  For example, if you updated to
@@ -13,60 +18,25 @@ Usage: fix_libtool_files.sh <old-gcc-version> [--oldarch <old-CHOST>]
 
       # fix_libtool_files.sh 3.2
 
-    If you updated to gcc-3.2.3, and the old CHOST was i586-pc-linux-gnu
-    but you now have CHOST as i686-pc-linux-gnu, run:
-
-      # fix_libtool_files.sh 3.2 --oldarch i586-pc-linux-gnu
-
-    Note that if only the CHOST and not the version changed, you can run
-    it with the current version and the '--oldarch <old-CHOST>' arguments,
-    and it will do the expected:
-
-      # fix_libtool_files.sh `gcc -dumpversion` --oldarch i586-pc-linux-gnu
-
 USAGE_END
-	exit 1
+
+        exit 1
 }
 
-if [[ $2 != "--oldarch" && $# -ne 1 ]] || \
-   [[ $2 == "--oldarch" && $# -ne 3 ]]
+if [ "$#" -ne 1 ]
 then
 	usage
 fi
 
-ARGV1=$1
-ARGV2=$2
-ARGV3=$3
+PORTDIR="`/usr/bin/python -c 'import portage; print portage.settings[\"PORTDIR\"];'`"
 
-source /etc/profile
-source /sbin/functions.sh
+AWKDIR="${PORTDIR}/sys-devel/gcc/files/awk"
 
-if [[ ${EUID} -ne 0 ]] ; then
-	eerror "${0##*/}: Must be root."
-	exit 1
-fi
-
-# make sure the files come out sane
-umask 0022
-
-if [[ ${ARGV2} == "--oldarch" ]] && [[ -n ${ARGV3} ]] ; then
-	OLDCHOST=${ARGV3}
-else
-	OLDCHOST=
-fi
-
-AWKDIR="/lib/rcscripts/awk"
-
-if [[ ! -r ${AWKDIR}/fixlafiles.awk ]] ; then
-	eerror "${0##*/}: ${AWKDIR}/fixlafiles.awk does not exist!"
+if [ ! -r ${AWKDIR}/getlibdirs.awk ]
+then
+	eerror "${0##*/}: ${AWKDIR}/getlibdirs.awk does not exist!"
 	exit 1
 fi
 
-OLDVER=${ARGV1}
-
-export OLDVER OLDCHOST
-
-einfo "Scanning libtool files for hardcoded gcc library paths..."
-/bin/gawk -f "${AWKDIR}/fixlafiles.awk"
+/bin/gawk -v OLDVER="$1" -f ${AWKDIR}/getlibdirs.awk
 
-# vim:ts=4
diff --git a/sys-devel/gcc/files/gcc-spec-env.patch b/sys-devel/gcc/files/gcc-spec-env.patch
index 27029c81f08e..96e6ded4ce41 100644
--- a/sys-devel/gcc/files/gcc-spec-env.patch
+++ b/sys-devel/gcc/files/gcc-spec-env.patch
@@ -1,17 +1,12 @@
-Add support for external spec file via the GCC_SPECS env var.  This 
-allows us to easily control pie/ssp defaults with gcc-config profiles.
-
-Patch by Rob Holland.
-
---- gcc-3/gcc/gcc.c
-+++ gcc-3/gcc/gcc.c
+--- gcc-3.4.2-r1/gcc/gcc.c	2004-09-13 14:30:15.995139424 +0000
++++ gcc-3.4.2-r1/gcc/gcc.c.new	2004-09-13 14:38:58.731671392 +0000
 @@ -6421,6 +6421,21 @@
  
    /* Process any user specified specs in the order given on the command
       line.  */
 +
 +  GET_ENVIRONMENT (specs_file, "GCC_SPECS");
-+  if (specs_file && (strlen(specs_file) > 0))
++  if (specs_file)
 +    {
 +      struct user_specs *user = (struct user_specs *)
 +        xmalloc (sizeof (struct user_specs));
diff --git a/sys-devel/gcc/files/scan_libgcc_linked_ssp.sh b/sys-devel/gcc/files/scan_libgcc_linked_ssp.sh
index f8817e21d15d..19f5969265d5 100644
--- a/sys-devel/gcc/files/scan_libgcc_linked_ssp.sh
+++ b/sys-devel/gcc/files/scan_libgcc_linked_ssp.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Author:  Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/files/scan_libgcc_linked_ssp.sh,v 1.3 2004/07/15 00:59:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/files/scan_libgcc_linked_ssp.sh,v 1.1 2003/12/28 21:46:24 azarah Exp $
 
 usage() {
 cat << "USAGE_END"
@@ -33,7 +33,7 @@ then
 	exit 1
 fi
 
-einfo "Scanning system for __guard@GCC symbols..."
+einfo "Scannig system for __guard@GCC symbols..."
 /bin/gawk -f "${AWKDIR}/scanforssp.awk"
 
 exit $?
diff --git a/sys-devel/gcc/files/stubs/gcc-3.4-htb-stub.patch b/sys-devel/gcc/files/stubs/gcc-3.4-htb-stub.patch
index 2be61a24013f..6b6d66338945 100644
--- a/sys-devel/gcc/files/stubs/gcc-3.4-htb-stub.patch
+++ b/sys-devel/gcc/files/stubs/gcc-3.4-htb-stub.patch
@@ -17,14 +17,13 @@
  Recognize built-in functions
 --- gcc-3.4.4/gcc/c-opts.c
 +++ gcc-3.4.4/gcc/c-opts.c
-@@ -708,6 +708,12 @@ c_common_handle_option (size_t scode, co
+@@ -708,6 +708,11 @@ c_common_handle_option (size_t scode, co
        flag_no_asm = !value;
        break;
  
 +    case OPT_fbounds_checking:
 +    case OPT_fbc_strings_only:
-+      if (value)
-+        warning ("htb stub: bounds checking is not supported");
++      warning ("htb stub: bounds checking is not supported");
 +      break;
 +
      case OPT_fbuiltin:
diff --git a/sys-devel/gcc/files/stubs/gcc-3.4-ssp-stub.patch b/sys-devel/gcc/files/stubs/gcc-3.4-ssp-stub.patch
index 3f620f30caad..74353d824c51 100644
--- a/sys-devel/gcc/files/stubs/gcc-3.4-ssp-stub.patch
+++ b/sys-devel/gcc/files/stubs/gcc-3.4-ssp-stub.patch
@@ -26,17 +26,16 @@
  g
  Common JoinedOrMissing
  Generate debug information in default format
---- gcc-3.4.3/gcc/opts.c
-+++ gcc-3.4.3/gcc/opts.c
-@@ -804,6 +807,13 @@ common_handle_option (size_t scode, cons
+--- gcc-3.4.3.orig/gcc/opts.c	2005-01-10 20:01:46.000000000 -0800
++++ gcc-3.4.3/gcc/opts.c	2005-01-11 00:04:13.000000000 -0800
+@@ -804,6 +807,12 @@ common_handle_option (size_t scode, cons
        warn_unused_variable = value;
        break;
  
 +    case OPT_fstack_protector:
 +    case OPT_fstack_protector_all:
 +    case OPT_Wstack_protector:
-+      if (value)
-+        warning ("ssp stub: stack protector is not supported");
++      warning ("ssp stub: stack protector is not supported");
 +      break;
 +
      case OPT_aux_info:
diff --git a/sys-devel/gcc/gcc-2.95.3-r9.ebuild b/sys-devel/gcc/gcc-2.95.3-r9.ebuild
index e14e1b1558d3..f929e4286e07 100644
--- a/sys-devel/gcc/gcc-2.95.3-r9.ebuild
+++ b/sys-devel/gcc/gcc-2.95.3-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-devel/gcc/gcc-2.95.3-r9.ebuild,v 1.3 2005/11/05 21:12:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-2.95.3-r9.ebuild,v 1.1 2005/05/21 06:21:13 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs versionator fixheadtails gnuconfig
 
@@ -57,7 +57,7 @@ else
 	SLOT="${GCC_BRANCH_VER}"
 fi
 
-RDEPEND="|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.2.3 )
+RDEPEND=">=sys-devel/gcc-config-1.2.3
 	>=sys-libs/zlib-1.1.4
 	>=sys-apps/texinfo-4.2-r4
 	!build? ( >=sys-libs/ncurses-5.2-r2 )"
@@ -98,8 +98,6 @@ src_unpack() {
 }
 
 src_compile() {
-	export LINGUAS=""
-
 	# Make sure we have sane CFLAGS
 	do_filter_flags
 
diff --git a/sys-devel/gcc/gcc-3.1.1-r2.ebuild b/sys-devel/gcc/gcc-3.1.1-r2.ebuild
index 27f76b7e420d..5f7008b4a3b8 100644
--- a/sys-devel/gcc/gcc-3.1.1-r2.ebuild
+++ b/sys-devel/gcc/gcc-3.1.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.1.1-r2.ebuild,v 1.7 2005/03/22 03:04:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.1.1-r2.ebuild,v 1.1 2004/06/08 01:45:07 vapier Exp $
 
 # NOTE TO MAINTAINER:  Info pages get nuked for multiple version installs.
 #                      Ill fix it later if i get a chance.
@@ -36,10 +36,10 @@ SLOT="${MY_PV}"
 KEYWORDS="x86 sparc -ppc"
 IUSE="static nls bootstrap java build"
 
-DEPEND="virtual/libc
+DEPEND="virtual/glibc
 	!build? ( >=sys-libs/ncurses-5.2-r2
 	          nls? ( sys-devel/gettext ) )"
-RDEPEND="virtual/libc
+RDEPEND="virtual/glibc
 	>=sys-libs/zlib-1.1.4
 	>=sys-apps/texinfo-4.2-r4
 	!build? ( >=sys-libs/ncurses-5.2-r2 )"
@@ -195,8 +195,6 @@ src_install() {
 	dodir /lib
 	dodir /etc/env.d
 	echo "LDPATH=${FULLPATH}" > ${D}/etc/env.d/05gcc${GCC_SUFFIX}
-	echo "CC=\"gcc\"" >> ${D}/etc/env.d/05gcc${GCC_SUFFIX}
-	echo "CXX=\"g++\"" >> ${D}/etc/env.d/05gcc${GCC_SUFFIX}
 	if ! build_multiple
 	then
 		dosym /usr/bin/cpp /lib/cpp
diff --git a/sys-devel/gcc/gcc-3.2.2.ebuild b/sys-devel/gcc/gcc-3.2.2.ebuild
index 0c03b986a266..22f2cb9891e9 100644
--- a/sys-devel/gcc/gcc-3.2.2.ebuild
+++ b/sys-devel/gcc/gcc-3.2.2.ebuild
@@ -1,31 +1,498 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.2.ebuild,v 1.28 2005/08/20 08:37:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.2.ebuild,v 1.1 2003/02/05 23:54:47 azarah Exp $
 
-# This version is really meant JUST for the ps2
+IUSE="static nls bootstrap java build"
 
-MAN_VER=""
-PATCH_VER="1.0"
-UCLIBC_VER=""
-PIE_VER=""
-PP_VER=""
-HTB_VER=""
+inherit eutils flag-o-matic libtool
 
-ETYPE="gcc-compiler"
+# Compile problems with these (bug #6641 among others)...
+filter-flags "-fno-exceptions -fomit-frame-pointer"
 
-SPLIT_SPECS=${SPLIT_SPECS-true}
+# Recently there has been a lot of stability problem in Gentoo-land.  Many
+# things can be the cause to this, but I believe that it is due to gcc3
+# still having issues with optimizations, or with it not filtering bad
+# combinations (protecting the user maybe from himeself) yet.
+#
+# This can clearly be seen in large builds like glibc, where too aggressive
+# CFLAGS cause the tests to fail miserbly.
+#
+# Quote from Nick Jones <carpaski@gentoo.org>, who in my opinion
+# knows what he is talking about:
+#
+#   People really shouldn't force code-specific options on... It's a
+#   bad idea. The -march options aren't just to look pretty. They enable
+#   options that are sensible (and include sse,mmx,3dnow when apropriate).
+#
+# The next command strips CFLAGS and CXXFLAGS from nearly all flags.  If
+# you do not like it, comment it, but do not bugreport if you run into
+# problems.
+#
+# <azarah@gentoo.org> (13 Oct 2002)
+strip-flags
 
-inherit toolchain eutils
+# Theoretical cross compiler support
+[ ! -n "${CCHOST}" ] && export CCHOST="${CHOST}"
+
+LOC="/usr"
+MY_PV="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`"
+MY_PV_FULL="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`"
+
+LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${MY_PV_FULL}"
+BINPATH="${LOC}/${CCHOST}/gcc-bin/${MY_PV}"
+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="${LIBPATH}/include/g++-v${MY_PV/\.*/}"
+
+# Patch tarball support ...
+#PATCH_VER="1.0"
+PATCH_VER=""
+
+# Snapshot support ...
+#SNAPSHOT="2002-08-12"
+SNAPSHOT=""
+
+# Branch update support ...
+MAIN_BRANCH="${PV}"  # Tarball, etc used ...
+#BRANCH_UPDATE="20021208"
+BRANCH_UPDATE=""
+
+if [ -z "${SNAPSHOT}" ]
+then
+	S="${WORKDIR}/${PN}-${MAIN_BRANCH}"
+	SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${MAIN_BRANCH}.tar.bz2"
+	
+	if [ -n "${PATCH_VER}" ]
+	then
+		SRC_URI="${SRC_URI}
+		         mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
+	fi
+
+	if [ -n "${BRANCH_UPDATE}" ]
+	then
+		SRC_URI="${SRC_URI}
+		         mirror://gentoo/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2"
+	fi
+else
+	S="${WORKDIR}/gcc-${SNAPSHOT//-}"
+	SRC_URI="ftp://sources.redhat.com/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT//-}.tar.bz2"
+fi
+#SRC_URI="${SRC_URI} mirror://gentoo/${P}-manpages.tar.bz2"
 
 DESCRIPTION="The GNU Compiler Collection.  Includes C/C++ and java compilers"
+HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
 
-KEYWORDS="-*"
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+
+# Ok, this is a hairy one again, but lets assume that we
+# are not cross compiling, than we want SLOT to only contain
+# $PV, as people upgrading to new gcc layout will not have
+# their old gcc unmerged ...
+if [ "${CHOST}" == "${CCHOST}" ]
+then
+	SLOT="${MY_PV}"
+else
+	SLOT="${CCHOST}-${MY_PV}"
+fi
+
+DEPEND="virtual/glibc
+	>=sys-devel/binutils-2.13.90.0.18
+	>=sys-devel/gcc-config-1.3.1
+	!build? ( >=sys-libs/ncurses-5.2-r2
+	          nls? ( sys-devel/gettext ) )"
+			  
+RDEPEND="virtual/glibc
+	>=sys-devel/gcc-config-1.3.1
+	>=sys-libs/zlib-1.1.4
+	>=sys-apps/texinfo-4.2-r4
+	!build? ( >=sys-libs/ncurses-5.2-r2 )"
+
+PDEPEND="sys-devel/gcc-config"
+
+
+# Hack used to patch Makefiles to install into the build dir
+FAKE_ROOT=""
 
 src_unpack() {
-	gcc_src_unpack
+	if [ -z "${SNAPSHOT}" ]
+	then
+		unpack ${PN}-${MAIN_BRANCH}.tar.bz2
+		
+		if [ -n "${PATCH_VER}" ]
+		then
+			unpack ${P}-patches-${PATCH_VER}.tar.bz2
+		fi
+	else
+		unpack gcc-${SNAPSHOT//-}.tar.bz2
+	fi
+
+	cd ${S}
+	# Fixup libtool to correctly generate .la files with portage
+	elibtoolize --portage --shallow
+
+	echo
+
+	# Branch update ...
+	if [ -n "${BRANCH_UPDATE}" ]
+	then
+		epatch ${DISTDIR}/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2
+	fi
+
+	# Do bulk patches included in ${P}-patches-${PATCH_VER}.tar.bz2
+	if [ -n "${PATCH_VER}" ]
+	then
+		epatch ${WORKDIR}/patch
+	fi
+
+	# Patches from Redhat ...
+	epatch ${FILESDIR}/3.2.1/gcc32-ada-make.patch
+	epatch ${FILESDIR}/3.2.1/gcc32-shared-pthread.patch
+	use sparc && epatch ${FILESDIR}/3.2.1/gcc32-sparc32-hack.patch
+
+	# Patches from Mandrake/Suse ...
+	epatch ${FILESDIR}/3.2.1/gcc31-loop-load-final-value.patch
+	epatch ${FILESDIR}/3.2.1/gcc32-pr8213.patch
+	epatch ${FILESDIR}/3.2.1/gcc32-strip-dotdot.patch
+	epatch ${FILESDIR}/3.2.1/gcc32-athlon-alignment.patch
+
+	# Install our pre generated manpages if we do not have perl ...
+#	if [ ! -x /usr/bin/perl ]
+#	then
+#		cd ${S}; unpack ${P}-manpages.tar.bz2
+#	fi
+
+	# Currently if any path is changed via the configure script, it breaks
+	# installing into ${D}.  We should not patch it in src_install() with
+	# absolute paths, as some modules then gets rebuild with the wrong
+	# paths.  Thus we use $FAKE_ROOT.
+	einfo "Fixing Makefiles..."
+	cd ${S}
+	for x in $(find . -name Makefile.in)
+	do
+		# Fix --datadir=
+		cp ${x} ${x}.orig
+		sed -e 's:datadir = @datadir@:datadir = $(FAKE_ROOT)@datadir@:' \
+			${x}.orig > ${x}
+		
+		# Fix --bindir=
+		cp ${x} ${x}.orig
+		sed -e 's:bindir = @bindir@:bindir = $(FAKE_ROOT)@bindir@:' \
+			${x}.orig > ${x}
+
+		# Fix --includedir=
+		cp ${x} ${x}.orig
+		sed -e 's:includedir = @includedir@:includedir = $(FAKE_ROOT)@includedir@:' \
+			${x}.orig > ${x}
+
+		# Fix --with-gxx-include-dir=
+		cp ${x} ${x}.orig
+		sed -e 's:gxx_include_dir = @gxx_:gxx_include_dir = $(FAKE_ROOT)@gxx_:' \
+			-e 's:glibcppinstalldir = @gxx_:glibcppinstalldir = $(FAKE_ROOT)@gxx_:' \
+			${x}.orig > ${x}
+		
+		# Where java security stuff should be installed
+		cp ${x} ${x}.orig
+		sed -e 's:secdir = $(libdir)/security:secdir = $(FAKE_ROOT)$(LIBPATH)/security:' \
+			${x}.orig > ${x}
+		
+		rm -f ${x}.orig
+	done
+
+	# This next bit is for updating libtool linker scripts ...
+	OLD_GCC_VERSION="`gcc -dumpversion`"
+
+	if [ "${OLD_GCC_VERSION}" != "${MY_PV_FULL}" ]
+	then
+		echo "${OLD_GCC_VERSION}" > ${WORKDIR}/.oldgccversion
+	fi
+}
+
+src_compile() {
+	local myconf=""
+	local gcc_lang=""
+	
+	if [ -z "`use build`" ]
+	then
+		myconf="${myconf} --enable-shared"
+		gcc_lang="c,c++,ada,f77,objc"
+	else
+		gcc_lang="c"
+	fi
+	if [ -z "`use nls`" ] || [ "`use build`" ]
+	then
+		myconf="${myconf} --disable-nls"
+	else
+		myconf="${myconf} --enable-nls --without-included-gettext"
+	fi
+	if [ -n "`use java`" ] && [ -z "`use build`" ]
+	then
+		gcc_lang="${gcc_lang},java"
+	fi
 
-	epatch "${FILESDIR}"/3.2.2/gcc32-pr7768.patch
-	epatch "${FILESDIR}"/3.2.2/gcc32-pr8213.patch
-	epatch "${FILESDIR}"/3.2.2/gcc-3.2.2-cross-compile.patch
-	epatch "${FILESDIR}"/3.2.2/gcc-3.2.2-no-COPYING-cross-compile.patch
+	# In general gcc does not like optimization, and add -O2 where
+	# it is safe.
+	export CFLAGS="${CFLAGS//-O?}"
+	export CXXFLAGS="${CXXFLAGS//-O?}"
+
+	# Build in a separate build tree
+	mkdir -p ${WORKDIR}/build
+	cd ${WORKDIR}/build
+
+	einfo "Configuring GCC..."
+	addwrite "/dev/zero"
+	${S}/configure --prefix=${LOC} \
+		--bindir=${BINPATH} \
+		--includedir=${LIBPATH}/include \
+		--datadir=${DATAPATH} \
+		--mandir=${DATAPATH}/man \
+		--infodir=${DATAPATH}/info \
+		--enable-shared \
+		--host=${CHOST} \
+		--target=${CCHOST} \
+		--with-system-zlib \
+		--enable-languages=${gcc_lang} \
+		--enable-threads=posix \
+		--enable-long-long \
+		--disable-checking \
+		--enable-cstdio=stdio \
+		--enable-clocale=generic \
+		--enable-__cxa_atexit \
+		--enable-version-specific-runtime-libs \
+		--with-gxx-include-dir=${STDCXX_INCDIR} \
+		--with-local-prefix=${LOC}/local \
+		${myconf} || die
+
+	touch ${S}/gcc/c-gperf.h
+
+	# Do not make manpages if we do not have perl ...
+	if [ ! -x /usr/bin/perl ]
+	then 
+		find ${S} -name '*.[17]' -exec touch {} \; || :
+	fi
+
+	# Setup -j in MAKEOPTS
+	get_number_of_jobs
+
+	einfo "Building GCC..."
+	if [ -z "`use static`" ]
+	then
+		# Fix for our libtool-portage.patch
+		S="${WORKDIR}/build" \
+		emake bootstrap-lean \
+			LIBPATH="${LIBPATH}" \
+			BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || die
+		# Above FLAGS optimize and speedup build, thanks
+		# to Jeff Garzik <jgarzik@mandrakesoft.com>
+	else
+		S="${WORKDIR}/build" \
+		emake LDFLAGS=-static bootstrap \
+			LIBPATH="${LIBPATH}" \
+			BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || die
+	fi
+}
+
+src_install() {
+	# Do allow symlinks in ${LOC}/lib/gcc-lib/${CHOST}/${PV}/include as
+	# this can break the build.
+	for x in cd ${WORKDIR}/build/gcc/include/*
+	do
+		if [ -L ${x} ]
+		then
+			rm -f ${x}
+		fi
+	done
+
+	einfo "Installing GCC..."
+	# Do the 'make install' from the build directory
+	cd ${WORKDIR}/build
+	S="${WORKDIR}/build" \
+	make prefix=${D}${LOC} \
+		bindir=${D}${BINPATH} \
+		includedir=${D}${LIBPATH}/include \
+		datadir=${D}${DATAPATH} \
+		mandir=${D}${DATAPATH}/man \
+		infodir=${D}${DATAPATH}/info \
+		LIBPATH="${LIBPATH}" \
+		FAKE_ROOT="${D}" \
+		install || die
+	
+	[ -r ${D}${BINPATH}/gcc ] || die "gcc not found in ${D}"
+	
+	dodir /lib /usr/bin
+	dodir /etc/env.d/gcc
+	echo "PATH=\"${BINPATH}\"" > ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	# Also set CC and CXX
+	echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	
+	# Install wrappers
+# Handled by gcc-config now ...
+#	exeinto /lib
+#	doexe ${FILESDIR}/cpp
+#	exeinto /usr/bin
+#	doexe ${FILESDIR}/cc
+	
+# This should be invalidated by the linker scripts we have as the latest
+# fix for bug #4411
+#
+#	# gcc-3.1 have a problem with the ordering of Search Directories.  For
+#	# instance, if you have libreadline.so in /lib, and libreadline.a in
+#	# /usr/lib, then it will link with libreadline.a instead of .so.  As far
+#	# as I can see from the source, /lib should be searched before /usr/lib,
+#	# and this also differs from gcc-2.95.3 and possibly 3.0.4, but ill have
+#	# to check on 3.0.4.  Thanks to Daniel Robbins for noticing this oddity,
+#	# bugzilla bug #4411
+#	#
+#	# Azarah - 3 Jul 2002
+#	#
+#	cd ${D}${LIBPATH}
+#	dosed -e "s:%{L\*} %(link_libgcc):%{L\*} -L/lib %(link_libgcc):" \
+#		${LIBPATH}/specs
+
+	# Make sure we dont have stuff lying around that
+	# can nuke multiple versions of gcc
+	if [ -z "`use build`" ]
+	then
+		cd ${D}${LIBPATH}
+
+		# Tell libtool files where real libraries are
+		for LA in ${D}${LOC}/lib/*.la ${D}${LIBPATH}/../*.la
+		do
+			if [ -f ${LA} ]
+			then
+				sed -e "s:/usr/lib:${LIBPATH}:" ${LA} > ${LA}.hacked
+				mv ${LA}.hacked ${LA}
+				mv ${LA} ${D}${LIBPATH}
+			fi
+		done
+
+		# Move all the libraries to version specific libdir.
+		for x in ${D}${LOC}/lib/*.{so,a}* ${D}${LIBPATH}/../*.{so,a}*
+		do
+			[ -f ${x} ] && mv -f ${x} ${D}${LIBPATH}
+		done
+
+		# Move Java headers to compiler-specific dir
+		for x in ${D}${LOC}/include/gc*.h ${D}${LOC}/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}${LOC}/include/${x} ]
+			then
+				dodir /${LIBPATH}/include/${x}
+				mv -f ${D}${LOC}/include/${x}/* ${D}${LIBPATH}/include/${x}/
+				rm -rf ${D}${LOC}/include/${x}
+			fi
+		done
+
+		# Move libgcj.spec to compiler-specific directories
+		[ -f ${D}${LOC}/lib/libgcj.spec ] && \
+			mv -f ${D}${LOC}/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}${LOC}/${CCHOST}/gcc-bin/${MY_PV}
+		[ -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
+		cd ${D}${BINPATH}
+		rm -f ${CCHOST}-{gcc,g++,c++,g77}
+		[ -f gcc ] && ln -sf gcc ${CCHOST}-gcc
+		[ -f g++ ] && ln -sf g++ ${CCHOST}-g++
+		[ -f g++ ] && ln -sf g++ ${CCHOST}-c++
+		[ -f g77 ] && ln -sf g77 ${CCHOST}-g77
+	fi
+
+	# This one comes with binutils
+	if [ -f ${D}${LOC}/lib/libiberty.a ]
+	then
+		rm -f ${D}${LOC}/lib/libiberty.a
+	fi
+
+	cd ${S}
+    if [ -z "`use build`" ]
+    then
+		cd ${S}
+		docinto /${CCHOST}
+		dodoc COPYING COPYING.LIB ChangeLog FAQ GNATS MAINTAINERS README
+		docinto ${CCHOST}/html
+		dohtml *.html
+		cd ${S}/boehm-gc
+		docinto ${CCHOST}/boehm-gc
+		dodoc ChangeLog doc/{README*,barrett_diagram}
+		docinto ${CCHOST}/boehm-gc/html
+		dohtml doc/*.html
+		cd ${S}/gcc
+		docinto ${CCHOST}/gcc
+		dodoc ChangeLog* FSFChangeLog* LANGUAGES NEWS ONEWS README* SERVICE
+		cd ${S}/libf2c
+	    docinto ${CCHOST}/libf2c
+	    dodoc ChangeLog README TODO *.netlib
+		cd ${S}/libffi
+	    docinto ${CCHOST}/libffi
+	    dodoc ChangeLog* LICENSE README
+	    cd ${S}/libiberty
+	    docinto ${CCHOST}/libiberty
+	    dodoc ChangeLog COPYING.LIB README
+	    cd ${S}/libobjc
+	    docinto ${CCHOST}/libobjc
+	    dodoc ChangeLog README* THREADS*
+		cd ${S}/libstdc++-v3
+		docinto ${CCHOST}/libstdc++-v3
+		dodoc ChangeLog* README
+		docinto ${CCHOST}/libstdc++-v3/html
+		dohtml -r -a css,diff,html,txt,xml docs/html/*
+		cp -f docs/html/17_intro/[A-Z]* \
+			${D}/usr/share/doc/${PF}/${DOCDESTTREE}/17_intro/
+		
+        if [ -n "`use java`" ]
+        then
+			cd ${S}/fastjar
+			docinto ${CCHOST}/fastjar
+			dodoc AUTHORS CHANGES COPYING ChangeLog NEWS README
+			cd ${S}/libjava
+			docinto ${CCHOST}/libjava
+			dodoc ChangeLog* COPYING HACKING LIBGCJ_LICENSE NEWS README THANKS
+        fi
+    else
+        rm -rf ${D}/usr/share/{man,info}
+	fi
+
+    # Fix ncurses b0rking
+    find ${D}/ -name '*curses.h' -exec rm -f {} \;
 }
+
+pkg_postinst() {
+
+	if [ "${ROOT}" = "/" -a "${COMPILER}" = "gcc3" -a "${CHOST}" == "${CCHOST}" ]
+	then
+		gcc-config --use-portage-chost ${CCHOST}-${MY_PV_FULL}
+	fi
+
+	# Update libtool linker scripts to reference new gcc version ...
+	if [ -f ${WORKDIR}/.oldgccversion -a "${ROOT}" = "/" ]
+	then 
+		OLD_GCC_VERSION="`cat ${WORKDIR}/.oldgccversion`"
+
+		cp -f ${FILESDIR}/fix_libtool_files.sh ${T}
+		chmod +x ${T}/fix_libtool_files.sh
+		${T}/fix_libtool_files.sh ${OLD_GCC_VERSION}
+	fi
+	
+	# Fix ncurses b0rking (if r5 isn't unmerged)
+	find ${ROOT}/usr/lib/gcc-lib -name '*curses.h' -exec rm -f {} \;
+}
+
diff --git a/sys-devel/gcc/gcc-3.2.3-r4.ebuild b/sys-devel/gcc/gcc-3.2.3-r4.ebuild
index 066257a39330..1e9e55be73f6 100644
--- a/sys-devel/gcc/gcc-3.2.3-r4.ebuild
+++ b/sys-devel/gcc/gcc-3.2.3-r4.ebuild
@@ -1,8 +1,14 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.3-r4.ebuild,v 1.18 2005/10/07 02:01:56 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.3-r4.ebuild,v 1.1 2004/01/27 10:04:46 lu_zero Exp $
 
-inherit eutils flag-o-matic libtool versionator
+IUSE="static nls bootstrap java build"
+
+inherit eutils flag-o-matic libtool
+
+# Compile problems with these (bug #6641 among others)...
+# We don't need these since we strip-flags below -- Joshua
+#filter-flags "-fno-exceptions -fomit-frame-pointer"
 
 # Recently there has been a lot of stability problem in Gentoo-land.  Many
 # things can be the cause to this, but I believe that it is due to gcc3
@@ -24,29 +30,21 @@ inherit eutils flag-o-matic libtool versionator
 # problems.
 #
 # <azarah@gentoo.org> (13 Oct 2002)
-do_filter_flags() {
-	strip-flags
-
-	# In general gcc does not like optimization, and add -O2 where
-	# it is safe.
-	filter-flags -O?
-}
+strip-flags
 
 # Theoretical cross compiler support
 [ ! -n "${CCHOST}" ] && export CCHOST="${CHOST}"
 
 LOC="/usr"
-#GCC_BRANCH_VER="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`"
-#GCC_RELEASE_VER="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`"
-GCC_BRANCH_VER="$(get_version_component_range 1-2)"
-GCC_RELEASE_VER="$(get_version_component_range 1-3)"
-
-LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${GCC_RELEASE_VER}"
-BINPATH="${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}"
-DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${GCC_BRANCH_VER}"
+MY_PV="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`"
+MY_PV_FULL="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`"
+
+LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${MY_PV_FULL}"
+BINPATH="${LOC}/${CCHOST}/gcc-bin/${MY_PV}"
+DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${MY_PV}"
 # Don't install in /usr/include/g++-v3/, but in gcc internal directory.
 # We will handle /usr/include/g++-v3/ with gcc-config ...
-STDCXX_INCDIR="${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}"
+STDCXX_INCDIR="${LIBPATH}/include/g++-v${MY_PV/\.*/}"
 
 # ProPolice version
 PP_VER1="3_2_2"
@@ -61,15 +59,15 @@ PATCH_VER=""
 SNAPSHOT=""
 
 # Branch update support ...
-GCC_RELEASE_VER="${PV}"  # Tarball, etc used ...
+MAIN_BRANCH="${PV}"  # Tarball, etc used ...
 
 #BRANCH_UPDATE="20021208"
 BRANCH_UPDATE=""
 
 if [ -z "${SNAPSHOT}" ]
 then
-	S="${WORKDIR}/${PN}-${GCC_RELEASE_VER}"
-	SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${GCC_RELEASE_VER}.tar.bz2"
+	S="${WORKDIR}/${PN}-${MAIN_BRANCH}"
+	SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${MAIN_BRANCH}.tar.bz2"
 
 	if [ -n "${PATCH_VER}" ]
 	then
@@ -80,14 +78,13 @@ then
 	if [ -n "${BRANCH_UPDATE}" ]
 	then
 		SRC_URI="${SRC_URI}
-		         mirror://gentoo/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2"
+		         mirror://gentoo/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2"
 	fi
 else
 	S="${WORKDIR}/gcc-${SNAPSHOT//-}"
 	SRC_URI="ftp://sources.redhat.com/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT//-}.tar.bz2"
 fi
 SRC_URI="${SRC_URI}
-	mirror://gentoo/protector-${PP_VER2}.tar.gz
 	http://www.research.ibm.com/trl/projects/security/ssp/gcc${PP_VER1}/protector-${PP_VER2}.tar.gz
 	mirror://gentoo/${P}-manpages.tar.bz2
 	mirror://gentoo/${P}-tls-update.patch.bz2"
@@ -96,34 +93,38 @@ DESCRIPTION="The GNU Compiler Collection.  Includes C/C++ and java compilers"
 HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
 
 LICENSE="GPL-2 LGPL-2.1"
+
 # this is a glibc-propolice forced bump to a gcc without guard 
 # when no binary on the system has references to guard@@libgcc
 # hppa has no dependency on propolice for gcc - skip this arch
-KEYWORDS="x86 ppc sparc mips alpha -hppa ia64 s390"
-IUSE="static nls bootstrap java build"
+KEYWORDS="~ppc" #x86 ppc sparc alpha arm mips -hppa"
 
 # Ok, this is a hairy one again, but lets assume that we
 # are not cross compiling, than we want SLOT to only contain
 # $PV, as people upgrading to new gcc layout will not have
 # their old gcc unmerged ...
-SLOT="${GCC_BRANCH_VER}"
+if [ "${CHOST}" == "${CCHOST}" ]
+then
+	SLOT="${MY_PV}"
+else
+	SLOT="${CCHOST}-${MY_PV}"
+fi
 
-DEPEND=">=sys-libs/glibc-2.3.2-r3
-	mips? ( >=sys-devel/binutils-2.13.90.0.16 )
-	!mips? ( >=sys-devel/binutils-2.13.90.0.18 )
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
-	!build? ( >=sys-libs/ncurses-5.2-r2
+DEPEND="!arm? ( >=sys-libs/glibc-2.3.2-r3 )
+	mips? >=sys-devel/binutils-2.13.90.0.16 : >=sys-devel/binutils-2.13.90.0.18
+	>=sys-devel/gcc-config-1.3.1
+	!build? ( !arm? ( >=sys-libs/ncurses-5.2-r2 )
 	          nls? ( sys-devel/gettext ) )"
 
 # this glibc has the glibc guard symbols which are needed for the propolice functions to get moved to glibc
 # out of the libgcc in this gcc release, however, the propolice patch itself is not defused by this removal
-RDEPEND=">=sys-libs/glibc-2.3.2-r3
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
+RDEPEND="!arm? ( >=sys-libs/glibc-2.3.2-r3 )
+	>=sys-devel/gcc-config-1.3.1
 	>=sys-libs/zlib-1.1.4
 	>=sys-apps/texinfo-4.2-r4
-	!build? ( >=sys-libs/ncurses-5.2-r2 )"
+	!build? ( !arm? ( >=sys-libs/ncurses-5.2-r2 ) )"
 
-PDEPEND="|| ( app-admin/eselect-compiler sys-devel/gcc-config )"
+PDEPEND="sys-devel/gcc-config"
 
 
 # Hack used to patch Makefiles to install into the build dir
@@ -135,7 +136,7 @@ chk_gcc_version() {
 	local OLD_GCC_CHOST="$(gcc -v 2>&1 | egrep '^Reading specs' |\
 	                       sed -e 's:^.*/gcc-lib/\([^/]*\)/[0-9]\+.*$:\1:')"
 
-	if [ "${OLD_GCC_VERSION}" != "${GCC_RELEASE_VER}" ]
+	if [ "${OLD_GCC_VERSION}" != "${MY_PV_FULL}" ]
 	then
 		echo "${OLD_GCC_VERSION}" > "${WORKDIR}/.oldgccversion"
 	fi
@@ -162,7 +163,7 @@ version_patch() {
 src_unpack() {
 	if [ -z "${SNAPSHOT}" ]
 	then
-		unpack ${PN}-${GCC_RELEASE_VER}.tar.bz2
+		unpack ${PN}-${MAIN_BRANCH}.tar.bz2
 
 		if [ -n "${PATCH_VER}" ]
 		then
@@ -183,7 +184,7 @@ src_unpack() {
 	# Branch update ...
 	if [ -n "${BRANCH_UPDATE}" ]
 	then
-		epatch ${DISTDIR}/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
+		epatch ${DISTDIR}/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2
 	fi
 
 	# Do bulk patches included in ${P}-patches-${PATCH_VER}.tar.bz2
@@ -327,25 +328,29 @@ src_compile() {
 	local myconf=""
 	local gcc_lang=""
 
-	if ! use build
+	if [ -z "`use build`" ]
 	then
 		myconf="${myconf} --enable-shared"
 		gcc_lang="c,c++,f77,objc"
 	else
 		gcc_lang="c"
 	fi
-	if ! use nls || use build
+	if [ -z "`use nls`" ] || [ "`use build`" ]
 	then
 		myconf="${myconf} --disable-nls"
 	else
 		myconf="${myconf} --enable-nls --without-included-gettext"
 	fi
-	if use java && ! use build
+	if [ -n "`use java`" ] && [ -z "`use build`" ]
 	then
 		gcc_lang="${gcc_lang},java"
 	fi
 
-	do_filter_flags
+	# In general gcc does not like optimization, and add -O2 where
+	# it is safe.
+	# These aren't needed since we strip-flags above -- Joshua
+	#export CFLAGS="${CFLAGS//-O?}"
+	#export CXXFLAGS="${CXXFLAGS//-O?}"
 
 	# Build in a separate build tree
 	mkdir -p ${WORKDIR}/build
@@ -383,10 +388,13 @@ src_compile() {
 		find ${S} -name '*.[17]' -exec touch {} \; || :
 	fi
 
+	# Setup -j in MAKEOPTS
+	get_number_of_jobs
+
 	einfo "Building GCC..."
 	# 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" ]
+	if [ -n "`use static`" -a "${gcc_lang}" = "c" ]
 	then
 		# Fix for our libtool-portage.patch
 		S="${WORKDIR}/build" \
@@ -442,15 +450,15 @@ src_install() {
 
 	dodir /lib /usr/bin
 	dodir /etc/env.d/gcc
-	echo "PATH=\"${BINPATH}\"" > ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
+	echo "PATH=\"${BINPATH}\"" > ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
 	# Also set CC and CXX
-	echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
+	echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
 
 	# Install wrappers
 # Handled by gcc-config now ...
@@ -461,7 +469,7 @@ src_install() {
 
 	# Make sure we dont have stuff lying around that
 	# can nuke multiple versions of gcc
-	if ! use build
+	if [ -z "`use build`" ]
 	then
 		cd ${D}${LIBPATH}
 
@@ -503,7 +511,7 @@ src_install() {
 
 		# 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}${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}
+		cd ${D}${LOC}/${CCHOST}/gcc-bin/${MY_PV}
 		[ -f jar ] && mv -f jar gcj-jar
 
 		# Move <cxxabi.h> to compiler-specific directories
@@ -526,11 +534,11 @@ src_install() {
 	fi
 
 	cd ${S}
-	if ! use build
+	if [ -z "`use build`" ]
 	then
 		cd ${S}
 		docinto /${CCHOST}
-		dodoc ChangeLog FAQ GNATS MAINTAINERS README
+		dodoc COPYING COPYING.LIB ChangeLog FAQ GNATS MAINTAINERS README
 		docinto ${CCHOST}/html
 		dohtml *.html
 		cd ${S}/boehm-gc
@@ -546,10 +554,10 @@ src_install() {
 		dodoc ChangeLog README TODO *.netlib
 		cd ${S}/libffi
 		docinto ${CCHOST}/libffi
-		dodoc ChangeLog* README
+		dodoc ChangeLog* LICENSE README
 		cd ${S}/libiberty
 		docinto ${CCHOST}/libiberty
-		dodoc ChangeLog README
+		dodoc ChangeLog COPYING.LIB README
 		cd ${S}/libobjc
 		docinto ${CCHOST}/libobjc
 		dodoc ChangeLog README* THREADS*
@@ -561,14 +569,14 @@ src_install() {
 		cp -f docs/html/17_intro/[A-Z]* \
 			${D}/usr/share/doc/${PF}/${DOCDESTTREE}/17_intro/
 
-		if use java
+		if [ -n "`use java`" ]
 		then
 			cd ${S}/fastjar
 			docinto ${CCHOST}/fastjar
-			dodoc AUTHORS CHANGES ChangeLog NEWS README
+			dodoc AUTHORS CHANGES COPYING ChangeLog NEWS README
 			cd ${S}/libjava
 			docinto ${CCHOST}/libjava
-			dodoc ChangeLog* HACKING LIBGCJ_LICENSE NEWS README THANKS
+			dodoc ChangeLog* COPYING HACKING LIBGCJ_LICENSE NEWS README THANKS
 		fi
 
 		prepman ${DATAPATH}
@@ -590,6 +598,7 @@ src_install() {
 }
 
 pkg_preinst() {
+
 	if [ ! -f "${WORKDIR}/.chkgccversion" ]
 	then
 		chk_gcc_version
@@ -602,11 +611,12 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+
 	export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}"
 
-	if [ "${ROOT}" = "/" -a "${CHOST}" = "${CCHOST}" ]
+	if [ "${ROOT}" = "/" -a "${COMPILER}" = "gcc3" -a "${CHOST}" = "${CCHOST}" ]
 	then
-		gcc-config --use-portage-chost ${CCHOST}-${GCC_RELEASE_VER}
+		gcc-config --use-portage-chost ${CCHOST}-${MY_PV_FULL}
 	fi
 
 	# Update libtool linker scripts to reference new gcc version ...
@@ -621,7 +631,7 @@ pkg_postinst() {
 		then
 			OLD_GCC_VERSION="$(cat "${WORKDIR}/.oldgccversion")"
 		else
-			OLD_GCC_VERSION="${GCC_RELEASE_VER}"
+			OLD_GCC_VERSION="${MY_PV_FULL}"
 		fi
 
 		if [ -f "${WORKDIR}/.oldgccchost" ] && \
@@ -642,3 +652,4 @@ pkg_postinst() {
 		[ "${ROOT}" = "/" ] && hardened-gcc -A
 	fi
 }
+
diff --git a/sys-devel/gcc/gcc-3.3.2-r7.ebuild b/sys-devel/gcc/gcc-3.3.2-r7.ebuild
index 93142391f1ea..732e64272254 100644
--- a/sys-devel/gcc/gcc-3.3.2-r7.ebuild
+++ b/sys-devel/gcc/gcc-3.3.2-r7.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.2-r7.ebuild,v 1.24 2005/10/07 02:01:56 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.2-r7.ebuild,v 1.1 2004/02/08 15:29:35 azarah Exp $
 
-IUSE="static nls bootstrap java build X multilib gcj emul-linux-x86"
+IUSE="static nls bootstrap java build X multilib"
 
-inherit eutils flag-o-matic libtool versionator
+inherit eutils flag-o-matic libtool
 
 # Compile problems with these (bug #6641 among others)...
 #filter-flags "-fno-exceptions -fomit-frame-pointer -fforce-addr"
@@ -38,17 +38,15 @@ strip-flags
 [ ! -n "${CCHOST}" ] && export CCHOST="${CHOST}"
 
 LOC="/usr"
-#GCC_BRANCH_VER="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`"
-#GCC_RELEASE_VER="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`"
-GCC_BRANCH_VER="$(get_version_component_range 1-2)"
-GCC_RELEASE_VER="$(get_version_component_range 1-3)"
-
-LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${GCC_RELEASE_VER}"
-BINPATH="${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}"
-DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${GCC_BRANCH_VER}"
+MY_PV="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`"
+MY_PV_FULL="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`"
+
+LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${MY_PV_FULL}"
+BINPATH="${LOC}/${CCHOST}/gcc-bin/${MY_PV}"
+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="${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}"
+STDCXX_INCDIR="${LIBPATH}/include/g++-v${MY_PV/\.*/}"
 
 # ProPolice version
 PP_VER="3_3"
@@ -63,15 +61,15 @@ PATCH_VER="1.0"
 SNAPSHOT=
 
 # Branch update support ...
-GCC_RELEASE_VER="${PV}"  # Tarball, etc used ...
+MAIN_BRANCH="${PV}"  # Tarball, etc used ...
 
 #BRANCH_UPDATE="20021208"
 BRANCH_UPDATE="20040119"
 
 if [ -z "${SNAPSHOT}" ]
 then
-	S="${WORKDIR}/${PN}-${GCC_RELEASE_VER}"
-	SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${GCC_RELEASE_VER}.tar.bz2"
+	S="${WORKDIR}/${PN}-${MAIN_BRANCH}"
+	SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${MAIN_BRANCH}.tar.bz2"
 
 	if [ -n "${PATCH_VER}" ]
 	then
@@ -82,7 +80,7 @@ then
 	if [ -n "${BRANCH_UPDATE}" ]
 	then
 		SRC_URI="${SRC_URI}
-		         mirror://gentoo/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2"
+		         mirror://gentoo/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2"
 	fi
 else
 	S="${WORKDIR}/gcc-${SNAPSHOT//-}"
@@ -91,7 +89,6 @@ fi
 if [ -n "${PP_VER}" ]
 then
 	SRC_URI="${SRC_URI}
-		mirror://gentoo/protector-${PP_FVER}.tar.gz
 		http://www.research.ibm.com/trl/projects/security/ssp/gcc${PP_VER}/protector-${PP_FVER}.tar.gz"
 fi
 SRC_URI="${SRC_URI}
@@ -102,13 +99,22 @@ HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
 
 LICENSE="GPL-2 LGPL-2.1"
 
-KEYWORDS="x86 mips ~sparc ~amd64 -hppa alpha ia64 ppc64"
+KEYWORDS="~x86 ~mips ~sparc ~amd64 -hppa ~alpha ~ia64 ~ppc64"
 
 # Ok, this is a hairy one again, but lets assume that we
 # are not cross compiling, than we want SLOT to only contain
 # $PV, as people upgrading to new gcc layout will not have
 # their old gcc unmerged ...
-SLOT="3.3"
+if [ "${CHOST}" == "${CCHOST}" ]
+then
+# GCC-3.3 is supposed to be binary compatible with 3.2..
+#	SLOT="${MY_PV}"
+	SLOT="3.2"
+else
+# GCC-3.3 is supposed to be binary compatible with 3.2..
+#	SLOT="${CCHOST}-${MY_PV}"
+	SLOT="${CCHOST}-3.2"
+fi
 
 # We need the later binutils for support of the new cleanup attribute.
 # 'make check' fails for about 10 tests (if I remember correctly) less
@@ -117,23 +123,23 @@ SLOT="3.3"
 # we scan for Guard@@libgcc and then apply the function moving patch.
 # If using NPTL, we currently cannot however depend on glibc-2.3.2-r3,
 # else bootstap will break.
-DEPEND="virtual/libc
+DEPEND="virtual/glibc
 	!nptl? ( >=sys-libs/glibc-2.3.2-r3 )
 	>=sys-devel/binutils-2.14.90.0.6-r1
 	>=sys-devel/bison-1.875
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
+	>=sys-devel/gcc-config-1.3.1
 	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-baselibs-1.0 ) )
 	!build? ( >=sys-libs/ncurses-5.2-r2
 	          nls? ( sys-devel/gettext ) )"
 
-RDEPEND="virtual/libc
+RDEPEND="virtual/glibc
 	!nptl? ( >=sys-libs/glibc-2.3.2-r3 )
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
+	>=sys-devel/gcc-config-1.3.1
 	>=sys-libs/zlib-1.1.4
 	>=sys-apps/texinfo-4.2-r4
 	!build? ( >=sys-libs/ncurses-5.2-r2 )"
 
-PDEPEND="|| ( app-admin/eselect-compiler sys-devel/gcc-config )"
+PDEPEND="sys-devel/gcc-config"
 
 
 chk_gcc_version() {
@@ -142,7 +148,7 @@ chk_gcc_version() {
 	local OLD_GCC_CHOST="$(gcc -v 2>&1 | egrep '^Reading specs' |\
 	                       sed -e 's:^.*/gcc-lib/\([^/]*\)/[0-9]\+.*$:\1:')"
 
-	if [ "${OLD_GCC_VERSION}" != "${GCC_RELEASE_VER}" ]
+	if [ "${OLD_GCC_VERSION}" != "${MY_PV_FULL}" ]
 	then
 		echo "${OLD_GCC_VERSION}" > "${WORKDIR}/.oldgccversion"
 	fi
@@ -175,7 +181,7 @@ glibc_have_ssp() {
 			my_libc="${ROOT}/lib64/libc.so.?"
 			;;
 	esac
-
+	
 	# Check for the glibc to have the __guard symbols
 	if  [ "$(readelf -s "${my_libc}" 2>/dev/null | \
 	         grep GLOBAL | grep OBJECT | grep '__guard')" ] && \
@@ -252,7 +258,7 @@ src_unpack() {
 
 	if [ -z "${SNAPSHOT}" ]
 	then
-		unpack ${PN}-${GCC_RELEASE_VER}.tar.bz2
+		unpack ${PN}-${MAIN_BRANCH}.tar.bz2
 
 		if [ -n "${PATCH_VER}" ]
 		then
@@ -276,7 +282,7 @@ src_unpack() {
 	# Branch update ...
 	if [ -n "${BRANCH_UPDATE}" ]
 	then
-		epatch ${DISTDIR}/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
+		epatch ${DISTDIR}/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2
 	fi
 
 	# Do bulk patches included in ${P}-patches-${PATCH_VER}.tar.bz2
@@ -286,7 +292,7 @@ src_unpack() {
 #		mv -f ${WORKDIR}/patch/{40,41}* ${WORKDIR}/patch/exclude/
 		mv -f ${WORKDIR}/patch/41* ${WORKDIR}/patch/exclude/
 
-		if use multilib && [ "${ARCH}" = "amd64" ]
+		if [ -n "`use multilib`" -a "${ARCH}" = "amd64" ]
 		then
 			mv -f ${WORKDIR}/patch/06* ${WORKDIR}/patch/exclude/
 			bzip2 -c ${FILESDIR}/gcc331_use_multilib.amd64.patch > \
@@ -341,20 +347,20 @@ src_compile() {
 	local myconf=
 	local gcc_lang=
 
-	if ! use build
+	if [ -z "`use build`" ]
 	then
 		myconf="${myconf} --enable-shared"
 		gcc_lang="c,c++,f77,objc"
 	else
 		gcc_lang="c"
 	fi
-	if ! use nls || use build
+	if [ -z "`use nls`" -o "`use build`" ]
 	then
 		myconf="${myconf} --disable-nls"
 	else
 		myconf="${myconf} --enable-nls --without-included-gettext"
 	fi
-	if use java && use gcj && ! use build
+	if [ -n "`use java`" -a -z "`use build`" ]
 	then
 		gcc_lang="${gcc_lang},java"
 	fi
@@ -364,14 +370,15 @@ src_compile() {
 	# X11 support is still very experimental but enabling it is
 	# quite innocuous...  [No, gcc is *not* linked to X11...]
 	# <dragon@gentoo.org> (15 May 2003)
-	if use java && use gcj && use X && ! use build && [ -f /usr/X11R6/include/X11/Xlib.h ]
+	if [ -n "`use java`" -a -n "`use X`" -a -z "`use build`" -a \
+	     -f /usr/X11R6/include/X11/Xlib.h ]
 	then
 		myconf="${myconf} --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib"
 		myconf="${myconf} --enable-interpreter --enable-java-awt=xlib --with-x"
 	fi
 
 	# Multilib not yet supported
-	if use multilib && [ "${ARCH}" = "amd64" ]
+	if [ -n "`use multilib`" -a "${ARCH}" = "amd64" ]
 	then
 		einfo "WARNING: Multilib support enabled. This is still experimental."
 		myconf="${myconf} --enable-multilib"
@@ -386,15 +393,12 @@ src_compile() {
 	# Fix linking problem with c++ apps which where linkedi
 	# agains a 3.2.2 libgcc
 	[ "${ARCH}" = "hppa" ] && myconf="${myconf} --enable-sjlj-exceptions"
-	myconf="${myconf} --disable-libunwind-exceptions"
 
 	# In general gcc does not like optimization, and add -O2 where
-	export CFLAGS="$(echo "${CFLAGS}" | sed -e 's|-O[0-9s]\?|-O2|g')"
-	einfo "CFLAGS=\"${CFLAGS}\""
-	export CXXFLAGS="$(echo "${CXXFLAGS}" | sed -e 's|-O[0-9s]\?|-O2|g')"
-	einfo "CXXFLAGS=\"${CXXFLAGS}\""
-	export GCJFLAGS="$(echo "${GCJFLAGS}" | sed -e 's|-O[0-9s]\?|-O2|g')"
-	einfo "GCJFLAGS=\"${GCJFLAGS}\""
+	# it is safe.  This is especially true for gcc-3.3 ...
+	export CFLAGS="${CFLAGS/-O?/-O2}"
+	export CXXFLAGS="${CXXFLAGS/-O?/-O2}"
+	export GCJFLAGS="${CFLAGS/-O?/-O2}"
 
 	# Build in a separate build tree
 	mkdir -p ${WORKDIR}/build
@@ -432,10 +436,13 @@ src_compile() {
 		find ${S} -name '*.[17]' -exec touch {} \; || :
 	fi
 
+	# Setup -j in MAKEOPTS
+	get_number_of_jobs
+
 	einfo "Building GCC..."
 	# 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" ]
+	if [ -n "`use static`" -a "${gcc_lang}" = "c" ]
 	then
 		# Fix for our libtool-portage.patch
 		S="${WORKDIR}/build" \
@@ -495,22 +502,22 @@ src_install() {
 
 	dodir /lib /usr/bin
 	dodir /etc/env.d/gcc
-	echo "PATH=\"${BINPATH}\"" > ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	if use multilib && [ "${ARCH}" = "amd64" ]
+	echo "PATH=\"${BINPATH}\"" > ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	if [ -n "`use multilib`" -a "${ARCH}" = "amd64" ]
 	then
 		# amd64 is a bit unique because of multilib.  Add some other paths
 		echo "LDPATH=\"${LIBPATH}:${LIBPATH}/32:${LIBPATH}/../lib64:${LIBPATH}/../lib32\"" >> \
-			${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
+			${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
 	else
-		echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
+		echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
 	fi
-	echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
+	echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
 	# Also set CC and CXX
-	echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
+	echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
 	# Make sure we do not check glibc for SSP again, as we did already
 	if glibc_have_ssp || \
 	   [ -f "${ROOT}/etc/env.d/99glibc_ssp" ]
@@ -520,7 +527,7 @@ src_install() {
 
 	# Make sure we dont have stuff lying around that
 	# can nuke multiple versions of gcc
-	if ! use build
+	if [ -z "`use build`" ]
 	then
 		cd ${D}${LIBPATH}
 
@@ -568,7 +575,7 @@ src_install() {
 
 		# 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}${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}
+		cd ${D}${LOC}/${CCHOST}/gcc-bin/${MY_PV}
 		[ -f jar ] && mv -f jar gcj-jar
 
 		# Move <cxxabi.h> to compiler-specific directories
@@ -597,7 +604,7 @@ src_install() {
 	fi
 
 	cd ${S}
-	if ! use build
+	if [ -z "`use build`" ]
 	then
 		cd ${S}
 		docinto /${CCHOST}
@@ -632,7 +639,7 @@ src_install() {
 		cp -f docs/html/17_intro/[A-Z]* \
 			${D}/usr/share/doc/${PF}/${DOCDESTTREE}/17_intro/
 
-		if use java && use gcj
+		if [ -n "`use java`" ]
 		then
 			cd ${S}/fastjar
 			docinto ${CCHOST}/fastjar
@@ -656,7 +663,7 @@ src_install() {
 	exeinto /sbin
 	doexe ${FILESDIR}/fix_libtool_files.sh
 
-	if use multilib && [ "${ARCH}" = "amd64" ]
+	if [ -n "`use multilib`" -a "${ARCH}" = "amd64" ]
 	then
 		# If using multilib, GCC has a bug, where it doesn't know where to find
 		# -lgcc_s when linking while compiling with g++ .  ${LIBPATH} is in
@@ -676,7 +683,7 @@ pkg_preinst() {
 
 	# Make again sure that the linker "should" be able to locate
 	# libstdc++.so ...
-	if use multilib && [ "${ARCH}" = "amd64" ]
+	if [ -n "`use multilib`" -a "${ARCH}" = "amd64" ]
 	then
 		# Can't always find libgcc_s.so.1, make it find it
 		export LD_LIBRARY_PATH="${LIBPATH}:${LIBPATH}/../lib64:${LIBPATH}/../lib32:${LD_LIBRARY_PATH}"
@@ -688,16 +695,16 @@ pkg_preinst() {
 
 pkg_postinst() {
 
-	if use multilib && [ "${ARCH}" = "amd64" ]
+	if [ -n "`use multilib`" -a "${ARCH}" = "amd64" ]
 	then
 		# Can't always find libgcc_s.so.1, make it find it
 		export LD_LIBRARY_PATH="${LIBPATH}:${LIBPATH}/../lib64:${LIBPATH}/../lib32:${LD_LIBRARY_PATH}"
 	else
 		export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}"
 	fi
-	if [ "${ROOT}" = "/" -a "${CHOST}" = "${CCHOST}" ]
+	if [ "${ROOT}" = "/" -a "${COMPILER}" = "gcc3" -a "${CHOST}" = "${CCHOST}" ]
 	then
-		gcc-config --use-portage-chost ${CCHOST}-${GCC_RELEASE_VER}
+		gcc-config --use-portage-chost ${CCHOST}-${MY_PV_FULL}
 	fi
 
 	# Update libtool linker scripts to reference new gcc version ...
@@ -712,7 +719,7 @@ pkg_postinst() {
 		then
 			OLD_GCC_VERSION="$(cat "${WORKDIR}/.oldgccversion")"
 		else
-			OLD_GCC_VERSION="${GCC_RELEASE_VER}"
+			OLD_GCC_VERSION="${MY_PV_FULL}"
 		fi
 
 		if [ -f "${WORKDIR}/.oldgccchost" ] && \
diff --git a/sys-devel/gcc/gcc-3.3.5-r1.ebuild b/sys-devel/gcc/gcc-3.3.5-r1.ebuild
index eef1022d49e9..a001c5481264 100644
--- a/sys-devel/gcc/gcc-3.3.5-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.3.5-r1.ebuild
@@ -1,17 +1,50 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.5-r1.ebuild,v 1.27 2005/10/07 02:01:56 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.5-r1.ebuild,v 1.1 2004/12/05 04:19:34 lv Exp $
 
-MAN_VER="3.3.5"
+DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~sh ~sparc ~x86"
+
+# we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
+# we also need at least glibc 2.3.3 20040420-r1 in order for gcc 3.4 not to nuke
+# SSP in glibc.
+
+# NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
+# .eh_frame ld optimisation and symbol visibility support, but it hasnt been
+# well tested in gentoo on any arch other than amd64!!
+RDEPEND="virtual/libc
+	>=sys-devel/gcc-config-1.3.6
+	>=sys-libs/zlib-1.1.4
+	!sys-devel/hardened-gcc
+	!uclibc? ( >=sys-libs/glibc-2.3.2-r9 )
+	>=sys-devel/binutils-2.14.90.0.6-r1
+	>=sys-devel/bison-1.875
+	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-1.1 ) )
+	sparc? ( hardened? ( >=sys-libs/glibc-2.3.3.20040420 ) )
+	!build? (
+		gcj? (
+			gtk? ( >=x11-libs/gtk+-2.2 )
+			>=media-libs/libart_lgpl-2.1
+		)
+		>=sys-libs/ncurses-5.2-r2
+		nls? ( sys-devel/gettext )
+	)"
+DEPEND="${RDEPEND}
+	>=sys-apps/texinfo-4.2-r4
+	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
+PDEPEND="sys-devel/gcc-config"
+
+GENTOO_TOOLCHAIN_BASE_URI="http://dev.gentoo.org/~lv/GCC/"
+#GCC_MANPAGE_VERSION="3.3.4"
 #BRANCH_UPDATE="20041025"
 PATCH_VER="1.0"
-PIE_VER="8.7.7.1"
+PIE_VER="8.7.7"
 PIE_CORE="gcc-3.3.5-piepatches-v${PIE_VER}.tar.bz2"
 PP_VER="3_3_2"
 PP_FVER="${PP_VER//_/.}-3"
 HTB_VER="1.00"
 #HTB_GCC_VER=""
-HTB_EXCLUSIVE="true"
 
 ETYPE="gcc-compiler"
 
@@ -34,80 +67,342 @@ SPLIT_SPECS="${SPLIT_SPECS:="true"}"
 #GENTOO_PATCH_EXCLUDE=""
 #PIEPATCH_EXCLUDE=""
 
-inherit toolchain eutils
+inherit eutils flag-o-matic libtool gnuconfig toolchain
 
-DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
+gcc_do_filter_flags() {
+	strip-flags
 
-KEYWORDS="~alpha ~amd64 arm hppa -ia64 ~mips s390 sh sparc x86"
+	# 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
 
-# we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
-# we also need at least glibc 2.3.3 20040420-r1 in order for gcc 3.4 not to nuke
-# SSP in glibc.
+	strip-unsupported-flags
 
-# NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
-# .eh_frame ld optimisation and symbol visibility support, but it hasnt been
-# well tested in gentoo on any arch other than amd64!!
-RDEPEND="virtual/libc
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.6 )
-	>=sys-libs/zlib-1.1.4
-	!sys-devel/hardened-gcc
-	elibc_glibc? ( >=sys-libs/glibc-2.3.2-r9 )
-	>=sys-devel/binutils-2.14.90.0.6-r1
-	>=sys-devel/bison-1.875
-	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-1.1 ) )
-	sparc? ( hardened? ( >=sys-libs/glibc-2.3.3.20040420 ) )
-	!build? (
-		gcj? (
-			gtk? ( >=x11-libs/gtk+-2.2 )
-			>=media-libs/libart_lgpl-2.1
-		)
-		>=sys-libs/ncurses-5.2-r2
-		nls? ( sys-devel/gettext )
-	)"
+	# If we use multilib on mips, we shouldn't pass -mabi flag - it breaks
+	# build of non-default-abi libraries.
+	use mips && use multilib && filter-flags "-mabi*"
 
-if [[ ${CATEGORY/cross-} != ${CATEGORY} ]]; then
-	RDEPEND="${RDEPEND} ${CATEGORY}/binutils"
-fi
+	# Compile problems with these (bug #6641 among others)...
+	#filter-flags "-fno-exceptions -fomit-frame-pointer -fforce-addr"
 
-DEPEND="${RDEPEND}
-	>=sys-apps/texinfo-4.2-r4
-	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
-PDEPEND="|| ( app-admin/eselect-compiler sys-devel/gcc-config )"
+	export GCJFLAGS="${CFLAGS}"
+}
+
+
+chk_gcc_version() {
+	mkdir -p "${WORKDIR}"
+
+	# This next bit is for updating libtool linker scripts ...
+	local OLD_GCC_VERSION="`gcc -dumpversion`"
+	local OLD_GCC_CHOST="$(gcc -v 2>&1 | egrep '^Reading specs' |\
+	                       sed -e 's:^.*/gcc[^/]*/\([^/]*\)/[0-9]\+.*$:\1:')"
+
+	if [ "${OLD_GCC_VERSION}" != "${MY_PV_FULL}" ]
+	then
+		echo "${OLD_GCC_VERSION}" > "${WORKDIR}/.oldgccversion"
+	fi
+
+	if [ -n "${OLD_GCC_CHOST}" ]
+	then
+		if [ "${CHOST}" = "${CTARGET}" -a "${OLD_GCC_CHOST}" != "${CHOST}" ]
+		then
+			echo "${OLD_GCC_CHOST}" > "${WORKDIR}/.oldgccchost"
+		fi
+	fi
+
+	# Did we check the version ?
+	touch "${WORKDIR}/.chkgccversion"
+}
 
 src_unpack() {
 	gcc_src_unpack
 
-	if [ -n "${PATCH_VER}" ] && use elibc_uclibc ; then
+	if [ -n "${PATCH_VER}" ] && use uclibc ; then
 		mv ${S}/gcc-3.3.2/libstdc++-v3/config/os/uclibc ${S}/libstdc++-v3/config/os/ || die
 		mv ${S}/gcc-3.3.2/libstdc++-v3/config/locale/uclibc ${S}/libstdc++-v3/config/locale/ || die
 		epatch ${FILESDIR}/3.3.3/gcc-uclibc-3.3-loop.patch
 	fi
 
 	# misc patches that havent made it into a patch tarball yet
-	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
-
-	# fix an incorrect prototype of ffecom_gfrt_basictype() which causes
-	# 3.3.5 to not compile on some configurations.
-	epatch ${FILESDIR}/3.3.5/gcc-3.3.5-ffecom_gfrt_basictype-prototype.patch
-
-	case $(tc-arch ${CTARGET}) in
-		ppc)
-			epatch ${FILESDIR}/3.3.3/gcc333_pre20040408-stack-size.patch
-			;;
-		arm)
-			epatch ${FILESDIR}/3.3.3/gcc333-debian-arm-getoff.patch
-			epatch ${FILESDIR}/3.3.3/gcc333-debian-arm-ldm.patch
-			;;
-	esac
+	epatch ${FILESDIR}/gcc-spec-env.patch
+
+	if [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ] ; then
+		epatch ${FILESDIR}/3.3.3/gcc333_pre20040408-stack-size.patch
+	fi
+
+	if [ "${ARCH}" = "arm" ] ; then
+		epatch ${FILESDIR}/3.3.3/gcc333-debian-arm-getoff.patch
+		epatch ${FILESDIR}/3.3.3/gcc333-debian-arm-ldm.patch
+	fi
 
 	# Anything useful and objc will require libffi. Seriously. Lets just force
 	# libffi to install with USE="objc", even though it normally only installs
 	# if you attempt to build gcj.
-	if use !build && use objc && ! use gcj ; then
+	if use objc && ! use gcj ; then
 		epatch ${FILESDIR}/3.3.4/libffi-without-libgcj.patch
 		#epatch ${FILESDIR}/3.4.3/libffi-nogcj-lib-path-fix.patch
 	fi
+}
+
+
+src_install() {
+	local x=
+
+	# Do allow symlinks in ${PREFIX}/lib/gcc-lib/${CHOST}/${PV}/include as
+	# this can break the build.
+	for x in ${WORKDIR}/build/gcc/include/*
+	do
+		if [ -L ${x} ]
+		then
+			rm -f ${x}
+			continue
+		fi
+	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
+		if grep -q 'It has been auto-edited by fixincludes from' ${x}
+		then
+			rm -f ${x}
+		fi
+	done
+
+	einfo "Installing GCC..."
+	# Do the 'make install' from the build directory
+	cd ${WORKDIR}/build
+	S="${WORKDIR}/build" \
+	make DESTDIR="${D}" install || die
+
+	if [ "${CHOST}" == "${CTARGET}" ] ; then
+		[ -r ${D}${BINPATH}/gcc ] || die "gcc not found in ${D}"
+	fi
+
+	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
+
+		cp ${WORKDIR}/build/*.specs ${D}/${LIBPATH}
+	fi
+
+	# This one comes with binutils
+	rm -f ${D}${PREFIX}/lib/libiberty.a
+	rm -f ${D}${LIBPATH}/libiberty.a
+	[ -e ${D}/${PREFIX}/lib/32 ] && rm -rf ${D}/${PREFIX}/lib/32
+
+	# we dont want these in freaky non-versioned paths that dont ever get used
+	fix_freaky_non_versioned_library_paths_that_dont_ever_get_used 32
+	fix_freaky_non_versioned_library_paths_that_dont_ever_get_used 64
+	# and mips is just freaky in general ;p
+	fix_freaky_non_versioned_library_paths_that_dont_ever_get_used o32
+	# and finally, the non-bitdepth-or-ABI-specific freaky path
+	if [ -d ${D}/${LIBPATH}/../lib ] ; then
+		mv ${D}/${LIBPATH}/../lib/* ${D}/${LIBPATH}/
+		rm -rf ${D}/${LIBPATH}/../lib
+	fi
+	# we also dont want libs in /usr/lib*
+	if [ -d ${D}/${PREFIX}/lib32 -a -d ${D}/${LIBPATH}/32 ] ; then
+		mv ${D}/${PREFIX}/lib32/* ${D}/${LIBPATH}/32/
+		rm -rf ${D}/${PREFIX}/lib32/
+	elif [ -d ${D}/${PREFIX}/lib32 -a ! -d ${D}/${LIBPATH}/32 ] ; then
+		mv ${D}/${PREFIX}/lib32/* ${D}/${LIBPATH}/
+		rm -rf ${D}/${PREFIX}/lib32/
+	fi
+	if [ -d ${D}/${PREFIX}/lib64 -a -d ${D}/${LIBPATH}/64 ] ; then
+		mv ${D}/${PREFIX}/lib64/* ${D}/${LIBPATH}/64/
+		rm -rf ${D}/${PREFIX}/lib64/
+	elif [ -d ${D}/${PREFIX}/lib64 -a ! -d ${D}/${LIBPATH}/64 ] ; then
+		mv ${D}/${PREFIX}/lib64/* ${D}/${LIBPATH}/
+		rm -rf ${D}/${PREFIX}/lib64/
+	fi
+	if [ "$(get_multilibdir)" != "lib" ] ; then
+		mv ${D}/${PREFIX}/lib/*so*  ${D}/${PREFIX}/lib/*\.la \
+			 ${D}/${PREFIX}/lib/*\.a ${D}/${LIBPATH}
+	else
+		mv ${D}/${PREFIX}/lib/*so*  ${D}/${PREFIX}/lib/*\.la \
+			 ${D}/${PREFIX}/lib/*\.a ${D}/${LIBPATH}/32/
+	fi
+	# and sometimes crap ends up here too :|
+	mv ${D}/${LIBPATH}/../*.a ${D}/${LIBPATH}/../*.la ${D}/${LIBPATH}/../*so* \
+		${D}/${LIBPATH}/
+
+	# 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)"
+
+	# 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/${MY_PV_FULL}
+		[ -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
+		cd ${D}${BINPATH}
+		for x in gcc g++ c++ g77 gcj
+		do
+			if [ "${CHOST}" == "${CTARGET}" ] && [ -f "${CTARGET}-${x}" ]
+			then
+				[ ! -f "${x}" ] && mv "${CTARGET}-${x}" "${x}"
+				ln -sf ${x} ${CTARGET}-${x}
+			fi
 
-	# Don't screw with directories when cross-compiling
-	epatch ${FILESDIR}/3.3.5/gcc-3.3.5-no-COPYING-cross-compile.patch
+			if [ -f "${CTARGET}-${x}-${PV}" ]
+			then
+				rm -f ${CTARGET}-${x}-${PV}
+				ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${PV}
+			fi
+		done
+	fi
+
+	cd ${S}
+	if ! use build && [ "${CHOST}" == "${CTARGET}" ] ; then
+		prepman ${DATAPATH}
+		prepinfo ${DATAPATH}
+	else
+		rm -rf ${D}/usr/share/{man,info}
+		rm -rf ${D}${DATAPATH}/{man,info}
+	fi
+
+	# Rather install the script, else portage with changing $FILESDIR
+	# between binary and source package borks things ....
+	if [ "${CHOST}" == "${CTARGET}" ] ; then
+		insinto /lib/rcscripts/awk
+		doins ${FILESDIR}/awk/fixlafiles.awk
+		exeinto /sbin
+		doexe ${FILESDIR}/fix_libtool_files.sh
+	fi
+}
+
+fix_freaky_non_versioned_library_paths_that_dont_ever_get_used() {
+	# first the multilib case
+	if [ -d ${D}/${LIBPATH}/../$1 -a -d ${D}/${LIBPATH}/$1 ] ; then
+		mv ${D}/${LIBPATH}/../$1/* ${D}/${LIBPATH}/$1/
+		rm -rf ${D}/${LIBPATH}/../$1
+	fi
+	if [ -d ${D}/${LIBPATH}/../lib$1 -a -d ${D}/${LIBPATH}/$1 ] ; then
+		mv ${D}/${LIBPATH}/../lib$1/* ${D}/${LIBPATH}/$1/
+		rm -rf ${D}/${LIBPATH}/../lib$1
+	fi
+	# and now to fix up the non-multilib case
+	if [ -d ${D}/${LIBPATH}/../$1 -a ! -d ${D}/${LIBPATH}/$1 ] ; then
+		mv ${D}/${LIBPATH}/../$1/* ${D}/${LIBPATH}/
+		rm -rf ${D}/${LIBPATH}/../$1
+	fi
+	if [ -d ${D}/${LIBPATH}/../lib$1 -a ! -d ${D}/${LIBPATH}/$1 ] ; then
+		mv ${D}/${LIBPATH}/../lib$1/* ${D}/${LIBPATH}/
+		rm -rf ${D}/${LIBPATH}/../lib$1
+	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
+}
+
+
+pkg_preinst() {
+
+	if [ ! -f "${WORKDIR}/.chkgccversion" ]
+	then
+		mkdir -p ${WORKDIR}
+		chk_gcc_version
+	fi
+
+	# Make again sure that the linker "should" be able to locate
+	# libstdc++.so ...
+	if use multilib && [ "${ARCH}" = "amd64" ]
+	then
+		# Can't always find libgcc_s.so.1, make it find it
+		export LD_LIBRARY_PATH="${LIBPATH}:${LIBPATH}/../lib64:${LIBPATH}/../lib32:${LD_LIBRARY_PATH}"
+	else
+		export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}"
+	fi
+	${ROOT}/sbin/ldconfig
+}
+
+pkg_postinst() {
+
+	if use multilib && [ "${ARCH}" = "amd64" ]
+	then
+		# Can't always find libgcc_s.so.1, make it find it
+		export LD_LIBRARY_PATH="${LIBPATH}:${LIBPATH}/../lib64:${LIBPATH}/../lib32:${LD_LIBRARY_PATH}"
+	else
+		export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}"
+	fi
+
+	should_we_gcc_config && do_gcc_config
+
+	# Update libtool linker scripts to reference new gcc version ...
+	if [ "${ROOT}" = "/" ] && \
+	   [ -f "${WORKDIR}/.oldgccversion" -o -f "${WORKDIR}/.oldgccchost" ]
+	then
+		local OLD_GCC_VERSION=
+		local OLD_GCC_CHOST=
+
+		if [ -f "${WORKDIR}/.oldgccversion" ] && \
+		   [ -n "$(cat "${WORKDIR}/.oldgccversion")" ]
+		then
+			OLD_GCC_VERSION="$(cat "${WORKDIR}/.oldgccversion")"
+		else
+			OLD_GCC_VERSION="${MY_PV_FULL}"
+		fi
+
+		if [ -f "${WORKDIR}/.oldgccchost" ] && \
+		   [ -n "$(cat "${WORKDIR}/.oldgccchost")" ]
+		then
+			OLD_GCC_CHOST="--oldarch $(cat "${WORKDIR}/.oldgccchost")"
+		fi
+
+		/sbin/fix_libtool_files.sh ${OLD_GCC_VERSION} ${OLD_GCC_CHOST}
+	fi
 }
diff --git a/sys-devel/gcc/gcc-3.3.5.20050130-r1.ebuild b/sys-devel/gcc/gcc-3.3.5.20050130-r1.ebuild
index 10609cbed1e7..4c119c932866 100644
--- a/sys-devel/gcc/gcc-3.3.5.20050130-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.3.5.20050130-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.5.20050130-r1.ebuild,v 1.11 2005/10/07 02:01:56 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.5.20050130-r1.ebuild,v 1.1 2005/03/19 00:46:46 vapier Exp $
 
 MAN_VER="3.3.5"
-PATCH_VER="1.4"
+PATCH_VER="1.3"
 UCLIBC_VER="1.0"
 PIE_VER="8.7.7.1"
 PIE_CORE="gcc-3.3.5-piepatches-v${PIE_VER}.tar.bz2"
@@ -11,7 +11,6 @@ PP_VER="3_3_5_20050130"
 PP_FVER="${PP_VER//_/.}-1"
 HTB_VER="1.00-r2"
 #HTB_GCC_VER="3.3.5"
-HTB_EXCLUSIVE="true"
 
 ETYPE="gcc-compiler"
 
@@ -38,16 +37,16 @@ inherit toolchain eutils
 
 DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
 
-KEYWORDS="~alpha ~amd64 arm ~hppa -ia64 ~mips sh sparc x86"
+KEYWORDS="~alpha -amd64 ~arm ~hppa -ia64 ~mips ~sh sparc ~x86"
 
 # NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
 # .eh_frame ld optimisation and symbol visibility support, but it hasnt been
 # well tested in gentoo on any arch other than amd64!!
 RDEPEND="virtual/libc
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.10 )
+	>=sys-devel/gcc-config-1.3.6
 	>=sys-libs/zlib-1.1.4
 	!sys-devel/hardened-gcc
-	elibc_glibc? ( >=sys-libs/glibc-2.3.2-r9 )
+	!uclibc? ( >=sys-libs/glibc-2.3.2-r9 )
 	>=sys-devel/binutils-2.14.90.0.6-r1
 	>=sys-devel/bison-1.875
 	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-1.1 ) )
@@ -68,7 +67,7 @@ fi
 DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
-PDEPEND="|| ( app-admin/eselect-compiler sys-devel/gcc-config )"
+PDEPEND="sys-devel/gcc-config"
 
 src_unpack() {
 	gcc_src_unpack
@@ -82,19 +81,13 @@ src_unpack() {
 	fi
 
 	# misc patches that havent made it into a patch tarball yet
-	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
+	epatch ${FILESDIR}/gcc-spec-env.patch
 
 	# Anything useful and objc will require libffi. Seriously. Lets just force
 	# libffi to install with USE="objc", even though it normally only installs
 	# if you attempt to build gcj.
-	if use !build && use objc && ! use gcj ; then
-		epatch ${FILESDIR}/3.3.4/libffi-without-libgcj.patch
+	if ! ( ! use build && use objc && ! use gcj ) ; then
+		GENTOO_PATCH_EXCLUDE="42*"
 		#epatch ${FILESDIR}/3.4.3/libffi-nogcj-lib-path-fix.patch
 	fi
-
-	if [[ $(tc-arch) == "amd64" ]] ; then
-		replace-cpu-flags k8 i686
-		replace-cpu-flags opteron i686
-		replace-cpu-flags athlon64 i686
-	fi
 }
diff --git a/sys-devel/gcc/gcc-3.3.5.20050130-r2.ebuild b/sys-devel/gcc/gcc-3.3.5.20050130-r2.ebuild
index a2be2a36a488..53774b905d7b 100644
--- a/sys-devel/gcc/gcc-3.3.5.20050130-r2.ebuild
+++ b/sys-devel/gcc/gcc-3.3.5.20050130-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-devel/gcc/gcc-3.3.5.20050130-r2.ebuild,v 1.6 2005/10/07 02:01:56 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.5.20050130-r2.ebuild,v 1.1 2005/04/08 04:14:26 vapier Exp $
 
 MAN_VER="3.3.5"
 PATCH_VER="1.5"
@@ -11,7 +11,6 @@ PP_VER="3_3_5_20050130"
 PP_FVER="${PP_VER//_/.}-1"
 HTB_VER="1.00-r2"
 #HTB_GCC_VER="3.3.5"
-HTB_EXCLUSIVE="true"
 
 ETYPE="gcc-compiler"
 
@@ -44,10 +43,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa -ia64 ~mips ~sh ~sparc ~x86"
 # .eh_frame ld optimisation and symbol visibility support, but it hasnt been
 # well tested in gentoo on any arch other than amd64!!
 RDEPEND="virtual/libc
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.10 )
+	>=sys-devel/gcc-config-1.3.10
 	>=sys-libs/zlib-1.1.4
 	!sys-devel/hardened-gcc
-	elibc_glibc? ( >=sys-libs/glibc-2.3.2-r9 )
+	!uclibc? ( >=sys-libs/glibc-2.3.2-r9 )
 	>=sys-devel/binutils-2.14.90.0.6-r1
 	>=sys-devel/bison-1.875
 	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-1.1 ) )
@@ -68,7 +67,7 @@ fi
 DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
-PDEPEND="|| ( app-admin/eselect-compiler sys-devel/gcc-config )"
+PDEPEND="sys-devel/gcc-config"
 
 src_unpack() {
 	gcc_src_unpack
@@ -82,7 +81,7 @@ src_unpack() {
 	fi
 
 	# misc patches that havent made it into a patch tarball yet
-	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
+	epatch ${FILESDIR}/gcc-spec-env.patch
 
 	# Anything useful and objc will require libffi. Seriously. Lets just force
 	# libffi to install with USE="objc", even though it normally only installs
diff --git a/sys-devel/gcc/gcc-3.3.6.ebuild b/sys-devel/gcc/gcc-3.3.6.ebuild
index 2ea1605457f9..832dae0f1abb 100644
--- a/sys-devel/gcc/gcc-3.3.6.ebuild
+++ b/sys-devel/gcc/gcc-3.3.6.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.6.ebuild,v 1.16 2005/11/29 03:04:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.6.ebuild,v 1.1 2005/05/24 04:33:46 vapier Exp $
 
 MAN_VER=""
-PATCH_VER="1.3"
+PATCH_VER="1.0"
 UCLIBC_VER="1.0"
 PIE_VER="8.7.8"
-PP_VER="1.0"
+PP_VER=""
+PP_FVER=""
 HTB_VER="1.00-r1"
 
 ETYPE="gcc-compiler"
@@ -34,26 +35,22 @@ inherit toolchain eutils
 
 DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
 
-# ia64 - broken static handling; USE=static emerge busybox
-KEYWORDS="-* ~alpha ~amd64 ~hppa -ia64 ~sparc x86"
+KEYWORDS="-*"
 
 # NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
 # .eh_frame ld optimisation and symbol visibility support, but it hasnt been
 # well tested in gentoo on any arch other than amd64!!
-RDEPEND="|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.10 )
+RDEPEND=">=sys-devel/gcc-config-1.3.10
 	>=sys-libs/zlib-1.1.4
 	!sys-devel/hardened-gcc
-	elibc_glibc? ( >=sys-libs/glibc-2.3.2-r9 )
+	!uclibc? ( >=sys-libs/glibc-2.3.2-r9 )
 	>=sys-devel/binutils-2.14.90.0.6-r1
 	>=sys-devel/bison-1.875
 	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-1.1 ) )
 	sparc? ( hardened? ( >=sys-libs/glibc-2.3.3.20040420 ) )
 	!build? (
 		gcj? (
-			gtk? (
-				|| ( ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto ) virtual/x11 )
-				>=x11-libs/gtk+-2.2
-			)
+			gtk? ( >=x11-libs/gtk+-2.2 )
 			>=media-libs/libart_lgpl-2.1
 		)
 		>=sys-libs/ncurses-5.2-r2
@@ -67,7 +64,7 @@ fi
 DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
-PDEPEND="|| ( app-admin/eselect-compiler sys-devel/gcc-config )"
+PDEPEND="sys-devel/gcc-config"
 
 src_unpack() {
 	gcc_src_unpack
@@ -78,8 +75,7 @@ src_unpack() {
 	fi
 
 	# misc patches that havent made it into a patch tarball yet
-	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
-	epatch "${FILESDIR}"/3.3.6/gcc-3.3.6-cross-compile.patch
+	epatch "${FILESDIR}"/gcc-spec-env.patch
 
 	# Anything useful and objc will require libffi. Seriously. Lets just force
 	# libffi to install with USE="objc", even though it normally only installs
diff --git a/sys-devel/gcc/gcc-3.4.1-r3.ebuild b/sys-devel/gcc/gcc-3.4.1-r3.ebuild
index 048018739653..6f43e0605afb 100644
--- a/sys-devel/gcc/gcc-3.4.1-r3.ebuild
+++ b/sys-devel/gcc/gcc-3.4.1-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.1-r3.ebuild,v 1.20 2005/10/07 02:01:56 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.1-r3.ebuild,v 1.1 2004/09/19 21:20:02 tigger Exp $
 
-IUSE="static nls bootstrap build multilib gcj gtk fortran objc hardened n32 n64 emul-linux-x86"
+IUSE="static nls bootstrap build multilib gcj gtk f77 objc hardened uclibc n32 n64"
 
-inherit eutils flag-o-matic libtool gnuconfig versionator
+inherit eutils flag-o-matic libtool gnuconfig
 
 DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie and ssp extensions"
 HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
@@ -12,7 +12,7 @@ LICENSE="GPL-2 LGPL-2.1"
 
 # previous release known to b0rk glibc on hppa... i dont know if this bug
 # still exists, so i'll keep in the -hppa...
-KEYWORDS="-* ~amd64 mips ppc64 ~x86 -hppa ppc s390"
+KEYWORDS="-* ~amd64 ~mips ~ppc64 ~x86 -hppa ppc"
 
 # we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
 # we also need at least glibc 2.3.3 20040420-r1 in order for gcc 3.4 not to nuke
@@ -22,29 +22,30 @@ KEYWORDS="-* ~amd64 mips ppc64 ~x86 -hppa ppc s390"
 # .eh_frame ld optimisation and symbol visibility support, but it hasnt been
 # well tested in gentoo on any arch other than amd64!!
 DEPEND="virtual/libc
-	!sys-devel/hardened-gcc
+	!uclibc? ( >=sys-libs/glibc-2.3.3_pre20040420-r1 )
+	!uclibc? ( hardened? ( >=sys-libs/glibc-2.3.3_pre20040529 ) )
+	( !sys-devel/hardened-gcc )
 	>=sys-devel/binutils-2.14.90.0.8-r1
 	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )
 	>=sys-devel/bison-1.875
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
+	>=sys-devel/gcc-config-1.3.1
 	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-baselibs-1.0 ) )
-	!build? (
-		gcj? (
-			gtk? ( >=x11-libs/gtk+-2.2 )
-			>=media-libs/libart_lgpl-2.1
-		)
-		>=sys-libs/ncurses-5.2-r2
-		nls? ( sys-devel/gettext )
-	)"
+	!build? ( gcj? ( gtk? ( >=x11-libs/gtk+-2.2 ) ) )
+	!build? ( gcj? ( >=media-libs/libart_lgpl-2.1 ) )
+	!build? ( >=sys-libs/ncurses-5.2-r2
+	          nls? ( sys-devel/gettext ) )"
+
 RDEPEND="virtual/libc
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
+	!uclibc? ( >=sys-libs/glibc-2.3.3_pre20040420-r1 )
+	!uclibc? ( hardened? ( >=sys-libs/glibc-2.3.3_pre20040529 ) )
+	>=sys-devel/gcc-config-1.3.1
 	>=sys-libs/zlib-1.1.4
 	>=sys-apps/texinfo-4.2-r4
 	!build? ( >=sys-libs/ncurses-5.2-r2 )"
 
-PDEPEND="|| ( app-admin/eselect-compiler sys-devel/gcc-config )"
+PDEPEND="sys-devel/gcc-config"
 [ "${ABI}" != "n32" ] && [ "${ABI}" != "n64" ] && PDEPEND="${PDEPEND}
-	!n32? ( !n64? ( !s390? ( !elibc_uclibc? ( sys-libs/libstdc++-v3 ) ) ) )"
+	!n32? ( !n64? ( !uclibc? ( sys-libs/libstdc++-v3 ) ) )"
 
 
 # <<--------------------SRC_URI variables-------------------->>
@@ -52,7 +53,7 @@ PDEPEND="|| ( app-admin/eselect-compiler sys-devel/gcc-config )"
 # would just make the files unavailable until they get mirrored. All files
 # in SRC_URI will eventually get mirrored and mirrors will be tried before
 # falling back on this location anyways.
-GENTOO_BASE_URI="http://dev.gentoo.org/~lv/GCC/"
+GENTOO_BASE_URI="http://dev.gentoo.org/~lv/"
 
 # Patch tarball support ...
 PATCH_VER="1.1"
@@ -67,7 +68,7 @@ if [ ${PV} != ${PV/_pre/-} ] ; then
 fi
 
 # Branch update support ...
-GCC_RELEASE_VER="${PV}"  # Tarball, etc used ...
+MAIN_BRANCH="${PV}"  # Tarball, etc used ...
 BRANCH_UPDATE=20040803
 
 # PIE support
@@ -87,12 +88,12 @@ elif [ -n "${SNAPSHOT}" ] ; then
 	S="${WORKDIR}/gcc-${SNAPSHOT//-}"
 	SRC_URI="ftp://sources.redhat.com/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT//-}.tar.bz2"
 else
-	S="${WORKDIR}/${PN}-${GCC_RELEASE_VER}"
-	SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${GCC_RELEASE_VER}.tar.bz2"
+	S="${WORKDIR}/${PN}-${MAIN_BRANCH}"
+	SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${MAIN_BRANCH}.tar.bz2"
 	if [ -n "${BRANCH_UPDATE}" ]
 	then
 		SRC_URI="${SRC_URI}
-		         ${GENTOO_BASE_URI}/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2"
+		         ${GENTOO_BASE_URI}/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2"
 	fi
 fi
 
@@ -104,7 +105,6 @@ fi
 if [ -n "${PP_VER}" ]
 then
 	SRC_URI="${SRC_URI}
-		mirror://gentoo/protector-${PP_FVER}.tar.gz
 		http://www.research.ibm.com/trl/projects/security/ssp/gcc${PP_VER}/protector-${PP_FVER}.tar.gz"
 fi
 
@@ -168,26 +168,29 @@ do_filter_flags() {
 [ ! -n "${CCHOST}" ] && export CCHOST="${CHOST}"
 
 LOC="/usr"
-#GCC_BRANCH_VER="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`"
-#GCC_RELEASE_VER="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`"
-GCC_BRANCH_VER="$(get_version_component_range 1-2)"
-GCC_RELEASE_VER="$(get_version_component_range 1-3)"
+MY_PV="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`"
+MY_PV_FULL="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`"
 
 # GCC 3.4 no longer uses gcc-lib. we'll rename this later for compatibility
 # reasons, as a few things would break without gcc-lib.
-LIBPATH="${LOC}/lib/gcc/${CCHOST}/${GCC_RELEASE_VER}"
-BINPATH="${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}"
-DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${GCC_BRANCH_VER}"
+LIBPATH="${LOC}/lib/gcc/${CCHOST}/${MY_PV_FULL}"
+BINPATH="${LOC}/${CCHOST}/gcc-bin/${MY_PV}"
+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="${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}"
+STDCXX_INCDIR="${LIBPATH}/include/g++-v${MY_PV/\.*/}"
 
 # Ok, this is a hairy one again, but lets assume that we
 # are not cross compiling, than we want SLOT to only contain
 # $PV, as people upgrading to new gcc layout will not have
 # their old gcc unmerged ...
 # GCC 3.4 introduces a new version of libstdc++
-SLOT="${GCC_BRANCH_VER}"
+if [ "${CHOST}" == "${CCHOST}" ]
+then
+	SLOT="${MY_PV}"
+else
+	SLOT="${CCHOST}-${MY_PV}"
+fi
 
 has_lib64() {
 	use amd64 && return 0
@@ -201,7 +204,7 @@ chk_gcc_version() {
 	local OLD_GCC_CHOST="$(gcc -v 2>&1 | egrep '^Reading specs' |\
 	                       sed -e 's:^.*/gcc[^/]*/\([^/]*\)/[0-9]\+.*$:\1:')"
 
-	if [ "${OLD_GCC_VERSION}" != "${GCC_RELEASE_VER}" ]
+	if [ "${OLD_GCC_VERSION}" != "${MY_PV_FULL}" ]
 	then
 		echo "${OLD_GCC_VERSION}" > "${WORKDIR}/.oldgccversion"
 	fi
@@ -253,7 +256,7 @@ glibc_have_ssp() {
 		&& local libc_prefix="/lib64/" \
 		|| local libc_prefix="/lib/"
 
-	use elibc_uclibc \
+	use uclibc \
 		&& local libc_file="libc.so.0" \
 		|| local libc_file="libc.so.6"
 
@@ -374,7 +377,7 @@ do_patch_tarball() {
 		# the uclibc patches need autoconf to be run
 		# for build stage we need the updated files though
 		use build || ( cd ${S}/libstdc++-v3; autoconf; cd ${S} )
-		#use build && use elibc_uclibc && ewarn "uclibc in build stage is not supported yet" && exit 1
+		#use build && use uclibc && ewarn "uclibc in build stage is not supported yet" && exit 1
 
 	elif use multilib && [ "${ARCH}" = "amd64" ]
 	then
@@ -398,7 +401,7 @@ do_piessp_patches() {
 		# adds default pie support (rs6000 too) if DEFAULT_PIE[_SSP] is defined
 		epatch ${WORKDIR}/piepatch/def
 		# disable relro/now
-		use elibc_uclibc && epatch ${FILESDIR}/3.3.3/gcc-3.3.3-norelro.patch
+		use uclibc && epatch ${FILESDIR}/3.3.3/gcc-3.3.3-norelro.patch
 	fi
 
 	# non-default SSP support.
@@ -461,7 +464,7 @@ src_unpack() {
 	elif [ -n "${SNAPSHOT}" ] ; then
 		unpack gcc-${SNAPSHOT//-}.tar.bz2
 	else
-		unpack ${PN}-${GCC_RELEASE_VER}.tar.bz2
+		unpack ${PN}-${MAIN_BRANCH}.tar.bz2
 	fi
 
 	if [ -n "${PATCH_VER}" ]
@@ -480,11 +483,13 @@ src_unpack() {
 	fi
 
 	cd ${S}
+	# Fixup libtool to correctly generate .la files with portage
+	elibtoolize --portage --shallow
 
 	# Branch update ...
 	if [ -n "${BRANCH_UPDATE}" ]
 	then
-		epatch ${DISTDIR}/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
+		epatch ${DISTDIR}/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2
 	fi
 
 	do_patch_tarball
@@ -495,7 +500,7 @@ src_unpack() {
 
 	# misc patches that havent made it into a patch tarball yet
 	epatch ${FILESDIR}/3.4.0/gcc34-reiser4-fix.patch
-	epatch ${FILESDIR}/gcc-spec-env.patch
+	epatch ${FILESDIR}/3.4.1/gcc-3.4.1-spec-env.patch
 
 	# MIPS is screwed screwed thing - but it's cool!
 	# I had to add ABI variable, because during bootstrap
@@ -530,9 +535,7 @@ src_unpack() {
 	# 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
 
-	gnuconfig_update
-	# Fixup libtool to correctly generate .la files with portage
-	elibtoolize --portage --shallow
+	use uclibc && gnuconfig_update
 
 	cd ${S}; ./contrib/gcc_update --touch &> /dev/null
 }
@@ -548,7 +551,7 @@ src_compile() {
 	then
 		myconf="${myconf} --enable-shared"
 		gcc_lang="c,c++"
-		use fortran && gcc_lang="${gcc_lang},f77"
+		use f77 && gcc_lang="${gcc_lang},f77"
 		use objc && gcc_lang="${gcc_lang},objc"
 		use gcj && gcc_lang="${gcc_lang},java"
 		# We do NOT want 'ADA support' in here!
@@ -595,7 +598,7 @@ src_compile() {
 	# uclibc uses --enable-clocale=uclibc (autodetected)
 	# --disable-libunwind-exceptions needed till unwind sections get fixed. see ps.m for details
 
-	if ! use elibc_uclibc
+	if ! use uclibc
 	then
 		# it's getting close to a time where we are going to need USE=glibc, uclibc, bsdlibc -solar
 		myconf="${myconf} --enable-__cxa_atexit --enable-clocale=gnu"
@@ -665,6 +668,9 @@ src_compile() {
 		find ${WORKDIR}/build -name '*.[17]' -exec touch {} \; || :
 	fi
 
+	# Setup -j in MAKEOPTS
+	get_number_of_jobs
+
 	einfo "Building GCC..."
 	# Only build it static if we are just building the C frontend, else
 	# a lot of things break because there are not libstdc++.so ....
@@ -736,8 +742,8 @@ src_install() {
 
 	dodir /lib /usr/bin
 	dodir /etc/env.d/gcc
-	echo "PATH=\"${BINPATH}\"" > ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
+	echo "PATH=\"${BINPATH}\"" > ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
 
 	# The LDPATH stuff is kinda iffy now that we need to provide compatibility
 	# with older versions of GCC for binary apps.
@@ -752,14 +758,14 @@ src_install() {
 	then
 		LDPATH="${LDPATH}:${LOC}/lib/gcc-lib/${CCHOST}/${BULIB}"
 	fi
-	echo "LDPATH=\"${LDPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
+	echo "LDPATH=\"${LDPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
 
-	echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
+	echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
 	# Also set CC and CXX
-	echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
+	echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
 
 	# Make sure we do not check glibc for SSP again, as we did already
 	if glibc_have_ssp || \
@@ -818,7 +824,7 @@ src_install() {
 
 		# 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}${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}
+		cd ${D}${LOC}/${CCHOST}/gcc-bin/${MY_PV}
 		[ -f jar ] && mv -f jar gcj-jar
 
 		# Move <cxxabi.h> to compiler-specific directories
@@ -866,7 +872,7 @@ src_install() {
 		cd ${S}/gcc
 		docinto ${CCHOST}/gcc
 		dodoc ChangeLog* FSFChangeLog* LANGUAGES NEWS ONEWS README* SERVICE
-		if use fortran
+		if use f77
 		then
 			cd ${S}/libf2c
 			docinto ${CCHOST}/libf2c
@@ -960,7 +966,7 @@ pkg_postinst() {
 	fi
 	if [ "${ROOT}" = "/" -a "${CHOST}" = "${CCHOST}" ]
 	then
-		gcc-config --use-portage-chost ${CCHOST}-${GCC_RELEASE_VER}
+		gcc-config --use-portage-chost ${CCHOST}-${MY_PV_FULL}
 	fi
 
 	# Update libtool linker scripts to reference new gcc version ...
@@ -975,7 +981,7 @@ pkg_postinst() {
 		then
 			OLD_GCC_VERSION="$(cat "${WORKDIR}/.oldgccversion")"
 		else
-			OLD_GCC_VERSION="${GCC_RELEASE_VER}"
+			OLD_GCC_VERSION="${MY_PV_FULL}"
 		fi
 
 		if [ -f "${WORKDIR}/.oldgccchost" ] && \
diff --git a/sys-devel/gcc/gcc-3.4.3-r1.ebuild b/sys-devel/gcc/gcc-3.4.3-r1.ebuild
index bb11686dab5e..24d853af4e8a 100644
--- a/sys-devel/gcc/gcc-3.4.3-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.4.3-r1.ebuild
@@ -1,29 +1,64 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.3-r1.ebuild,v 1.44 2005/10/16 08:00:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.3-r1.ebuild,v 1.1 2004/11/26 03:18:56 lv Exp $
 
-MAN_VER="3.4.3"
+DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
+HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
+
+LICENSE="GPL-2 LGPL-2.1"
+#KEYWORDS="-* ~amd64 ~mips ~ppc64 ~x86 -hppa ~ppc ~sparc"
+KEYWORDS="-*"
+
+# we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
+# NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
+# .eh_frame ld optimisation and symbol visibility support, but it hasnt been
+# well tested in gentoo on any arch other than amd64!!
+RDEPEND="virtual/libc
+	>=sys-devel/gcc-config-1.3.1
+	>=sys-libs/zlib-1.1.4
+	!sys-devel/hardened-gcc
+	!uclibc? (
+		>=sys-libs/glibc-2.3.3_pre20040420-r1
+		hardened? ( >=sys-libs/glibc-2.3.3_pre20040529 )
+	)
+	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-1.1 ) )
+	!build? (
+		gcj? (
+			gtk? ( >=x11-libs/gtk+-2.2 )
+			>=media-libs/libart_lgpl-2.1
+		)
+		>=sys-libs/ncurses-5.2-r2
+		nls? ( sys-devel/gettext )
+	)"
+DEPEND="${RDEPEND}
+	>=sys-apps/texinfo-4.2-r4
+	>=sys-devel/bison-1.875
+	>=sys-devel/binutils-2.14.90.0.8-r1
+	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
+PDEPEND="sys-devel/gcc-config
+	!nocxx? ( !mips? ( !uclibc? ( !build? ( sys-libs/libstdc++-v3 ) ) ) )"
+
+
+GENTOO_TOOLCHAIN_BASE_URI="http://dev.gentoo.org/~lv/GCC/"
+#GCC_MANPAGE_VERSION="none"
 BRANCH_UPDATE="20041125"
-PATCH_VER="1.7"
-UCLIBC_VER="1.1"
-PIE_VER="8.7.7"
+PATCH_VER="1.1"
+PIE_VER="8.7.6.7"
 PIE_CORE="gcc-3.4.3-piepatches-v${PIE_VER}.tar.bz2"
 PP_VER="3_4_3"
 PP_FVER="${PP_VER//_/.}-0"
 HTB_VER="1.00"
-HTB_EXCLUSIVE="true"
+HTB_GCC_VER="3.4.2"
 
-GCC_LIBSSP_SUPPORT="true"
+# nothing in the tree supports libssp
+#GCC_LIBSSP_SUPPORT="true"
 
 ETYPE="gcc-compiler"
 
-# Punt redhat patch #87631
-GENTOO_PATCH_EXCLUDE="08_all_gcc34-chk.patch"
-
 # arch/libc configurations known to be stable with {PIE,SSP}-by-default
-SSP_STABLE="x86 sparc amd64 ppc ppc64"
-SSP_UCLIBC_STABLE="arm mips ppc x86"
-PIE_GLIBC_STABLE="x86 sparc amd64 ppc ppc64"
+SSP_STABLE="x86 sparc amd64"
+SSP_UCLIBC_STABLE=""
+PIE_GLIBC_STABLE="x86 sparc amd64"
 PIE_UCLIBC_STABLE="x86 mips ppc"
 
 # arch/libc configurations known to be broken with {PIE,SSP}-by-default
@@ -34,120 +69,406 @@ PIE_GLIBC_UNSUPPORTED="hppa"
 
 # whether we should split out specs files for multiple {PIE,SSP}-by-default
 # and vanilla configurations.
-SPLIT_SPECS=${SPLIT_SPECS:-true}
+SPLIT_SPECS="${SPLIT_SPECS:="true"}"
 
 #GENTOO_PATCH_EXCLUDE=""
 #PIEPATCH_EXCLUDE=""
 
-inherit toolchain eutils
+inherit eutils flag-o-matic libtool gnuconfig toolchain
 
-DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
+gcc_do_filter_flags() {
+	strip-flags
 
-KEYWORDS="-* amd64 mips ppc64 ~x86 -hppa ppc ~sparc -ia64"
+	# 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
 
-# we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
-# NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
-# .eh_frame ld optimisation and symbol visibility support, but it hasnt been
-# well tested in gentoo on any arch other than amd64!!
-RDEPEND="virtual/libc
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.6-r4 )
-	>=sys-libs/zlib-1.1.4
-	!sys-devel/hardened-gcc
-	!elibc_uclibc? (
-		>=sys-libs/glibc-2.3.3_pre20040420-r1
-		hardened? ( >=sys-libs/glibc-2.3.3_pre20040529 )
-	)
-	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-1.1 ) )
-	!build? (
-		gcj? (
-			gtk? ( >=x11-libs/gtk+-2.2 )
-			>=media-libs/libart_lgpl-2.1
-		)
-		>=sys-libs/ncurses-5.2-r2
-		nls? ( sys-devel/gettext )
-	)"
+	# -mcpu is deprecated on these archs, and possibly others
+	if use amd64 || use x86 ; then
+		setting="`get-flag mcpu`"
+		[ ! -z "${setting}" ] && \
+			replace-flags -mcpu="${setting}" -mtune="${setting}" && \
+			ewarn "-mcpu is deprecated on your arch\a\a\a" && \
+			epause 5
+	fi
 
-if [[ ${CATEGORY/cross-} != ${CATEGORY} ]]; then
-	RDEPEND="${RDEPEND} ${CATEGORY}/binutils"
-fi
+	strip-unsupported-flags
 
-DEPEND="${RDEPEND}
-	>=sys-apps/texinfo-4.2-r4
-	>=sys-devel/bison-1.875
-	>=sys-devel/binutils-2.14.90.0.8-r1
-	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
-PDEPEND="|| ( app-admin/eselect-compiler sys-devel/gcc-config )
-	!nocxx? ( !mips? ( !ia64? ( !elibc_uclibc? ( !build? ( sys-libs/libstdc++-v3 ) ) ) ) )"
+	# If we use multilib on mips, we shouldn't pass -mabi flag - it breaks
+	# build of non-default-abi libraries.
+	use mips && use multilib && filter-flags "-mabi*"
+
+	# Compile problems with these (bug #6641 among others)...
+	#filter-flags "-fno-exceptions -fomit-frame-pointer -fforce-addr"
+
+	export GCJFLAGS="${CFLAGS}"
+}
+
+
+chk_gcc_version() {
+	mkdir -p "${WORKDIR}"
+
+	# This next bit is for updating libtool linker scripts ...
+	local OLD_GCC_VERSION="`gcc -dumpversion`"
+	local OLD_GCC_CHOST="$(gcc -v 2>&1 | egrep '^Reading specs' |\
+	                       sed -e 's:^.*/gcc[^/]*/\([^/]*\)/[0-9]\+.*$:\1:')"
+
+	if [ "${OLD_GCC_VERSION}" != "${MY_PV_FULL}" ]
+	then
+		echo "${OLD_GCC_VERSION}" > "${WORKDIR}/.oldgccversion"
+	fi
+
+	if [ -n "${OLD_GCC_CHOST}" ]
+	then
+		if [ "${CHOST}" = "${CTARGET}" -a "${OLD_GCC_CHOST}" != "${CHOST}" ]
+		then
+			echo "${OLD_GCC_CHOST}" > "${WORKDIR}/.oldgccchost"
+		fi
+	fi
+
+	# Did we check the version ?
+	touch "${WORKDIR}/.chkgccversion"
+}
 
 src_unpack() {
+	# if sandbox is enabled, and multilib is enabled, but we dont have a 32bit
+	# sandbox... installing gcc will fail as soon as it starts configuring the
+	# 32bit libstdc++. not fun.
+	if use amd64 && use multilib && hasq sandbox $FEATURES && [ ! -e /lib32/libsandbox.so ] ; then
+		eerror "You need a 32bit sandbox to install 32bit code with sandbox"
+		eerror "enabled. Either add FEATURES=-sandbox or disable multilib."
+		eerror "After installing a multilib gcc, you can re-emerge portage"
+		eerror "to get a 32bit sandbox, and this problem will go away."
+		ebeep
+		die "no 32bit sandbox"
+	fi
+
 	gcc_src_unpack
 
 	# bah
 	sed -e 's/3\.4\.4/3.4.3/' -i ${S}/gcc/version.c
 
 	# misc patches that havent made it into a patch tarball yet
-	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
 	epatch ${FILESDIR}/3.4.0/gcc34-reiser4-fix.patch
+	epatch ${FILESDIR}/gcc-spec-env.patch
 	epatch ${FILESDIR}/3.4.2/810-arm-bigendian-uclibc.patch
 
-	# nothing in the tree provides libssp.so, so nothing will ever trigger this
-	# logic, but having the patch in the tree makes life so much easier for me
-	# since I dont have to also have an overlay for this.
-	want_libssp && epatch ${FILESDIR}/3.4.3/libssp.patch
+	# If mips, and we DON'T want multilib, then rig gcc to only use n32 OR n64
+	if use mips && use !multilib; then
+		use n32 && epatch ${FILESDIR}/3.4.1/gcc-3.4.1-mips-n32only.patch
+		use n64 && epatch ${FILESDIR}/3.4.1/gcc-3.4.1-mips-n64only.patch
+	fi
 
-	# Anything useful and objc will require libffi. Seriously. Lets just force
-	# libffi to install with USE="objc", even though it normally only installs
-	# if you attempt to build gcj.
-	if use !build && use objc && ! use gcj ; then
-		epatch ${FILESDIR}/3.4.3/libffi-without-libgcj.patch
-		#epatch ${FILESDIR}/3.4.3/libffi-nogcj-lib-path-fix.patch
+	# Patch forward-ported from a gcc-3.0.x patch that adds -march=r10000 and
+	# -mtune=r10000 support to gcc (Allows the compiler to generate code to
+	# take advantage of R10k's second ALU, perform shifts, etc..
+	# Needs re-porting for DFA in gcc-4.0
+	if use mips; then
+		epatch ${FILESDIR}/3.4.2/gcc-3.4.x-mips-add-march-r10k.patch
 	fi
 
 	# hack around some ugly 32bit sse2 wrong-code bugs
 	epatch ${FILESDIR}/3.4.2/gcc34-m32-no-sse2.patch
 	epatch ${FILESDIR}/3.4.2/gcc34-fix-sse2_pinsrw.patch
 
-	# Fix cross-compiling
-	epatch ${FILESDIR}/3.4.3/gcc-3.4.3-cross-compile.patch
+	if use amd64 && use multilib ; then
+		# this should hack around the GCC_NO_EXECUTABLES bug
+		epatch ${FILESDIR}/3.4.1/gcc-3.4.1-glibc-is-native.patch
+		cd ${S}/libstdc++-v3
+		einfo "running autoreconf..."
+		autoreconf 2> /dev/null
+		cd ${S}
+	fi
+}
+
+
+src_install() {
+	local x=
+
+	# Do allow symlinks in ${LOC}/lib/gcc-lib/${CHOST}/${PV}/include as
+	# this can break the build.
+	for x in ${WORKDIR}/build/gcc/include/*
+	do
+		if [ -L ${x} ]
+		then
+			rm -f ${x}
+			continue
+		fi
+	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
+		if grep -q 'It has been auto-edited by fixincludes from' ${x}
+		then
+			rm -f ${x}
+		fi
+	done
+
+	einfo "Installing GCC..."
+	# Do the 'make install' from the build directory
+	cd ${WORKDIR}/build
+	S="${WORKDIR}/build" \
+	make DESTDIR="${D}" install || die
+
+	if [ "${CHOST}" == "${CTARGET}" ] ; then
+		[ -r ${D}${BINPATH}/gcc ] || die "gcc not found in ${D}"
+	fi
+
+	dodir /lib /usr/bin
+	dodir /etc/env.d/gcc
+	create_gcc_env_entry
 
-	# Arch stuff
-	case $(tc-arch ${CTARGET}) in
-		mips)
-			# If mips, and we DON'T want multilib, then rig gcc to only use n32 OR n64
-			if ! is_multilib; then
-				use n32 && epatch ${FILESDIR}/3.4.1/gcc-3.4.1-mips-n32only.patch
-				use n64 && epatch ${FILESDIR}/3.4.1/gcc-3.4.1-mips-n64only.patch
+	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
+
+		cp ${WORKDIR}/build/*.specs ${D}/${LIBPATH}
+	fi
+
+	# Make sure we dont have stuff lying around that
+	# can nuke multiple versions of gcc
+	if ! use build
+	then
+		cd ${D}${LIBPATH}
+
+		# Tell libtool files where real libraries are
+		for x in ${D}${LOC}/lib/*.la ${D}${LIBPATH}/../*.la
+		do
+			if [ -f "${x}" ]
+			then
+				sed -i -e "s:/usr/lib:${LIBPATH}:" ${x}
+				mv ${x} ${D}${LIBPATH}
 			fi
+		done
+
+		# Move all the libraries to version specific libdir.
+		for x in ${D}${PREFIX}/lib/*.{so,a}* ${D}${LIBPATH}/../*.{so,a}*
+		do
+			[ -f "${x}" -o -L "${x}" ] && mv -f ${x} ${D}${LIBPATH}
+		done
+
+		# 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
 
-			# Patch forward-ported from a gcc-3.0.x patch that adds -march=r10000 and
-			# -mtune=r10000 support to gcc (Allows the compiler to generate code to
-			# take advantage of R10k's second ALU, perform shifts, etc..
-			#
-			# Needs re-porting to DFA in gcc-4.0 - Any Volunteers? :)
-			epatch ${FILESDIR}/3.4.2/gcc-3.4.x-mips-add-march-r10k.patch
-
-			# This is a very special patch -- it allows us to build semi-usable kernels
-			# on SGI IP28 (Indigo2 Impact R10000) systems.  The patch is henceforth
-			# regarded as a kludge by upstream, and thus, it will never get accepted upstream,
-			# but for our purposes of building a kernel, it works.
-			# Unless you're building an IP28 kernel, you really don't need care about what
-			# this patch does, because if you are, you are probably already aware of what
-			# it does.
-			# All that said, the abilities of this patch are disabled by default and need
-			# to be enabled by passing -mip28-cache-barrier.  Only used to build kernels, 
-			# There is the possibility it may be used for very specific userland apps too.
-			if use ip28; then
-				epatch ${FILESDIR}/3.4.2/gcc-3.4.2-mips-ip28_cache_barriers-v2.patch
+		# 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/${MY_PV_FULL}
+		[ -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
+		cd ${D}${BINPATH}
+		for x in gcc g++ c++ g77 gcj
+		do
+			if [ "${CHOST}" == "${CTARGET}" ] && [ -f "${CTARGET}-${x}" ]
+			then
+				[ ! -f "${x}" ] && mv "${CTARGET}-${x}" "${x}"
+				ln -sf ${x} ${CTARGET}-${x}
 			fi
-			;;
-		amd64)
-			if is_multilib; then
-				epatch ${FILESDIR}/3.4.1/gcc-3.4.1-glibc-is-native.patch
-				cd ${S}/libstdc++-v3
-				einfo "running autoreconf..."
-				autoreconf 2> /dev/null
-				cd ${S}
+
+			if [ -f "${CTARGET}-${x}-${PV}" ]
+			then
+				rm -f ${CTARGET}-${x}-${PV}
+				ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${PV}
 			fi
-			;;
-	esac
+		done
+	fi
+
+	# This one comes with binutils
+	rm -f ${D}${PREFIX}/lib/libiberty.a
+	rm -f ${D}${LIBPATH}/libiberty.a
+
+	[ -e ${D}/${PREFIX}/lib/32 ] && rm -rf ${D}/${PREFIX}/lib/32
+
+	cd ${S}
+	if ! use build && [ "${CHOST}" == "${CTARGET}" ] ; then
+		cd ${S}
+		docinto ${CTARGET}
+		dodoc ChangeLog* FAQ MAINTAINERS README
+		docinto ${CTARGET}/html
+		dohtml *.html
+		cd ${S}/boehm-gc
+		docinto ${CTARGET}/boehm-gc
+		dodoc ChangeLog doc/{README*,barrett_diagram}
+		docinto ${CTARGET}/boehm-gc/html
+		dohtml doc/*.html
+		cd ${S}/gcc
+		docinto ${CTARGET}/gcc
+		dodoc ChangeLog* FSFChangeLog* LANGUAGES NEWS ONEWS README* SERVICE
+		if use fortran ; then
+			cd ${S}/libf2c
+			docinto ${CTARGET}/libf2c
+			dodoc ChangeLog* README TODO *.netlib
+		fi
+		cd ${S}/libffi
+		docinto ${CTARGET}/libffi
+		dodoc ChangeLog* README
+		cd ${S}/libiberty
+		docinto ${CTARGET}/libiberty
+		dodoc ChangeLog* README
+		if use objc
+		then
+			cd ${S}/libobjc
+			docinto ${CTARGET}/libobjc
+			dodoc ChangeLog* README* THREADS*
+		fi
+		cd ${S}/libstdc++-v3
+		docinto ${CTARGET}/libstdc++-v3
+		dodoc ChangeLog* README
+		docinto ${CTARGET}/libstdc++-v3/html
+		dohtml -r -a css,diff,html,txt,xml docs/html/*
+		cp -f docs/html/17_intro/[A-Z]* \
+			${D}/usr/share/doc/${PF}/${DOCDESTTREE}/17_intro/
+
+		if use gcj
+		then
+			cd ${S}/fastjar
+			docinto ${CTARGET}/fastjar
+			dodoc AUTHORS CHANGES ChangeLog* NEWS README
+			cd ${S}/libjava
+			docinto ${CTARGET}/libjava
+			dodoc ChangeLog* HACKING NEWS README THANKS
+		fi
+
+		prepman ${DATAPATH}
+		prepinfo ${DATAPATH}
+	else
+		rm -rf ${D}/usr/share/{man,info}
+		rm -rf ${D}${DATAPATH}/{man,info}
+	fi
+
+	# Rather install the script, else portage with changing $FILESDIR
+	# between binary and source package borks things ....
+	if [ "${CHOST}" == "${CTARGET}" ] ; then
+		insinto /lib/rcscripts/awk
+		doins ${FILESDIR}/awk/fixlafiles.awk
+		exeinto /sbin
+		doexe ${FILESDIR}/fix_libtool_files.sh
+	fi
+
+	# we dont want these in freaky non-versioned paths that dont ever get used
+	fix_freaky_non_versioned_library_paths_that_dont_ever_get_used 32
+	fix_freaky_non_versioned_library_paths_that_dont_ever_get_used 64
+	# and mips is just freaky in general ;p
+	fix_freaky_non_versioned_library_paths_that_dont_ever_get_used o32
+	# and finally, the non-bitdepth-or-ABI-specific freaky path
+	if [ -d ${D}/${LIBPATH}/../lib ] ; then
+		mv ${D}/${LIBPATH}/../lib/* ${D}/${LIBPATH}/
+		rm -rf ${D}/${LIBPATH}/../lib
+	fi
+}
+
+fix_freaky_non_versioned_library_paths_that_dont_ever_get_used() {
+	# first the multilib case
+	if [ -d ${D}/${LIBPATH}/../$1 -a -d ${D}/${LIBPATH}/$1 ] ; then
+		mv ${D}/${LIBPATH}/../$1/* ${D}/${LIBPATH}/$1/
+		rm -rf ${D}/${LIBPATH}/../$1
+	fi
+	if [ -d ${D}/${LIBPATH}/../lib$1 -a -d ${D}/${LIBPATH}/$1 ] ; then
+		mv ${D}/${LIBPATH}/../lib$1/* ${D}/${LIBPATH}/$1/
+		rm -rf ${D}/${LIBPATH}/../lib$1
+	fi
+	# and now to fix up the non-multilib case
+	if [ -d ${D}/${LIBPATH}/../$1 -a ! -d ${D}/${LIBPATH}/$1 ] ; then
+		mv ${D}/${LIBPATH}/../$1/* ${D}/${LIBPATH}/
+		rm -rf ${D}/${LIBPATH}/../$1
+	fi
+	if [ -d ${D}/${LIBPATH}/../lib$1 -a ! -d ${D}/${LIBPATH}/$1 ] ; then
+		mv ${D}/${LIBPATH}/../lib$1/* ${D}/${LIBPATH}/
+		rm -rf ${D}/${LIBPATH}/../lib$1
+	fi
 }
+
+
+pkg_preinst() {
+
+	if [ ! -f "${WORKDIR}/.chkgccversion" ]
+	then
+		mkdir -p ${WORKDIR}
+		chk_gcc_version
+	fi
+
+	# Make again sure that the linker "should" be able to locate
+	# libstdc++.so ...
+	if use multilib && [ "${ARCH}" = "amd64" ]
+	then
+		# Can't always find libgcc_s.so.1, make it find it
+		export LD_LIBRARY_PATH="${LIBPATH}:${LIBPATH}/../lib64:${LIBPATH}/../lib32:${LD_LIBRARY_PATH}"
+	else
+		export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}"
+	fi
+	${ROOT}/sbin/ldconfig
+}
+
+pkg_postinst() {
+
+	if use multilib && [ "${ARCH}" = "amd64" ]
+	then
+		# Can't always find libgcc_s.so.1, make it find it
+		export LD_LIBRARY_PATH="${LIBPATH}:${LIBPATH}/../lib64:${LIBPATH}/../lib32:${LD_LIBRARY_PATH}"
+	else
+		export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}"
+	fi
+
+	should_we_gcc_config && do_gcc_config
+
+	# Update libtool linker scripts to reference new gcc version ...
+	if [ "${ROOT}" = "/" ] && \
+	   [ -f "${WORKDIR}/.oldgccversion" -o -f "${WORKDIR}/.oldgccchost" ]
+	then
+		local OLD_GCC_VERSION=
+		local OLD_GCC_CHOST=
+
+		if [ -f "${WORKDIR}/.oldgccversion" ] && \
+		   [ -n "$(cat "${WORKDIR}/.oldgccversion")" ]
+		then
+			OLD_GCC_VERSION="$(cat "${WORKDIR}/.oldgccversion")"
+		else
+			OLD_GCC_VERSION="${MY_PV_FULL}"
+		fi
+
+		if [ -f "${WORKDIR}/.oldgccchost" ] && \
+		   [ -n "$(cat "${WORKDIR}/.oldgccchost")" ]
+		then
+			OLD_GCC_CHOST="--oldarch $(cat "${WORKDIR}/.oldgccchost")"
+		fi
+
+		/sbin/fix_libtool_files.sh ${OLD_GCC_VERSION} ${OLD_GCC_CHOST}
+	fi
+}
+
diff --git a/sys-devel/gcc/gcc-3.4.3.20050110-r2.ebuild b/sys-devel/gcc/gcc-3.4.3.20050110-r2.ebuild
index 426b7761de9d..01c9becf9e20 100644
--- a/sys-devel/gcc/gcc-3.4.3.20050110-r2.ebuild
+++ b/sys-devel/gcc/gcc-3.4.3.20050110-r2.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/sys-devel/gcc/gcc-3.4.3.20050110-r2.ebuild,v 1.12 2005/10/16 08:00:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.3.20050110-r2.ebuild,v 1.1 2005/04/08 02:52:07 vapier Exp $
 
 MAN_VER="3.4.3"
-PATCH_VER="2.0"
-UCLIBC_VER="1.1"
+PATCH_VER="1.3"
+UCLIBC_VER="1.0"
 PIE_VER="8.7.7"
 PIE_CORE="gcc-3.4.3-piepatches-v${PIE_VER}.tar.bz2"
 PP_VER="3.4.3.20050110"
 PP_FVER="${PP_VER//_/.}-0"
 HTB_VER="1.00"
-HTB_EXCLUSIVE="true"
+HTB_GCC_VER="3.4.2"
 
 GCC_LIBSSP_SUPPORT="true"
 
 ETYPE="gcc-compiler"
 
-# Punt redhat patch #87631
-GENTOO_PATCH_EXCLUDE="08_all_gcc34-chk.patch"
-
 # arch/libc configurations known to be stable with {PIE,SSP}-by-default
 SSP_STABLE="x86 sparc amd64 ppc ppc64"
 SSP_UCLIBC_STABLE="arm mips ppc x86"
@@ -42,16 +39,20 @@ inherit toolchain eutils
 
 DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
 
-KEYWORDS="-* ~amd64 -hppa ~ia64 mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="-* ~amd64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 # we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
 # NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
 # .eh_frame ld optimisation and symbol visibility support, but it hasnt been
 # well tested in gentoo on any arch other than amd64!!
 RDEPEND="virtual/libc
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.10 )
+	>=sys-devel/gcc-config-1.3.10
 	>=sys-libs/zlib-1.1.4
 	!sys-devel/hardened-gcc
+	!uclibc? (
+		>=sys-libs/glibc-2.3.3_pre20040420-r1
+		hardened? ( >=sys-libs/glibc-2.3.3_pre20040529 )
+	)
 	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-1.1 ) )
 	!build? (
 		gcj? (
@@ -71,8 +72,8 @@ DEPEND="${RDEPEND}
 	>=sys-devel/bison-1.875
 	>=sys-devel/binutils-2.14.90.0.8-r1
 	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
-PDEPEND="|| ( app-admin/eselect-compiler sys-devel/gcc-config )
-	!nocxx? ( !mips? ( !ia64? ( !elibc_uclibc? ( !build? ( sys-libs/libstdc++-v3 ) ) ) ) )"
+PDEPEND="sys-devel/gcc-config
+	!nocxx? ( !mips? ( !ia64? ( !uclibc? ( !build? ( sys-libs/libstdc++-v3 ) ) ) ) )"
 
 src_unpack() {
 	gcc_src_unpack
@@ -81,7 +82,7 @@ src_unpack() {
 	sed -e 's/3\.4\.4/3.4.3/' -i ${S}/gcc/version.c
 
 	# misc patches that havent made it into a patch tarball yet
-	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
+	epatch ${FILESDIR}/gcc-spec-env.patch
 
 	# nothing in the tree provides libssp.so, so nothing will ever trigger this
 	# logic, but having the patch in the tree makes life so much easier for me
@@ -130,7 +131,7 @@ src_unpack() {
 			# to be enabled by passing -mip28-cache-barrier.  Only used to build kernels, 
 			# There is the possibility it may be used for very specific userland apps too.
 			if use ip28; then
-				epatch ${FILESDIR}/3.4.2/gcc-3.4.2-mips-ip28_cache_barriers-v2.patch
+				epatch ${FILESDIR}/3.4.2/gcc-3.4.2-mips-ip28_cache_barriers.patch
 			fi
 			;;
 		amd64)
diff --git a/sys-devel/gcc/gcc-3.4.4-r1.ebuild b/sys-devel/gcc/gcc-3.4.4-r1.ebuild
index 31f40519ff89..0c497a043a82 100644
--- a/sys-devel/gcc/gcc-3.4.4-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.4.4-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-devel/gcc/gcc-3.4.4-r1.ebuild,v 1.8 2005/11/29 03:04:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.4-r1.ebuild,v 1.1 2005/08/27 04:29:54 vapier Exp $
 
 MAN_VER=""
-PATCH_VER="1.7"
-UCLIBC_VER="1.2"
+PATCH_VER="1.5"
+UCLIBC_VER="1.1"
 PIE_VER="8.7.8"
 PP_VER="1.0"
 HTB_VER="1.00"
@@ -40,13 +40,13 @@ inherit toolchain eutils
 DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
 
 # Stuff to test before adding ~arch
-KEYWORDS="-* alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sh ~sparc ~x86"
+KEYWORDS="-* ~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86"
 
 # we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
 # NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
 # .eh_frame ld optimisation and symbol visibility support, but it hasnt been
 # well tested in gentoo on any arch other than amd64!!
-RDEPEND="|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.10 )
+RDEPEND=">=sys-devel/gcc-config-1.3.10
 	>=sys-libs/zlib-1.1.4
 	!sys-devel/hardened-gcc
 	elibc_glibc? (
@@ -56,10 +56,7 @@ RDEPEND="|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.10 )
 	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-1.1 ) )
 	!build? (
 		gcj? (
-			gtk? (
-				|| ( ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto ) virtual/x11 )
-				>=x11-libs/gtk+-2.2
-			)
+			gtk? ( >=x11-libs/gtk+-2.2 )
 			>=media-libs/libart_lgpl-2.1
 		)
 		>=sys-libs/ncurses-5.2-r2
@@ -75,7 +72,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/bison-1.875
 	>=sys-devel/binutils-2.14.90.0.8-r1
 	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
-PDEPEND="|| ( app-admin/eselect-compiler sys-devel/gcc-config )
+PDEPEND="sys-devel/gcc-config
 	x86? ( !nocxx? ( !elibc_uclibc? ( !build? ( || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* ) ) ) ) )"
 
 src_unpack() {
diff --git a/sys-devel/gcc/gcc-4.0.1.ebuild b/sys-devel/gcc/gcc-4.0.1.ebuild
index aa1671be652d..96a4eb5e00be 100644
--- a/sys-devel/gcc/gcc-4.0.1.ebuild
+++ b/sys-devel/gcc/gcc-4.0.1.ebuild
@@ -1,22 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.1.ebuild,v 1.10 2005/11/21 01:12:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.1.ebuild,v 1.1 2005/07/08 19:07:22 eradicator Exp $
 
 PATCH_VER="1.0"
-PATCH_GCC_VER="4.0.1"
-UCLIBC_VER="1.0"
-UCLIBC_GCC_VER="4.0.0"
-PIE_VER="8.7.8"
-PIE_GCC_VER="4.0.0"
-PP_VER=""
-HTB_VER="1.00"
-
+PATCH_GCC_VER=4.0.1_pre20050616
 ETYPE="gcc-compiler"
 
-# whether we should split out specs files for multiple {PIE,SSP}-by-default
-# and vanilla configurations.
-SPLIT_SPECS=no #${SPLIT_SPECS-true} hard disable until #106690 is fixed
-
 inherit toolchain
 
 DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
@@ -25,14 +14,13 @@ HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
 LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS="-*"
 
-RDEPEND="!sys-devel/hardened-gcc
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.10 )
+RDEPEND="virtual/libc
+	>=sys-devel/gcc-config-1.3.1
 	>=sys-libs/zlib-1.1.4
+	!sys-devel/hardened-gcc
+	elibc_glibc? ( >=sys-libs/glibc-2.3.5 )
 	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-1.1 ) )
-	fortran? (
-	  dev-libs/gmp
-	  dev-libs/mpfr
-	)
+	fortran? ( dev-libs/gmp )
 	!build? (
 		gcj? (
 			gtk? ( >=x11-libs/gtk+-2.2 )
@@ -41,16 +29,19 @@ RDEPEND="!sys-devel/hardened-gcc
 		>=sys-libs/ncurses-5.2-r2
 		nls? ( sys-devel/gettext )
 	)"
-if [[ ${CATEGORY} != cross-* ]] ; then
-	RDEPEND="${RDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.3.6 )"
+
+
+if [[ ${CATEGORY/cross-} != ${CATEGORY} ]]; then
+	RDEPEND="${RDEPEND} ${CATEGORY}/binutils"
 fi
+
 DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
-	>=${CATEGORY}/binutils-2.16.1"
+	>=sys-devel/binutils-2.15.97"
 
-PDEPEND="|| ( app-admin/eselect-compiler sys-devel/gcc-config )
-	x86? ( !nocxx? ( !elibc_uclibc? ( !build? ( || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* ) ) ) ) )"
+PDEPEND="sys-devel/gcc-config
+	!nocxx? ( !n32? ( !n64? ( !elibc_uclibc? ( !build? ( sys-libs/libstdc++-v3 ) ) ) ) )"
 
 pkg_postinst() {
 	toolchain_pkg_postinst
diff --git a/sys-devel/gcc/gcc-4.0.2-r1.ebuild b/sys-devel/gcc/gcc-4.0.2-r1.ebuild
index 201e83a9dbd1..42961063e669 100644
--- a/sys-devel/gcc/gcc-4.0.2-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.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-devel/gcc/gcc-4.0.2-r1.ebuild,v 1.12 2005/11/29 03:04:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.2-r1.ebuild,v 1.1 2005/10/04 19:43:04 halcy0n Exp $
 
 PATCH_VER="1.2"
 PATCH_GCC_VER="4.0.2"
@@ -10,16 +10,13 @@ PIE_VER="8.7.8"
 PIE_GCC_VER="4.0.0"
 PP_VER=""
 HTB_VER="1.00"
+HTB_GCC_VER="4.0.1"
 
 ETYPE="gcc-compiler"
 
 # whether we should split out specs files for multiple {PIE,SSP}-by-default
 # and vanilla configurations.
-SPLIT_SPECS=no #${SPLIT_SPECS-true} hard disable until #106690 is fixed
-
-# this patch is broken and causes ICEs in a few packages.  I'll remove it on the
-# next revbump
-GENTOO_PATCH_EXCLUDE="28_all_gcc4-pr19520.patch"
+SPLIT_SPECS=${SPLIT_SPECS-true}
 
 inherit toolchain
 
@@ -29,43 +26,39 @@ HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
 LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS="-*"
 
-RDEPEND="!sys-devel/hardened-gcc
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.10 )
+RDEPEND="virtual/libc
+	>=sys-devel/gcc-config-1.3.1
 	>=sys-libs/zlib-1.1.4
+	!sys-devel/hardened-gcc
+	elibc_glibc? ( >=sys-libs/glibc-2.3.5 )
 	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-1.1 ) )
-	fortran? (
-	  dev-libs/gmp
-	  dev-libs/mpfr
-	)
+	fortran? ( dev-libs/gmp )
 	!build? (
 		gcj? (
-			gtk? (
-				|| ( ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto ) virtual/x11 )
-				>=x11-libs/gtk+-2.2
-			)
+			gtk? ( >=x11-libs/gtk+-2.2 )
 			>=media-libs/libart_lgpl-2.1
 		)
 		>=sys-libs/ncurses-5.2-r2
 		nls? ( sys-devel/gettext )
 	)"
-if [[ ${CATEGORY} != cross-* ]] ; then
-	RDEPEND="${RDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.3.6 )"
+
+
+if [[ ${CATEGORY/cross-} != ${CATEGORY} ]]; then
+	RDEPEND="${RDEPEND} ${CATEGORY}/binutils"
 fi
+
 DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
-	>=${CATEGORY}/binutils-2.16.1"
+	>=sys-devel/binutils-2.15.97"
 
-PDEPEND="|| ( app-admin/eselect-compiler sys-devel/gcc-config )
+PDEPEND="sys-devel/gcc-config
 	x86? ( !nocxx? ( !elibc_uclibc? ( !build? ( || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* ) ) ) ) )"
 
 src_unpack() {
 	gcc_src_unpack
 
 	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
-
-	# Fix cross-compiling
-	epatch "${FILESDIR}"/4.0.2/gcc-4.0.2-cross-compile.patch
 }
 
 pkg_postinst() {
diff --git a/sys-devel/gcc/gcc-4.1.0_beta20051125.ebuild b/sys-devel/gcc/gcc-4.1.0_beta20051112.ebuild
index 362e57966ff3..f2884bfe5405 100644
--- a/sys-devel/gcc/gcc-4.1.0_beta20051125.ebuild
+++ b/sys-devel/gcc/gcc-4.1.0_beta20051112.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.0_beta20051125.ebuild,v 1.2 2005/11/29 03:04:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.0_beta20051112.ebuild,v 1.1 2005/11/12 20:15:21 halcy0n Exp $
 
 ETYPE="gcc-compiler"
 
@@ -12,9 +12,11 @@ HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
 LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS="-*"
 
-RDEPEND="!sys-devel/hardened-gcc
+RDEPEND="virtual/libc
 	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.10 )
 	>=sys-libs/zlib-1.1.4
+	!sys-devel/hardened-gcc
+	elibc_glibc? ( >=sys-libs/glibc-2.3.5 )
 	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-1.1 ) )
 	fortran? (
 	  dev-libs/gmp
@@ -22,22 +24,22 @@ RDEPEND="!sys-devel/hardened-gcc
 	)
 	!build? (
 		gcj? (
-			gtk? (
-				|| ( ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto ) virtual/x11 )
-				>=x11-libs/gtk+-2.2
-			)
+			gtk? ( >=x11-libs/gtk+-2.2 )
 			>=media-libs/libart_lgpl-2.1
 		)
 		>=sys-libs/ncurses-5.2-r2
 		nls? ( sys-devel/gettext )
 	)"
-if [[ ${CATEGORY} != cross-* ]] ; then
-	RDEPEND="${RDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.3.6 )"
+
+
+if [[ ${CATEGORY/cross-} != ${CATEGORY} ]]; then
+	RDEPEND="${RDEPEND} ${CATEGORY}/binutils"
 fi
+
 DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
-	>=${CATEGORY}/binutils-2.16.1"
+	>=sys-devel/binutils-2.15.97"
 
 PDEPEND="|| ( app-admin/eselect-compiler sys-devel/gcc-config )
 	x86? ( !nocxx? ( !elibc_uclibc? ( !build? ( || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* ) ) ) ) )"
@@ -50,7 +52,6 @@ pkg_setup() {
 
 src_unpack() {
 	toolchain_src_unpack
-	epatch "${FILESDIR}"/4.1.0/gcc-4.1.0-pr22313.patch
 
 	echo ${PV/_/-} > "${S}"/gcc/BASE-VER
 	echo "" > "${S}"/gcc/DATESTAMP
diff --git a/sys-devel/gcc/metadata.xml b/sys-devel/gcc/metadata.xml
index fb4199eb7afe..94f3e3c59fe2 100644
--- a/sys-devel/gcc/metadata.xml
+++ b/sys-devel/gcc/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>toolchain</herd>
+<herd>gcc-porting</herd>
+<maintainer>
+<email>gcc-porting@gentoo.org</email>
+<name>GCC Porting Team</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-devel/gdb/ChangeLog b/sys-devel/gdb/ChangeLog
index c88930def320..3b2a9be4a4de 100644
--- a/sys-devel/gdb/ChangeLog
+++ b/sys-devel/gdb/ChangeLog
@@ -1,325 +1,6 @@
 # ChangeLog for sys-devel/gdb
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.79 2005/07/16 11:01:20 kugelfang Exp $
-
-  16 Jul 2005; Danny van Dyk <kugelfang@gentoo.org> gdb-6.3-r4.ebuild:
-  Marked s390.
-
-*gdb-6.3-r4 (09 Jul 2005)
-
-  09 Jul 2005; Mike Frysinger <vapier@gentoo.org> +gdb-6.3-r4.ebuild:
-  Sync with latest debian patchset.
-
-*gdb-6.2.1-r1 (15 May 2005)
-
-  15 May 2005; <solar@gentoo.org> -gdb-6.0-r1.ebuild, -gdb-6.0.ebuild,
-  -gdb-6.1.1.ebuild, -gdb-6.2.1-r1.ebuild, -gdb-6.2.ebuild, gdb-6.3-r3.ebuild,
-  -gdb-6.3.ebuild:
-  - stable on arm #91654 - cleanup most vuln non stabilized versions of gdb
-
-  15 May 2005; <plasmaroo@gentoo.org> gdb-6.3-r3.ebuild:
-  Stable on IA64, bug #91654.
-
-  09 May 2005; <solar@gentoo.org> files/gdb-6.3-gdbinit-stat.patch:
-  - Jan Postransky writes via email gdb doesn't read .gdbinit file in current
-  working directory. I suggest putting parentheses arround the last condition
-  like in the attached fix.
-
-  06 May 2005; Bryan Østergaard <kloeri@gentoo.org> gdb-6.3-r3.ebuild:
-  Stable on alpha, bug 91654.
-
-  06 May 2005; <solar@gentoo.org>
-  +files/gdb-6.2.1-200-uclibc-readline-conf.patch,
-  +files/gdb-6.2.1-400-mips-coredump.patch,
-  +files/gdb-6.2.1-libiberty-pic.patch, +files/gdb-6.3-pass_all-uclibc.patch,
-  gdb-6.3-r3.ebuild:
-  - minor touch ups for mips/x86/uclibc/pic
-
-  06 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> gdb-6.3-r3.ebuild:
-  Stable on sparc wrt #91654
-
-  06 May 2005; <tester@gentoo.org> gdb-6.3-r3.ebuild:
-  Mark stable on x86 and amd64 per bug #91654
-
-  06 May 2005; Markus Rothe <corsair@gentoo.org> gdb-6.3-r3.ebuild:
-  Stable on ppc64; bug #91654
-
-  06 May 2005; Michael Hanselmann <hansmi@gentoo.org> gdb-6.3-r3.ebuild:
-  Stable on hppa.
-
-  06 May 2005; Michael Hanselmann <hansmi@gentoo.org> gdb-6.3-r3.ebuild:
-  Stable on ppc.
-
-*gdb-6.3-r3 (05 May 2005)
-
-  05 May 2005; <solar@gentoo.org> +files/bfd-malloc-wrap.patch,
-  -gdb-6.3-r1.ebuild, -gdb-6.3-r2.ebuild, +gdb-6.3-r3.ebuild:
-  - add security patch to bfd/elfcode.h to from bug #91398
-
-  28 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> gdb-6.3.ebuild:
-  Stable on sparc
-
-  25 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> gdb-6.3.ebuild:
-  Stable on alpha.
-
-*gdb-6.3-r2 (24 Apr 2005)
-
-  24 Apr 2005; <solar@gentoo.org> +files/gdb-6.3-gdbinit-stat.patch,
-  +gdb-6.3-r2.ebuild:
-  - avoid executing arbitrary .gdbinit files in pwd that are not owned by the
-  current uid or that are world writeable. sec bug #88398
-
-  24 Apr 2005; Markus Rothe <corsair@gentoo.org> gdb-6.3.ebuild:
-  Stable on ppc64
-
-*gdb-6.3-r1 (23 Apr 2005)
-
-  23 Apr 2005; Mike Frysinger <vapier@gentoo.org> +gdb-6.3-r1.ebuild:
-  Grab & use Debians patchset.
-
-  14 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> gdb-6.3.ebuild:
-  To ~sparc, this version actually works
-
-  03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-*gdb-6.3 (27 Nov 2004)
-
-  27 Nov 2004; <solar@gentoo.org> +files/gdb-6.3-relative-paths.patch,
-  +files/gdb-6.3-scanmem.patch, +files/gdb-6.3-uclibc.patch, +gdb-6.3.ebuild:
-  initial commit gdb-6.3. - Adds new ~/.gdbinit file for x86 users. - Adds a
-  forward port of antilove's scanmem gdb-6.1 patch. Forward ported every patch,
-  minus the gdb-6.x-crash.patch
-
-  09 Nov 2004; Mike Frysinger <vapier@gentoo.org>
-  +files/gdb-6.2.1-pass-libdir.patch, +files/gdb-6.2.1-relative-paths.patch,
-  +files/gdb-6.x-crash.patch, gdb-6.0-r1.ebuild, gdb-6.0.ebuild,
-  gdb-6.1.1.ebuild:
-  Clean up ebuilds and add support for maketest (#68643). Also add misc
-  patches to resolve segfaults/sandbox violations (#49582 #65404) and package
-  collisions (#69496).
-
-  03 Nov 2004; Joshua Kinard <kumba@gentoo.org> gdb-6.2.1.ebuild,
-  gdb-6.2.ebuild:
-  Marked stable on mips.
-
-  13 Oct 2004; Travis Tilley <lv@gentoo.org> gdb-6.0-r1.ebuild:
-  another sandbox fix
-
-  23 Sep 2004; Travis Tilley <lv@gentoo.org> gdb-6.2.1.ebuild:
-  make CONF_LIBDIR aware again to fix a sandbox violation. lets hope nobody
-  reverts the change this time.
-
-*gdb-6.2.1 (23 Sep 2004)
-
-  23 Sep 2004; Luca Barbato <lu_zero@gentoo.org> +gdb-6.2.1.ebuild:
-  new version, thanks Pär Karlsson <paer.karlsson@kmstudiosystems.com> for
-  reporting
-
-  09 Sep 2004; Chris Gianelloni <wolf31o2@gentoo.org> gdb-6.2.ebuild:
-  Making multilib safe and closing bug #63438.
-
-  07 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> gdb-6.1.1.ebuild:
-  Stable on sparc
-
-  09 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> gdb-6.1.1.ebuild,
-  gdb-6.2.ebuild:
-  6.1.1 ~sparc, 6.2 -sparc
-
-*gdb-6.2 (08 Aug 2004)
-
-  08 Aug 2004; <solar@gentoo.org> gdb-6.2.ebuild:
-  version bump
-
-  03 Aug 2004; Mike Frysinger <vapier@gentoo.org> gdb-6.0.ebuild,
-  gdb-6.1.1.ebuild:
-  Strip out LINGUAs that gdb doesnt support #59179 by Matthias Peick.
-
-  28 Jul 2004; <solar@gentoo.org> gdb-6.1.1.ebuild, gdb-6.1.ebuild,
-  files/gdb-6.1-uclibc.patch:
-  patched bfd/config.bfd and ltmain for uclibc
-
-  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gdb-5.1.1-r2.ebuild:
-  virtual/glibc -> virtual/libc
-
-  24 Jun 2004; Aron Griffis <agriffis@gentoo.org> gdb-5.3.90.ebuild,
-  gdb-5.3.ebuild:
-  QA - fix use invocation
-
-  23 Jun 2004; Aron Griffis <agriffis@gentoo.org> gdb-6.1.1.ebuild,
-  gdb-6.1.ebuild:
-  Add ~alpha
-
-*gdb-6.1.1 (22 Jun 2004)
-
-  22 Jun 2004; Martin Schlemmer <azarah@gentoo.org> +gdb-6.1.1.ebuild:
-  Update version.
-
-  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> gdb-6.0.ebuild:
-  Stable on alpha.
-
-  06 Jun 2004; Guy Martin <gmsoft@gentoo.org> gdb-6.1.ebuild,
-  files/gdb-6.1-hppa-01.patch, files/gdb-6.1-hppa.patch:
-  Update of the hppa patch to fix the inclusion of asm/offset[s].h
-
-  30 May 2004; Guy Martin <gmsoft@gentoo.org> gdb-6.1.ebuild,
-  files/gdb-6.1-hppa.patch:
-  Added hppa support to gdb-6.1. Marked ~hppa.
-
-  28 May 2004; Tom Gall <tgall@gentoo.org> gdb-6.1.ebuild:
-  stable on ppc64 (with small patch)
-
-  13 May 2004; Stephen P. Becker <geoman@gentoo.org> gdb-6.0.ebuild:
-  Stable on mips.
-
-  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> gdb-5.3-r1.ebuild,
-  gdb-5.3.90.ebuild, gdb-5.3.ebuild:
-  Add inherit eutils
-
-  22 Apr 2004; Travis Tilley <lv@gentoo.org> gdb-6.0-r1.ebuild,
-  gdb-6.0.ebuild:
-  stable on amd64
-
-*gdb-5.3-r1 (18 Apr 2004)
-
-  18 Apr 2004; Michael McCabe <randy@gentoo.org> +gdb-5.3-r1.ebuild:
-  Added s390 specific fixes to gdb-5.3.  Closes bug #47903
-
-*gdb-6.1 (05 Apr 2004)
-
-  05 Apr 2004; Stefan Jones <cretin@gentoo.org> :
-  Try gdb-6.1 to try and fix bug #45756
-  
-  09 Mar 2004; <agriffis@gentoo.org> gdb-6.0.ebuild:
-  stable on ia64
-
-*gdb-6.0-r1 (05 Mar 2004)
-
-  05 Mar 2004; Luca Barbato <lu_zero@gentoo.org> gdb-6.0-r1.ebuild,
-  files/gdb-6.0-xfreemod-all.patch:
-  New revision, xfree module tracking support added
-
-  23 Feb 2004; Sven Blumenstein <bazik@gentoo.org> gdb-6.0.ebuild:
-  Stable on sparc (finally).
-
-  15 Feb 2004; Bartosch Pixa <darkspecter@gentoo.org> gdb-6.0.ebuild:
-  set ppc in keywords
-
-  08 Feb 2004; Martin Schlemmer <azarah@gentoo.org> gdb-6.0.ebuild:
-  Bump to stable for x86.
-
-  19 Jan 2004; Martin Schlemmer <azarah@gentoo.org> gdb-5.1.1-r2.ebuild,
-  gdb-5.2.1.ebuild, gdb-5.3.90.ebuild, gdb-5.3.ebuild, gdb-6.0.ebuild:
-  Do not install configure, bfd, and standards info manuals, as binutils provide
-  them.
-
-  18 Oct 2003; Jason Wever <weeve@gentoo.org> gdb-5.3.90.ebuild,
-  gdb-6.0.ebuild:
-  Added fix for bug #29845 and fixed gdb-6.0 compile on sparc.
-
-*gdb-6.0 (17 Oct 2003)
-
-  17 Oct 2003; Stefan Jones <cretin@gentoo.org> :
-  New version, has most of the old gdb-5.3.90 patch already in, if any are
-  needed for non-x86 arch then feel free to add.
-
-*gdb-5.3.90 (20 Sep 2003)
-
-  30 Sep 2003; Joshua Kinard <kumba@gentoo.org> gdb-5.3.90.ebuild:
-  Added ~mips to KEYWORDS
-
-  24 Sep 2003; Jason Wever <weeve@gentoo.org> gdb-5.3.90.ebuild:
-  Applied patch from Sven Blumenstein <me@pl4.net> to fix sparc and hppa
-  compilation issues, fixes bug #29390.
-
-  20 Sep 2003; Martin Schlemmer <azarah@gentoo.org> gdb-5.3.90.ebuild:
-  Update to cvs version - should fix debugging threaded applications for users
-  using NPTL.
-
-  26 May 2003; Tavis Ormandy <taviso@gentoo.org> gdb-5.3.ebuild:
-  ccc compatability fixes
-
-*gdb-5.3 (21 Dec 2002)
-
-  19 May 2003; Joshua Kinard <kumba@gentoo.org> gdb-5.3.ebuild:
-  Added a patch that allows gdb-5.3 to compile properly
-  on sparc and set KEYWORDS to ~sparc from -sparc
-
-  24 Mar 2003; Guy Martin <gmsoft@gentoo.org> gdb-5.3.ebuild :
-  Added patch for hppa support. Added hppa to keywords.
-
-  28 Feb 2003; Stefan Jones <cretin@gentoo.org> gdb-5.3.ebuild :
-  Added support for objc via the USE flag objc, see bug #16507
-
-  31 Jan 2003; Joshua Brindle <method@gentoo.org> gdb-5.3.ebuild :
-  This does not compile on sparc, changing to -sparc
-
-  22 Jan 2003; Jason Wever <weeve@gentoo.org> gdb-5.3.ebuild :
-  Changed sparc keyword back to ~sparc as bug 12866 is not yet resolved.
-
-  02 Jan 2002; Nick Hadaway <raker@gentoo.org> gdb-5.3.ebuild :
-  Marked stable.
-
-  26 Dec 2002; Nick Hadaway <raker@gentoo.org> gdb-5.3.ebuild :
-  Removed the unneeded man patch.
-
-  21 Dec 2002; Nick Hadaway <raker@gentoo.org> gdb-5.3.ebuild,
-  files/digest-gdb-5.3 :
-  Version bump.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*gdb-5.2.1 (20 Aug 2002)
-
-  19 Oct 2002; Seemant Kulleen <seemant@gentoo.org> :
-
-  cleanup of old ebuilds and formatting.
-
-  11 Oct 2002; Nick Hadaway <raker@gentoo.org> gdb-5.2.1.ebuild :
-  Throttled optimization flags down to -O2.  See bug #6089
-
-  20 Aug 2002; Nick Hadaway <raker@gentoo.org>
-  gdb-5.2.1.ebuild, files/digest-gdb-5.2.1, files/man.diff :
-  Version bump.
-
-*gdb-5.1.1-r2 (2 June 2002)
-
-  24 Jul 2002; Mark Guertin <gerk@gentoo.org> :
-  Added ppc to keywords
-
-  2 June 2002; Olivier Reisch <doctomoe@gentoo.org> gdb-5.1.1-r2.ebuild
-
-  Have the PPC patch only applied on PPC platform.
-
-*gdb-5.1.1-r1 (6 May 2002)
-
-  6 May 2002; Kain <kain@kain.org> gdb-5.1.1-r1.ebuild
-
-  PPC compatibility patch to fix some bool typedef stuff.
-
-*gdb-5.1.1 (5 Apr 2002)
-
-  5 Apr 2002; Seemant Kulleen <seemant@gentoo.org> gdb-5.1.1.ebuild
-  files/digest-gdb-5.1.1
-
-  Version bump, but this is being masked until the ncurses incompatibility
-  is resolved.
-
-*gdb-5.1 (7 Feb 2002) Karl Trygve Kalleberg <karltk@gentoo.org>: gdb-5.1.ebuild files/digest-gdb-5.1
-
-  GDB, the GNU Project debugger, allows you to see what is going on `inside'
-  another program while it executes -- or what another program was doing at 
-  the moment it crashed.
-
-  GDB can do four main kinds of things (plus other things in support of these)
-  to help you catch bugs in the act:
-
-    * Start your program, specifying anything that might affect its behavior.
-    * Make your program stop on specified conditions.
-    * Examine what has happened, when your program has stopped.
-    * Change things in your program, so you can experiment with correcting the effects of one bug and go on to learn about another.
-
-  GDB works on a wide variety of UNIX and non-UNIX systems.
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
 
 *gdb-5.0-r2 (1 Feb 2002)
 
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 818a2a1aed5d..81334aaaf8c0 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -1,36 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 773bcc1f5e9b2bdcb637f6f1185334cb ChangeLog 11488
-MD5 d3ab2683d88b3cbecb8a9faa439703a1 files/bfd-malloc-wrap.patch 782
-MD5 460629563df21e6a68b8941c07d4f30b files/digest-gdb-6.1 131
-MD5 b3790be989db97b22c599572afbce109 files/digest-gdb-6.2.1 133
-MD5 1bf79e32094a4c2c7cde754dd12e4d90 files/digest-gdb-6.3-r4 183
+MD5 be6d7adfb74f12091018e636e56073d6 ChangeLog 3479
+MD5 f741db03148c86f10f51002aa02a6951 gdb-5.1.1-r2.ebuild 1844
+MD5 fa35394889eb5b7e0b6c597ffaab552b gdb-5.2.1.ebuild 1577
+MD5 ffef7eead7c2cbb5b3cdbc732782e56c gdb-5.3.ebuild 2333
+MD5 c9906583fd4286272dff5fd2503ebe39 files/digest-gdb-5.1.1-r2 63
+MD5 263738287571b63dd7bb69d3d5d50e04 files/digest-gdb-5.2.1 64
+MD5 2e43a9ed1afd8f8047e7b752b95f0c12 files/digest-gdb-5.3 128
+MD5 734c7bb9c66275fa7982d104905234da files/gdb-5.1.1-ppc-booltypes.patch 994
+MD5 ca7cf8e4b2eba16df1842e0a453e2b32 files/gdb-5.3-hppa-01.patch 182179
+MD5 d5314bcbc29fb3ce8351caa3a501c351 files/gdb-5.3-hppa-02.patch 926
+MD5 5b0433c121b92f2a35c2106bbf45bbb9 files/gdb-5.3-hppa-03.patch 2678
+MD5 4d383b990c22a7f0ee0d4a1679b82d20 files/man.diff 607
 MD5 1de0e1b91ac150426719e904f0e1a5cd files/gdb-5.3-sparc-nat-asm.patch 521
-MD5 e497ab2f05d847bde74f4e3441e2c7a2 files/gdb-6.0-coreutils.patch 1964
-MD5 c6dfff1373e52fef5872c1bdca4cb706 files/gdb-6.0-info.patch 1108
-MD5 adbe09f334ca5267284ca9404400d2f5 files/gdb-6.0-threadver-aug2003.patch 4081
-MD5 dc01eff75d7495a2159e2ff9fc48f164 files/gdb-6.0-xfreemod-all.patch 1599
-MD5 1da0dcdbff7ba48a06350a28ecdd238e files/gdb-6.1-ppc64-01.patch 359
-MD5 cc65dade388e6a21b5858b146f52b6eb files/gdb-6.1-uclibc.patch 6363
-MD5 c7d303fad9794b8a463bddf3c43737e5 files/gdb-6.2.1-200-uclibc-readline-conf.patch 586
-MD5 9b939edb72d0e54160869b48f2ebc080 files/gdb-6.2.1-400-mips-coredump.patch 736
-MD5 31dd65bca08d42b0b7cdb61c53fd647f files/gdb-6.2.1-libiberty-pic.patch 370
-MD5 37007f485c9f93564f99675e59b65e7f files/gdb-6.2.1-pass-libdir.patch 300
-MD5 374352fdf0b1516a88eeaf0a921a2208 files/gdb-6.2.1-relative-paths.patch 3499
-MD5 0ddba28928cd6fa87537312ddfa9d5ee files/gdb-6.3-gdbinit-stat.patch 431
-MD5 2657b597618d0c35b48f47e3f808d171 files/gdb-6.3-relative-paths.patch 3286
-MD5 a4610ec65e88f73e0b00b525467a5372 files/gdb-6.3-scanmem.patch 6652
-MD5 8b7f5c46b8dabbc9239c37f52278b971 files/gdb-6.3-uclibc.patch 8221
-MD5 7ea8f83bb7b0d70e7e6d6c8cf42292d3 files/gdb-6.x-crash.patch 678
-MD5 2a52c4cd9bf5e2667c6bc7312e179fa0 gdb-6.1.ebuild 1807
-MD5 fb4ab4aaccb90b523c650a5f30d02281 gdb-6.2.1.ebuild 1784
-MD5 20334b11833489b3bcc13c0fea645a1d gdb-6.3-r4.ebuild 2983
-MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDWE85gIKl8Uu19MoRAoaQAJ9NgjvejzH2fqNOLGDXfuKcHcIdXgCeJ6C2
-bel+2fmoiXqP8+vLqGI8Wuo=
-=TGuU
------END PGP SIGNATURE-----
diff --git a/sys-devel/gdb/files/digest-gdb-6.1 b/sys-devel/gdb/files/digest-gdb-6.1
index 657495a4bdb4..ab1d69e9e9cc 100644
--- a/sys-devel/gdb/files/digest-gdb-6.1
+++ b/sys-devel/gdb/files/digest-gdb-6.1
@@ -1,2 +1 @@
 MD5 4ba97f5efba4190f2e214e32c72c3fa0 gdb-6.1.tar.bz2 12571495
-MD5 3e0f43b95685125b20fc866c88d1d122 gdb-6.1-hppa-01.patch.bz2 41093
diff --git a/sys-devel/gdb/files/gdb-6.1-uclibc.patch b/sys-devel/gdb/files/gdb-6.1-uclibc.patch
index b2cdc2cf5517..8967bb70df9c 100644
--- a/sys-devel/gdb/files/gdb-6.1-uclibc.patch
+++ b/sys-devel/gdb/files/gdb-6.1-uclibc.patch
@@ -1,7 +1,6 @@
-diff -ur gdb-6.2.orig/bfd/config.bfd gdb-6.2/bfd/config.bfd
---- gdb-6.2.orig/bfd/config.bfd	2004-08-24 14:42:18.000000000 +0000
-+++ gdb-6.2/bfd/config.bfd	2004-08-24 17:52:29.000000000 +0000
-@@ -129,7 +129,7 @@
+--- gdb-6.1/bfd/config.bfd.uclibc	2004-03-13 13:37:09.000000000 +0100
++++ gdb-6.1/bfd/config.bfd	2004-05-11 17:59:12.000000000 +0200
+@@ -121,7 +121,7 @@ case "${targ}" in
      targ_defvec=ecoffalpha_little_vec
      targ_selvecs=bfd_elf64_alpha_vec
      ;;
@@ -10,7 +9,7 @@ diff -ur gdb-6.2.orig/bfd/config.bfd gdb-6.2/bfd/config.bfd
      targ_defvec=bfd_elf64_alpha_vec
      targ_selvecs=ecoffalpha_little_vec
      ;;
-@@ -139,7 +139,7 @@
+@@ -131,7 +131,7 @@ case "${targ}" in
    alpha*-*-*)
      targ_defvec=ecoffalpha_little_vec
      ;;
@@ -19,7 +18,7 @@ diff -ur gdb-6.2.orig/bfd/config.bfd gdb-6.2/bfd/config.bfd
      targ_defvec=bfd_elf64_ia64_little_vec
      targ_selvecs="bfd_elf64_ia64_big_vec bfd_efi_app_ia64_vec"
      ;;
-@@ -216,7 +216,7 @@
+@@ -208,7 +208,7 @@ case "${targ}" in
      targ_defvec=bfd_elf32_littlearm_vec
      targ_selvecs=bfd_elf32_bigarm_vec
      ;;
@@ -28,16 +27,7 @@ diff -ur gdb-6.2.orig/bfd/config.bfd gdb-6.2/bfd/config.bfd
      targ_defvec=bfd_elf32_bigarm_vec
      targ_selvecs=bfd_elf32_littlearm_vec
      ;;
-@@ -225,7 +225,7 @@
-     targ_selvecs=bfd_elf32_bigarm_vec
-     ;;
-   arm-*-elf | arm-*-freebsd* | arm*-*-linux-gnu* | arm*-*-conix* | \
--  arm*-*-uclinux* | arm-*-kfreebsd*-gnu | arm-*-vxworks)
-+  arm*-*-uclinux* | arm-*-kfreebsd*-gnu | arm-*-vxworks | arm*-*-linux-uclibc* )
-     targ_defvec=bfd_elf32_littlearm_vec
-     targ_selvecs=bfd_elf32_bigarm_vec
-     ;;
-@@ -373,7 +373,7 @@
+@@ -350,7 +350,7 @@ case "${targ}" in
      ;;
  
  #ifdef BFD64
@@ -46,7 +36,7 @@ diff -ur gdb-6.2.orig/bfd/config.bfd gdb-6.2/bfd/config.bfd
      targ_defvec=bfd_elf64_hppa_linux_vec
      targ_selvecs=bfd_elf64_hppa_vec
      ;;
-@@ -384,7 +384,7 @@
+@@ -361,7 +361,7 @@ case "${targ}" in
      ;;
  #endif
  
@@ -55,7 +45,7 @@ diff -ur gdb-6.2.orig/bfd/config.bfd gdb-6.2/bfd/config.bfd
      targ_defvec=bfd_elf32_hppa_linux_vec
      targ_selvecs=bfd_elf32_hppa_vec
      ;;
-@@ -507,7 +507,7 @@
+@@ -483,7 +483,7 @@ case "${targ}" in
      targ_selvecs=bfd_elf32_i386_vec
      targ_underscore=yes
      ;;
@@ -64,7 +54,7 @@ diff -ur gdb-6.2.orig/bfd/config.bfd gdb-6.2/bfd/config.bfd
      targ_defvec=bfd_elf32_i386_vec
      targ_selvecs="i386linux_vec bfd_efi_app_ia32_vec"
      targ64_selvecs=bfd_elf64_x86_64_vec
-@@ -521,7 +521,7 @@
+@@ -497,7 +497,7 @@ case "${targ}" in
      targ_defvec=bfd_elf64_x86_64_vec
      targ_selvecs="bfd_elf32_i386_vec i386netbsd_vec i386coff_vec bfd_efi_app_ia32_vec"
      ;;
@@ -73,7 +63,7 @@ diff -ur gdb-6.2.orig/bfd/config.bfd gdb-6.2/bfd/config.bfd
      targ_defvec=bfd_elf64_x86_64_vec
      targ_selvecs="bfd_elf32_i386_vec i386linux_vec bfd_efi_app_ia32_vec"
      ;;
-@@ -691,7 +691,7 @@
+@@ -667,7 +667,7 @@ case "${targ}" in
      targ_defvec=hp300hpux_vec
      targ_underscore=yes
      ;;
@@ -82,7 +72,7 @@ diff -ur gdb-6.2.orig/bfd/config.bfd gdb-6.2/bfd/config.bfd
      targ_defvec=m68klinux_vec
      targ_selvecs=bfd_elf32_m68k_vec
      targ_underscore=yes
-@@ -972,8 +972,8 @@
+@@ -952,8 +952,8 @@ case "${targ}" in
      ;;
  #endif
    powerpc-*-*bsd* | powerpc-*-elf* | powerpc-*-sysv4* | powerpc-*-eabi* | \
@@ -93,7 +83,7 @@ diff -ur gdb-6.2.orig/bfd/config.bfd gdb-6.2/bfd/config.bfd
      targ_defvec=bfd_elf32_powerpc_vec
      targ_selvecs="rs6000coff_vec bfd_elf32_powerpcle_vec ppcboot_vec"
      targ64_selvecs="bfd_elf64_powerpc_vec bfd_elf64_powerpcle_vec"
-@@ -1009,8 +1009,8 @@
+@@ -984,8 +984,8 @@ case "${targ}" in
      targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec"
      ;;
    powerpcle-*-elf* | powerpcle-*-sysv4* | powerpcle-*-eabi* | \
@@ -104,7 +94,7 @@ diff -ur gdb-6.2.orig/bfd/config.bfd gdb-6.2/bfd/config.bfd
      targ_defvec=bfd_elf32_powerpcle_vec
      targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec"
      targ64_selvecs="bfd_elf64_powerpc_vec bfd_elf64_powerpcle_vec"
-@@ -1177,7 +1177,7 @@
+@@ -1141,7 +1141,7 @@ case "${targ}" in
      targ_selvecs="bfd_elf32_sparc_vec sunos_big_vec"
      targ_underscore=yes
      ;;
@@ -113,7 +103,7 @@ diff -ur gdb-6.2.orig/bfd/config.bfd gdb-6.2/bfd/config.bfd
      targ_defvec=bfd_elf32_sparc_vec
      targ_selvecs="sparclinux_vec bfd_elf64_sparc_vec sunos_big_vec"
      ;;
-@@ -1224,7 +1224,7 @@
+@@ -1188,7 +1188,7 @@ case "${targ}" in
      targ_defvec=sunos_big_vec
      targ_underscore=yes
      ;;
@@ -122,10 +112,10 @@ diff -ur gdb-6.2.orig/bfd/config.bfd gdb-6.2/bfd/config.bfd
      targ_defvec=bfd_elf64_sparc_vec
      targ_selvecs="bfd_elf32_sparc_vec sparclinux_vec sunos_big_vec"
      ;;
-diff -ur gdb-6.2.orig/libtool.m4 gdb-6.2/libtool.m4
---- gdb-6.2.orig/libtool.m4	2004-08-24 14:42:13.000000000 +0000
-+++ gdb-6.2/libtool.m4	2004-08-24 14:43:10.000000000 +0000
-@@ -645,6 +645,11 @@
+ 		;;
+--- gdb-6.1/libtool.m4.uclibc	2004-05-11 18:03:37.000000000 +0200
++++ gdb-6.1/libtool.m4	2004-05-11 18:05:59.000000000 +0200
+@@ -645,6 +645,11 @@ linux-gnu*)
    lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
    ;;
  
@@ -137,10 +127,9 @@ diff -ur gdb-6.2.orig/libtool.m4 gdb-6.2/libtool.m4
  netbsd*)
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
-diff -ur gdb-6.2.orig/ltconfig gdb-6.2/ltconfig
---- gdb-6.2.orig/ltconfig	2004-08-24 14:42:13.000000000 +0000
-+++ gdb-6.2/ltconfig	2004-08-24 14:43:10.000000000 +0000
-@@ -602,7 +602,7 @@
+--- gdb-6.1/ltconfig.uclibc	2004-05-11 18:07:29.000000000 +0200
++++ gdb-6.1/ltconfig	2004-05-11 18:11:59.000000000 +0200
+@@ -602,7 +602,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-
  
  # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
  case $host_os in
@@ -149,7 +138,7 @@ diff -ur gdb-6.2.orig/ltconfig gdb-6.2/ltconfig
  linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
  esac
  
-@@ -1259,6 +1259,24 @@
+@@ -1259,6 +1259,24 @@ linux-gnu*)
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
diff --git a/sys-devel/gdb/files/gdb-6.3-gdbinit-stat.patch b/sys-devel/gdb/files/gdb-6.3-gdbinit-stat.patch
index fac4584f9a7a..36e1289260e2 100644
--- a/sys-devel/gdb/files/gdb-6.3-gdbinit-stat.patch
+++ b/sys-devel/gdb/files/gdb-6.3-gdbinit-stat.patch
@@ -5,7 +5,7 @@
    if (!homedir
        || memcmp ((char *) &homebuf, (char *) &cwdbuf, sizeof (struct stat)))
 -    if (!inhibit_gdbinit)
-+    if (!inhibit_gdbinit && (cwdbuf.st_uid == getuid()) && (!(cwdbuf.st_mode & (S_IWOTH))))
++    if (!inhibit_gdbinit && (cwdbuf.st_uid == getuid()) && (!cwdbuf.st_mode & (S_IWOTH)))
        {
  	catch_command_errors (source_command, gdbinit, 0, RETURN_MASK_ALL);
        }
diff --git a/sys-devel/gdb/files/gdb-6.3-scanmem.patch b/sys-devel/gdb/files/gdb-6.3-scanmem.patch
index 851c358c4a9a..7770a2143628 100644
--- a/sys-devel/gdb/files/gdb-6.3-scanmem.patch
+++ b/sys-devel/gdb/files/gdb-6.3-scanmem.patch
@@ -122,7 +122,7 @@ diff -Nrup gdb-6.3.orig/gdb/printcmd.c gdb-6.3/gdb/printcmd.c
 +	    }
 +	    for (i = 0; i <= (nfetch - memsize); i++, addr++) {
 +	       int *pint;
-+	       pint = (unsigned char *) (data + i);
++	       (unsigned char *) pint = (unsigned char *) (data + i);
 +	       if (*pint == typi) {
 +		  printf_filtered("pattern match at ");
 +		  print_address_numeric((addr), 1, gdb_stdout);
@@ -165,7 +165,7 @@ diff -Nrup gdb-6.3.orig/gdb/printcmd.c gdb-6.3/gdb/printcmd.c
 +	       if (strncmp("0x", pattern, 2) == 0) {
 +		  sscanf(pattern, "0x%02x", &typc);
 +	       } else
-+		  typc = (unsigned char)atoi(pattern);
++		  (int) typc = atoi(pattern);
 +	    }
 +	    printf_filtered(">>>%0x2\n", (int) typc);
 +	    if (nfetch < memsize) {
diff --git a/sys-devel/gdb/files/gdb-6.3-uclibc.patch b/sys-devel/gdb/files/gdb-6.3-uclibc.patch
index cc69ff33bd82..d292f6e23a89 100644
--- a/sys-devel/gdb/files/gdb-6.3-uclibc.patch
+++ b/sys-devel/gdb/files/gdb-6.3-uclibc.patch
@@ -1,78 +1,79 @@
---- gdb-6.3/bfd/config.bfd.orig	Fri Oct 15 07:47:11 2004
-+++ gdb-6.3/bfd/config.bfd	Mon Feb 28 00:04:43 2005
-@@ -129,7 +129,7 @@
+diff -Nrup gdb-6.3.orig/bfd/config.bfd gdb-6.3/bfd/config.bfd
+--- gdb-6.3.orig/bfd/config.bfd	2004-10-15 01:47:11.000000000 -0400
++++ gdb-6.3/bfd/config.bfd	2004-11-27 20:15:57.000000000 -0500
+@@ -129,7 +129,7 @@ case "${targ}" in
      targ_defvec=ecoffalpha_little_vec
      targ_selvecs=bfd_elf64_alpha_vec
      ;;
 -  alpha*-*-linux-gnu* | alpha*-*-elf*)
-+  alpha*-*-linux-* | alpha*-*-elf*)
++  alpha*-*-linux-gnu* | alpha*-*-linux-uclibc* | alpha*-*-elf*)
      targ_defvec=bfd_elf64_alpha_vec
      targ_selvecs=ecoffalpha_little_vec
      ;;
-@@ -139,7 +139,7 @@
+@@ -139,7 +139,7 @@ case "${targ}" in
    alpha*-*-*)
      targ_defvec=ecoffalpha_little_vec
      ;;
 -  ia64*-*-freebsd* | ia64*-*-netbsd* | ia64*-*-linux-gnu* | ia64*-*-elf* | ia64*-*-kfreebsd*-gnu)
-+  ia64*-*-freebsd* | ia64*-*-netbsd* | ia64*-*-linux-* | ia64*-*-elf* | ia64*-*-kfreebsd*-gnu)
++  ia64*-*-freebsd* | ia64*-*-netbsd* | ia64*-*-linux-gnu* | ia64*-*-elf* | ia64*-*-kfreebsd*-gnu | ia64*-*-linux-uclibc*)
      targ_defvec=bfd_elf64_ia64_little_vec
      targ_selvecs="bfd_elf64_ia64_big_vec bfd_efi_app_ia64_vec"
      ;;
-@@ -216,7 +216,7 @@
+@@ -216,7 +216,7 @@ case "${targ}" in
      targ_defvec=bfd_elf32_littlearm_vec
      targ_selvecs=bfd_elf32_bigarm_vec
      ;;
 -  armeb-*-elf | arm*b-*-linux-gnu*)
-+  armeb-*-elf | arm*b-*-linux-*)
++  armeb-*-elf | arm*b-*-linux-gnu* | arm*b-*-linux-uclibc*)
      targ_defvec=bfd_elf32_bigarm_vec
      targ_selvecs=bfd_elf32_littlearm_vec
      ;;
-@@ -224,7 +224,7 @@
-     targ_defvec=bfd_elf32_littlearm_vec
+@@ -225,7 +225,7 @@ case "${targ}" in
      targ_selvecs=bfd_elf32_bigarm_vec
      ;;
--  arm-*-elf | arm-*-freebsd* | arm*-*-linux-gnu* | arm*-*-conix* | \
-+  arm-*-elf | arm-*-freebsd* | arm*-*-linux-* | arm*-*-conix* | \
-   arm*-*-uclinux* | arm-*-kfreebsd*-gnu | arm-*-vxworks | \
+   arm-*-elf | arm-*-freebsd* | arm*-*-linux-gnu* | arm*-*-conix* | \
+-  arm*-*-uclinux* | arm-*-kfreebsd*-gnu | arm-*-vxworks | \
++  arm*-*-uclinux* | arm*-*-linux-uclibc* | arm-*-kfreebsd*-gnu | arm-*-vxworks | \
    arm*-*-eabi* )
      targ_defvec=bfd_elf32_littlearm_vec
-@@ -378,7 +378,7 @@
+     targ_selvecs=bfd_elf32_bigarm_vec
+@@ -378,7 +378,7 @@ case "${targ}" in
      ;;
  
  #ifdef BFD64
 -  hppa*64*-*-linux-gnu*)
-+  hppa*64*-*-linux-*)
++  hppa*64*-*-linux-gnu* | hppa*64*-*-linux-uclibc*)
      targ_defvec=bfd_elf64_hppa_linux_vec
      targ_selvecs=bfd_elf64_hppa_vec
      ;;
-@@ -389,7 +389,7 @@
+@@ -389,7 +389,7 @@ case "${targ}" in
      ;;
  #endif
  
 -  hppa*-*-linux-gnu*)
-+  hppa*-*-linux-*)
++  hppa*-*-linux-gnu* | hppa*-*-linux-uclibc*)
      targ_defvec=bfd_elf32_hppa_linux_vec
      targ_selvecs=bfd_elf32_hppa_vec
      ;;
-@@ -522,7 +522,7 @@
+@@ -522,7 +522,7 @@ case "${targ}" in
      targ_selvecs=bfd_elf32_i386_vec
      targ_underscore=yes
      ;;
 -  i[3-7]86-*-linux-gnu*)
-+  i[3-7]86-*-linux-*)
++  i[3-7]86-*-linux-gnu* | i[3-7]86-*-linux-uclibc*)
      targ_defvec=bfd_elf32_i386_vec
      targ_selvecs="i386linux_vec bfd_efi_app_ia32_vec"
      targ64_selvecs=bfd_elf64_x86_64_vec
-@@ -536,7 +536,7 @@
+@@ -536,7 +536,7 @@ case "${targ}" in
      targ_defvec=bfd_elf64_x86_64_vec
      targ_selvecs="bfd_elf32_i386_vec i386netbsd_vec i386coff_vec bfd_efi_app_ia32_vec"
      ;;
 -  x86_64-*-linux-gnu*)
-+  x86_64-*-linux-*)
++  x86_64-*-linux-gnu* | x86_64-*-linux-uclibc*)
      targ_defvec=bfd_elf64_x86_64_vec
      targ_selvecs="bfd_elf32_i386_vec i386linux_vec bfd_efi_app_ia32_vec"
      ;;
-@@ -706,7 +706,7 @@
+@@ -706,7 +706,7 @@ case "${targ}" in
      targ_defvec=hp300hpux_vec
      targ_underscore=yes
      ;;
@@ -81,156 +82,64 @@
      targ_defvec=m68klinux_vec
      targ_selvecs=bfd_elf32_m68k_vec
      targ_underscore=yes
-@@ -987,7 +987,7 @@
+@@ -987,8 +987,8 @@ case "${targ}" in
      ;;
  #endif
    powerpc-*-*bsd* | powerpc-*-elf* | powerpc-*-sysv4* | powerpc-*-eabi* | \
 -  powerpc-*-solaris2* | powerpc-*-linux-gnu* | powerpc-*-rtems* | \
-+  powerpc-*-solaris2* | powerpc-*-linux-* | powerpc-*-rtems* | \
-   powerpc-*-chorus* | powerpc-*-vxworks* | powerpc-*-windiss*)
+-  powerpc-*-chorus* | powerpc-*-vxworks* | powerpc-*-windiss*)
++  powerpc-*-solaris2* | powerpc-*-linux-gnu* | powerpc-*-linux-uclibc* | powerpc-*-rtems* | \
++  powerpc-*-chorus* | powerpc-*-vxworks* | powerpc-*-windiss* )
      targ_defvec=bfd_elf32_powerpc_vec
      targ_selvecs="rs6000coff_vec bfd_elf32_powerpcle_vec ppcboot_vec"
-@@ -1024,7 +1024,7 @@
+     targ64_selvecs="bfd_elf64_powerpc_vec bfd_elf64_powerpcle_vec"
+@@ -1024,8 +1024,8 @@ case "${targ}" in
      targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec"
      ;;
    powerpcle-*-elf* | powerpcle-*-sysv4* | powerpcle-*-eabi* | \
 -  powerpcle-*-solaris2* | powerpcle-*-linux-gnu* | powerpcle-*-vxworks* |\
-+  powerpcle-*-solaris2* | powerpcle-*-linux-* | powerpcle-*-vxworks* |\
-   powerpcle-*-rtems*)
+-  powerpcle-*-rtems*)
++  powerpcle-*-solaris2* | powerpcle-*-linux-gnu* | powerpcle-*-linux-uclibc* | \
++  powerpcle-*-vxworks* | powerpcle-*-rtems*)
      targ_defvec=bfd_elf32_powerpcle_vec
      targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec"
-@@ -1192,7 +1192,7 @@
+     targ64_selvecs="bfd_elf64_powerpc_vec bfd_elf64_powerpcle_vec"
+@@ -1192,7 +1192,7 @@ case "${targ}" in
      targ_selvecs="bfd_elf32_sparc_vec sunos_big_vec"
      targ_underscore=yes
      ;;
 -  sparc-*-linux-gnu*)
-+  sparc-*-linux-*)
++  sparc-*-linux-gnu* | sparc-*-linux-uclibc*)
      targ_defvec=bfd_elf32_sparc_vec
      targ_selvecs="sparclinux_vec bfd_elf64_sparc_vec sunos_big_vec"
      ;;
-@@ -1239,7 +1239,7 @@
+@@ -1239,7 +1239,7 @@ case "${targ}" in
      targ_defvec=sunos_big_vec
      targ_underscore=yes
      ;;
 -  sparc64-*-linux-gnu*)
-+  sparc64-*-linux-*)
++  sparc64-*-linux-gnu* | sparc64-*-linux-uclibc*)
      targ_defvec=bfd_elf64_sparc_vec
      targ_selvecs="bfd_elf32_sparc_vec sparclinux_vec sunos_big_vec"
      ;;
-@@ -1308,7 +1308,7 @@
-     targ_underscore=yes
-     ;;
- 
--  vax-*-linux-gnu*)
-+  vax-*-linux-*)
-     targ_defvec=bfd_elf32_vax_vec
-     ;;
- 
---- gdb-6.3/bfd/configure.orig	Fri Oct  8 16:53:56 2004
-+++ gdb-6.3/bfd/configure	Sun Feb 27 18:32:58 2005
-@@ -3583,6 +3583,11 @@
+diff -Nrup gdb-6.3.orig/libtool.m4 gdb-6.3/libtool.m4
+--- gdb-6.3.orig/libtool.m4	2004-07-21 15:21:41.000000000 -0400
++++ gdb-6.3/libtool.m4	2004-11-27 20:12:48.000000000 -0500
+@@ -645,6 +645,10 @@ linux-gnu*)
    lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
    ;;
  
 +linux-uclibc*)
 +  lt_cv_deplibs_check_method=pass_all
 +  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+  ;;
 +
  netbsd* | knetbsd*-gnu)
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-@@ -9914,7 +9919,7 @@
-   alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
- 	COREFILE=''
- 	;;
--  alpha*-*-linux-gnu*)
-+  alpha*-*-linux-*)
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/alphalinux.h"'
- 	;;
-@@ -9978,7 +9983,7 @@
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/i386mach3.h"'
- 	;;
--  i[3-7]86-*-linux-gnu*)
-+  i[3-7]86-*-linux-*)
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/i386linux.h"'
- 	;;
-@@ -10016,7 +10021,7 @@
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/hp300bsd.h"'
- 	;;
--  m68*-*-linux-gnu*)
-+  m68*-*-linux-*)
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/m68klinux.h"'
- 	;;
-@@ -10150,7 +10155,7 @@
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/vaxult2.h"'
- 	;;
--  vax-*-linux-gnu*)
-+  vax-*-linux-*)
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/vaxlinux.h"'
- 	;;
---- gdb-6.3/bfd/configure.in.orig	Fri Oct  8 16:53:59 2004
-+++ gdb-6.3/bfd/configure.in	Sun Feb 27 18:14:41 2005
-@@ -163,7 +163,7 @@
-   alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
- 	COREFILE=''
- 	;;
--  alpha*-*-linux-gnu*)
-+  alpha*-*-linux-*)
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/alphalinux.h"'
- 	;;
-@@ -248,7 +248,7 @@
- 	TRAD_HEADER='"hosts/i386mach3.h"'
- 	;;
- changequote(,)dnl
--  i[3-7]86-*-linux-gnu*)
-+  i[3-7]86-*-linux-*)
- changequote([,])dnl
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/i386linux.h"'
-@@ -289,7 +289,7 @@
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/hp300bsd.h"'
- 	;;
--  m68*-*-linux-gnu*)
-+  m68*-*-linux-*)
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/m68klinux.h"'
- 	;;
-@@ -375,7 +375,7 @@
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/vaxult2.h"'
- 	;;
--  vax-*-linux-gnu*)
-+  vax-*-linux-*)
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/vaxlinux.h"'
- 	;;
---- gdb-6.3/libtool.m4.orig	Wed Jul 21 21:21:41 2004
-+++ gdb-6.3/libtool.m4	Mon Feb 28 00:08:11 2005
-@@ -653,6 +653,11 @@
-   fi
-   ;;
- 
-+linux-uclibc*)
-+  lt_cv_deplibs_check_method=pass_all
-+  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+  ;;
-+
- newsos6)
-   [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
-   lt_cv_file_magic_cmd=/usr/bin/file
---- gdb-6.3/ltconfig.orig	Tue Oct  5 15:34:42 2004
-+++ gdb-6.3/ltconfig	Sun Feb 27 18:14:41 2005
-@@ -602,7 +602,7 @@
+     [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
+diff -Nrup gdb-6.3.orig/ltconfig gdb-6.3/ltconfig
+--- gdb-6.3.orig/ltconfig	2004-10-05 09:34:42.000000000 -0400
++++ gdb-6.3/ltconfig	2004-11-27 20:01:13.000000000 -0500
+@@ -602,7 +602,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-
  
  # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
  case $host_os in
@@ -239,7 +148,7 @@
  linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
  esac
  
-@@ -1270,6 +1270,24 @@
+@@ -1270,6 +1270,24 @@ linux-gnu*)
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -264,17 +173,3 @@
  netbsd*)
    need_lib_prefix=no
    need_version=no
---- gdb-6.3/opcodes/configure.orig	Fri Sep 17 08:13:38 2004
-+++ gdb-6.3/opcodes/configure	Mon Feb 28 00:09:42 2005
-@@ -3595,6 +3595,11 @@
-   fi
-   ;;
- 
-+linux-uclibc*)
-+  lt_cv_deplibs_check_method=pass_all
-+  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+  ;;
-+
- newsos6)
-   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-   lt_cv_file_magic_cmd=/usr/bin/file
diff --git a/sys-devel/gdb/gdb-6.1.ebuild b/sys-devel/gdb/gdb-6.1.ebuild
index 6731389b0a15..7bea342a47d8 100644
--- a/sys-devel/gdb/gdb-6.1.ebuild
+++ b/sys-devel/gdb/gdb-6.1.ebuild
@@ -1,71 +1,69 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.1.ebuild,v 1.13 2005/01/11 21:14:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.1.ebuild,v 1.1 2004/04/06 14:15:49 cretin Exp $
 
 inherit flag-o-matic eutils
 
 DESCRIPTION="GNU debugger"
 HOMEPAGE="http://sources.redhat.com/gdb/"
-SRC_URI="http://mirrors.rcn.net/pub/sourceware/gdb/releases/${P}.tar.bz2
-	mirror://gentoo/gdb-6.1-hppa-01.patch.bz2"
+SRC_URI="http://mirrors.rcn.net/pub/sourceware/gdb/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~hppa ppc64 s390 ~x86"
-IUSE="nls test"
+KEYWORDS="~x86"
+IUSE="nls"
 
-RDEPEND=">=sys-libs/ncurses-5.2-r2"
-DEPEND="${RDEPEND}
-	test? ( dev-util/dejagnu )
+DEPEND=">=sys-libs/ncurses-5.2-r2
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/gdb-6.1-ppc64-01.patch
-	epatch ${WORKDIR}/gdb-6.1-hppa-01.patch
-	epatch ${FILESDIR}/gdb-6.1-uclibc.patch
 }
 
 src_compile() {
 	replace-flags -O? -O2
-	econf $(use_enable nls) || die
+	econf `use_enable nls` || die
 	make || die
 }
 
 src_install() {
-	make \
+	 make \
 		prefix=${D}/usr \
 		mandir=${D}/usr/share/man \
-		libdir=${D}/usr/$(get_libdir) \
 		infodir=${D}/usr/share/info \
-		install || die "install"
-	dodoc README
-	docinto gdb
-	dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
-		gdb/NEWS gdb/ChangeLog* gdb/TODO
-	docinto sim
-	dodoc sim/ChangeLog sim/MAINTAINERS sim/README-HACKING
-	docinto mmalloc
-	dodoc mmalloc/MAINTAINERS mmalloc/ChangeLog mmalloc/TODO
+		install || die
 
-	if ! has noinfo ${FEATURES} ; then
-		cd gdb/doc
-		make \
-			infodir=${D}/usr/share/info \
-			install-info || die "install doc info"
+	cd gdb/doc
+	make \
+		infodir=${D}/usr/share/info \
+		install-info || die
 
-		cd ${S}/bfd/doc
-		make \
-			infodir=${D}/usr/share/info \
-			install-info || die "install bfd info"
-	fi
+	cd ${S}/bfd/doc
+	make \
+		infodir=${D}/usr/share/info \
+		install-info || die
+
+	cd ${S}
 
 	# These includes and libs are in binutils already
 	rm -f ${D}/usr/lib/libbfd.*
 	rm -f ${D}/usr/lib/libiberty.*
 	rm -f ${D}/usr/lib/libopcodes.*
 	rm -f ${D}/usr/share/info/{bfd,configure,standards}.info*
-	rm -r ${D}/usr/share/locale
-	rm -r ${D}/usr/include
+
+	rm -rf ${D}/usr/include
+
+	dodoc COPYING* README
+
+	docinto gdb
+	dodoc gdb/CONTRIBUTE gdb/COPYING* gdb/README \
+		gdb/MAINTAINERS gdb/NEWS gdb/ChangeLog* \
+		gdb/TODO
+
+	docinto sim
+	dodoc sim/ChangeLog sim/MAINTAINERS sim/README-HACKING
+
+	docinto mmalloc
+	dodoc mmalloc/COPYING.LIB mmalloc/MAINTAINERS \
+		mmalloc/ChangeLog mmalloc/TODO
 }
diff --git a/sys-devel/gdb/gdb-6.2.1.ebuild b/sys-devel/gdb/gdb-6.2.1.ebuild
index f2d4ff593c9a..1d183057531b 100644
--- a/sys-devel/gdb/gdb-6.2.1.ebuild
+++ b/sys-devel/gdb/gdb-6.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.2.1.ebuild,v 1.7 2005/01/11 21:14:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.2.1.ebuild,v 1.1 2004/09/22 23:36:25 lu_zero Exp $
 
 inherit flag-o-matic eutils
 
@@ -11,12 +11,10 @@ SRC_URI="http://mirrors.rcn.net/pub/sourceware/gdb/releases/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa mips ~ppc ~ppc64 -sparc ~x86"
-IUSE="nls test"
+KEYWORDS="~x86 ~alpha ~arm hppa ~ppc64 ~amd64 -sparc ~ppc"
+IUSE="nls"
 
-RDEPEND=">=sys-libs/ncurses-5.2-r2"
-DEPEND="${RDEPEND}
-	test? ( dev-util/dejagnu )
+DEPEND=">=sys-libs/ncurses-5.2-r2
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
@@ -27,43 +25,44 @@ src_unpack() {
 
 src_compile() {
 	replace-flags -O? -O2
-	econf $(use_enable nls) || die
+	econf `use_enable nls` || die
 	make || die
 }
 
 src_install() {
-	make \
+	 make \
 		prefix=${D}/usr \
 		mandir=${D}/usr/share/man \
-		libdir=${D}/usr/$(get_libdir) \
 		infodir=${D}/usr/share/info \
-		install || die "install"
-	dodoc README
-	docinto gdb
-	dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
-		gdb/NEWS gdb/ChangeLog* gdb/TODO
-	docinto sim
-	dodoc sim/ChangeLog sim/MAINTAINERS sim/README-HACKING
-	docinto mmalloc
-	dodoc mmalloc/MAINTAINERS mmalloc/ChangeLog mmalloc/TODO
+		install || die
+
+	cd gdb/doc
+	make \
+		infodir=${D}/usr/share/info \
+		install-info || die
 
-	if ! has noinfo ${FEATURES} ; then
-		cd gdb/doc
-		make \
-			infodir=${D}/usr/share/info \
-			install-info || die "install doc info"
+	cd ${S}/bfd/doc
+	make \
+		infodir=${D}/usr/share/info \
+		install-info || die
 
-		cd ${S}/bfd/doc
-		make \
-			infodir=${D}/usr/share/info \
-			install-info || die "install bfd info"
-	fi
+	cd ${S}
 
 	# These includes and libs are in binutils already
 	rm -f ${D}/usr/lib/libbfd.*
 	rm -f ${D}/usr/lib/libiberty.*
 	rm -f ${D}/usr/lib/libopcodes.*
 	rm -f ${D}/usr/share/info/{bfd,configure,standards}.info*
-	rm -r ${D}/usr/share/locale
-	rm -r ${D}/usr/include
+
+	rm -rf ${D}/usr/include
+
+	dodoc README
+	docinto gdb
+	dodoc gdb/CONTRIBUTE gdb/README \
+		gdb/MAINTAINERS gdb/NEWS gdb/ChangeLog* \
+		gdb/TODO
+	docinto sim
+	dodoc sim/ChangeLog sim/MAINTAINERS sim/README-HACKING
+	docinto mmalloc
+	dodoc mmalloc/MAINTAINERS mmalloc/ChangeLog mmalloc/TODO
 }
diff --git a/sys-devel/gdb/gdb-6.3-r4.ebuild b/sys-devel/gdb/gdb-6.3-r4.ebuild
index e752f630f38c..566725ac10ea 100644
--- a/sys-devel/gdb/gdb-6.3-r4.ebuild
+++ b/sys-devel/gdb/gdb-6.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.3-r4.ebuild,v 1.4 2005/10/21 02:12:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.3-r4.ebuild,v 1.1 2005/07/09 23:44:44 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -15,15 +15,16 @@ DEB_VER=6
 DESCRIPTION="GNU debugger"
 HOMEPAGE="http://sources.redhat.com/gdb/"
 SRC_URI="http://mirrors.rcn.net/pub/sourceware/gdb/releases/${P}.tar.bz2
-	!vanilla? ( mirror://debian/pool/main/g/gdb/gdb_${PV}-${DEB_VER}.diff.gz )
+	mirror://debian/pool/main/g/gdb/gdb_${PV}-${DEB_VER}.diff.gz
 	mirror://gentoo/gdb_init.txt.bz2"
+#SRC_URI="${SRC_URI} mirror://gentoo/gdb-6.1-hppa-01.patch.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 [[ ${CTARGET} != ${CHOST} ]] \
 	&& SLOT="${CTARGET}" \
 	|| SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="nls test vanilla"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~s390"
+IUSE="nls test"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r2"
 DEPEND="${RDEPEND}
@@ -34,26 +35,23 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	mv "${WORKDIR}"/gdb_init.txt . || die
-
-	if ! use vanilla ; then
-		epatch "${WORKDIR}"/gdb_${PV}-${DEB_VER}.diff
-		for f in $(<debian/patches/series) ; do
-			EPATCH_SINGLE_MSG="Applying Debian's ${f}" \
-			epatch debian/patches/${f}
-		done
-		epatch "${FILESDIR}"/gdb-6.3-uclibc.patch
-		epatch "${FILESDIR}"/gdb-6.3-relative-paths.patch
-		#epatch "${FILESDIR}"/gdb-6.x-crash.patch
-		epatch "${FILESDIR}"/gdb-6.2.1-pass-libdir.patch
-		epatch "${FILESDIR}"/gdb-6.3-scanmem.patch
-		epatch "${FILESDIR}"/gdb-6.3-gdbinit-stat.patch
-		# sec bug 91398
-		epatch "${FILESDIR}"/bfd-malloc-wrap.patch
-
-		epatch "${FILESDIR}"/gdb-6.2.1-200-uclibc-readline-conf.patch
-		epatch "${FILESDIR}"/gdb-6.2.1-400-mips-coredump.patch
-		epatch "${FILESDIR}"/gdb-6.2.1-libiberty-pic.patch
-	fi
+	epatch "${WORKDIR}"/gdb_${PV}-${DEB_VER}.diff
+	for f in $(<debian/patches/series) ; do
+		EPATCH_SINGLE_MSG="Applying Debian's ${f}" \
+		epatch debian/patches/${f}
+	done
+	epatch "${FILESDIR}"/gdb-6.3-uclibc.patch
+	epatch "${FILESDIR}"/gdb-6.3-relative-paths.patch
+	#epatch "${FILESDIR}"/gdb-6.x-crash.patch
+	epatch "${FILESDIR}"/gdb-6.2.1-pass-libdir.patch
+	epatch "${FILESDIR}"/gdb-6.3-scanmem.patch
+	epatch "${FILESDIR}"/gdb-6.3-gdbinit-stat.patch
+	# sec bug 91398
+	epatch "${FILESDIR}"/bfd-malloc-wrap.patch
+
+	epatch "${FILESDIR}"/gdb-6.2.1-200-uclibc-readline-conf.patch
+	epatch "${FILESDIR}"/gdb-6.2.1-400-mips-coredump.patch
+	epatch "${FILESDIR}"/gdb-6.2.1-libiberty-pic.patch
 
 	strip-linguas -u bfd/po opcodes/po
 }
@@ -100,11 +98,11 @@ src_install() {
 	fi
 
 	if ! has noinfo ${FEATURES} ; then
-		make \
+		make -C "${S}"/gdb/doc \
+			infodir="${D}"/usr/share/info \
+			install-info || die "install doc info"
+		make -C "${S}"/bfd/doc \
 			infodir="${D}"/usr/share/info \
-			install-info \
-			|| die "install doc info"
-		# Remove shared info pages
-		rm -f "${D}"/usr/share/info/{annotate,bfd,configure,standards}.info*
+			install-info || die "install bfd info"
 	fi
 }
diff --git a/sys-devel/gdb/metadata.xml b/sys-devel/gdb/metadata.xml
index fb4199eb7afe..f093d416cbb1 100644
--- a/sys-devel/gdb/metadata.xml
+++ b/sys-devel/gdb/metadata.xml
@@ -1,5 +1,7 @@
+ [32;01m*[0m Generated metadata.xml:
+
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>toolchain</herd>
+<herd>base-system</herd>
 </pkgmetadata>
diff --git a/sys-devel/gecc/ChangeLog b/sys-devel/gecc/ChangeLog
index b84cf8087809..fea8deb8bd9d 100644
--- a/sys-devel/gecc/ChangeLog
+++ b/sys-devel/gecc/ChangeLog
@@ -1,15 +1,7 @@
-# ChangeLog for sys-devel/gecc
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gecc/ChangeLog,v 1.7 2004/08/24 04:00:55 swegener Exp $
+# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gecc/ChangeLog,v 1.1 2002/10/20 00:29:10 mjc Exp $
 
-  24 Aug 2004; Sven Wegener <swegener@gentoo.org> gecc-20021019.ebuild,
-  gecc-20021102.ebuild:
-  Use epatch for patching and removed RDEPEND="${DEPEND}"
-
-*gecc-20021102 (16 Nov 2002)
-
-  16 Nov 2002; Michael Cohen <mjc@gentoo.org> version bump.
-
-*gecc-20021019 (19 Oct 2002)
+*<gecc-20021019> (19 Oct 2002)
 
   19 Oct 2002; Michael Cohen <mjc@gentoo.org> initial ebuild.
diff --git a/sys-devel/gecc/Manifest b/sys-devel/gecc/Manifest
index 975ac2d61d27..e69de29bb2d1 100644
--- a/sys-devel/gecc/Manifest
+++ b/sys-devel/gecc/Manifest
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 fc92b92b16df5da3209467a8544bd6a7 gecc-20021102.ebuild 1052
-MD5 59327139a1cedec1359a341cd2786b45 ChangeLog 541
-MD5 00ef9b1c6a002f83fb096be1238489c8 files/digest-gecc-20021102 65
-MD5 c4c746f382351fcddd32f5cfd4aa172c files/rc.geccd 718
-MD5 a7851866401ff56cb3df9208fb123070 files/env.geccd 37
-MD5 f67688363174d942ba9780b190ba09fa files/conf.geccd 611
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC2l/NgIKl8Uu19MoRAnYGAJsFxbIL+s9wvnhZVHbIOwvOC0F4JgCfdifs
-JaqFlV2XGv0gbSa4LAAemnQ=
-=F86K
------END PGP SIGNATURE-----
diff --git a/sys-devel/gecc/files/conf.geccd b/sys-devel/gecc/files/conf.geccd
index c847bb1b8805..df0000f6fb5c 100644
--- a/sys-devel/gecc/files/conf.geccd
+++ b/sys-devel/gecc/files/conf.geccd
@@ -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-devel/gecc/files/conf.geccd,v 1.3 2004/07/15 01:00:06 agriffis Exp $
+# 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-devel/gecc/files/conf.geccd,v 1.1 2002/10/20 01:50:25 lostlogic Exp $
 
 # Where should gecc store it's cache?
 GECCD_CACHE="/var/tmp/geccd-cache"
diff --git a/sys-devel/gecc/files/rc.geccd b/sys-devel/gecc/files/rc.geccd
index de606080e5c8..f783581d6c39 100644
--- a/sys-devel/gecc/files/rc.geccd
+++ b/sys-devel/gecc/files/rc.geccd
@@ -1,13 +1,15 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gecc/files/rc.geccd,v 1.4 2004/07/15 01:00:06 agriffis Exp $
+# 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-devel/gecc/files/rc.geccd,v 1.1 2002/10/20 01:50:25 lostlogic Exp $
 
-depend() {
+depend()
+{
 	need net
 }
 
-start() {
+start()
+{
 	local myopts
 	if [ ! -z "${GECCD_CENTRAL}" ]; then
 		myopts="-c -a ${GECCD_CENTRAL} -A ${GECCD_PORT}"
@@ -15,17 +17,18 @@ start() {
 
 	ebegin "Starting geccd"
 	start-stop-daemon --start --quiet --exec /usr/bin/geccd -- \
-		${myopts} \
-		-c \
-		-p ${GECCD_PORT} \
-		-C ${GECCD_CACHE} \
-		-j ${GECCD_JOBS} \
-		-s /var/run/geccd.sock \
-		--pid-file /var/run/geccd.pid
+						 ${myopts} \
+						 -c \
+						 -p ${GECCD_PORT} \
+						 -C ${GECCD_CACHE} \
+						 -j ${GECCD_JOBS} \
+						 -s /var/run/geccd.sock \
+						 --pid-file /var/run/geccd.pid
 	eend $?
 }
 
-stop() {
+stop()
+{
 	ebegin "Stopping geccd"
 	start-stop-daemon --stop --quiet -p /var/run/geccd.pid
 	eend $?
diff --git a/sys-devel/gecc/gecc-20021102.ebuild b/sys-devel/gecc/gecc-20021102.ebuild
index 2ba5308929d0..2e50c0594d5c 100644
--- a/sys-devel/gecc/gecc-20021102.ebuild
+++ b/sys-devel/gecc/gecc-20021102.ebuild
@@ -1,17 +1,24 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gecc/gecc-20021102.ebuild,v 1.7 2005/07/17 13:40:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gecc/gecc-20021102.ebuild,v 1.1 2002/11/16 16:43:06 mjc Exp $
 
-DESCRIPTION="tool to speed up compilation of C/C++ sources with compilation distribution and caches"
+IUSE=""
+DESCRIPTION="gecc is a tool to speed up compilation of C/C++ sources. It distributes the compilation on a cluster of compilation nodes. It also caches the object files to save some unneeded work."
 HOMEPAGE="http://gecc.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE=""
+DEPEND="sys-devel/gcc"
+RDEPEND="$DEPEND"
+S="${WORKDIR}/${P}"
 
-DEPEND=""
+src_compile() {
+#	rm -rf test
+	econf || die "configure failed"
+#	patch -p0 < ${FILESDIR}/${P}-gentoo.diff || die
+	emake || die "make failed"
+}
 
 src_install() {
 	einstall || die "Install failed"
@@ -23,15 +30,20 @@ src_install() {
 	dosym /usr/bin/gecc /usr/bin/gecc_link/c++
 	dosym /usr/bin/gecc /usr/bin/gecc_link/cc
 
-	newconfd ${FILESDIR}/conf.geccd geccd
-	newenvd ${FILESDIR}/env.geccd 06geccd
-	newinitd ${FILESDIR}/rc.geccd geccd
+	insinto /etc/conf.d
+	newins ${FILESDIR}/conf.geccd geccd
+
+	insinto /etc/env.d
+	newins ${FILESDIR}/env.geccd 06geccd
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/rc.geccd geccd
 }
 
 pkg_postinst() {
 	einfo
 	einfo "To use gecc for you local compiles you will need to add"
-	einfo "/usr/bin/gecc/ to the front of your path, and add geccd"
+	einfo "/usr/bin/gecc to the front of your path, and add geccd"
 	einfo "to your default runlevel"
 	einfo
 }
diff --git a/sys-devel/gecc/metadata.xml b/sys-devel/gecc/metadata.xml
index 96a2d586367d..f093d416cbb1 100644
--- a/sys-devel/gecc/metadata.xml
+++ b/sys-devel/gecc/metadata.xml
@@ -1,3 +1,5 @@
+ [32;01m*[0m Generated metadata.xml:
+
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index 8572d3b1b050..580e7322026a 100644
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,340 +1,6 @@
 # ChangeLog for sys-devel/gettext
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.97 2005/09/17 11:28:38 kloeri Exp $
-
-  01 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> gettext-0.14.5.ebuild:
-  Remove charset.alias always, not just in ppc-macos case.
-
-*gettext-0.14.5 (01 Sep 2005)
-
-  01 Sep 2005; Mike Frysinger <vapier@gentoo.org> +gettext-0.14.5.ebuild:
-  Version bump.
-
-  29 Jun 2005; Joshua Kinard <kumba@gentoo.org> gettext-0.14.4.ebuild:
-  Marked stable on mips.
-
-  18 Jun 2005; Markus Rothe <corsair@gentoo.org> gettext-0.14.4.ebuild:
-  Stable on ppc64
-
-  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> gettext-0.14.4.ebuild:
-  Stable on ppc.
-
-  16 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> gettext-0.14.4.ebuild:
-  Stable on sparc
-
-  12 Jun 2005; Lina Pezzella <j4rg0n@gentoo.org> gettext-0.14.4.ebuild:
-  Stable ppc-macos
-
-  25 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
-  gettext-0.14.1-r1.ebuild:
-  Stable on alpha.
-
-*gettext-0.14.1-r1 (20 Apr 2005)
-
-  20 Apr 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/gettext-0.14.1-tempfile.patch, -gettext-0.14.1.ebuild,
-  +gettext-0.14.1-r1.ebuild:
-  Add tempfile patch to resolve #85766.
-
-*gettext-0.14.4 (19 Apr 2005)
-
-  19 Apr 2005; Mike Frysinger <vapier@gentoo.org> +gettext-0.14.4.ebuild:
-  Version bump.
-
-  12 Apr 2005; Mamoru KOMACHI <usata@gentoo.org> +files/50po-mode-gentoo.el,
-  gettext-0.14.2.ebuild:
-  Register po-mode if emacs USE is set; bug #74458.
-
-  09 Apr 2005; Markus Rothe <corsair@gentoo.org> gettext-0.14.1.ebuild:
-  Stable on ppc64
-
-  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> gettext-0.14.1.ebuild:
-  Stable on ppc.
-
-  03 Apr 2005; Lina Pezzella <j4rg0n@gentoo.org> gettext-0.14.1.ebuild,
-  gettext-0.14.2.ebuild:
-  Fix for Bug #70448
-
-  26 Mar 2005; Lina Pezzella <j4rg0n@gentoo.org> gettext-0.14.1.ebuild:
-  Stable ppc-macos
-
-  15 Mar 2005; Christian Birchinger <joker@gentoo.org> gettext-0.14.1.ebuild:
-  Added sparc stable keyword
-
-  14 Mar 2005; Martin Schlemmer <azarah@gentoo.org>
-  +files/gettext-0.14.2-fix-race.patch, gettext-0.14.2.ebuild:
-  Fix race, bug #85054.
-
-*gettext-0.14.2 (13 Mar 2005)
-
-  13 Mar 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/gettext-0.14.2-no-java-tests.patch, +gettext-0.14.2.ebuild:
-  Version bump.
-
-  19 Feb 2005; Kito <kito@gentoo.org> gettext-0.14.1.ebuild:
-  add conditional to save existing libintl. ~ppc-macos keyword
-
-  06 Feb 2005; Mike Frysinger <vapier@gentoo.org> gettext-0.14.1.ebuild:
-  Disable sandbox when running tests #70358.
-
-  03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-  29 Dec 2004; Lina Pezzella <j4rg0n@gentoo.org> gettext-0.14.1.ebuild:
-  Removed ppc-macos keyword until conditional check for libintl.so.2 is made
-  OSX-compatible.
-
-  29 Dec 2004; Lina Pezzella <j4rg0n@gentoo.org> gettext-0.12.1-r2.ebuild:
-  Let gettext install libintl.h and friends; bug #64779
-
-  13 Dec 2004; Mamoru KOMACHI <usata@gentoo.org> gettext-0.12.1-r2.ebuild:
-  Disabled elibtoolize on ppc-macos; bug #72843.
-
-  08 Dec 2004; Kito <kito@gentoo.org> gettext-0.14.1.ebuild:
-  stable on ppc-macos
-
-  11 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> gettext-0.14.1.ebuild:
-  ppc-macos doesn't like elibtoolize --reverse-deps
-
-  04 Nov 2004; Mike Frysinger <vapier@gentoo.org> gettext-0.14.1.ebuild:
-  Move back to unstable #66449.
-
-  04 Nov 2004; Travis Tilley <lv@gentoo.org> gettext-0.14.1.ebuild:
-  re-keywording as stable on amd64 now that bug #66449 has been fixed.
-  re-fixes bug 68578
-
-  31 Oct 2004; Mike Frysinger <vapier@gentoo.org> gettext-0.12.1-r2.ebuild,
-  gettext-0.14.1.ebuild:
-  Clean up the install phase and try to address linking issues #66449.
-
-  16 Oct 2004; Hardave Riar <hardave@gentoo.org> gettext-0.12.1-r2.ebuild:
-  Stable on mips, bug #66355.
-
-  09 Oct 2004; Tom Gall <tgall@gentoo.org> gettext-0.12.1-r2.ebuild:
-  stable on ppc64, bug #66355
-
-  09 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> gettext-0.12.1-r2.ebuild:
-  Stable on alpha, bug 66355.
-
-  08 Oct 2004; Guy Martin <gmsoft@gentoo.org> gettext-0.12.1-r2.ebuild:
-  Marked stable on hppa.
-
-  08 Oct 2004; <SeJo@gentoo.org> gettext-0.12.1-r2.ebuild:
-  stable ppc gsla bug: 66355
-
-  07 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  gettext-0.12.1-r2.ebuild:
-  Stable sparc.
-
-  07 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  gettext-0.12.1-r2.ebuild:
-  Stable on amd64 and x86 per security bug #66355.
-
-*gettext-0.12.1-r2 (07 Oct 2004)
-
-  07 Oct 2004; Mike Frysinger <vapier@gentoo.org>
-  +files/gettext-0.12.1-tempfile.patch, +gettext-0.12.1-r2.ebuild:
-  Version bump for security #66355.
-
-*gettext-0.14.1 (05 Oct 2004)
-
-  05 Oct 2004; Mike Frysinger <vapier@gentoo.org>
-  +files/gettext-0.14.1-without_java.patch, +gettext-0.14.1.ebuild:
-  Version bump #47788 and security #66355.
-
-  03 Oct 2004; Mike Frysinger <vapier@gentoo.org> gettext-0.11.5-r1.ebuild,
-  gettext-0.11.5.ebuild, gettext-0.12.1-r1.ebuild, gettext-0.12.1.ebuild:
-  Have the ebuilds install the GNU gmsgfmt symlink #43435.
-
-  31 Jul 2004; <solar@gentoo.org> gettext-0.12.1-r1.ebuild,
-  gettext-0.12.1.ebuild:
-  gnuconfig update needed for atleast uclibc
-
-  31 Jul 2004; Tom Gall <tgall@gentoo.org> gettext-0.12.1-r1:
-  stable on ppc64, bug #57114
-
-  25 Jul 2004; Lina Pezzella <burgundy@gentoo.org> :
-  gettext-0.12.1-r1:
-  Rewrote test for nls use flag.  Forced --enable-nls on macos as per bug #57868.
-
-  23 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> gettext-0.12.1-r1.ebuild:
-  Stable on macos.
-
-  20 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> gettext-0.12.1-r1.ebuild:
-  Fixed file collision on macos
-
-  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  gettext-0.12.1-r1.ebuild, gettext-0.12.1.ebuild:
-  virtual/glibc -> virtual/libc
-
-  24 Jun 2004; Aron Griffis <agriffis@gentoo.org> gettext-0.12.1-r1.ebuild,
-  gettext-0.12.1.ebuild:
-  QA - fix use invocation
-
-  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> gettext-0.12.1-r1.ebuild:
-  Stable on alpha.
-
-  02 Jun 2004; Seemant Kulleen <seemant@gentoo.org> gettext-0.12.1-r1.ebuild,
-  gettext-0.12.1.ebuild:
-  Remove the emacs site-lisp stuff, if emacs is not in USE. Closes bug #47854 by
-  Andrew Kirilenko <icedank@gmx.net>. Eric Brown <bigwhitecow@hotmail.com> did
-  the actual patch to the gettext ebuild.
-
-  02 Jun 2004; Travis Tilley <lv@gentoo.org> gettext-0.12.1-r1.ebuild:
-  stable on amd64
-
-  07 Apr 2004; Travis Tilley <lv@gentoo.org> gettext-0.12.1-r1.ebuild:
-  added ~amd64 keyword
-
-  02 Mar 2004; Brian Jackson <iggy@gentoo.org> gettext-0.12.1-r1.ebuild:
-  s390 keywords
-
-  08 Feb 2004; Brad House <brad_mssw@gentoo.org> gettext-0.11.5-r1.ebuild:
-  ppc64 fixes
-
-  08 Feb 2004; Martin Schlemmer <azarah@gentoo.org> gettext-0.12.1-r1.ebuild:
-  Fix it to actually do as advertised.
-
-*gettext-0.12.1-r1 (08 Feb 2004)
-
-  08 Feb 2004; Martin Schlemmer <azarah@gentoo.org> gettext-0.12.1-r1.ebuild:
-  Build with --without-included-gettext (will use that of glibc), as we need
-  preloadable_libintl.so for new help2man, bug #40162.
-
-  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> gettext-0.12.1.ebuild:
-  set ppc in keywords
-
-  12 Jan 2004; Guy Martin <gmsoft@gentoo.org> gettext-0.12.1.ebuild :
-  Marked stable on hppa.
-
-  09 Jan 2004; Aron Griffis <agriffis@gentoo.org> gettext-0.12.1.ebuild:
-  stable on alpha
-
-  08 Jan 2004; <gustavoz@gentoo.org> gettext-0.12.1.ebuild:
-  upgrade fix for sparc with java present
-
-  07 Jan 2004; Jason Wever <weeve@gentoo.org> gettext-0.12.1.ebuild:
-  Marked stable on sparc, resolves #35970 for sparc.
-
-  28 Dec 2003; Joshua Kinard <kumba@gentoo.org> gettext-0.12.1.ebuild:
-  Move to mips stable (~mips -> mips)
-
-  16 Dec 2003; Marius Mauch <genone@gentoo.org> gettext-0.12.1.ebuild:
-  marking stable on x86
-
-  17 Nov 2003; Aron Griffis <agriffis@gentoo.org> gettext-0.12.1.ebuild:
-  Repair compilation on alpha when compaq-jdk/jre is installed
-
-  13 Nov 2003; Brad House <brad_mssw@gentoo.org> gettext-0.12.1.ebuild:
-  take ~amd64 flag off gettext-0.12.1. It detects
-  being installed and messes things up royally.  Once portage is patched
-  to build 32bit and 64bit libsandbox.so's, or we have a native 64bit
-
-  12 Nov 2003; Will Woods <wwoods@gentoo.org> gettext-0.11.5-r1.ebuild:
-  Marked stable for alpha
-
-  10 Nov 2003; Seemant Kulleen <seemant@gentoo.org> gettext-0.11.1.ebuild,
-  gettext-0.11.3-r1.ebuild, gettext-0.12.1.ebuild,
-  files/gettext-0.10.38-gentoo.diff:
-  Added a patch to kill the C++ checks during the configure stage, for
-  bootstrapping, closes bug #25080 by: Harald Schioeberg
-  <schioebe@net.in.tum.de>
-
-  02 Nov 2003; Aron Griffis <agriffis@gentoo.org> gettext-0.11.5-r1.ebuild:
-  Repair compilation on alpha when compaq-jdk/jre is installed
-
-  16 Sep 2003; Daniel Robbins <drobbins@gentoo> gettext-0.12.1.ebuild:
-  KEYWORDS="-*" since it needs C++ to compile and breaks bootstrap.
-  Closing bug #12699.
-
-*gettext-0.12.1 (14 Jul 2003)
-
-  14 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> gettext-0.12.1.ebuild :
-  Version bump.
-
-*gettext-0.12 (13 Jul 2003)
-
-  13 Jul 2003; Hanno Boeck <hanno@gentoo.org> gettext-0.12.ebuild:
-  Version bump.
-
-*gettext-0.11.5-r1 (24 Nov 2002)
-
-  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> gettext-0.11.5-r1.ebuild :
-  ia64 keywords.
-
-  01 Jul 2003; Todd Sunderlin <todd@gentoo.org> gettext-0.11.5-r1.ebuild:
-  set stable on sparc
-
-  19 May 2003; <root@gentoo.org> gettext-0.11.5-r1.ebuild:
-  Added ~mips to KEYWORDS
-
-  18 Feb 2003; Zach Welch <zwelch@gentoo.org> gettext-0.11.5-r1.ebuild : 
-  Added arm to keywords.
-
-  07 Feb 2003; Guy Martin <gmsoft@gentoo.org> gettext-0.11.5-r1.ebuild : 
-  Added hppa to keywords.
-
-*gettext-0.11.1  (12 Dec 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
- 
-*gettext-0.11.5-r1 (24 Nov 2002)
-
-  24 Nov 2002; L. Boshell <leonardop@gentoo.org> : Don't delete the entire
-  ${D}/usr/lib directory, only the files that could be problematic (i.e.
-  *.{a,so}. Added IUSE var. Use mirror://gnu for SRC_URI.
-  
-  11 Sep 2002; Martin Schlemmer <azarah@gentoo.org> gettext-0.11.1.ebuild :
-
-  Make sure that no headers is installed.  Seems like this happened in
-  very rare instances, bug #7682.
-
-*gettext-0.11.5 (16 Aug 2002)
-
-  31 Mar 2003; Jan Seidel <tuxus@gentoo.org> gettext-0.11.5.ebuild :
-  Added mips to KEYWORDS
-
-  16 Aug 2002; Seemant Kulleen <seemant@gentoo.org> gettext-0.11.5.ebuild
-  files/digest-gettext-0.11.5 :
-
-  Version bump.
-
-*gettext-0.11.3-r1 (3 Aug 2002)
-
-  3 Aug 2002; Martin Schlemmer <azarah@gentoo.org> gettext-0.11.3-r1.ebuild :
-
-  Remove the installed header files, as these overwrite those that comes with
-  glibc, and then breaks things.
-
-*gettext-0.11.3 (21 Jul 2002)
-
-  21 Jul 2002; Seemant Kulleen <seemant@gentoo.org> gettext-0.11.3.ebuild :
-  files/digest-gettext-0.11.3 :
-
-  Version bump.
-
-  17 Apr 2002; Seemant Kulleen <seemant@gentoo.org> gettext-0.11.1-r1.ebuild :
-
-  Vitaly reports that glibc doesn't have libs, but contains the functioality
-  of the gettext libs.  this ebuild is unnecessary.
-
-*gettext-0.11.1-r1 (16 Apr 2002)
-
-  16 Apr 2002; Seemant Kulleen <seemant@gentoo.org> gettext-0.11.1-r1.ebuild
-  files/digest-gettext-0.11.1-r1 :
-
-  Since glibc does not seem to be providing the header files and such, I have
-  enabled gettext to install them instead.  Hopefully this solves the
-  intermittent php emerge bug.
-
-*gettext-0.11.1
-
-  27 Mar 2002; Seemant Kulleen <seemant@gentoo.org> gettext-0.11.1.ebuild :
-
-  Version bump -- copied old ebuild to new name.
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
 
 *gettext-0.10.40 (1 Feb 2002)
 
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 4bdafdb160e4..d429371e5f18 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,31 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 417febf61ac7e268e0252516ded8556a ChangeLog 12061
-MD5 38756cea2e4f8e36c2e45b890f1a7463 files/50po-mode-gentoo.el 183
-MD5 83b80576c27ac3a75d70802eb9c92790 files/digest-gettext-0.12.1-r2 67
-MD5 0e4a00cc30a91523c838cd17b5841399 files/digest-gettext-0.14.1-r1 67
-MD5 44ad3082200305087e6244f5a2665892 files/digest-gettext-0.14.2 67
-MD5 bc7e7f683a64a5f805af77b1ed851b65 files/digest-gettext-0.14.4 67
-MD5 ba2eaf73c69d33eeb6f259f2c2da4ded files/digest-gettext-0.14.5 67
-MD5 fada337fd753f2580b6849dc560498ff files/gettext-0.12.1-tempfile.patch 2226
-MD5 3b9aefbb552545fdf0836f56121c9ae5 files/gettext-0.12.1-without_java.patch 2743
-MD5 3077319e6090fcd6262e2d8fd463441f files/gettext-0.14.1-lib-path-tests.patch 707
-MD5 2a60a632eb22d99acfa09d16828fe073 files/gettext-0.14.1-no-java-tests.patch 2885
-MD5 095399be17e9cf19b7b02ffcd1fb95a5 files/gettext-0.14.1-tempfile.patch 2636
-MD5 3b9aefbb552545fdf0836f56121c9ae5 files/gettext-0.14.1-without_java.patch 2743
-MD5 dfcc1d12d05c42f262de0dada08ed90d files/gettext-0.14.2-fix-race.patch 417
-MD5 b56837fdd725fc00c173b57b951b90cc files/gettext-0.14.2-no-java-tests.patch 2524
-MD5 0890c612ec51d74a5cefbb0ca3ab8ae7 gettext-0.12.1-r2.ebuild 2543
-MD5 ac4041bb4e436a9935d04cd63b40d425 gettext-0.14.1-r1.ebuild 2886
-MD5 f46f927893861e2d082d7b836f597ef7 gettext-0.14.2.ebuild 3509
-MD5 430e22b4c52c95f6c61427e5ec6d9439 gettext-0.14.4.ebuild 3578
-MD5 c01230991728fd8cb2d1167f7c49a33b gettext-0.14.5.ebuild 3818
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDcschgIKl8Uu19MoRAgqAAJ9vcwj6M0KhCJrMR4cnp/Kwgjj9nACeMN23
-mVZCRW5kDX/LFnS3W1n5LBA=
-=XPKN
------END PGP SIGNATURE-----
+MD5 141c024610af9e3582fd281d7d795536 ChangeLog 2840
+MD5 f3e17acceba8b5199d03000dcad9ca8b gettext-0.11.1.ebuild 1418
+MD5 69f0218e2d33af0bc6d715202faf45b0 gettext-0.11.3-r1.ebuild 1440
+MD5 f23412ecea861335b9fbdddb37c449d4 gettext-0.11.5-r1.ebuild 1486
+MD5 a334b9e8d4dfadc8dfa76401cc46e60d gettext-0.11.5.ebuild 1462
+MD5 aece59e56ab02e28c4fa41834e699ac5 files/digest-gettext-0.11.1 67
+MD5 3edc9a1e003157012622c2dd3792229b files/digest-gettext-0.11.3-r1 67
+MD5 e99872d90f08d5a5ce57121d10f0e07f files/digest-gettext-0.11.5 67
+MD5 e99872d90f08d5a5ce57121d10f0e07f files/digest-gettext-0.11.5-r1 67
+MD5 e1790fcdc21680848c6c1edd65fef16f files/gettext-0.10.38-gentoo.diff 640
diff --git a/sys-devel/gettext/gettext-0.12.1-r2.ebuild b/sys-devel/gettext/gettext-0.12.1-r2.ebuild
index ef316cc49d38..fdf563271106 100644
--- a/sys-devel/gettext/gettext-0.12.1-r2.ebuild
+++ b/sys-devel/gettext/gettext-0.12.1-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.12.1-r2.ebuild,v 1.18 2005/01/03 00:05:06 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.12.1-r2.ebuild,v 1.1 2004/10/07 23:51:46 vapier Exp $
 
-inherit eutils gnuconfig toolchain-funcs libtool
+inherit eutils gnuconfig
 
 DESCRIPTION="GNU locale utilities"
 HOMEPAGE="http://www.gnu.org/software/gettext/gettext.html"
@@ -10,23 +10,22 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos s390 sh sparc x86"
-IUSE="emacs nls"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc ~x86"
+IUSE="bootstrap emacs nls"
 
 DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epunt_cxx
+	use bootstrap && epatch ${FILESDIR}/${P}-bootstrap.patch
 	epatch ${FILESDIR}/${P}-tempfile.patch #66355
-	use ppc-macos || elibtoolize --reverse-deps
 	gnuconfig_update
 }
 
 src_compile() {
 	local myconf=""
-	use ppc-macos && myconf="--enable-nls" || myconf="`use_enable nls`"
+	( use macos || use ppc-macos ) && myconf="--enable-nls" || myconf="`use_enable nls`"
 
 	# Compaq Java segfaults trying to build gettext stuff, and there's
 	# no good way to tell gettext to refrain from building the java
@@ -46,8 +45,7 @@ src_compile() {
 	# need preloadable_libintl.so for new help2man, bug #40162.
 	# Also note that it only gets build with USE=nls ...
 	# Lastly, we need to build without --disable-shared ...
-	CXX=$(tc-getCC) \
-		econf \
+	CXX=${CC} econf \
 		--without-included-gettext \
 		${myconf} || die
 
@@ -65,15 +63,15 @@ src_install() {
 	exeinto /usr/bin
 	doexe gettext-tools/misc/gettextize || die "doexe"
 
-	# remove stuff that glibc handles
-	if ! use ppc-macos; then
-		# these files are not provided on Mac OS X
-		rm -f ${D}/usr/include/libintl.h
-		rm -f ${D}/usr/$(get_libdir)/libintl.*
-	fi
+	# Glibc includes gettext; this isn't needed anymore
+#	rm -rf ${D}/usr/include
+#	rm -rf ${D}/usr/lib/lib*.{a,so}
+
+	# Again, installed by glibc
 	rm -rf ${D}/usr/share/locale/locale.alias
+
 	# /usr/lib/charset.alias is provided by Mac OS X
-	use ppc-macos && rm -f ${D}/usr/lib/charset.alias
+	( use macos || use ppc-macos ) && rm -f ${D}/usr/lib/charset.alias
 
 	if [ -d ${D}/usr/doc/gettext ]
 	then
diff --git a/sys-devel/gettext/gettext-0.14.1-r1.ebuild b/sys-devel/gettext/gettext-0.14.1-r1.ebuild
index 67727ab975db..bc5b643b35c4 100644
--- a/sys-devel/gettext/gettext-0.14.1-r1.ebuild
+++ b/sys-devel/gettext/gettext-0.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-devel/gettext/gettext-0.14.1-r1.ebuild,v 1.3 2005/08/24 00:35:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.14.1-r1.ebuild,v 1.1 2005/04/20 04:35:02 vapier Exp $
 
 inherit eutils gnuconfig toolchain-funcs mono libtool
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 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="emacs nls"
 
 DEPEND=""
@@ -79,7 +79,7 @@ src_install() {
 		fi
 	else
 		if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.so.2 ] ; then
-			cp -pPR ${ROOT}/usr/$(get_libdir)/libintl.so.2* ${D}/usr/$(get_libdir)/
+			cp -a ${ROOT}/usr/$(get_libdir)/libintl.so.2* ${D}/usr/$(get_libdir)/
 			touch ${D}/usr/$(get_libdir)/libintl.so.2*
 		fi
 	fi
diff --git a/sys-devel/gettext/gettext-0.14.2.ebuild b/sys-devel/gettext/gettext-0.14.2.ebuild
index a5339a1167ab..c29940ada4c5 100644
--- a/sys-devel/gettext/gettext-0.14.2.ebuild
+++ b/sys-devel/gettext/gettext-0.14.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-devel/gettext/gettext-0.14.2.ebuild,v 1.7 2005/08/24 00:35:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.14.2.ebuild,v 1.1 2005/03/13 06:07:16 vapier Exp $
 
-inherit flag-o-matic eutils toolchain-funcs mono libtool elisp-common
+inherit eutils toolchain-funcs mono libtool
 
 DESCRIPTION="GNU locale utilities"
 HOMEPAGE="http://www.gnu.org/software/gettext/gettext.html"
@@ -25,11 +25,8 @@ src_unpack() {
 	# java sucks
 	epatch "${FILESDIR}"/${PN}-0.14.1-without_java.patch
 	epatch "${FILESDIR}"/${PN}-0.14.2-no-java-tests.patch
-	# Fix race, bug #85054
-	epatch "${FILESDIR}"/${PN}-0.14.2-fix-race.patch
 
 	# bundled libtool seems to be broken so skip certain rpath tests
-	# http://lists.gnu.org/archive/html/bug-libtool/2005-03/msg00070.html
 	sed -i \
 		-e '2iexit 77' \
 		autoconf-lib-link/tests/rpath-3*[ef] || die "sed tests"
@@ -43,8 +40,7 @@ src_unpack() {
 		|| die "sed docdir"
 
 	if use ppc-macos ; then
-		glibtoolize
-		append-flags -bind_at_load
+		elibtoolize
 	else
 		elibtoolize --reverse-deps
 	fi
@@ -86,12 +82,12 @@ src_install() {
 	if use ppc-macos; then
 		rm -f ${D}/usr/lib/charset.alias
 		if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.2.dylib ] ; then
-			cp -pPR ${ROOT}/usr/$(get_libdir)/libintl.2.dylib ${D}/usr/$(get_libdir)/
+			cp -a ${ROOT}/usr/$(get_libdir)/libintl.2.dylib ${D}/usr/$(get_libdir)/
 			touch ${D}/usr/$(get_libdir)/libintl.2.dylib
 		fi
 	else
 		if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.so.2 ] ; then
-			cp -pPR ${ROOT}/usr/$(get_libdir)/libintl.so.2* ${D}/usr/$(get_libdir)/
+			cp -a ${ROOT}/usr/$(get_libdir)/libintl.so.2* ${D}/usr/$(get_libdir)/
 			touch ${D}/usr/$(get_libdir)/libintl.so.2*
 		fi
 	fi
@@ -103,23 +99,14 @@ src_install() {
 	fi
 
 	# Remove emacs site-lisp stuff if 'emacs' is not in USE
-	if use emacs ; then
-		elisp-site-file-install ${FILESDIR}/50po-mode-gentoo.el
-	else
-		rm -rf ${D}/usr/share/emacs
-	fi
+	use emacs || rm -rf ${D}/usr/share/emacs
 
 	dodoc AUTHORS BUGS ChangeLog DISCLAIM NEWS README* THANKS TODO
 }
 
 pkg_postinst() {
-	use emacs && elisp-site-regen
 	ewarn "Any package that linked against the previous version"
 	ewarn "of gettext will have to be rebuilt."
 	ewarn "Please 'emerge gentoolkit' and run:"
 	ewarn "revdep-rebuild --soname libintl.so.2"
 }
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-devel/gettext/gettext-0.14.4.ebuild b/sys-devel/gettext/gettext-0.14.4.ebuild
index 651ed4d445e7..8805ca17131e 100644
--- a/sys-devel/gettext/gettext-0.14.4.ebuild
+++ b/sys-devel/gettext/gettext-0.14.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-devel/gettext/gettext-0.14.4.ebuild,v 1.14 2005/08/24 00:35:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.14.4.ebuild,v 1.1 2005/04/19 22:19:40 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs mono libtool elisp-common
 
@@ -10,10 +10,10 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc-macos ppc64 s390 sh sparc x86"
-IUSE="emacs nls doc"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="emacs nls"
 
-DEPEND="|| ( sys-libs/glibc dev-libs/libiconv )"
+DEPEND=""
 
 src_unpack() {
 	unpack ${A}
@@ -49,63 +49,61 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf=""
-	# Build with --without-included-gettext (on glibc systems)
-	if use elibc_glibc ; then
-		myconf="${myconf} --without-included-gettext $(use_enable nls)"
-	else
-		myconf="${myconf} --with-included-gettext --enable-nls"
-	fi
-	use emacs || export EMACS=no #93823
+	# Build with --without-included-gettext (will use that of glibc), as we
+	# need preloadable_libintl.so for new help2man, bug #40162.
+	# Also note that it only gets build with USE=nls ...
+	# Lastly, we need to build without --disable-shared ...
 	CXX=$(tc-getCC) \
 	econf \
 		--without-java \
-		${myconf} \
+		--without-included-gettext \
+		$(use_enable nls) \
 		|| die
 	emake || die
 }
 
 src_install() {
 	make install DESTDIR="${D}" || die "install failed"
-	use nls || rm -r "${D}"/usr/share/locale
 	dosym msgfmt /usr/bin/gmsgfmt #43435
-	dobin gettext-tools/misc/gettextize || die "gettextize"
+
+	exeopts -m0755
+	exeinto /usr/bin
+	doexe gettext-tools/misc/gettextize || die "doexe"
 
 	# remove stuff that glibc handles
-	if use elibc_glibc ; then
-		rm -f "${D}"/usr/include/libintl.h
-		rm -f "${D}"/usr/$(get_libdir)/libintl.*
+	if ! use ppc-macos; then
+		# Mac OS X does not provide these files.
+		rm -f ${D}/usr/include/libintl.h
+		rm -f ${D}/usr/$(get_libdir)/libintl.*
 	fi
-	rm -f "${D}"/usr/share/locale/locale.alias
+	rm -rf ${D}/usr/share/locale/locale.alias
 
 	# older gettext's sometimes installed libintl ...
 	# need to keep the linked version or the system
 	# could die (things like sed link against it :/)
 	if use ppc-macos; then
-		rm -f "${D}"/usr/lib/charset.alias
+		rm -f ${D}/usr/lib/charset.alias
 		if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.2.dylib ] ; then
 			cp -pPR ${ROOT}/usr/$(get_libdir)/libintl.2.dylib ${D}/usr/$(get_libdir)/
 			touch ${D}/usr/$(get_libdir)/libintl.2.dylib
 		fi
 	else
 		if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.so.2 ] ; then
-			cp -pPR ${ROOT}/usr/$(get_libdir)/libintl.so.2* ${D}/usr/$(get_libdir)/
+			cp -a ${ROOT}/usr/$(get_libdir)/libintl.so.2* ${D}/usr/$(get_libdir)/
 			touch ${D}/usr/$(get_libdir)/libintl.so.2*
 		fi
 	fi
 
-	if ! use doc ; then
-		rm -r "${D}"/usr/share/doc/${PF}/html
-		rm -r "${D}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
+	if [[ -d ${D}/usr/doc/gettext ]] ; then
+		mv "${D}"/usr/doc/gettext "${D}"/usr/share/doc/${PF}/html
+		rm -r "${D}"/usr/doc
 	fi
-	dohtml "${D}"/usr/share/doc/${PF}/*.html
-	rm -f "${D}"/usr/share/doc/${PF}/*.html
 
 	# Remove emacs site-lisp stuff if 'emacs' is not in USE
 	if use emacs ; then
-		elisp-site-file-install "${FILESDIR}"/50po-mode-gentoo.el
+		elisp-site-file-install ${FILESDIR}/50po-mode-gentoo.el
 	else
-		rm -rf "${D}"/usr/share/emacs
+		rm -rf ${D}/usr/share/emacs
 	fi
 
 	dodoc AUTHORS BUGS ChangeLog DISCLAIM NEWS README* THANKS TODO
diff --git a/sys-devel/gettext/gettext-0.14.5.ebuild b/sys-devel/gettext/gettext-0.14.5.ebuild
index 3df2cf7d89c0..8ba18e62e521 100644
--- a/sys-devel/gettext/gettext-0.14.5.ebuild
+++ b/sys-devel/gettext/gettext-0.14.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-devel/gettext/gettext-0.14.5.ebuild,v 1.3 2005/11/10 04:05:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.14.5.ebuild,v 1.1 2005/09/01 06:50:27 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs mono libtool elisp-common
 
@@ -46,13 +46,6 @@ src_unpack() {
 		glibtoolize
 		append-flags -bind_at_load
 	fi
-
-	# sanity check for Bug 105304
-	if [[ -z ${USERLAND} ]] ; then
-		eerror "You just hit Bug 105304, please post your 'emerge info' here:"
-		eerror "http://bugs.gentoo.org/105304"
-		die "Aborting to prevent screwing your system"
-	fi
 }
 
 src_compile() {
@@ -83,12 +76,13 @@ src_install() {
 		rm -f "${D}"/usr/include/libintl.h
 		rm -f "${D}"/usr/$(get_libdir)/libintl.*
 	fi
-	rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
+	rm -f "${D}"/usr/share/locale/locale.alias
 
 	# older gettext's sometimes installed libintl ...
 	# need to keep the linked version or the system
 	# could die (things like sed link against it :/)
 	if use ppc-macos; then
+		rm -f "${D}"/usr/lib/charset.alias
 		if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.2.dylib ] ; then
 			cp -pPR ${ROOT}/usr/$(get_libdir)/libintl.2.dylib ${D}/usr/$(get_libdir)/
 			touch "${D}"/usr/$(get_libdir)/libintl.2.dylib
diff --git a/sys-devel/gettext/metadata.xml b/sys-devel/gettext/metadata.xml
index 96a2d586367d..f093d416cbb1 100644
--- a/sys-devel/gettext/metadata.xml
+++ b/sys-devel/gettext/metadata.xml
@@ -1,3 +1,5 @@
+ [32;01m*[0m Generated metadata.xml:
+
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/sys-devel/gnuconfig/ChangeLog b/sys-devel/gnuconfig/ChangeLog
index dbde05002ed3..91e4c5fcdecb 100644
--- a/sys-devel/gnuconfig/ChangeLog
+++ b/sys-devel/gnuconfig/ChangeLog
@@ -1,36 +1,7 @@
 # ChangeLog for sys-devel/gnuconfig
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gnuconfig/ChangeLog,v 1.21 2005/06/16 23:01:00 vapier Exp $
+# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gnuconfig/ChangeLog,v 1.1 2003/07/12 09:28:32 kumba Exp $
 
-*gnuconfig-20050602 (16 Jun 2005)
-
-  16 Jun 2005; Mike Frysinger <vapier@gentoo.org>
-  +gnuconfig-20050602.ebuild:
-  Sync to latest upstream.
-
-*gnuconfig-20050324 (17 Apr 2005)
-
-  17 Apr 2005; Mike Frysinger <vapier@gentoo.org>
-  +gnuconfig-20050324.ebuild:
-  Sync to latest upstream version and add some hunks for ps2 support.
-
-*gnuconfig-20050223 (23 Feb 2005)
-
-  23 Feb 2005; Mike Frysinger <vapier@gentoo.org>
-  +gnuconfig-20050223.ebuild:
-  CVS update.
-
-  24 Jun 2004; <solar@gentoo.org> gnuconfig-20040214.ebuild,
-  files/automake-1.8.5-config-guess-uclibc.patch,
-  files/gnuconfig-20040312-update.patch:
-  added uclibc support to gnuconfig with 2004-03-12 update
-
-*gnuconfig-20040214 (14 Feb 2004)
-
-  14 Feb 2004; Joshua Kinard <kumba@gentoo.org> gnuconfig-20040214.ebuild,
-  metadata.xml:
-  Updated config.sub/guess files taken from GNU CVS (Savannah). Older versions
-  off ftp.gnu.org still unavailable.  Also removed arm keywords.
 
 *gnuconfig-20030708 (12 Jul 2003)
 
@@ -41,3 +12,4 @@
   This package will start in stable, since it's just a few files called only
   if gnuconfig_update is called.  Starting keywords are "mips sparc x86 alpha hppa".
   This snapshot is from 2003 Jul 08.
+
diff --git a/sys-devel/gnuconfig/Manifest b/sys-devel/gnuconfig/Manifest
index 72a0fcab0835..ed7505072653 100644
--- a/sys-devel/gnuconfig/Manifest
+++ b/sys-devel/gnuconfig/Manifest
@@ -1,16 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d63a72170e518490dcdf40f5ea8fcd62 metadata.xml 293
-MD5 16a373b76399563b7ecbca09614b4cc7 gnuconfig-20050324.ebuild 819
-MD5 be399c4a071211c5da46720c2699f612 gnuconfig-20050602.ebuild 826
-MD5 9e0cc75af984e19009630f1f2986ad49 ChangeLog 1687
-MD5 3a869d5bbfb2e872aa492fef9678a67d files/digest-gnuconfig-20050602 70
-MD5 bcc49e0a3cffa806deeda49e2013362a files/digest-gnuconfig-20050324 70
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDF8EDgIKl8Uu19MoRAhX7AJ9A93pMk+oX/qTc0iep2K+lLktibgCfSvUM
-EY3Y6R/buUJ+OyP372z6QH8=
-=xNTl
------END PGP SIGNATURE-----
+MD5 ecae91614373b5089182a981fab0c40b gnuconfig-20030708.ebuild 498
+MD5 7293b2ac9b418302cc0ded04926f5ccc ChangeLog 663
+MD5 55675a7956a38f4c1e5c01b980532978 files/digest-gnuconfig-20030708 70
diff --git a/sys-devel/gnuconfig/gnuconfig-20050324.ebuild b/sys-devel/gnuconfig/gnuconfig-20050324.ebuild
index b1b86d1972f7..66b68e92023a 100644
--- a/sys-devel/gnuconfig/gnuconfig-20050324.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20050324.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gnuconfig/gnuconfig-20050324.ebuild,v 1.2 2005/05/13 01:31:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gnuconfig/gnuconfig-20050324.ebuild,v 1.1 2005/04/17 08:19:06 vapier Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 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=""
 
 S=${WORKDIR}
diff --git a/sys-devel/gnuconfig/gnuconfig-20050602.ebuild b/sys-devel/gnuconfig/gnuconfig-20050602.ebuild
index a7979db7a938..5053996b48cf 100644
--- a/sys-devel/gnuconfig/gnuconfig-20050602.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20050602.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/sys-devel/gnuconfig/gnuconfig-20050602.ebuild,v 1.3 2005/09/02 03:02:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gnuconfig/gnuconfig-20050602.ebuild,v 1.1 2005/06/16 23:01:00 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="Updated config.sub and config.guess file from GNU"
-HOMEPAGE="http://savannah.gnu.org/projects/config"
+HOMEPAGE="ftp://ftp.gnu.org/pub/gnu/config"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 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=""
 
 S=${WORKDIR}
diff --git a/sys-devel/gnuconfig/metadata.xml b/sys-devel/gnuconfig/metadata.xml
index 59c5b7bb0175..f093d416cbb1 100644
--- a/sys-devel/gnuconfig/metadata.xml
+++ b/sys-devel/gnuconfig/metadata.xml
@@ -1,8 +1,7 @@
+ [32;01m*[0m Generated metadata.xml:
+
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
-<longdescription>
-Updated config.{sub,guess} files from upstream cvs to properly detect various system types.
-</longdescription>
 </pkgmetadata>
diff --git a/sys-devel/icecream/Manifest b/sys-devel/icecream/Manifest
index ee15869ff9d7..4c2fefeaf670 100644
--- a/sys-devel/icecream/Manifest
+++ b/sys-devel/icecream/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ea60760140f2090a5cd09bf0c896b729 icecream-0.6.20040829.ebuild 3074
-MD5 821ac28605bc2f1fa3c102ef193e0c14 ChangeLog 459
+MD5 30eeb0539b50638d5536a6c5e65a8d4f icecream-0.6.20040829.ebuild 2904
+MD5 ed4be6637604b623bd3b0ffd2e1bae18 files/icecream_disable.patch 1247
 MD5 b5b8e00fbdd696a2030334749ab1184b files/icecreamscheduler 366
-MD5 de86e8bf5603c45b9b2f9d565feda153 files/digest-icecream-0.6.20040829 155
-MD5 b1b6fb13f50e10d75174baac7bcaf65e files/icecream_disable.patch.bz2 738
+MD5 2767711be1cec7b6ab1aa9a23cb7851d files/digest-icecream-0.6.20040829 74
 MD5 70af2ad7d27b5da02a1653d2098e8ee4 files/99icecream 69
 MD5 11da9aee8c0bd3a91fdf7a5d883846ea files/icecreamdaemon 387
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB5F0AKtJO8LeSoosRAutdAKCkpakBaeH99aGu/U0mnAAr5hPPLgCfdPuT
-3sAHmn8LuiXXLzdc+7+LBG0=
-=6x3P
------END PGP SIGNATURE-----
+MD5 1df17e7a71380a4c2199af858e2be008 files/icecream.nokde.patch 441160
+MD5 2767711be1cec7b6ab1aa9a23cb7851d files/digest-icecream-0.6 74
diff --git a/sys-devel/icecream/files/digest-icecream-0.6.20040829 b/sys-devel/icecream/files/digest-icecream-0.6.20040829
index 16ef175dd26b..830d01ee82f9 100644
--- a/sys-devel/icecream/files/digest-icecream-0.6.20040829
+++ b/sys-devel/icecream/files/digest-icecream-0.6.20040829
@@ -1,2 +1 @@
 MD5 969bb373964f31a26198a00b57c54d5a icecream-0.6-20040829.tar.bz2 549028
-MD5 52e777e4a24c363c813acc9039c0c786 icecream-0.6.20040829.nokde.patch.bz2 45508
diff --git a/sys-devel/icecream/icecream-0.6.20040829.ebuild b/sys-devel/icecream/icecream-0.6.20040829.ebuild
index 250057dbc602..bf4c09f7c36d 100644
--- a/sys-devel/icecream/icecream-0.6.20040829.ebuild
+++ b/sys-devel/icecream/icecream-0.6.20040829.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/icecream-0.6.20040829.ebuild,v 1.2 2005/01/11 23:08:56 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/icecream-0.6.20040829.ebuild,v 1.1 2005/01/11 22:40:00 tantive Exp $
 inherit eutils
 DESCRIPTION="Icecream is a program for distributed compiling of C(++) code across several machines based on ideas and code by distcc."
 HOMEPAGE="http://wiki.kde.org/icecream"
@@ -68,7 +68,7 @@ pkg_postinst() {
 	einfo "to install the appropriate icecream-chroot package."
 	einfo "To use icecream with gentoo/ebuild use"
 	einfo " PREROOTPATH=/opt/icecream/bin"
-	einfo " (e.g. add this line in your /etc/make.conf)."
+	einfo " (e.g. in /etc/profile)."
 	einfo "To use it with normal make use"
 	einfo ' PATH=/opt/icecream/bin:$PATH'
 	einfo "Right now it doesn't work with ccache without some special work."
diff --git a/sys-devel/kgcc/ChangeLog b/sys-devel/kgcc/ChangeLog
index b99cf0773838..319cbe1fad94 100644
--- a/sys-devel/kgcc/ChangeLog
+++ b/sys-devel/kgcc/ChangeLog
@@ -1,34 +1,9 @@
 # ChangeLog for sys-devel/kgcc
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc/ChangeLog,v 1.10 2004/10/21 02:28:39 weeve Exp $
-
-*kgcc-2.95.3 (20 Oct 2004)
-
-  20 Oct 2004; Jason Wever <weeve@gentoo.org> +metadata.xml,
-  +files/kgcc-2.95.3-new-atexit.diff, +kgcc-2.95.3.ebuild:
-  Added kgcc back in as it's needed to build sparc32 2.2 kernels and so Skunky
-  won't kill me :)
-
-  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> kgcc-2.95.3.ebuild:
-  virtual/glibc -> virtual/libc
-
-  23 Jun 2004; Aron Griffis <agriffis@gentoo.org> kgcc-2.95.3.ebuild:
-  QA - fix use invocation
-
-  12 May 2004; Alexander Gabert <pappy@gentoo.org> kgcc-2.95.3.ebuild:
-  changed hardened-gcc logic to filter-flags
-
-  11 Oct 2003; Alexander Gabert <pappy@gentoo.org> kgcc-2.95.3.ebuild:
-  added yno_propolice flags for kgcc building due to guard symbol bailing out
-  while processing libiberty
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc/ChangeLog,v 1.1 2002/12/31 18:25:28 cretin Exp $
 
 *kgcc-2.95.3 (31 Dec 2002)
 
-  09 Jan 2003; Seemant Kulleen <seemant@gentoo.org> :
-
-  KEYWORDED for only sparc, as that is the only architecture which needs it,
-  even though it can work for others (for future references).
-
   31 Dec 2002; Stefan Jones <Cretin@gentoo.org> :
   Installs a gcc-2.95.3 C-compiler only, named kgcc, used to compile sparc
   32bit kernels.
diff --git a/sys-devel/kgcc/Manifest b/sys-devel/kgcc/Manifest
index 55193fe1a931..e69de29bb2d1 100644
--- a/sys-devel/kgcc/Manifest
+++ b/sys-devel/kgcc/Manifest
@@ -1,5 +0,0 @@
-MD5 06b402610110131fe599becfd286fc93 ChangeLog 1317
-MD5 2c151eb1df754360d5cf690a43d49a80 kgcc-2.95.3.ebuild 2635
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 b298194887d06a1a0368293db55b7b47 files/digest-kgcc-2.95.3 69
-MD5 523970c128b929fe7c7cf36508ebd1d5 files/kgcc-2.95.3-new-atexit.diff 13604
diff --git a/sys-devel/kgcc/kgcc-2.95.3.ebuild b/sys-devel/kgcc/kgcc-2.95.3.ebuild
index a7286799230e..eb5709b3d94c 100644
--- a/sys-devel/kgcc/kgcc-2.95.3.ebuild
+++ b/sys-devel/kgcc/kgcc-2.95.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc/kgcc-2.95.3.ebuild,v 1.12 2005/05/24 05:09:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc/kgcc-2.95.3.ebuild,v 1.1 2002/12/31 18:25:28 cretin Exp $
 
 IUSE="static"
 
@@ -10,25 +10,25 @@ SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-core-${PV}.tar.bz2"
 
 S="${WORKDIR}/gcc-${PV}"
 LOC="/usr"
-DESCRIPTION="Modern GCC C compiler for building kernels on Sparc32 machines"
+DESCRIPTION="Modern GCC C compiler for building kernels"
 HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="-x86 -ppc sparc"
+KEYWORDS="x86 ppc sparc"
 
-DEPEND="virtual/libc"
-RDEPEND="virtual/libc"
+DEPEND="virtual/glibc"
+RDEPEND="virtual/glibc"
 DEPEND="${DEPEND}
 	>=sys-libs/ncurses-5.2-r2
 	>=sys-apps/texinfo-4.2-r4"
 
 src_unpack() {
 	unpack gcc-core-${PV}.tar.bz2
-
+	
 	cd ${S}
 
 	libtoolize --copy --force &> ${T}/foo-out
-
+	
 	# This new patch for the atexit problem occured with glibc-2.2.3 should
 	# work with glibc-2.2.4.  This closes bug #3987 and #4004.
 	#
@@ -45,20 +45,18 @@ src_unpack() {
 	# Azarah - 30 Jun 2002
 	#
 	epatch ${FILESDIR}/${P}-new-atexit.diff
-
+	
 }
 
 src_compile() {
 	local myconf=""
 	myconf="${myconf} --enable-languages=c --enable-shared"
 
-	filter-flags -fPIC -fstack-protector
-
 	# gcc does not like optimization
 
 	unset CFLAGS
 	unset CXXFLAGS
-
+	
 	${S}/configure --prefix=${LOC} \
 		--mandir=${LOC}/share/man \
 		--infodir=${LOC}/share/info \
@@ -70,7 +68,10 @@ src_compile() {
 		--with-local-prefix=${LOC}/local \
 		${myconf} || die
 
-	if ! use static
+	# Setup -j in MAKEOPTS
+	get_number_of_jobs
+
+	if [ -z "`use static`" ]
 	then
 		emake bootstrap-lean || die
 	else
@@ -88,7 +89,7 @@ src_install() {
 	# binutils libiberty.a and we want to use that version
 	# closes bug #2262
 	rm -f ${D}/usr/lib/libiberty.a
-
+	
 	# Don't need man and info files
 	cd ${D}/usr/share
 	rm -rf info man
@@ -101,7 +102,7 @@ src_install() {
 	rm -rf *-linux-gnu
 
 	cd ${S}
-	docinto /
+	docinto /	
 	dodoc COPYING COPYING.LIB README* FAQ MAINTAINERS
 	docinto html
 	dodoc faq.html
diff --git a/sys-devel/kgcc/metadata.xml b/sys-devel/kgcc/metadata.xml
index 96a2d586367d..f093d416cbb1 100644
--- a/sys-devel/kgcc/metadata.xml
+++ b/sys-devel/kgcc/metadata.xml
@@ -1,3 +1,5 @@
+ [32;01m*[0m Generated metadata.xml:
+
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/sys-devel/libperl/ChangeLog b/sys-devel/libperl/ChangeLog
index ccdff3261393..cfa7478fbd95 100644
--- a/sys-devel/libperl/ChangeLog
+++ b/sys-devel/libperl/ChangeLog
@@ -1,353 +1,9 @@
 # ChangeLog for sys-devel/libperl
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.88 2005/11/29 19:35:52 flameeyes Exp $
-
-  29 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> libperl-5.8.7.ebuild:
-  Fix typo (FreeBsd -> FreeBSD).
-
-  14 Nov 2005; Michael Cummings <mcummings@gentoo.org> libperl-5.8.6.ebuild,
-  libperl-5.8.6-r1.ebuild, libperl-5.8.7.ebuild:
-  NetBSD for osname per thunder
-
-  05 Nov 2005; <solar@gentoo.org> libperl-5.8.5-r1.ebuild,
-  libperl-5.8.5.ebuild:
-  - remove global use violations in old ebuilds.
-
-  02 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> libperl-5.8.7.ebuild:
-  Stable on ia64, bug 106678.
-
-  23 Sep 2005; Bryan Østergaard <kloeri@gentoo.org> libperl-5.8.7.ebuild:
-  Stable on alpha, bug 106678.
-
-  21 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> libperl-5.8.7.ebuild:
-  Stable on sparc wrt #106678
-
-  20 Sep 2005; Markus Rothe <corsair@gentoo.org> libperl-5.8.7.ebuild:
-  Stable on ppc64 (bug #106678)
-
-  05 Sep 2005; Herbie Hopkins <herbs@gentoo.org> libperl-5.8.7.ebuild:
-  More multilib fixes thanks to Christophe Saout, bug 104509.
-
-  14 Aug 2005; Michael Cummings <mcummings@gentoo.org> libperl-5.8.7.ebuild:
-  The rest of the patch for bug 58931
-
-  14 Aug 2005; Michael Cummings <mcummings@gentoo.org> libperl-5.8.7.ebuild:
-  Bug #58931, more userland darwin
-
-  12 Aug 2005; Michael Cummings <mcummings@gentoo.org> libperl-5.8.7.ebuild:
-  Further bug #58931 - mistake on my part for the LIBPERL= syntax
-
-  12 Aug 2005; Michael Cummings <mcummings@gentoo.org> libperl-5.8.7.ebuild:
-  getlibdir changes for 5.8.7, bug #58931
-
-  08 Aug 2005; <solar.@gentoo.org> libperl-5.8.5-r1.ebuild,
-  libperl-5.8.5.ebuild, libperl-5.8.6-r1.ebuild, libperl-5.8.6.ebuild,
-  libperl-5.8.7.ebuild:
-  - Redisable the groff dep for uclibc (again and again...)
-
-  28 Jul 2005; Michael Cummings <mcummings@gentoo.org>
-  files/libperl-reorder-INC.patch:
-  Update to reorder patch, tested with 5.8.6 and 5.8.7, resolves bug 95770
-
-  28 Jul 2005; Herbie Hopkins <herbs@gentoo.org> libperl-5.8.6-r1.ebuild:
-  Stable on amd64.
-
-  20 Jul 2005; <solar.@gentoo.org> libperl-5.8.6-r1.ebuild,
-  libperl-5.8.7.ebuild:
-  - Redisable the groff dep for uclibc. For whatever unsolved reason under
-  sandbox it breaks when building system. bug 98187
-
-  07 Jul 2005; Markus Rothe <corsair@gentoo.org> libperl-5.8.6-r1.ebuild:
-  Stable on ppc64
-
-  06 Jul 2005; <plasmaroo@gentoo.org> libperl-5.8.6-r1.ebuild:
-  Stable on IA64.
-
-  06 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  libperl-5.8.6-r1.ebuild:
-  Stable on arm, m68k, s390, and sh.
-
-  05 Jul 2005; Hardave Riar <hardave@gentoo.org> libperl-5.8.6-r1.ebuild:
-  Stable on mips.
-
-  03 Jul 2005; Michael Hanselmann <hansmi@gentoo.org>
-  libperl-5.8.6-r1.ebuild:
-  Stable on ppc.
-
-  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
-  libperl-5.8.6-r1.ebuild:
-  Stable on alpha.
-
-  02 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
-  libperl-5.8.6-r1.ebuild:
-  Stable on hppa.
-
-*libperl-5.8.6-r1 (30 Jun 2005)
-
-  30 Jun 2005; Michael Cummings <mcummings@gentoo.org>
-  +libperl-5.8.6-r1.ebuild, libperl-5.8.6.ebuild:
-  Bad osname= line in the 5.8.6 libperl was screwing up. Glad it was caught
-  early I guess. Should close bug 97479. Was previously fixed in 5.8.7 in
-  testing.
-
-*libperl-5.8.7 (29 Jun 2005)
-
-  29 Jun 2005; Michael Cummings <mcummings@gentoo.org>
-  -files/libperl-5.8.2-create-libperl-soname.patch,
-  -files/libperl-5.8.4-create-libperl-soname.patch,
-  -files/libperl-5.8.4-noksh.patch, -files/libperl-5.8.4-uclibc.patch,
-  -files/libperl-5.8.5-create-libperl-soname.patch,
-  -files/libperl-5.8.5-noksh.patch, -files/libperl-5.8.5-reorder-INC.patch,
-  -files/libperl-5.8.5-uclibc.patch,
-  -files/libperl-5.8.6-create-libperl-soname.patch,
-  -files/libperl-5.8.6-noksh.patch, -files/libperl-5.8.6-uclibc.patch,
-  +files/libperl-create-libperl-soname.patch, +files/libperl-noksh.patch,
-  +files/libperl-reorder-INC.patch, +files/libperl-uclibc.patch,
-  -libperl-5.8.2.ebuild, -libperl-5.8.2-r1.ebuild, -libperl-5.8.4.ebuild,
-  -libperl-5.8.4-r1.ebuild, libperl-5.8.5.ebuild, libperl-5.8.5-r1.ebuild,
-  libperl-5.8.6.ebuild, +libperl-5.8.7.ebuild:
-  Perl 5.8.6 unmasking; perl 5.8.7 being added
-
-  17 Jun 2005; Danny van Dyk <kugelfang@gentoo.org> libperl-5.8.5.ebuild,
-  libperl-5.8.6.ebuild:
-  Specifying LIBPERL variable for make on command line to fix BUG #63699.
-
-  29 May 2005; <solar@gentoo.org> libperl-5.8.2-r1.ebuild,
-  libperl-5.8.4-r1.ebuild, libperl-5.8.5-r1.ebuild, libperl-5.8.5.ebuild,
-  libperl-5.8.6.ebuild:
-  - update sys-devel/libperl to use libc expanded variable elibc_uclibc vs
-  uclibc so USE=-* works
-
-  23 May 2005; Herbie Hopkins <herbs@gentoo.org> libperl-5.8.6.ebuild:
-  More get_libdir-ization, fixes compilation on amd64's no-lib32 profile.
-
-  08 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  libperl-5.8.6.ebuild:
-  More multilib fixes
-
-  16 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  libperl-5.8.5-r1.ebuild, libperl-5.8.5.ebuild, libperl-5.8.6.ebuild:
-  multilib fixes for amd64's 2005.0.
-
-  03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-  13 Dec 2004; Mike Frysinger <vapier@gentoo.org> libperl-5.8.5-r1.ebuild,
-  libperl-5.8.5.ebuild, libperl-5.8.6.ebuild:
-  Use toolchain-funcs to get $CC.
-
-  07 Dec 2004; Hardave Riar <hardave@gentoo.org> libperl-5.8.5.ebuild:
-  Stable on mips, dep for bug #66360
-
-  06 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> libperl-5.8.5.ebuild:
-  Stable on sparc wrt #66360
-
-  05 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> libperl-5.8.5.ebuild:
-  Stable on alpha, bug 66360.
-
-  05 Dec 2004; Markus Rothe <corsair@gentoo.org> libperl-5.8.5.ebuild:
-  Stable on ppc64; bug #66360
-
-  04 Dec 2004; Robert Coie <rac@gentoo.org> libperl-5.8.5.ebuild:
-  keyword 5.8.5 x86/amd64/ppc
-
-*libperl-5.8.6 (30 Nov 2004)
-
-  30 Nov 2004; Robert Coie <rac@gentoo.org>
-  -files/libperl-5.8.3-create-libperl-soname.patch,
-  +files/libperl-5.8.6-create-libperl-soname.patch,
-  +files/libperl-5.8.6-noksh.patch, +files/libperl-5.8.6-uclibc.patch,
-  -libperl-5.8.3.ebuild, +libperl-5.8.6.ebuild:
-  New upstream
-
-  27 Sep 2004; Michael Cummings <mcummings@gentoo.org>
-  libperl-5.8.2-r1.ebuild, libperl-5.8.2.ebuild, libperl-5.8.3.ebuild,
-  libperl-5.8.4-r1.ebuild, libperl-5.8.4.ebuild, libperl-5.8.5-r1.ebuild,
-  libperl-5.8.5.ebuild:
-  Added perl debugging support, bug 60775
-
-  22 Sep 2004; Robert Coie <rac@gentoo.org> libperl-5.8.2-r1.ebuild,
-  libperl-5.8.2.ebuild, libperl-5.8.3.ebuild, libperl-5.8.4-r1.ebuild,
-  libperl-5.8.4.ebuild, libperl-5.8.5.ebuild:
-  USE threads -> ithreads cleanup
-
-*libperl-5.8.5-r1 (22 Sep 2004)
-
-  22 Sep 2004; Robert Coie <rac@gentoo.org>
-  +files/libperl-5.8.5-reorder-INC.patch, +libperl-5.8.5-r1.ebuild:
-  Change USE from threads to ithreads, reorder @INC
-
-  09 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> libperl-5.8.4-r1.ebuild:
-  Stable on sparc to finally solve #36478
-
-  08 Sep 2004; Robert Coie <rac@gentoo.org> libperl-5.8.4-r1.ebuild:
-  keyword x86 and arm for uclibc folks
-
-  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> libperl-5.8.2-r1.ebuild,
-  libperl-5.8.2.ebuild, libperl-5.8.3.ebuild, libperl-5.8.4-r1.ebuild,
-  libperl-5.8.4.ebuild, libperl-5.8.5.ebuild:
-  Switch to use epause and ebeep, bug #62950
-
-  21 Aug 2004; Joshua Kinard <kumba@gentoo.org> libperl-5.8.4-r1.ebuild:
-  Marked stable on mips.
-
-  18 Aug 2004; Aron Griffis <agriffis@gentoo.org> libperl-5.8.4-r1.ebuild:
-  stable on alpha
-
-  14 Aug 2004; Michael Cummings <mcummings@gentoo.org>
-  libperl-5.8.2-r1.ebuild, libperl-5.8.2.ebuild, libperl-5.8.3.ebuild,
-  libperl-5.8.4-r1.ebuild, libperl-5.8.4.ebuild, libperl-5.8.5.ebuild:
-  Removed reference to old patch
-
-  13 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> libperl-5.8.4.ebuild:
-  Stable on alpha.
-
-*libperl-5.8.5 (06 Aug 2004)
-
-  06 Aug 2004; Robert Coie <rac@gentoo.org>
-  +files/libperl-5.8.5-create-libperl-soname.patch,
-  +files/libperl-5.8.5-noksh.patch, +files/libperl-5.8.5-uclibc.patch,
-  +libperl-5.8.5.ebuild:
-  5.8.5
-
-  06 Aug 2004; Robert Coie <rac@gentoo.org> libperl-5.8.2-r1.ebuild,
-  libperl-5.8.2.ebuild, libperl-5.8.3.ebuild, libperl-5.8.4-r1.ebuild,
-  libperl-5.8.4.ebuild:
-  restrict maketest, avoid forkbomb in portage 51 with maketest enabled,
-  eliminate some global scope external calls
-
-  29 Jul 2004; Guy Martin <gmsoft@gentoo.org> libperl-5.8.4-r1.ebuild:
-  Stable on hppa.
-
-  23 Jul 2004; Robert Coie <rac@gentoo.org> libperl-5.8.4.ebuild:
-  keywording x86 and sparc
-
-  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> libperl-5.8.2-r1.ebuild,
-  libperl-5.8.2.ebuild, libperl-5.8.3.ebuild, libperl-5.8.4-r1.ebuild,
-  libperl-5.8.4.ebuild:
-  kill sparc64 use flag
-
-*libperl-5.8.4-r1 (16 Jun 2004)
-*libperl-5.8.2-r1 (16 Jun 2004)
-
-  16 Jun 2004; Daniel Black <dragonheart@gentoo.org>
-  +files/libperl-5.8.2-uclibc.patch, +files/libperl-5.8.4-uclibc.patch,
-  +libperl-5.8.2-r1.ebuild, +libperl-5.8.4-r1.ebuild:
-  uclibc fixes thanks to Peter S. Mazinger <ps.m@gmx.net>
-
-  14 Jun 2004; Aron Griffis <agriffis@gentoo.org> libperl-5.8.2.ebuild,
-  libperl-5.8.3.ebuild:
-  Fix use invocation
-
-  09 Jun 2004; Robert Coie <rac@gentoo.org> +files/libperl-5.8.4-noksh.patch,
-  libperl-5.8.4.ebuild:
-  Add noksh.patch, bug 42665
-
-  02 Jun 2004; Travis Tilley <lv@gentoo.org> libperl-5.8.4.ebuild:
-  stable on amd64
-
-*libperl-5.8.4 (10 May 2004)
-
-  10 May 2004; Michael McCabe <randy@gentoo.org> libperl-5.8.4.ebuild:
-  Stable on s390
-
-  03 May 2004; Robert Coie <rac@gentoo.org> libperl-5.8.1.ebuild,
-  files/libperl-5.8.0-create-libperl-soname.patch,
-  files/libperl-5.8.1-create-libperl-soname.patch,
-  files/libperl-5.8.1_rc1-create-libperl-soname.patch,
-  files/libperl-5.8.1_rc2-create-libperl-soname.patch:
-  Add 5.8.4, clean out 5.8.0, 5.8.1, add IUSE for threads to everything
-
-  08 Mar 2004; <rac@gentoo.org> libperl-5.8.2.ebuild:
-  Add threads to IUSE
-
-  21 Feb 2004; Michael Cummings <mcummings@gentoo.org> libperl-5.8.0.ebuild:
-  Finish the cleanup of perl 5.8.0
-
-  19 Feb 2004; Aron Griffis <agriffis@gentoo.org> libperl-5.8.2.ebuild:
-  stable on alpha and ia64
-
-  19 Feb 2004; Joshua Kinard <kumba@gentoo.org> libperl-5.8.2.ebuild:
-  Marking stable on mips
-
-  09 Feb 2004; Bartosch Pixa <darkspecter@gentoo.org> libperl-5.8.2.ebuild:
-  set ppc in keywords
-
-  06 Feb 2004; <gustavoz@gentoo.org> libperl-5.8.2.ebuild:
-  stable on sparc
-
-  03 Feb 2004; <gustavoz@gentoo.org> libperl-5.8.2.ebuild:
-  stable on hppa
-
-  01 Feb 2004; <rac@gentoo.org> libperl-5.8.2.ebuild:
-  mark x86
-
-*libperl-5.8.3 (17 Jan 2004)
-
-  17 Jan 2004; <rac@gentoo.org> libperl-5.8.3.ebuild,
-  files/libperl-5.8.3-create-libperl-soname.patch:
-  New upstream, housecleaning
-
-  26 Nov 2003; Brad House <brad_mssw@gentoo.org> libperl-5.8.2.ebuild:
-  mark stable on amd64
-
-*libperl-5.8.2 (08 Nov 2003)
-
-  08 Nov 2003; <rac@gentoo.org> libperl-5.8.2.ebuild,
-  files/libperl-5.8.2-create-libperl-soname.patch:
-  new upstream version
-
-*libperl-5.8.1 (27 Sep 2003)
-
-  27 Sep 2003; <rac@gentoo.org> libperl-5.8.1.ebuild,
-  files/libperl-5.8.1-create-libperl-soname.patch:
-  New upstream release
-
-*libperl-5.8.1_rc2 (23 Jul 2003)
-
-  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> libperl-5.8.0.ebuild :
-  Added ia64 keywords
-
-  23 Jul 2003; <rac@gentoo.org> libperl-5.8.1_rc2.ebuild:
-  Add 5.8.1-rc2
-
-  11 Jul 2003; <rac@gentoo.org> libperl-5.8.0.ebuild,
-  libperl-5.8.1_rc1.ebuild:
-  Add mips u32align workaround...thanks to Kumba
-
-*libperl-5.8.1_rc1 (10 Jul 2003)
-
-  10 Jul 2003; <rac@gentoo.org> libperl-5.8.1_rc1.ebuild,
-  files/libperl-5.8.1_rc1-create-libperl-soname.patch:
-  Upstream version bump.  Experimental.
-
-  18 May 2003; Tavis Ormandy <taviso@gentoo.org> libperl-5.8.0.ebuild:
-  removing gcc hardcoded compiler, using ${CC:-gcc}
-
-  11 Feb 2003; Guy Martin <gmsoft@gentoo.org> libperl-5.8.0.ebuild :
-  Added hppa to keywords.
-
-  05 Jan 2003; J Robert Ray <jrray@gentoo.org> libperl-5.8.0.ebuild : Synced
-  up with perl-5.8.0-r9.ebuild.
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.1 2003/01/06 14:31:24 mcummings Exp $
 
 *libperl-5.8.0 (06 Jan 2003)
 
-  28 Mar 2003; Seemant Kulleen <seemant@gentoo.org> libperl-5.8.0.ebuild:
-  unmasked for ppc and hppa
-
-  01 Mar 2003; Brandon Low <lostlogic@gentoo.org> libperl-5.8.0.ebuild:
-  Make->emake still not parallel where needed
-
-  26 Feb 2003; Zach Welch <zwelch@gentoo.org> libperl-5.8.0.ebuild:
-  add arm keyword
-
-  08 Jan 2002; Seemant Kulleen <seemant@gentoo.org> libperl-5.8.0.ebuild :
-
-  Unmasked for sparc
-
-  08 Jan 2003; Michael Cummings <mcummings@gentoo.org> libperl-5.8.0:
-  Unmasking for x86.
-
   06 Jan 2003; Michael Cummings <mcummings@gentoo.org> libperl-5.8.0:
   Initial import. Ebuild was provided by azarah. The seperation of
   the libperl portion of perl into a seperate ebuild is to counter 
diff --git a/sys-devel/libperl/Manifest b/sys-devel/libperl/Manifest
index fddb14ef98c1..e69de29bb2d1 100644
--- a/sys-devel/libperl/Manifest
+++ b/sys-devel/libperl/Manifest
@@ -1,27 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9dec53cdc95c6e7a016199e43e265024 ChangeLog 13108
-MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-libperl-5.8.5 64
-MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-libperl-5.8.5-r1 64
-MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-libperl-5.8.6 64
-MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-libperl-5.8.6-r1 64
-MD5 c10e44e47d7f702efe7d4009064a97ca files/digest-libperl-5.8.7 64
-MD5 ce442db939c59218a16be167f793b817 files/libperl-5.8.2-uclibc.patch 573
-MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-create-libperl-soname.patch 417
-MD5 076dcbef37263d6dd7af719b55cfc2de files/libperl-noksh.patch 611
-MD5 f7324a62f22aabde3387b7e8a8b2106e files/libperl-reorder-INC.patch 1141
-MD5 ce442db939c59218a16be167f793b817 files/libperl-uclibc.patch 573
-MD5 2fb571ee80c894f660e610ef4c717082 libperl-5.8.5-r1.ebuild 10032
-MD5 642d6d7d6f6cdd65347342bcb7970733 libperl-5.8.5.ebuild 9923
-MD5 b84aca47b4bf72b939c2058d36f9a4f5 libperl-5.8.6-r1.ebuild 10525
-MD5 95d8eb043ad2bad59f1c56d50c39afca libperl-5.8.6.ebuild 10529
-MD5 f476f95a7de3e5c3840e7580026e261d libperl-5.8.7.ebuild 11131
-MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDjK3XAiZjviIA2XgRAmM6AJ4+q9MDuKr8EGiEgIHh/OdkKzGEPgCfao1z
-CokzLRK68AE1ZooX6WdVWsM=
-=oO7L
------END PGP SIGNATURE-----
diff --git a/sys-devel/libperl/files/libperl-reorder-INC.patch b/sys-devel/libperl/files/libperl-reorder-INC.patch
index cc314d97d314..c934b4135a13 100644
--- a/sys-devel/libperl/files/libperl-reorder-INC.patch
+++ b/sys-devel/libperl/files/libperl-reorder-INC.patch
@@ -1,6 +1,6 @@
---- 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)
+--- 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 @@
      incpush(APPLLIB_EXP, TRUE, TRUE, TRUE);
  #endif
  
@@ -13,7 +13,7 @@
  #ifdef MACOS_TRADITIONAL
      {
  	Stat_t tmpstatbuf;
-@@ -4426,8 +4426,6 @@ S_init_perllib(pTHX)
+@@ -3961,8 +3961,6 @@
  #endif
  #if defined(WIN32)
      incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
@@ -22,7 +22,7 @@
  #endif
  
  #ifdef SITEARCH_EXP
-@@ -4471,6 +4469,15 @@ S_init_perllib(pTHX)
+@@ -4006,6 +4004,60 @@
      incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE);
  #endif
  
@@ -34,6 +34,51 @@
 +
 +    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/sys-devel/libperl/libperl-5.8.5-r1.ebuild b/sys-devel/libperl/libperl-5.8.5-r1.ebuild
index 423588f3de80..0c17bb135a38 100644
--- a/sys-devel/libperl/libperl-5.8.5-r1.ebuild
+++ b/sys-devel/libperl/libperl-5.8.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.5-r1.ebuild,v 1.13 2005/11/05 14:54:47 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.5-r1.ebuild,v 1.1 2004/09/22 17:40:02 rac Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
@@ -52,12 +52,12 @@
 #
 # Martin Schlemmer <azarah@gentoo.org> (28 Dec 2002).
 
-IUSE="berkdb debug gdbm ithreads"
+IUSE="berkdb gdbm ithreads uclibc"
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit eutils flag-o-matic
 
 # Perl has problems compiling with -Os in your flags
-
+use uclibc || replace-flags "-Os" "-O2"
 # This flag makes compiling crash in interesting ways
 filter-flags "-malign-double"
 
@@ -73,7 +73,7 @@ HOMEPAGE="http://www.perl.org"
 SLOT="${PERLSLOT}"
 LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
 LICENSE="Artistic GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390 ~sh"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
 
 # rac 2004.08.06
 
@@ -83,11 +83,12 @@ KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390 ~sh
 # badly when you -n it, because it won't exist and will therefore try
 # to build itself again ad infinitum.
 
-RESTRICT="test"
+RESTRICT="maketest"
 
-DEPEND="!elibc_uclibc? ( sys-apps/groff )
+DEPEND="!uclibc? ( sys-apps/groff )
 	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	>=sys-apps/portage-2.0.45-r4"
 
 RDEPEND="
 	berkdb? ( sys-libs/db )
@@ -134,19 +135,19 @@ src_unpack() {
 	#
 	#   LIBPERL=libperl.so.${SLOT}.`echo ${PV} | cut -d. -f1,2`
 	#
-	cd ${S}; epatch ${FILESDIR}/${PN}-create-libperl-soname.patch
+	cd ${S}; epatch ${FILESDIR}/${P}-create-libperl-soname.patch
 
 	# uclibc support - dragonheart 2004.06.16
-	cd ${S}; epatch ${FILESDIR}/${PN}-uclibc.patch
+	cd ${S}; epatch ${FILESDIR}/${P}-uclibc.patch
 
 	# Configure makes an unwarranted assumption that /bin/ksh is a
 	# good shell. This patch makes it revert to using /bin/sh unless
 	# /bin/ksh really is executable. Should fix bug 42665.
 	# rac 2004.06.09
-	cd ${S}; epatch ${FILESDIR}/${PN}-noksh.patch
+	cd ${S}; epatch ${FILESDIR}/${P}-noksh.patch
 
 	# we need the same @INC-inversion magic here we do in perl
-	cd ${S}; epatch ${FILESDIR}/${PN}-reorder-INC.patch
+	cd ${S}; epatch ${FILESDIR}/${P}-reorder-INC.patch
 }
 
 src_compile() {
@@ -154,8 +155,6 @@ src_compile() {
 	export LC_ALL="C"
 	local myconf=""
 
-	use elibc_uclibc || replace-flags "-Os" "-O2"
-
 	if use ithreads
 	then
 		einfo "using ithreads"
@@ -183,12 +182,6 @@ src_compile() {
 		# <rac@gentoo.org> 2003.06.26
 		myconf="${myconf} -Dd_u32align"
 	fi
-
-	if use debug
-	then
-		CFLAGS="${CFLAGS} -g"
-	fi
-
 	if use sparc
 	then
 		myconf="${myconf} -Ud_longdbl"
@@ -196,13 +189,11 @@ src_compile() {
 
 	rm -f config.sh Policy.sh
 
-	[ -n "${ABI}" ] && myconf="${myconf} -Dusrinc=$(get_ml_incdir)"
-
 	sh Configure -des \
 		-Darchname="${myarch}" \
 		-Dcccdlflags='-fPIC' \
 		-Dccdlflags='-rdynamic' \
-		-Dcc="$(tc-getCC)" \
+		-Dcc="${CC:-gcc}" \
 		-Dprefix='/usr' \
 		-Dvendorprefix='/usr' \
 		-Dsiteprefix='/usr' \
diff --git a/sys-devel/libperl/libperl-5.8.5.ebuild b/sys-devel/libperl/libperl-5.8.5.ebuild
index 7d25ff31610e..1faa92227492 100644
--- a/sys-devel/libperl/libperl-5.8.5.ebuild
+++ b/sys-devel/libperl/libperl-5.8.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.5.ebuild,v 1.22 2005/11/05 14:54:47 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.5.ebuild,v 1.1 2004/08/07 06:39:27 rac Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
@@ -52,10 +52,12 @@
 #
 # Martin Schlemmer <azarah@gentoo.org> (28 Dec 2002).
 
-IUSE="berkdb debug gdbm ithreads"
+IUSE="berkdb gdbm threads uclibc"
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit eutils flag-o-matic
 
+# Perl has problems compiling with -Os in your flags
+use uclibc || replace-flags "-Os" "-O2"
 # This flag makes compiling crash in interesting ways
 filter-flags "-malign-double"
 
@@ -71,7 +73,7 @@ HOMEPAGE="http://www.perl.org"
 SLOT="${PERLSLOT}"
 LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
 LICENSE="Artistic GPL-2"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390 sh"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
 
 # rac 2004.08.06
 
@@ -81,11 +83,12 @@ KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390 sh"
 # badly when you -n it, because it won't exist and will therefore try
 # to build itself again ad infinitum.
 
-RESTRICT="test"
+RESTRICT="maketest"
 
-DEPEND="!elibc_uclibc? ( sys-apps/groff )
+DEPEND="!uclibc? ( sys-apps/groff )
 	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	>=sys-apps/portage-2.0.45-r4"
 
 RDEPEND="
 	berkdb? ( sys-libs/db )
@@ -94,28 +97,28 @@ RDEPEND="
 PDEPEND=">=dev-lang/perl-${PV}"
 
 pkg_setup() {
-	# I think this should rather be displayed if you *have* 'ithreads'
+	# I think this should rather be displayed if you *have* 'threads'
 	# in USE if it could break things ...
-	if use ithreads
+	if use threads
 	then
 		ewarn ""
 		ewarn "PLEASE NOTE: You are compiling perl-5.8 with"
-		ewarn "interpreter-level threading enabled."
+		ewarn "threading enabled."
 		ewarn "Threading is not supported by all applications "
 		ewarn "that compile against perl. You use threading at "
 		ewarn "your own discretion. "
 		ewarn ""
-		epause 10
+		sleep 10
 	else
 		ewarn ""
 		ewarn "PLEASE NOTE: If you want to compile perl-5.8 with"
 		ewarn "threading enabled , you must restart this emerge"
-		ewarn "with USE=ithreads emerge...."
+		ewarn "with USE=threads emerge...."
 		ewarn "Threading is not supported by all applications "
 		ewarn "that compile against perl. You use threading at "
 		ewarn "your own discretion. "
 		ewarn ""
-		epause 10
+		sleep 10
 	fi
 }
 
@@ -132,16 +135,16 @@ src_unpack() {
 	#
 	#   LIBPERL=libperl.so.${SLOT}.`echo ${PV} | cut -d. -f1,2`
 	#
-	cd ${S}; epatch ${FILESDIR}/${PN}-create-libperl-soname.patch
+	cd ${S}; epatch ${FILESDIR}/${P}-create-libperl-soname.patch
 
 	# uclibc support - dragonheart 2004.06.16
-	cd ${S}; epatch ${FILESDIR}/${PN}-uclibc.patch
+	cd ${S}; epatch ${FILESDIR}/${P}-uclibc.patch
 
 	# Configure makes an unwarranted assumption that /bin/ksh is a
 	# good shell. This patch makes it revert to using /bin/sh unless
 	# /bin/ksh really is executable. Should fix bug 42665.
 	# rac 2004.06.09
-	cd ${S}; epatch ${FILESDIR}/${PN}-noksh.patch
+	cd ${S}; epatch ${FILESDIR}/${P}-noksh.patch
 
 }
 
@@ -150,12 +153,9 @@ src_compile() {
 	export LC_ALL="C"
 	local myconf=""
 
-	# Perl has problems compiling with -Os in your flags
-	use elibc_uclibc || replace-flags "-Os" "-O2"
-
-	if use ithreads
+	if use threads
 	then
-		einfo "using ithreads"
+		einfo "using threads"
 		mythreading="-multi"
 		myconf="-Dusethreads ${myconf}"
 		myarch="${CHOST%%-*}-linux-thread"
@@ -180,12 +180,6 @@ src_compile() {
 		# <rac@gentoo.org> 2003.06.26
 		myconf="${myconf} -Dd_u32align"
 	fi
-
-	if use debug
-	then
-		CFLAGS="${CFLAGS} -g"
-	fi
-
 	if use sparc
 	then
 		myconf="${myconf} -Ud_longdbl"
@@ -193,13 +187,11 @@ src_compile() {
 
 	rm -f config.sh Policy.sh
 
-	[ -n "${ABI}" ] && myconf="${myconf} -Dusrinc=$(get_ml_incdir)"
-
 	sh Configure -des \
 		-Darchname="${myarch}" \
 		-Dcccdlflags='-fPIC' \
 		-Dccdlflags='-rdynamic' \
-		-Dcc="$(tc-getCC)" \
+		-Dcc="${CC:-gcc}" \
 		-Dprefix='/usr' \
 		-Dvendorprefix='/usr' \
 		-Dsiteprefix='/usr' \
@@ -216,7 +208,7 @@ src_compile() {
 		${myconf} || die
 
 	emake -j1 -f Makefile depend || die "Couldn't make libperl.so depends"
-	emake -j1 -f Makefile LIBPERL=${LIBPERL} ${LIBPERL} || die "Unable to make libperl.so"
+	emake -j1 -f Makefile ${LIBPERL} || die "Unable to make libperl.so"
 	mv ${LIBPERL} ${WORKDIR}
 }
 
@@ -246,6 +238,7 @@ src_install() {
 			install || die "Unable to make install"
 
 		cp -f utils/h2ph utils/h2ph_patched
+		epatch ${FILESDIR}/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch
 
 		LD_LIBRARY_PATH=. ./perl -Ilib utils/h2ph_patched \
 			-a -d ${D}/usr/lib/perl5/${PV}/${myarch}${mythreading} <<EOF
diff --git a/sys-devel/libperl/libperl-5.8.6-r1.ebuild b/sys-devel/libperl/libperl-5.8.6-r1.ebuild
index 011c717d550f..187711987eb8 100644
--- a/sys-devel/libperl/libperl-5.8.6-r1.ebuild
+++ b/sys-devel/libperl/libperl-5.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/sys-devel/libperl/libperl-5.8.6-r1.ebuild,v 1.13 2005/11/14 21:42:02 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.6-r1.ebuild,v 1.1 2005/06/30 14:54:49 mcummings Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
@@ -52,7 +52,7 @@
 #
 # Martin Schlemmer <azarah@gentoo.org> (28 Dec 2002).
 
-IUSE="berkdb debug gdbm ithreads"
+IUSE="berkdb debug gdbm ithreads nocxx"
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -68,7 +68,7 @@ HOMEPAGE="http://www.perl.org"
 SLOT="${PERLSLOT}"
 LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
 LICENSE="Artistic GPL-2"
-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"
 
 # rac 2004.08.06
 
@@ -80,7 +80,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 
 RESTRICT="test"
 
-DEPEND="!elibc_uclibc? ( sys-apps/groff )
+DEPEND="!nocxx? ( sys-apps/groff )
 	berkdb? ( sys-libs/db )
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
 
@@ -155,8 +155,6 @@ src_compile() {
 
 	if [[ ${KERNEL} == "FreeBSD" && "${ELIBC}" = "FreeBsd" ]]; then
 		osname="freebsd"
-	elif [[ ${KERNEL} == "NetBSD" ]]; then
-		osname="netbsd"
 	else
 		osname="linux"
 	fi
diff --git a/sys-devel/libperl/libperl-5.8.6.ebuild b/sys-devel/libperl/libperl-5.8.6.ebuild
index 59456b4378e2..b490fb81ca16 100644
--- a/sys-devel/libperl/libperl-5.8.6.ebuild
+++ b/sys-devel/libperl/libperl-5.8.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.6.ebuild,v 1.18 2005/11/14 21:42:02 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.6.ebuild,v 1.1 2004/11/30 21:01:58 rac Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
@@ -52,9 +52,14 @@
 #
 # Martin Schlemmer <azarah@gentoo.org> (28 Dec 2002).
 
-IUSE="berkdb debug gdbm ithreads"
+IUSE="berkdb debug gdbm ithreads uclibc"
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit eutils flag-o-matic
+
+# Perl has problems compiling with -Os in your flags
+use uclibc || replace-flags "-Os" "-O2"
+# This flag makes compiling crash in interesting ways
+filter-flags "-malign-double"
 
 # The slot of this binary compat version of libperl.so
 PERLSLOT="1"
@@ -68,7 +73,7 @@ HOMEPAGE="http://www.perl.org"
 SLOT="${PERLSLOT}"
 LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
 LICENSE="Artistic GPL-2"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390 ~sh"
 
 # rac 2004.08.06
 
@@ -78,11 +83,12 @@ KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86
 # badly when you -n it, because it won't exist and will therefore try
 # to build itself again ad infinitum.
 
-RESTRICT="test"
+RESTRICT="maketest"
 
-DEPEND="!elibc_uclibc? ( sys-apps/groff )
+DEPEND="!uclibc? ( sys-apps/groff )
 	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	>=sys-apps/portage-2.0.45-r4"
 
 RDEPEND="
 	berkdb? ( sys-libs/db )
@@ -129,52 +135,33 @@ src_unpack() {
 	#
 	#   LIBPERL=libperl.so.${SLOT}.`echo ${PV} | cut -d. -f1,2`
 	#
-	cd ${S}; epatch ${FILESDIR}/${PN}-create-libperl-soname.patch
+	cd ${S}; epatch ${FILESDIR}/${P}-create-libperl-soname.patch
 
 	# uclibc support - dragonheart 2004.06.16
-	cd ${S}; epatch ${FILESDIR}/${PN}-uclibc.patch
+	cd ${S}; epatch ${FILESDIR}/${P}-uclibc.patch
 
 	# Configure makes an unwarranted assumption that /bin/ksh is a
 	# good shell. This patch makes it revert to using /bin/sh unless
 	# /bin/ksh really is executable. Should fix bug 42665.
 	# rac 2004.06.09
-	cd ${S}; epatch ${FILESDIR}/${PN}-noksh.patch
-
-	# we need the same @INC-inversion magic here we do in perl
-	cd ${S}; epatch ${FILESDIR}/${PN}-reorder-INC.patch
+	cd ${S}; epatch ${FILESDIR}/${P}-noksh.patch
 }
 
 src_compile() {
-	# Perl has problems compiling with -Os in your flags
-	use elibc_uclibc || replace-flags "-Os" "-O2"
-	# This flag makes compiling crash in interesting ways
-	filter-flags "-malign-double"
 
 	export LC_ALL="C"
 	local myconf=""
 
-	if [[ ${KERNEL} == "FreeBSD" && "${ELIBC}" = "FreeBsd" ]]; then
-		osname="freebsd"
-	elif [[ ${KERNEL} == "NetBSD" ]]; then
-		osname="netbsd"
-	else
-		osname="linux"
-	fi
-
 	if use ithreads
 	then
 		einfo "using ithreads"
 		mythreading="-multi"
 		myconf="-Dusethreads ${myconf}"
-		myarch=$(get_abi_CHOST)
-		myarch="${myarch%%-*}-${osname}-thread"
+		myarch="${CHOST%%-*}-linux-thread"
 	else
-		myarch=$(get_abi_CHOST)
-		myarch="${myarch%%-*}-${osname}"
+		myarch="${CHOST%%-*}-linux"
 	fi
 
-	ewarn "myarch: ${myarch}"
-
 	if use gdbm
 	then
 		myconf="${myconf} -Di_gdbm"
@@ -205,15 +192,11 @@ src_compile() {
 
 	rm -f config.sh Policy.sh
 
-	[ -n "${ABI}" ] && myconf="${myconf} -Dusrinc=$(get_ml_incdir)"
-
-	[[ ${ELIBC} == "FreeBSD" ]] && myconf="${myconf} -Dlibc=/usr/lib/libc.a"
-
 	sh Configure -des \
 		-Darchname="${myarch}" \
 		-Dcccdlflags='-fPIC' \
 		-Dccdlflags='-rdynamic' \
-		-Dcc="$(tc-getCC)" \
+		-Dcc="${CC:-gcc}" \
 		-Dprefix='/usr' \
 		-Dvendorprefix='/usr' \
 		-Dsiteprefix='/usr' \
@@ -230,7 +213,7 @@ src_compile() {
 		${myconf} || die
 
 	emake -j1 -f Makefile depend || die "Couldn't make libperl.so depends"
-	emake -j1 -f Makefile LIBPERL=${LIBPERL} ${LIBPERL} || die "Unable to make libperl.so"
+	emake -j1 -f Makefile ${LIBPERL} || die "Unable to make libperl.so"
 	mv ${LIBPERL} ${WORKDIR}
 }
 
@@ -247,9 +230,9 @@ src_install() {
 		# the library ...
 		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 ../../../../${LIBPERL} ${coredir}/${LIBPERL}
+		dosym ../../../../${LIBPERL} ${coredir}/libperl.so.${PERLSLOT}
+		dosym ../../../../${LIBPERL} ${coredir}/libperl.so
 
 		# Fix for "stupid" modules and programs
 		dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading}
@@ -319,19 +302,19 @@ EOF
 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/lib/libperl.so" -a ! -L "${ROOT}usr/lib/libperl.so" ]
 	then
-		mv -f ${ROOT}usr/$(get_libdir)/libperl.so ${ROOT}usr/$(get_libdir)/libperl.so.old
+		mv -f ${ROOT}usr/lib/libperl.so ${ROOT}usr/lib/libperl.so.old
 	fi
 
 	# Next bit is to try and setup the /usr/lib/libperl.so symlink
 	# properly ...
-	local libnumber="`ls -1 ${ROOT}usr/$(get_libdir)/libperl.so.?.* | grep -v '\.old' | wc -l`"
+	local libnumber="`ls -1 ${ROOT}usr/lib/libperl.so.?.* | grep -v '\.old' | wc -l`"
 	if [ "${libnumber}" -eq 1 ]
 	then
 		# Only this version of libperl is installed, so just link libperl.so
 		# to the *soname* version of it ...
-		ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/$(get_libdir)/libperl.so
+		ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/lib/libperl.so
 	else
 		if [ -x "${ROOT}/usr/bin/perl" ]
 		then
@@ -340,7 +323,7 @@ pkg_postinst() {
 			# to that *soname* version of libperl.so ...
 			local perlversion="`${ROOT}/usr/bin/perl -V:version | cut -d\' -f2 | cut -d. -f1,2`"
 
-			cd ${ROOT}usr/$(get_libdir)
+			cd ${ROOT}usr/lib
 			# Link libperl.so to the *soname* versioned lib ...
 			ln -snf `echo libperl.so.?.${perlversion} | cut -d. -f1,2,3` libperl.so
 		else
@@ -348,12 +331,12 @@ pkg_postinst() {
 
 			# Nope, we are not so lucky ... try to figure out what version
 			# is the latest, and keep fingers crossed ...
-			for x in `ls -1 ${ROOT}usr/$(get_libdir)/libperl.so.?.*`
+			for x in `ls -1 ${ROOT}usr/lib/libperl.so.?.*`
 			do
 				latest="${x}"
 			done
 
-			cd ${ROOT}usr/$(get_libdir)
+			cd ${ROOT}usr/lib
 			# Link libperl.so to the *soname* versioned lib ...
 			ln -snf `echo ${latest##*/} | cut -d. -f1,2,3` libperl.so
 		fi
diff --git a/sys-devel/libperl/libperl-5.8.7.ebuild b/sys-devel/libperl/libperl-5.8.7.ebuild
index 2edd458fb25f..75fcbd493de2 100644
--- a/sys-devel/libperl/libperl-5.8.7.ebuild
+++ b/sys-devel/libperl/libperl-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/sys-devel/libperl/libperl-5.8.7.ebuild,v 1.17 2005/11/29 19:35:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.7.ebuild,v 1.1 2005/06/29 22:13:08 mcummings Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
@@ -52,9 +52,9 @@
 #
 # Martin Schlemmer <azarah@gentoo.org> (28 Dec 2002).
 
-IUSE="berkdb debug gdbm ithreads"
+IUSE="berkdb debug gdbm ithreads nocxx"
 
-inherit eutils flag-o-matic toolchain-funcs multilib
+inherit eutils flag-o-matic toolchain-funcs
 
 # The slot of this binary compat version of libperl.so
 PERLSLOT="1"
@@ -66,9 +66,9 @@ DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
 SRC_URI="ftp://ftp.cpan.org/pub/CPAN/src/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.perl.org"
 SLOT="${PERLSLOT}"
-LIBPERL="libperl$(get_libname ${PERLSLOT}.${SHORT_PV})"
+LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
 LICENSE="Artistic GPL-2"
-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"
 
 # rac 2004.08.06
 
@@ -80,7 +80,7 @@ KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~m68k ~mips ~ppc ~ppc-macos ppc64 ~s390 ~
 
 RESTRICT="test"
 
-DEPEND="!elibc_uclibc? ( sys-apps/groff )
+DEPEND="!nocxx? ( sys-apps/groff )
 	berkdb? ( sys-libs/db )
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
 
@@ -129,8 +129,7 @@ src_unpack() {
 	#
 	#   LIBPERL=libperl.so.${SLOT}.`echo ${PV} | cut -d. -f1,2`
 	#
-	cd ${S};
-	use userland_Darwin || epatch ${FILESDIR}/${PN}-create-libperl-soname.patch
+	cd ${S}; epatch ${FILESDIR}/${PN}-create-libperl-soname.patch
 
 	# uclibc support - dragonheart 2004.06.16
 	# Now upstreamed - MPC 2005.06.28
@@ -155,12 +154,8 @@ src_compile() {
 	export LC_ALL="C"
 	local myconf=""
 
-	if [[ ${KERNEL} == "FreeBSD" && "${ELIBC}" = "FreeBSD" ]]; then
+	if [[ ${KERNEL} == "FreeBSD" && "${ELIBC}" = "FreeBsd" ]]; then
 		osname="freebsd"
-	elif [[ ${KERNEL} == "NetBSD" ]]; then
-		osname="netbsd"
-	elif [[ ${USERLAND} == "Darwin" ]]; then
-		osname="darwin"
 	else
 		osname="linux"
 	fi
@@ -213,11 +208,6 @@ src_compile() {
 
 	[[ ${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' \
@@ -238,8 +228,8 @@ src_compile() {
 		-Ud_csh \
 		${myconf} || die
 
-	emake -j1 -f Makefile depend || die "Couldn't make libperl$(get_libname) depends"
-	emake -j1 -f Makefile LIBPERL=${LIBPERL} ${LIBPERL} || die "Unable to make libperl$(get_libname)"
+	emake -j1 -f Makefile depend || die "Couldn't make libperl.so depends"
+	emake -j1 -f Makefile LIBPERL=${LIBPERL} ${LIBPERL} || die "Unable to make libperl.so"
 	mv ${LIBPERL} ${WORKDIR}
 }
 
@@ -250,19 +240,15 @@ src_install() {
 	if [ "${PN}" = "libperl" ]
 	then
 		dolib.so ${WORKDIR}/${LIBPERL}
-		if [[ ${USERLAND} == "Darwin" ]]; then
-			install_name_tool -id /usr/$(get_libdir)/${LIBPERL} ${D}/usr/$(get_libdir)/${LIBPERL}
-		else
-			preplib
-		fi
+		preplib
 	else
 		# Need to do this, else apps do not link to dynamic version of
 		# the library ...
 		local coredir="/usr/lib/perl5/${PV}/${myarch}${mythreading}/CORE"
 		dodir ${coredir}
 		dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/${LIBPERL}
-		dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname ${PERLSLOT})
-		dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname)
+		dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl.so.${PERLSLOT}
+		dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl.so
 
 		# Fix for "stupid" modules and programs
 		dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading}
@@ -332,19 +318,19 @@ EOF
 pkg_postinst() {
 
 	# Make sure we do not have stale/invalid libperl.so 's ...
-	if [ -f "${ROOT}usr/$(get_libdir)/libperl$(get_libname)" -a ! -L "${ROOT}usr/$(get_libdir)/libperl$(get_libname)" ]
+	if [ -f "${ROOT}usr/$(get_libdir)/libperl.so" -a ! -L "${ROOT}usr/$(get_libdir)/libperl.so" ]
 	then
-		mv -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname) ${ROOT}usr/$(get_libdir)/libperl$(get_libname).old
+		mv -f ${ROOT}usr/$(get_libdir)/libperl.so ${ROOT}usr/$(get_libdir)/libperl.so.old
 	fi
 
 	# Next bit is to try and setup the /usr/lib/libperl.so symlink
 	# properly ...
-	local libnumber="`ls -1 ${ROOT}usr/$(get_libdir)/libperl$(get_libname ?.*) | grep -v '\.old' | wc -l`"
+	local libnumber="`ls -1 ${ROOT}usr/$(get_libdir)/libperl.so.?.* | grep -v '\.old' | wc -l`"
 	if [ "${libnumber}" -eq 1 ]
 	then
 		# Only this version of libperl is installed, so just link libperl.so
 		# to the *soname* version of it ...
-		ln -snf libperl$(get_libname ${PERLSLOT}) ${ROOT}usr/$(get_libdir)/libperl$(get_libname)
+		ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/$(get_libdir)/libperl.so
 	else
 		if [ -x "${ROOT}/usr/bin/perl" ]
 		then
@@ -355,20 +341,20 @@ pkg_postinst() {
 
 			cd ${ROOT}usr/$(get_libdir)
 			# Link libperl.so to the *soname* versioned lib ...
-			ln -snf `echo libperl$(get_libname ?.${perlversion}) | cut -d.  -f1,2,3` libperl$(get_libname)
+			ln -snf `echo libperl.so.?.${perlversion} | cut -d. -f1,2,3` libperl.so
 		else
 			local x latest
 
 			# Nope, we are not so lucky ... try to figure out what version
 			# is the latest, and keep fingers crossed ...
-			for x in `ls -1 ${ROOT}usr/$(get_libdir)/libperl$(get_libname ?.*)`
+			for x in `ls -1 ${ROOT}usr/$(get_libdir)/libperl.so.?.*`
 			do
 				latest="${x}"
 			done
 
 			cd ${ROOT}usr/$(get_libdir)
 			# Link libperl.so to the *soname* versioned lib ...
-			ln -snf `echo ${latest##*/} | cut -d. -f1,2,3` libperl$(get_libname)
+			ln -snf `echo ${latest##*/} | cut -d. -f1,2,3` libperl.so
 		fi
 	fi
 }
diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index 664eee0f264f..d9d672f30bd0 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,441 +1,6 @@
 # ChangeLog for sys-devel/libtool
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.94 2005/11/19 19:11:21 corsair Exp $
-
-  19 Nov 2005; Markus Rothe <corsair@gentoo.org> libtool-1.5.20.ebuild:
-  Stable on ppc64; bug #108846
-
-  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> libtool-1.5.20.ebuild:
-  Stable on ppc.
-
-*libtool-1.5.20-r1 (04 Nov 2005)
-
-  04 Nov 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/1.5.20/libtool-1.5.20-version-checking.patch,
-  +libtool-1.5.20-r1.ebuild:
-  Dont use non-portable character classes in Gentoo sanity check #111353 by
-  Erik Månsson.
-
-  18 Oct 2005; Aron Griffis <agriffis@gentoo.org> libtool-1.5.20.ebuild:
-  Mark 1.5.20 stable on alpha
-
-  16 Oct 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/1.5.20/libtool-1.5.20-use-linux-version-in-fbsd.patch,
-  libtool-1.5.20.ebuild:
-  Add patch by Diego Pettenò to tweak versioning styles on Gentoo/FreeBSD
-  hosts #109105.
-
-  13 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> libtool-1.5.20.ebuild:
-  Stable on sparc wrt #108846
-
-  12 Oct 2005; Andrej Kacian <ticho@gentoo.org> libtool-1.5.20.ebuild:
-  Stable on x86, bug #108846.
-
-  12 Oct 2005; <dang@gentoo.org> libtool-1.5.20.ebuild:
-  Marked stable on amd64
-
-  29 Sep 2005; Mike Frysinger <vapier@gentoo.org>
-  files/1.5.6/libtool-1.5-filter-host-tags.patch:
-  Update the host tags patch to handle the case where user changes their CHOST
-  but doesnt re-emerge libtool.
-
-  25 Sep 2005; Mike Frysinger <vapier@gentoo.org>
-  files/1.5.10/libtool-1.5.10-version-checking.patch,
-  +files/1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch,
-  libtool-1.5.20.ebuild:
-  Fix bracket quoting in the sanity check and make sure LD_LIBRARY_PATH doesnt
-  clobber wrapped libtool files.
-
-  10 Sep 2005; Martin Schlemmer <azarah@gentoo.org>
-  files/1.5.10/libtool-1.5.10-portage.patch:
-  Fix typo in portage patch, bug #105054.
-
-*libtool-1.5.20 (02 Sep 2005)
-
-  02 Sep 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/1.5.20/libtool-1.5.20-ltmain_sh-max_cmd_len.patch,
-  +libtool-1.5.20.ebuild:
-  Version bump.
-
-  30 Jun 2005; Martin Schlemmer <azarah@gentoo.org>
-  files/1.5.10/libtool-1.5.10-portage.patch,
-  files/1.5.14/libtool-1.5.14-egrep.patch:
-  Fix tests to be sh-complaint.
-
-*libtool-1.5.18-r1 (29 Jun 2005)
-
-  29 Jun 2005; Martin Schlemmer <azarah@gentoo.org>
-  files/1.5.10/libtool-1.5.10-portage.patch,
-  +files/1.5.14/libtool-1.5.14-egrep.patch, libtool-1.5.14.ebuild,
-  libtool-1.5.16.ebuild, libtool-1.5.18.ebuild, +libtool-1.5.18-r1.ebuild:
-  Update portage patch to define EGREP just in case (maybe a bit too much?).
-  Also make sure its global defined as well as LTCC.
-
-*libtool-1.5.18 (18 May 2005)
-
-  18 May 2005; Mike Frysinger <vapier@gentoo.org> +libtool-1.5.18.ebuild:
-  Version bump.
-
-*libtool-1.5.16 (26 Apr 2005)
-
-  26 Apr 2005; Mike Frysinger <vapier@gentoo.org> +libtool-1.5.16.ebuild:
-  Version bump.
-
-  31 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
-  libtool-1.5.10-r4.ebuild:
-  Stable on alpha, requested by Karol Wojtaszek <sekretarz@gentoo.org>.
-
-*libtool-1.5.14 (13 Mar 2005)
-
-  13 Mar 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/1.5.14/libtool-1.5.14-ltmain_sh-max_cmd_len.patch,
-  +libtool-1.5.14.ebuild:
-  Version bump.
-
-  04 Mar 2005; Daniel Goller <morfic@gentoo.org> libtool-1.5.10-r4.ebuild:
-  Stable on ppc
-
-*libtool-1.5.10-r5 (23 Feb 2005)
-
-  23 Feb 2005; Martin Schlemmer <azarah@gentoo.org>
-  +files/1.5.10/libtool-1.5.10-portage.patch, +libtool-1.5.10-r5.ebuild:
-  Update portage.patch to verify that we always have a leading '/' when we
-  replace $D.
-
-  15 Feb 2005; Markus Rothe <corsair@gentoo.org> libtool-1.5.10-r4.ebuild:
-  Stable on ppc64
-
-  15 Feb 2005; Mike Frysinger <vapier@gentoo.org>
-  files/1.5.6/libtool-1.5-filter-host-tags.patch:
-  Add a catch for infer tags with CC=cc just like CC=gcc.
-
-  06 Feb 2005; Joshua Kinard <kumba@gentoo.org> libtool-1.5.10-r4.ebuild:
-  Marked stable on mips.
-
-  01 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  libtool-1.5.10-r4.ebuild:
-  Stable on sparc
-
-*libtool-1.5.10-r4 (27 Jan 2005)
-
-  27 Jan 2005; Mike Frysinger <vapier@gentoo.org>
-  files/1.5.6/libtool-1.5-filter-host-tags.patch, +libtool-1.5.10-r4.ebuild:
-  Fix typo in the tag infer patch.
-
-  22 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  libtool-1.5.2-r7.ebuild:
-  Multilib fixes.
-
-  20 Jan 2005; Mike Frysinger <vapier@gentoo.org> -libtool-1.5.10-r2.ebuild:
-  Push out updated patches.
-
-  19 Jan 2005; Mike Frysinger <vapier@gentoo.org>
-  files/1.4.3/libtool-1.4.2-portage.patch:
-  Touch up portage patch to pass libtools `make check` #70350.
-
-  19 Jan 2005; Mike Frysinger <vapier@gentoo.org>
-  files/1.5.6/libtool-1.5-filter-host-tags.patch:
-  Update the infer tag patch to go both ways #77921.
-
-  03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-*libtool-1.5.10-r2 (17 Dec 2004)
-
-  17 Dec 2004; Mike Frysinger <vapier@gentoo.org> +libtool-1.5.10-r2.ebuild:
-  Remove useless C++ checks #73344. Means we have to run all the autotool
-  stuff ourself (whee!).
-
-  17 Dec 2004; Mike Frysinger <vapier@gentoo.org>
-  -files/1.4.3/libtool-1.4.3-amd64-alias.patch, libtool-1.5.10-r1.ebuild,
-  libtool-1.5.2-r5.ebuild, libtool-1.5.2-r7.ebuild:
-  Remove the amd64-alias patch since gnuconfig_update does all the magic now.
-
-*libtool-1.5.10-r1 (11 Dec 2004)
-
-  11 Dec 2004; Mike Frysinger <vapier@gentoo.org>
-  +files/1.5.10/libtool-1.5.10-version-checking.patch,
-  -files/1.5.6/libtool-1.5.6-libtool_m4-shared_ext.patch,
-  +libtool-1.5.10-r1.ebuild:
-  Rather than guess at variable name changes, perform version sanity checks to
-  make sure that the libtool version being used by configure (via
-  aclocal.m4/libtool.m4) matches that of the local ltmain.sh/libtool files.
-
-  29 Nov 2004; Mike Frysinger <vapier@gentoo.org>
-  +files/1.5.10/libtool-1.5.10-locking.patch, libtool-1.5.10.ebuild:
-  Move to unstable and include patch by Robin Johnson to fix locking issues
-  #40992.
-
-  09 Nov 2004; Mike Frysinger <vapier@gentoo.org>
-  +files/1.5.6/libtool-1.5-filter-host-tags.patch,
-  +files/1.5.6/libtool-1.5.6-libtool_m4-shared_ext.patch,
-  libtool-1.5.10.ebuild:
-  Update the .so and tag guessing patches.
-
-  09 Nov 2004; Mike Frysinger <vapier@gentoo.org> +libtool-1.3.5.ebuild:
-  SLOT-ed version of libtool, no point in building 1.3.5 all the time.
-
-*libtool-1.5.2-r7 (09 Nov 2004)
-
-  09 Nov 2004; Mike Frysinger <vapier@gentoo.org>
-  files/1.5.2/libtool-1.5-filter-host-tags.patch, -libtool-1.5.2-r6.ebuild:
-  Add another check to the CC tag guessing.
-
-*libtool-1.5.2-r6 (04 Nov 2004)
-
-  04 Nov 2004; Mike Frysinger <vapier@gentoo.org>
-  +files/1.5.2/libtool-1.5-filter-host-tags.patch, +libtool-1.5.2-r6.ebuild:
-  Try to impove auto-guessing at --tag #67692.
-
-*libtool-1.5.10 (01 Nov 2004)
-
-  01 Nov 2004; Mike Frysinger <vapier@gentoo.org> +libtool-1.5.10.ebuild,
-  -libtool-1.5.6.ebuild:
-  Version bump.
-
-  25 Sep 2004; Joshua Kinard <kumba@gentoo.org> libtool-1.5.2-r5.ebuild:
-  Marked stable on mips.
-
-  01 Sep 2004; Mike Frysinger <vapier@gentoo.org>
-  files/1.5.2/libtool-1.5.2-libtool_m4-shared_ext.patch:
-  Make sure we quote the grep #47771 by csm@gnu.org.
-
-  15 Jul 2004; Aron Griffis <agriffis@gentoo.org> libtool-1.4.3-r3.ebuild,
-  libtool-1.4.3-r4.ebuild, libtool-1.5.2-r3.ebuild, libtool-1.5.2-r4.ebuild,
-  libtool-1.5.2-r5.ebuild, libtool-1.5.6.ebuild:
-  Fix all the gnuconfig_update screwiness in these ebuilds #57224
-
-  15 Jul 2004; Tom Gall <tgall@gentoo.org> libtool-1.5.2-r5.ebuild:
-  calling multiple gnuconfig_updates in a row kills gnus
-  bug #57224
-
-  10 Jul 2004; Travis Tilley <lv@gentoo.org> libtool-1.5.6.ebuild:
-  it seems that this libtool breaks building .so files for a few ebuilds. next
-  time i test, i guess i'll have to emerge world -e twice instead of just once
-  ;)
-
-  09 Jul 2004; Travis Tilley <lv@gentoo.org> libtool-1.5.6.ebuild:
-  added back keywords for all supported archs
-
-*libtool-1.5.6 (08 Jul 2004)
-
-  08 Jul 2004; Travis Tilley <lv@gentoo.org>
-  +files/1.5.6/libtool-1.5.6-ltmain-SED.patch, +libtool-1.5.6.ebuild:
-  version bump. keyworded -* until i know this wont break anything
-
-  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  libtool-1.4.1-r10.ebuild, libtool-1.4.3-r3.ebuild, libtool-1.4.3-r4.ebuild,
-  libtool-1.5.2-r3.ebuild, libtool-1.5.2-r4.ebuild, libtool-1.5.2-r5.ebuild:
-  virtual/glibc -> virtual/libc
-
-  24 Jun 2004; <solar@gentoo.org> libtool-1.4.3-r4.ebuild,
-  libtool-1.5.2-r5.ebuild, files/libltdl-uclibc.patch,
-  files/ltconfig-uclibc.patch, files/1.4.3/libtool-1.4.3-uclibc.patch:
-  uclibc support added
-
-  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> libtool-1.5.2-r5.ebuild:
-  Stable on alpha.
-
-  27 Apr 2004; Robin H. Johnson <robbat2@gentoo.org> libtool-1.5.2-r5.ebuild:
-  make sure we have the correct version of autoconf
-
-  09 Apr 2004; Travis Tilley <lv@gentoo.org> libtool-1.5.2-r5.ebuild:
-  stable on amd64
-
-  30 Mar 2004; Todd Sunderlin <todd@gentoo.org> libtool-1.5.2-r5.ebuild:
-  set stable on sparc
-
-*libtool-1.5.2-r5 (01 Mar 2004)
-*libtool-1.4.3-r4 (01 Mar 2004)
-
-  01 Mar 2004; Martin Schlemmer <azarah@gentoo.org> libtool-1.4.3-r4.ebuild,
-  libtool-1.5.2-r5.ebuild:
-  Actually remove the correct patch for bug #43244.
-
-*libtool-1.5.2-r4 (29 Feb 2004)
-
-  29 Feb 2004; Martin Schlemmer <azarah@gentoo.org> libtool-1.5.2-r4.ebuild:
-  Remove libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch, as it breaks
-  things for newer gst-plugins, etc (bug #43244).
-
-  18 Feb 2004; Tom Gall <tgall@gentoo.org> libtool-1.5.2-r3.ebuild
-  Fix for ppc64, older 1.3.x libtool needs to have configs etc regenerated
-  so they are aware that ppc64 is a valid build,host,target, follow in amd64
-  footsteps
-
-*libtool-1.5.2-r3 (11 Feb 2004)
-
-  11 Feb 2004; Martin Schlemmer <azarah@gentoo.org> libtool-1.5.2-r3.ebuild,
-  files/1.5.2/libtool-1.5.2-ltmain_sh-max_cmd_len.patch:
-  For older autoconf setups's that do not support libtool.m4, $max_cmd_len
-  are never set, causing all tests against it to fail, resulting in
-  'integer expression expected' errors and possible misbehaviour.
-
-*libtool-1.5.2-r2 (11 Feb 2004)
-
-  11 Feb 2004; Martin Schlemmer <azarah@gentoo.org> libtool-1.5.2-r2.ebuild,
-  files/1.5.2/libtool-1.5.2-libtool_m4-shared_ext.patch:
-  If a package use an older libtool, and libtool.m4 for that package is
-  updated, but not libtool, then we run into an issue where $shared_ext
-  is not set.  This results in libraries being built without '.so'
-  extension, bug #40901.
-
-*libtool-1.5.2-r1 (07 Feb 2004)
-
-  07 Feb 2004; Martin Schlemmer <azarah@gentoo.org> libtool-1.5.2-r1.ebuild:
-  Fix empty VERSION and PACKAGE, bug #39576.
-
-  07 Feb 2004; Martin Schlemmer <azarah@gentoo.org> libtool-1.5.2.ebuild:
-  Mask again as it have some issues.
-
-  06 Feb 2004; Martin Schlemmer <azarah@gentoo.org> libtool-1.5.2.ebuild:
-  Add to testing.
-
-  06 Feb 2004; Martin Schlemmer <azarah@gentoo.org> libtool-1.4.3-r3.ebuild:
-  Bump to stable.
-
-*libtool-1.5.2 (03 Feb 2004)
-
-  03 Feb 2004; Martin Schlemmer <azarah@gentoo.org> libtool-1.5.2.ebuild,
-  files/1.5.2/libtool-1.5-libtool.m4-x86_64.patch,
-  files/1.5.2/libtool-1.5-testfailure.patch:
-  Update version; closes bug #39576.
-
-  22 Dec 2003; Joshua Kinard <kumba@gentoo.org> libtool-1.4.3-r3.ebuild:
-  Added gnuconfig bits to detect systems running mips64 kernels
-
-  16 Nov 2003; Brad House <brad_mssw@gentoo.org> libtool-1.4.3-r3.ebuild:
-  the amd64 _required_ patch was reverted between -r2 and -r3 
-  without reason. Putting it back. Basically when it compiles libtool-1.3.5, that
-  package needs to be re-libtoolized b/c it doesn't know what x86_64 is.
-
-*libtool-1.4.3-r3 (17 Nov 2003)
-
-  17 Nov 2003; Martin Schlemmer <azarah@gentoo.org> libtool-1.4.3-r3.ebuild,
-  files/1.4.3/libtool-1.4.2-expsym-linux.patch,
-  files/1.4.3/libtool-1.4.3-amd64-alias.patch,
-  files/1.4.3/libtool-1.4.3-libtoolize--config-only.patch,
-  files/1.4.3/libtool-1.4.3-pass-thread-flags.patch,
-  files/1.4.3/libtool-1.4.3-quotes.patch:
-  Add more patches from Mandrake.
-
-  25 Sep 2003; Martin Schlemmer <azarah@gentoo.org> libtool-1.4.3-r2.ebuild:
-  Only reinstall missing script if not bootstrap, else we error out.
-
-*libtool-1.4.3-r2 (24 Sep 2003)
-
-  24 Sep 2003; Martin Schlemmer <azarah@gentoo.org> libtool-1.4.3-r2.ebuild,
-  files/1.4.3/libtool-1.4.2-archive-shared.patch,
-  files/1.4.3/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch,
-  files/1.4.3/libtool-1.4.2-portage.patch,
-  files/1.4.3/libtool-1.4.3-ltmain-SED.patch:
-  With 1.4.3, we have ltmain.in and ltmain.sh which both got patched, but not
-  with all the patches :/ Fix all the patches to only apply to ltmain.in, and
-  then fix the breakage that follows due to us having to remove ltmain.sh.
-
-  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> libtool-1.4.3-r1.ebuild :
-  ia64 keywords.
-
-  02 Aug 2003; Martin Schlemmer <azarah@gentoo.org> libtool-1.4.3-r1.ebuild:
-  Mark stable for all.  (shoot me later)
-
-*libtool-1.4.3-r1 (09 Mar 2003)
-
-  03 Aug 2003; Guy Martin <gmsoft@gentoo.org> libtool-1.4.3-r1.ebuild :
-  Fixed for hppa.
-
-  27 Jun 2003; Joshua Kinard <kumba@gentoo.org> libtool-1.4.3-r1.ebuild:
-  Added ~mips to KEYWORDS
-
-  09 Mar 2003; Martin Schlemmer <azarah@gentoo.org> libtool-1.4.3-r1.ebuild :
-  Add various patches from Mandrake, including one to fix the problem where
-  $SED was not defined if we used autoconf-2.13 ...
-
-  18 Feb 2003; Zach Welch <zwelch@gentoo.org> libtool-1.4.3.ebuild :
-  Added arm to keywords.
-
-  07 Feb 2003; Guy Martin <gmsoft@gentoo.org> libtool-1.4.1-r10-ebuild :
-  Added hppa to keywords.
-
-*libtool-1.4.1-r10 (20 Dec 2002)
-  20 Dec 2002; Jan Seidel <tuxus@gentoo.org> libtool-1.4.1-r10-ebuild :
-  Added mips to keywords
-
-*libtool-1.4.3 (14 Dec 2002)
-
-  26 Feb 2003; Zach Welch <zwelch@gentoo.org> libtool-1.4.1-r10.ebuild,
-  libtool-1.4.3.ebuild:
-  fix arm keywords
-
-  14 Dec 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  Update version.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*libtool-1.4.2-r2 (20 Oct 2002)
-
-  20 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  Spiced up version.
-
-*libtool-1.4.1-r10 (20 Oct 2002)
-
-  20 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  Remove the ltmain.sh-hack.patch, as it caused problems with linking
-  dependencies.
-
-*libtool-1.4.1-r9 (3 Jul 2002)
-
-  3 Jul 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  Fix a bug in libtool-1.4.1-portage.patch-v? .. basically just a type o.  Also
-  Enhanced it to be able to use $PWORKDIR ($WORKDIR in ebuilds) that the latest
-  portage should export.
-
-  27 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  Fix a bug in libtool-1.4.1-portage.patch-v5 that has been dropping link dirs
-  and -l? flags.
-
-*libtool-1.4.1-r8 (26 Jun 2002)
-
-  26 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  Fix bug #4122.
-
-*libtool-1.4.1-r7 (10 April 2002)
-
-  26 May 2002; M.Schlemmer <azarah@gentoo.org> :
-
-  Update libtool portage patch not to add duplicates.
-
-*libtool-1.4.1-r6 (10 April 2002)
-
-  10 April 2002; M.Schlemmer <azarah@gentoo.org> :
-
-  Made a sligt mistake with $install_libdir in previous patch, should now
-  be fixed.  Enhanced other parts of patch again.
-
-*libtool-1.4.1-r5 (07 April 2002)
-
-  07 April 2002; M.Schlemmer <azarah@gentoo.org> :
-
-  Patch libtool not to include ${D} and ${S} in .la files (enhance previous).
-
-*libtool-1.4.1-r4 (03 April 2002)
-
-  03 April 2002; M.Schlemmer <azarah@gentoo.org> :
-
-  Patch libtool not to include ${D} and ${S} in .la files.
-
-*libtool-1.4.1-r3 (21 March 2002)
-
-  21 March 2002; M.Schlemmer <azarah@gentoo.org> :
-
-  Since -r1, added the relink patch, as well as additional patches that fixes
-  quoting problems, etc
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
 
 *libtool-1.4.1-r1 (1 Feb 2002)
 
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index c0f362da2991..e69de29bb2d1 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -1,38 +0,0 @@
-MD5 627e538293f951771c932cb693bc692c ChangeLog 16150
-MD5 856e14ff512ae227c3d32c3582618ff9 libtool-1.3.5.ebuild 1454
-MD5 e48784e20efad8d2437f1c271104a4b4 libtool-1.5.16.ebuild 5178
-MD5 50b3b9fe1d346665231c739e48d616b6 libtool-1.5.18-r1.ebuild 5181
-MD5 c230b7f5bd8fc555c76e041bc3c47b02 libtool-1.5.20.ebuild 5104
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 86dd9bc18548613d5629e361b17fb257 libtool-1.5.20-r1.ebuild 5117
-MD5 e893eae0aa5740740c388dbf0a35b3c6 files/digest-libtool-1.3.5 65
-MD5 b6199e286b76757fc802a5de44fc3b79 files/digest-libtool-1.5.20 67
-MD5 4186a4565c7e9eca281c8ccc852abd3d files/digest-libtool-1.5.16 67
-MD5 e052afbe0e1106d25d39eb3ba55cf1b7 files/digest-libtool-1.5.18-r1 67
-MD5 bd27a462a2a9fe3662d3d34179ed3200 files/libltdl-uclibc.patch 4590
-MD5 2cd6110e84c85c183c7b8dcd0be814e7 files/ltconfig-uclibc.patch 1167
-MD5 b6199e286b76757fc802a5de44fc3b79 files/digest-libtool-1.5.20-r1 67
-MD5 7f097b89e5b555f46b8c56b064f21db8 files/1.5.20/libtool-1.5.20-ltmain_sh-max_cmd_len.patch 1073
-MD5 c7faa473d0ebb7cddcae5fb6e76ed29d files/1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch 637
-MD5 ed908a69f44e42aa9dce9ffde8bbb41d files/1.5.20/libtool-1.5.20-use-linux-version-in-fbsd.patch 1185
-MD5 7ee59c3c6384fd26a9e93db41bc1c88b files/1.5.20/libtool-1.5.20-version-checking.patch 1864
-MD5 8ad4f6ed8863c26c4ac562e1d00e6db1 files/1.4.3/libtool-1.2f-cache.patch 698
-MD5 55544e163772c87195b893d27e00a0f8 files/1.4.3/libtool-1.3.5-mktemp.patch 642
-MD5 67757e15bfa1cdefb5c23f76198329ec files/1.4.3/libtool-1.3.5-nonneg.patch 895
-MD5 7c11e213296b02b7e4583d7c94e9c9e0 files/1.4.3/libtool-1.4.2-archive-shared.patch 633
-MD5 66ec977174eec4eba66454e4f0f5772a files/1.4.3/libtool-1.4.2-demo.patch 538
-MD5 d4838522fa55dc06521ddde517901767 files/1.4.3/libtool-1.4.2-expsym-linux.patch 1678
-MD5 3b185e86e062b438eb8d418fc5af462f files/1.4.3/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch 816
-MD5 f6f24e776d832798365777c26c2c56fc files/1.4.3/libtool-1.4.2-multilib.patch 1780
-MD5 e03f7ed340f294fdb7ddd6c84d4b6b09 files/1.4.3/libtool-1.4.2-relink-58664.patch 3213
-MD5 191388758ae78d4982f143636e47f514 files/1.4.3/libtool-1.4.3-lib64.patch 1193
-MD5 a9be6866b7096092613595ccff0fd773 files/1.4.3/libtool-1.4.3-pass-thread-flags.patch 494
-MD5 2196d46d17a239f4b4d7629ca264a9ff files/1.5.10/libtool-1.5.10-locking.patch 513
-MD5 6a91891583a50a0bc2124ee61814b7b8 files/1.5.10/libtool-1.5.10-portage.patch 2895
-MD5 7e914d56a9e704e071b385ca3380a974 files/1.5.10/libtool-1.5.10-version-checking.patch 1841
-MD5 4e8d48f4fc332eb1291a12356b1e2f13 files/1.5.14/libtool-1.5.14-egrep.patch 404
-MD5 807631adcb4daeff2315f390d95d262f files/1.5.14/libtool-1.5.14-ltmain_sh-max_cmd_len.patch 1093
-MD5 6ef585a59058c79f3601bbd7787f2683 files/1.5.2/libtool-1.5-libtool.m4-x86_64.patch 466
-MD5 0fb02114fa6b6cd63ea25510f04f346a files/1.5.2/libtool-1.5-testfailure.patch 6448
-MD5 eea7fbac7b23154feebdfb9ad0951569 files/1.5.6/libtool-1.5-filter-host-tags.patch 1426
-MD5 5e84c0a07a77ed6408b25453373914ab files/1.5.6/libtool-1.5.6-ltmain-SED.patch 431
diff --git a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-archive-shared.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-archive-shared.patch
index 52183aff1e12..52183b2f0f12 100644
--- a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-archive-shared.patch
+++ b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-archive-shared.patch
@@ -1,5 +1,5 @@
---- libtool-1.4.2/ltmain.in.archive-shared	2002-07-15 09:12:03.000000000 -0400
-+++ libtool-1.4.2/ltmain.in	2002-07-15 09:13:04.000000000 -0400
+--- libtool-1.4.2/ltmain.sh.archive-shared	2002-07-15 09:12:03.000000000 -0400
++++ libtool-1.4.2/ltmain.sh	2002-07-15 09:13:04.000000000 -0400
 @@ -2644,6 +2644,13 @@ EOF
  			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
  			esac
diff --git a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch
index a89fef4f324d..7e5b69c74681 100644
--- a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch
+++ b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch
@@ -18,3 +18,23 @@
  # If this variable is set in any of the actions, the command in it
  # will be execed at the end.  This prevents here-documents from being
  # left over by shells.
+--- ./ltmain.sh.gege	2002-05-15 13:33:49.000000000 +0200
++++ ./ltmain.sh	2002-05-15 13:36:53.000000000 +0200
+@@ -207,6 +207,17 @@
+   exit 1
+ fi
+ 
++# Mandrake: (gc) It's bad to link C++ code with GCC, so we need to use the compiler name if provided
++if test "$mode" = link && test -n "$archive_cmds" && test -x "/usr/bin/perl"; then
++    case $nonopt in
++    *cc | *++ | gcc* | *-gcc* | egcs*)
++	    archive_cmds=`echo $archive_cmds | perl -pe 's/^\S+\s+//'`
++	    archive_cmds="$nonopt $archive_cmds"
++	    archive_expsym_cmds=`echo $archive_expsym_cmds | perl -pe 's/^\S+\s+//'`
++	    archive_expsym_cmds="$nonopt $archive_expsym_cmds"
++    esac
++fi
++
+ # If this variable is set in any of the actions, the command in it
+ # will be execed at the end.  This prevents here-documents from being
+ # left over by shells.
diff --git a/sys-devel/libtool/files/1.5.10/libtool-1.5.10-portage.patch b/sys-devel/libtool/files/1.5.10/libtool-1.5.10-portage.patch
index c731567b79a9..7cb831bb250b 100644
--- a/sys-devel/libtool/files/1.5.10/libtool-1.5.10-portage.patch
+++ b/sys-devel/libtool/files/1.5.10/libtool-1.5.10-portage.patch
@@ -1,21 +1,10 @@
-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.in.orig	Wed Apr  3 01:19:37 2002
 +++ ltmain.in	Sun May 26 19:50:52 2002
-@@ -3940,9 +3940,53 @@
+@@ -3940,9 +3940,50 @@
  		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
  		  exit 1
  		fi
 -		newdependency_libs="$newdependency_libs $libdir/$name"
-+		if test "X$EGREP" = X ; then
-+			EGREP=egrep
-+		fi
 +		# 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
@@ -40,10 +29,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"`
-+		  # 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=""
++		  # We do not want portage's install root ($D) present.
++		  my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
 +		  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
@@ -70,7 +59,7 @@ name should be bumped, but the patch content should stay fairly the same.
  	  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/sys-devel/libtool/files/1.5.10/libtool-1.5.10-version-checking.patch b/sys-devel/libtool/files/1.5.10/libtool-1.5.10-version-checking.patch
index da01e4553830..392d81ceabec 100644
--- a/sys-devel/libtool/files/1.5.10/libtool-1.5.10-version-checking.patch
+++ b/sys-devel/libtool/files/1.5.10/libtool-1.5.10-version-checking.patch
@@ -26,17 +26,17 @@
 +if test -z "$ltmain"; then
 +  AC_MSG_RESULT(no)
 +  echo
-+  echo "*** @<:@Gentoo@:>@ sanity check failed! ***"
++  echo "*** [Gentoo] sanity check failed! ***"
 +  echo "*** \$ltmain is not defined, please check the patch for consistency! ***"
 +  echo
 +  exit 1
 +fi
 +gentoo_lt_version="@_LT_VERSION@"
-+gentoo_ltmain_version=`grep '^@<:@@<:@:space:@:>@@:>@*VERSION=' $ltmain | sed -e 's|^@<:@@<:@:space:@:>@@:>@*VERSION=||'`
++gentoo_ltmain_version=`grep '^[[:space:]]*VERSION=' $ltmain | sed -e 's|^[[:space:]]*VERSION=||'`
 +if test "$gentoo_lt_version" != "$gentoo_ltmain_version"; then
 +  AC_MSG_RESULT(no)
 +  echo
-+  echo "*** @<:@Gentoo@:>@ sanity check failed! ***"
++  echo "*** [Gentoo] sanity check failed! ***"
 +  echo "*** libtool.m4 and ltmain.sh have a version mismatch! ***"
 +  echo "*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***"
 +  echo
diff --git a/sys-devel/libtool/files/1.5.14/libtool-1.5.14-egrep.patch b/sys-devel/libtool/files/1.5.14/libtool-1.5.14-egrep.patch
index 175a492554db..5c4098c40071 100644
--- a/sys-devel/libtool/files/1.5.14/libtool-1.5.14-egrep.patch
+++ b/sys-devel/libtool/files/1.5.14/libtool-1.5.14-egrep.patch
@@ -5,10 +5,10 @@
      SED=sed
  fi
 +# Same for EGREP, and just to be sure, do LTCC as well
-+if test "X$EGREP" = X ; then
++if [ "x$EGREP" = x ] ; then
 +    EGREP=egrep
 +fi
-+if test "X$LTCC" = X ; then
++if [ "x$LTCC" = x ] ; then
 +    LTCC=${CC-gcc}
 +fi
  
diff --git a/sys-devel/libtool/files/1.5.6/libtool-1.5-filter-host-tags.patch b/sys-devel/libtool/files/1.5.6/libtool-1.5-filter-host-tags.patch
index de8ad9269792..ccaa25f7264c 100644
--- a/sys-devel/libtool/files/1.5.6/libtool-1.5-filter-host-tags.patch
+++ b/sys-devel/libtool/files/1.5.6/libtool-1.5-filter-host-tags.patch
@@ -1,29 +1,14 @@
-Make the infer tag logic a bit more magical since a lot of old packages still 
-exist which utilize this functionality.
-
-http://bugs.gentoo.org/show_bug.cgi?id=77921
-
---- libtool-1.5.10/ltmain.in
-+++ libtool-1.5.10/ltmain.in
-@@ -242,7 +242,21 @@
+--- libtool-1.5.10/ltmain.in.orig	2004-11-09 13:43:24.290875562 -0500
++++ libtool-1.5.10/ltmain.in	2004-11-09 13:45:51.250048464 -0500
+@@ -242,7 +242,11 @@
  	    esac
  	    CC_quoted="$CC_quoted $arg"
  	  done
 +	    # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
-+	    trimedcc=`echo ${CC} | $SED -e "s/${host}-//g"`
-+	    # and sometimes libtool has CC=<HOST>-gcc but user does CC=gcc
-+	    extendcc=${host}-${CC}
-+	    # and sometimes libtool has CC=<OLDHOST>-gcc but user has CC=<NEWHOST>-gcc  
-+	    # (Gentoo-specific hack because we always export $CHOST)
-+	    mungedcc=${CHOST-${host}}-${trimedcc}
++	    trimedcc="${CC/${host}-}"
  	    case "$@ " in
-+	      "cc "* | " cc "* | "${host}-cc "* | " ${host}-cc "*|\
-+	      "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
-+	      tagname=CC
-+	      break ;;
++	      "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*) tagname=CC ; break ;;
 +	      "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*|\
-+	      "$extendcc "* | " $extendcc "* | "`$echo $extendcc` "* | " `$echo $extendcc` "*|\
-+	      "$mungedcc "* | " $mungedcc "* | "`$echo $mungedcc` "* | " `$echo $mungedcc` "*|\
  	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
  	      # The compiler in the base compile command matches
  	      # the one in the tagged configuration.
diff --git a/sys-devel/libtool/libtool-1.3.5.ebuild b/sys-devel/libtool/libtool-1.3.5.ebuild
index c8bedf5d8522..d42239d87283 100644
--- a/sys-devel/libtool/libtool-1.3.5.ebuild
+++ b/sys-devel/libtool/libtool-1.3.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.3.5.ebuild,v 1.6 2005/04/26 23:07:44 vapier Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.3.5.ebuild,v 1.1 2004/11/09 16:33:04 vapier Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
 
-inherit eutils libtool
+inherit eutils gnuconfig libtool
 
 DESCRIPTION="A shared library tool for developers"
 HOMEPAGE="http://www.gnu.org/software/libtool/libtool.html"
@@ -10,10 +10,11 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1.3"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
-DEPEND=">=sys-devel/autoconf-2.58
+DEPEND="virtual/libc
+	>=sys-devel/autoconf-2.58
 	>=sys-devel/automake-1.8.3"
 # the autoconf dep is due to it complaining 'configure.ac:55: error: Autoconf version 2.58 or higher is required'
 # the automake dep is due to Bug #46037
@@ -28,7 +29,7 @@ src_unpack() {
 
 	unpack ${A}
 
-	cd "${S}"
+	cd ${S}
 	echo
 	# Install updated missing script
 	portageq has_version / "sys-devel/automake" && {
@@ -36,11 +37,12 @@ src_unpack() {
 		automake --add-missing
 	}
 
-	epatch "${FILESDIR}"/1.4.3/${PN}-1.2f-cache.patch
-	epatch "${FILESDIR}"/1.4.3/${PN}-1.3.5-nonneg.patch
-	epatch "${FILESDIR}"/1.4.3/${PN}-1.3.5-mktemp.patch
+	epatch ${FILESDIR}/1.4.3/${PN}-1.2f-cache.patch
+	epatch ${FILESDIR}/1.4.3/${PN}-1.3.5-nonneg.patch
+	epatch ${FILESDIR}/1.4.3/${PN}-1.3.5-mktemp.patch
 
 	uclibctoolize
+	gnuconfig_update ${WORKDIR}
 }
 
 src_compile() {
@@ -51,9 +53,9 @@ src_compile() {
 
 src_install() {
 	cd libltdl
-	make DESTDIR="${D}" install || die
+	make DESTDIR=${D} install || die
 
-	# basically we just install ABI libs for old packages
+	# basically we just install for old packages
 	rm -r "${D}"/usr/include
 	rm -f "${D}"/usr/lib/libltdl.{a,la,so}
 }
diff --git a/sys-devel/libtool/libtool-1.5.16.ebuild b/sys-devel/libtool/libtool-1.5.16.ebuild
index eb06551eccf5..9489fdfcab4c 100644
--- a/sys-devel/libtool/libtool-1.5.16.ebuild
+++ b/sys-devel/libtool/libtool-1.5.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-devel/libtool/libtool-1.5.16.ebuild,v 1.2 2005/06/29 11:04:00 azarah Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.16.ebuild,v 1.1 2005/04/26 23:19:58 vapier Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
 
 inherit eutils libtool
 
@@ -108,9 +108,6 @@ src_unpack() {
 	# so we have to use a diff source for the link.  #40992
 	epatch ${FILESDIR}/1.5.10/libtool-1.5.10-locking.patch
 
-	# In some cases EGREP is not set by the build system.
-	epatch ${FILESDIR}/1.5.14/libtool-1.5.14-egrep.patch
-
 	ebegin "Generating ltmain.sh"
 	gen_ltmain_sh || die "Failed to generate ltmain.sh!"
 	eend 0
diff --git a/sys-devel/libtool/libtool-1.5.18-r1.ebuild b/sys-devel/libtool/libtool-1.5.18-r1.ebuild
index 0d289d71506b..e2a1706ffa71 100644
--- a/sys-devel/libtool/libtool-1.5.18-r1.ebuild
+++ b/sys-devel/libtool/libtool-1.5.18-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.18-r1.ebuild,v 1.2 2005/07/05 23:34:09 vapier Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.18-r1.ebuild,v 1.1 2005/06/29 11:04:00 azarah Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
 
 inherit eutils libtool
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1.5"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 DEPEND="sys-devel/gnuconfig
diff --git a/sys-devel/libtool/libtool-1.5.20.ebuild b/sys-devel/libtool/libtool-1.5.20.ebuild
index 800d8d10e150..dc8bb39b2b26 100644
--- a/sys-devel/libtool/libtool-1.5.20.ebuild
+++ b/sys-devel/libtool/libtool-1.5.20.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-devel/libtool/libtool-1.5.20.ebuild,v 1.11 2005/11/19 19:11:21 corsair Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.20.ebuild,v 1.1 2005/09/02 05:06:09 vapier Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
 
-inherit eutils
+inherit eutils libtool
 
 DESCRIPTION="A shared library tool for developers"
 HOMEPAGE="http://www.gnu.org/software/libtool/libtool.html"
@@ -10,14 +10,14 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1.5"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
-RDEPEND="sys-devel/gnuconfig
+DEPEND="sys-devel/gnuconfig
 	>=sys-devel/autoconf-2.59
 	>=sys-devel/automake-1.9"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
+# the autoconf dep is due to it complaining 'configure.ac:55: error: Autoconf version 2.58 or higher is required'
+# the automake dep is due to Bug #46037
 
 lt_setup() {
 	export WANT_AUTOCONF=2.5
@@ -73,7 +73,6 @@ src_unpack() {
 	epatch "${FILESDIR}"/1.5.6/${PN}-1.5.6-ltmain-SED.patch
 	epatch "${FILESDIR}"/1.4.3/${PN}-1.4.2-expsym-linux.patch
 	epatch "${FILESDIR}"/1.4.3/${PN}-1.4.3-pass-thread-flags.patch
-	epatch "${FILESDIR}"/1.5.20/${PN}-1.5.20-use-linux-version-in-fbsd.patch #109105
 
 	# Gentoo Patches
 	# Do not create bogus entries in $dependency_libs or $libdir
@@ -107,9 +106,6 @@ src_unpack() {
 	# In some cases EGREP is not set by the build system.
 	epatch "${FILESDIR}"/1.5.14/libtool-1.5.14-egrep.patch
 
-	# Make sure LD_LIBRARY_PATH doesn't override RUNPATH #99593
-	epatch "${FILESDIR}"/1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch
-
 	ebegin "Generating ltmain.sh"
 	gen_ltmain_sh || die "Failed to generate ltmain.sh!"
 	eend 0
@@ -120,7 +116,7 @@ src_unpack() {
 	local d p
 	for d in . libltdl ; do
 		ebegin "Running autotools in '${d}'"
-		cd "${S}"/${d}
+		cd ${S}/${d}
 		touch acinclude.m4
 		for p in aclocal "automake -c -a" autoconf ; do
 			${p} || die "${p}"
@@ -129,6 +125,7 @@ src_unpack() {
 	done
 	cd "${S}"
 
+	uclibctoolize
 	epunt_cxx
 }
 
@@ -142,12 +139,6 @@ src_install() {
 	make DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog* NEWS README THANKS TODO doc/PLATFORMS
 
-	local x
-	for x in libtool libtoolize ; do
-		help2man ${x} > ${x}.1
-		doman ${x}.1
-	done
-
 	for x in $(find "${D}" -name config.guess -o -name config.sub) ; do
 		rm -f "${x}" ; ln -sf ../gnuconfig/$(basename "${x}") "${x}"
 	done
diff --git a/sys-devel/libtool/metadata.xml b/sys-devel/libtool/metadata.xml
index 96a2d586367d..f093d416cbb1 100644
--- a/sys-devel/libtool/metadata.xml
+++ b/sys-devel/libtool/metadata.xml
@@ -1,3 +1,5 @@
+ [32;01m*[0m Generated metadata.xml:
+
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/sys-devel/m4/ChangeLog b/sys-devel/m4/ChangeLog
index 22b78855feae..ad911d335e9a 100644
--- a/sys-devel/m4/ChangeLog
+++ b/sys-devel/m4/ChangeLog
@@ -1,149 +1,6 @@
 # ChangeLog for sys-devel/m4
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/ChangeLog,v 1.44 2005/10/21 12:42:27 agriffis Exp $
-
-*m4-1.4.4 (21 Oct 2005)
-
-  21 Oct 2005; Aron Griffis <agriffis@gentoo.org> +m4-1.4.4.ebuild:
-  Bump to 1.4.4 (from 1.4.3).  No longer apply m4-1.4.3-autotools.patch
-
-  16 Sep 2005; Aron Griffis <agriffis@gentoo.org> m4-1.4.3.ebuild:
-  Mark 1.4.3 stable on alpha
-
-  03 Sep 2005; Markus Rothe <corsair@gentoo.org> m4-1.4.3.ebuild:
-  Stable on ppc64
-
-  18 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> m4-1.4.3.ebuild:
-  Stable on ppc.
-
-  16 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> m4-1.4.3.ebuild:
-  Stable on sparc
-
-  05 May 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/m4-1.4.3-pointer.patch, m4-1.4.3.ebuild:
-  Fix 64bit issues where pointers are stored in types which are too small
-  #87873 by Matt Hargett.
-
-  05 May 2005; Mike Frysinger <vapier@gentoo.org> m4-1.4.3.ebuild:
-  Install as gm4 by default and drop in a m4 symlink on GNU systems #90858.
-
-  09 Apr 2005; Markus Rothe <corsair@gentoo.org> m4-1.4.2-r1.ebuild:
-  Stable on ppc64
-
-*m4-1.4.3 (01 Apr 2005)
-
-  01 Apr 2005; Martin Schlemmer <azarah@gentoo.org> +m4-1.4.3.ebuild:
-  Update version.
-
-  31 Mar 2005; Joshua Kinard <kumba@gentoo.org> m4-1.4.2-r1.ebuild:
-  Marked stable on mips.
-
-  28 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> m4-1.4.2-r1.ebuild:
-  Stable on ppc.
-
-  21 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> m4-1.4.2-r1.ebuild:
-  Stable on sparc
-
-  12 Mar 2005; Aron Griffis <agriffis@gentoo.org> m4-1.4.2-r1.ebuild:
-  stabilize alpha ia64
-
-*m4-1.4.2-r1 (20 Jan 2005)
-
-  20 Jan 2005; Mike Frysinger <vapier@gentoo.org> +m4-1.4.2-r1.ebuild,
-  -m4-1.4.2.ebuild:
-  Add back in changeword since it breaks some packages (should review later
-  again).
-
-*m4-1.4.2 (12 Jan 2005)
-
-  12 Jan 2005; Mike Frysinger <vapier@gentoo.org> +m4-1.4.2.ebuild:
-  Version bump.
-
-  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> m4-1.4.1.ebuild:
-  stable on amd64.
-
-  15 Jul 2004; Gustavo Zacarias <gustavoz@gentoo.org> m4-1.4.1.ebuild:
-  Stable on sparc
-
-  04 Jul 2004; Joshua Kinard <kumba@gentoo.org> m4-1.4.1.ebuild:
-  Marked stable on mips.
-
-  03 Jul 2004; Guy Martin <gmsoft@gentoo.org> m4-1.4.1.ebuild:
-  Marked stable on hppa.
-
-  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> m4-1.4-r1.ebuild,
-  m4-1.4.1.ebuild, m4-1.4.ebuild:
-  virtual/glibc -> virtual/libc
-
-  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> m4-1.4.1.ebuild:
-  stable on x86, alpha, ia64
-
-*m4-1.4.1 (16 Jun 2004)
-
-  16 Jun 2004; Martin Schlemmer <azarah@gentoo.org> m4-1.4.1.ebuild:
-  Bump version.
-
-  07 Mar 2004; Joshua Kinard <kumba@gentoo.org> m4-1.4-r1.ebuild,
-  m4-1.4.ebuild:
-  Marked stable on mips.
-
-  17 Jan 2004; Christian Birchinger <joker@gentoo.org> m4-1.4-r1.ebuild:
-  Added sparc stable keyword
-
-  08 Dec 2003; Seemant Kulleen <seemant@gentoo.org> m4-1.4-r1.ebuild:
-  coreutils-5.0.91 seems to require this version of m4, so updating to stable
-  the same versions that coreutils-5.0.91 is stable on
-
-*m4-1.4-r1 (01 Nov 2003)
-
-  01 Nov 2003; Martin Schlemmer <azarah@gentoo.org> m4-1.4-r1.ebuild,
-  m4-1.4.ebuild:
-  Fix debian patch URL to point to Gentoo mirrors, closing bug #32353. Add new
-  version with updated debian patch.
-
-  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> m4-1.4.ebuild :
-  ia64 keywords.
-
-  08 Sep 2003; Martin Schlemmer <azarah@gentoo.org> m4-1.4.ebuild,
-  m4-1.4o-r2.ebuild, m4-1.4p-r1.ebuild, m4-1.4p.ebuild:
-  Bootstrap fixups; cleanup old ebuilds.
-
-  05 Jun 2003; Daniel Robbins <drobbins@gentoo.org> m4-1.4.ebuild:
-  removed perl dependency. Not required.
-
-*m4-1.4 (09 Mar 2003)
-
-  18 Mar 2003; root <root@gentoo.org> m4-1.4.ebuild:
-  removed authors from dodoc cause the file doesn't exist.
-
-  09 Mar 2003; Martin Schlemmer <azarah@gentoo.org> m4-1.4.ebuild :
-  Mark stable.
-
-  09 Mar 2003; Martin Schlemmer <azarah@gentoo.org> m4-1.4.ebuild :
-  Add non beta, with Debian fixes to close bug #15573.
-
-  24 Feb 2003; Nicholas Jones <carpaski@gentoo.org> :
-  Fixed the 1.4p ebuilds for the 'env' call that was putting root's
-  environment into /tmp world readable.
-
-  18 Feb 2003; Zach Welch <zwelch@gentoo.org> :
-  Added arm to keywords.
-
-  07 Feb 2003; Guy Martin <gmsoft@gentoo.org> :
-  Added hppa to keywords.
-
-*m4-1.4p-r1 (07 Jan 2003)
-
-  07 Jan 2003; Martin Schlemmer <azarah@gentoo.org> m4-1.4p-r1.ebuild
-
-  Add perl depend, as its needed for docs.  Should close bug #13231.
-
-  12 Dec 2002; Jan Seidel <tuxus@gentoo.org> m4-1.4p.ebuild :
-  Added mips to keywords.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*m4-1.4p (21 March 2002)
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
 
 *m4-1.4o-r2 (1 Feb 2002)
 
diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index dd6d61d52d90..e69de29bb2d1 100644
--- a/sys-devel/m4/Manifest
+++ b/sys-devel/m4/Manifest
@@ -1,20 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 87698eb003ce8322b1942fa515b36a8e ChangeLog 5149
-MD5 7703a5bdcc14909f62302b74508db3d3 files/digest-m4-1.4.2-r1 60
-MD5 a0fbe19c80ff3efb55bbc711d4ef2648 files/digest-m4-1.4.3 61
-MD5 1b64751b46f09e76ce3b0ee0828fcd41 files/digest-m4-1.4.4 61
-MD5 1c9901ef77c76aba3f66e96448a12769 files/m4-1.4.3-autotools.patch 913
-MD5 df6d359aafe64845b09d1a1055643936 files/m4-1.4.3-pointer.patch 1705
-MD5 91da8d2c90ce807e73b59ec3ba895e7e m4-1.4.2-r1.ebuild 763
-MD5 56c8a0ca688d09c662e353745b32390d m4-1.4.3.ebuild 1004
-MD5 129e76bc263beb6e494bdfc6a0ac5470 m4-1.4.4.ebuild 982
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD4DBQFDfUwbgIKl8Uu19MoRAvk+AJ9CjF1MTIMgtYfy6eGY5FqhJDqaBgCY42gG
-E5OG+faCDgMN+bYAnBg/PA==
-=mrTl
------END PGP SIGNATURE-----
diff --git a/sys-devel/m4/m4-1.4.2-r1.ebuild b/sys-devel/m4/m4-1.4.2-r1.ebuild
index 63a446f1ef59..83655e675aff 100644
--- a/sys-devel/m4/m4-1.4.2-r1.ebuild
+++ b/sys-devel/m4/m4-1.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4.2-r1.ebuild,v 1.7 2005/04/09 13:15:20 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4.2-r1.ebuild,v 1.1 2005/01/20 16:27:53 vapier Exp $
 
 inherit toolchain-funcs
 
@@ -11,11 +11,12 @@ 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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~sh ~x86"
 IUSE="nls"
 
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND=""
+DEPEND="virtual/libc
+	nls? ( sys-devel/gettext )"
+RDEPEND="virtual/libc"
 
 src_compile() {
 	econf \
diff --git a/sys-devel/m4/m4-1.4.3.ebuild b/sys-devel/m4/m4-1.4.3.ebuild
index aa588b805e6e..3e31c0c3ba86 100644
--- a/sys-devel/m4/m4-1.4.3.ebuild
+++ b/sys-devel/m4/m4-1.4.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/sys-devel/m4/m4-1.4.3.ebuild,v 1.11 2005/11/18 03:34:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4.3.ebuild,v 1.1 2005/04/01 17:30:11 azarah Exp $
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="GNU macro processor"
 HOMEPAGE="http://www.gnu.org/software/m4/m4.html"
@@ -11,31 +11,21 @@ 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="nls"
 
 DEPEND="nls? ( sys-devel/gettext )"
 RDEPEND=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-autotools.patch
-	epatch "${FILESDIR}"/${P}-pointer.patch
-}
-
 src_compile() {
-	local myconf=""
-	[[ ${USERLAND} != "GNU" ]] && myconf="--program-prefix=g"
 	econf \
 		$(use_enable nls) \
 		--enable-changeword \
-		${myconf} \
 		|| die
 	emake AR="$(tc-getAR)" || die
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die
+	einstall || die
 	dodoc BACKLOG ChangeLog NEWS README* THANKS TODO
 }
diff --git a/sys-devel/m4/metadata.xml b/sys-devel/m4/metadata.xml
index 96a2d586367d..f093d416cbb1 100644
--- a/sys-devel/m4/metadata.xml
+++ b/sys-devel/m4/metadata.xml
@@ -1,3 +1,5 @@
+ [32;01m*[0m Generated metadata.xml:
+
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/sys-devel/make/ChangeLog b/sys-devel/make/ChangeLog
index 8853d5057fa0..99a8a050410b 100644
--- a/sys-devel/make/ChangeLog
+++ b/sys-devel/make/ChangeLog
@@ -1,113 +1,6 @@
 # ChangeLog for sys-devel/make
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/ChangeLog,v 1.32 2005/09/29 22:31:41 vapier Exp $
-
-*make-3.80-r3 (29 Sep 2005)
-
-  29 Sep 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/make-3.80-parallel-build-failure.patch, +make-3.80-r3.ebuild:
-  Add patch from upstream to fix issues with parallel builds #107613 by Icebird.
-
-  17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
-  Converted to UTF-8, fixed encoding screwups
-
-  16 Sep 2005; Aron Griffis <agriffis@gentoo.org> make-3.80-r2.ebuild:
-  Mark 3.80-r2 stable on alpha
-
-  08 Sep 2005; Aaron Walker <ka0ttic@gentoo.org> make-3.80-r2.ebuild:
-  Stable on mips.
-
-  03 Sep 2005; Markus Rothe <corsair@gentoo.org> make-3.80-r2.ebuild:
-  Stable on ppc64
-
-  18 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> make-3.80-r2.ebuild:
-  Stable on ppc.
-
-  16 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> make-3.80-r2.ebuild:
-  Stable on sparc
-
-  13 Jun 2005; Mike Frysinger <vapier@gentoo.org> make-3.80-r2.ebuild:
-  Make sure we dont kill make on non-GNU systems with USE=build #95942 by
-  Diego Pettenò.
-
-  03 May 2005; Diego Pettenò <flameeyes@gentoo.org> make-3.80-r2.ebuild:
-  Readded keywords to -r2 and closed the bug.
-
-*make-3.80-r2 (03 May 2005)
-
-  03 May 2005; Mike Frysinger <vapier@gentoo.org> +make-3.80-r2.ebuild:
-  Add support for non-GNU systems #90849.
-
-  06 Apr 2005; Daniel Ostrow <dostrow@gentoo.org> make-3.80-r1.ebuild:
-  Add patch for ppc64 hardened
-
-*make-3.80-r1 (09 Oct 2004)
-
-  09 Oct 2004; Mike Frysinger <vapier@gentoo.org> +files/3.80-memory.patch,
-  +make-3.80-r1.ebuild:
-  Add patch for 'virtual memory exhausted' bug. Patch comes from
-  Debian/upstream. Bug by Natanael Copa #48765.
-
-  16 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> make-3.80.ebuild:
-  gnuconfig_update in src_unpack; use emake; use bz2; use econf; use use_enable;
-  tidy
-
-  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  make-3.79.1-r4.ebuild, make-3.79.1-r5.ebuild, make-3.80.ebuild:
-  virtual/glibc -> virtual/libc
-
-  23 Jun 2004; Aron Griffis <agriffis@gentoo.org> make-3.79.1-r4.ebuild,
-  make-3.79.1-r5.ebuild:
-  QA - fix use invocation
-
-  15 Jun 2004; <solar@gentoo.org> make-3.80.ebuild:
-  add uclibc to the list of things gnuconfig_update is run on
-
-  10 Apr 2004; Joshua Kinard <kumba@gentoo.org> make-3.79.1-r5.ebuild:
-  Marked stable on mips, and added gnuconfig for mips64 hosts.
-
-  21 Mar 2004; Joshua Kinard <kumba@gentoo.org> make-3.80.ebuild:
-  Added gnuconfig support for mips64 hosts
-
-  02 Mar 2004; Brian Jackson <iggy@gentoo.org> make-3.80.ebuild:
-  adding initial s390 support
-
-*make-3.80 (14 Oct 2002)
-
-  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> make-3.80.ebuild :
-  ia64 keywords.
-
-  06 Jul 2003; Joshua Kinard <kumba@gentoo.org> make-3.80.ebuild:
-  Added "mips" to KEYWORDS (works for me)
-
-  18 Feb 2003; Zach Welch <zwelch@gentoo.org> make-3.80.ebuild :
-  Added arm to keywords.
-  
-  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> make-3.80.ebuild :
-  Added hppa to keywords.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : 
-  changed sparc ~sparc keywords
- 
-  14 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  Update version.
-
-*make-3.79.1-r5 (29 Sep 2002)
-
-  29 Sep 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  Install gmake as symlink to make for compat reasons.
-  Closes bug #8487.
-
-*make-3.79.1-r4 (07 Aug 2002)
-
-  18 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
-  Added mips to keywords
-
-  07 Aug 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  Do not install make sgid.  Resolves bug #4056.
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
 
 *make-3.79.1-r3 (1 Feb 2002)
 
diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest
index 64ef22111a1f..e69de29bb2d1 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -1,21 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 039d9a79c20899233ae7f42867feee7c make-3.80-r1.ebuild 1105
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 f86f99b2ab003e6f5483f365a3db7ebc make-3.80-r2.ebuild 1301
-MD5 cd294e0cc4eb67fedc45653fee8a3c41 make-3.80-r3.ebuild 1250
-MD5 389b848eb375318eadf5ae4b05f1d0d0 ChangeLog 4080
-MD5 6c9afd5ac674f6a9703fdab9e49846c4 files/digest-make-3.80-r2 62
-MD5 6c9afd5ac674f6a9703fdab9e49846c4 files/digest-make-3.80-r3 62
-MD5 85ce0c4d36cd02b0c1abae84c022dba3 files/make-3.80-parallel-build-failure.patch 2210
-MD5 ea2daf4e61545882b6ba566f2b9132a2 files/make-3.80-ppc64-hardened-clock_gettime.patch 514
-MD5 3adc1d9cc832e98b435305f9f466279b files/3.80-memory.patch 2248
-MD5 6c9afd5ac674f6a9703fdab9e49846c4 files/digest-make-3.80-r1 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDPGuOgIKl8Uu19MoRAjhEAJ4qRPsFNJbXLK56nH5jnJ75gOpUDwCffYyD
-52ORL1FoXo8BsQMJud/XjoI=
-=aVOh
------END PGP SIGNATURE-----
diff --git a/sys-devel/make/make-3.80-r1.ebuild b/sys-devel/make/make-3.80-r1.ebuild
index 4977da14a01e..65c2bb31e0d6 100644
--- a/sys-devel/make/make-3.80-r1.ebuild
+++ b/sys-devel/make/make-3.80-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.80-r1.ebuild,v 1.6 2005/05/03 03:10:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.80-r1.ebuild,v 1.1 2004/10/10 03:57:29 vapier Exp $
 
-inherit eutils flag-o-matic
+inherit gnuconfig eutils flag-o-matic
 
 DESCRIPTION="Standard tool to compile source trees"
 HOMEPAGE="http://www.gnu.org/software/make/make.html"
@@ -10,19 +10,19 @@ SRC_URI="ftp://ftp.gnu.org/gnu/make/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls static build hardened"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc s390 x86"
+IUSE="nls static build uclibc"
 
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND=""
+DEPEND="virtual/libc
+	nls? ( sys-devel/gettext )"
+RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-memory.patch
-	if use ppc64 && use hardened ; then
-		epatch "${FILESDIR}"/make-3.80-ppc64-hardened-clock_gettime.patch
-	fi
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-memory.patch
+	# Detect mips and uclibc systems properly
+	gnuconfig_update
 }
 
 src_compile() {
@@ -32,7 +32,8 @@ src_compile() {
 }
 
 src_install() {
-	if use build ; then
+	if use build
+	then
 		dobin make || die
 	else
 		make DESTDIR="${D}" install || die "make install failed"
diff --git a/sys-devel/make/make-3.80-r2.ebuild b/sys-devel/make/make-3.80-r2.ebuild
index e16032e756a6..ee623eefa1e8 100644
--- a/sys-devel/make/make-3.80-r2.ebuild
+++ b/sys-devel/make/make-3.80-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-devel/make/make-3.80-r2.ebuild,v 1.9 2005/09/16 11:22:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.80-r2.ebuild,v 1.1 2005/05/03 03:32:49 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,7 +10,8 @@ SRC_URI="ftp://ftp.gnu.org/gnu/make/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="-*"
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="nls static build hardened"
 
 DEPEND="nls? ( sys-devel/gettext )"
@@ -36,11 +37,7 @@ src_compile() {
 
 src_install() {
 	if use build ; then
-		if [[ ${USERLAND} == "GNU" ]] ; then
-			dobin make || die "dobin"
-		else
-			newbin make gmake || die "newbin failed"
-		fi
+		dobin make || die "dobin"
 	else
 		make DESTDIR="${D}" install || die "make install failed"
 		dodoc AUTHORS ChangeLog NEWS README*
diff --git a/sys-devel/make/metadata.xml b/sys-devel/make/metadata.xml
index 96a2d586367d..f093d416cbb1 100644
--- a/sys-devel/make/metadata.xml
+++ b/sys-devel/make/metadata.xml
@@ -1,3 +1,5 @@
+ [32;01m*[0m Generated metadata.xml:
+
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/sys-devel/metadata.xml b/sys-devel/metadata.xml
index 2e78bac99d8f..e061dc9f15b6 100644
--- a/sys-devel/metadata.xml
+++ b/sys-devel/metadata.xml
@@ -5,26 +5,5 @@
 		The sys-devel category contains various core system development tools
 		and libraries.
 	</longdescription>
-	<longdescription lang="es">
-		La categoría sys-devel contiene paquetes esenciales para el desarrollo
-		de software.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie sys-devel enthält essentielle Entwicklungswerkzeuge und
-		Bibliotheken.
-	</longdescription>
-	<longdescription lang="ja">
-		sys-develカテゴリにはコアシステム開発ツールとライブラリが含まれます。
-	</longdescription>
-	<longdescription lang="nl">
-		De sys-devel categorie bevat essentiele ontwikkelgereedschappen en
-		bibliotheken.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm sys-devel chứa các phần mềm và thư viện phát triển hệ thống cốt lõi.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria sys-devel contiene gli strumenti e le librerie essenziali per lo sviluppo del software e la compilazione del sistema.
-	</longdescription>
 </catmetadata>
 
diff --git a/sys-devel/mips32/ChangeLog b/sys-devel/mips32/ChangeLog
index 771d0cc9a473..728c50709bb4 100644
--- a/sys-devel/mips32/ChangeLog
+++ b/sys-devel/mips32/ChangeLog
@@ -1,9 +1,6 @@
 # ChangeLog for sys-devel/mips32
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/mips32/ChangeLog,v 1.3 2004/07/02 08:41:39 eradicator Exp $
-
-  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> mips32-1.0.ebuild:
-  virtual/glibc -> virtual/libc
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/mips32/ChangeLog,v 1.1 2004/05/05 08:11:30 kumba Exp $
 
 *mips32-1.0 (05 May 2004)
 
diff --git a/sys-devel/mips32/Manifest b/sys-devel/mips32/Manifest
index f4d50a21f7fd..9f27971b64bf 100644
--- a/sys-devel/mips32/Manifest
+++ b/sys-devel/mips32/Manifest
@@ -1,5 +1,5 @@
-MD5 7860ca8dc66a934bea8cff3f03876afc ChangeLog 558
 MD5 4826e2b8c0e9daba29345b97411414d5 metadata.xml 416
-MD5 8b93a8d24a9299ed20dde74ad9cd6cbc mips32-1.0.ebuild 627
-MD5 fdeb67748be855f61d2434ade029d86c files/digest-mips32-1.0 60
+MD5 c26b8ffdaea93ddf943224ff8324696e mips32-1.0.ebuild 545
+MD5 4cc78b0b4d850b59d98e31654456730d ChangeLog 365
 MD5 1f8a13f362cfb02255037057e5d7abab files/mips32-1.0-no-kern-headers.patch 579
+MD5 fdeb67748be855f61d2434ade029d86c files/digest-mips32-1.0 60
diff --git a/sys-devel/mips32/mips32-1.0.ebuild b/sys-devel/mips32/mips32-1.0.ebuild
index 4780d2c4045f..579376fd4631 100644
--- a/sys-devel/mips32/mips32-1.0.ebuild
+++ b/sys-devel/mips32/mips32-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/mips32/mips32-1.0.ebuild,v 1.3 2004/07/02 08:41:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/mips32/mips32-1.0.ebuild,v 1.1 2004/05/05 08:11:30 kumba Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="-* mips"
 IUSE=""
 
-DEPEND="virtual/libc"
+DEPEND="virtual/glibc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-devel/odinmp/ChangeLog b/sys-devel/odinmp/ChangeLog
index 870b3aabc53d..1c37c29fe191 100644
--- a/sys-devel/odinmp/ChangeLog
+++ b/sys-devel/odinmp/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-devel/odinmp
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/odinmp/ChangeLog,v 1.2 2004/06/24 22:48:27 agriffis Exp $
+# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/odinmp/ChangeLog,v 1.1 2003/06/03 13:00:05 tantive Exp $
 
 *odinmp-0.167.2 (03 Jun 2003)
 
diff --git a/sys-devel/odinmp/Manifest b/sys-devel/odinmp/Manifest
index fe3a6f359c46..783dae2bf37a 100644
--- a/sys-devel/odinmp/Manifest
+++ b/sys-devel/odinmp/Manifest
@@ -1,4 +1,3 @@
-MD5 cc7216c4bf1d8d465e00d1d59db0806c odinmp-0.167.2.ebuild 1063
-MD5 77b3694014888c4ffb9c0eb9669426fb ChangeLog 347
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 8eb00a61d3b1644c3a4a5147d1252aeb odinmp-0.167.2.ebuild 1071
+MD5 838c79b3ccfe5a1725db06faf71af42e ChangeLog 355
 MD5 8a383a3e8b6f66efcb26e4be697fcce5 files/digest-odinmp-0.167.2 132
diff --git a/sys-devel/odinmp/metadata.xml b/sys-devel/odinmp/metadata.xml
index 96a2d586367d..f093d416cbb1 100644
--- a/sys-devel/odinmp/metadata.xml
+++ b/sys-devel/odinmp/metadata.xml
@@ -1,3 +1,5 @@
+ [32;01m*[0m Generated metadata.xml:
+
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/sys-devel/odinmp/odinmp-0.167.2.ebuild b/sys-devel/odinmp/odinmp-0.167.2.ebuild
index 5de1feda64f5..206f1ed99223 100644
--- a/sys-devel/odinmp/odinmp-0.167.2.ebuild
+++ b/sys-devel/odinmp/odinmp-0.167.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/odinmp/odinmp-0.167.2.ebuild,v 1.2 2004/06/24 22:48:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/odinmp/odinmp-0.167.2.ebuild,v 1.1 2003/06/03 13:00:05 tantive Exp $
 
 DESCRIPTION="The OdinMP OpenMP compiler"
 
diff --git a/sys-devel/omni/ChangeLog b/sys-devel/omni/ChangeLog
index 4463970615af..b2f88aea7858 100644
--- a/sys-devel/omni/ChangeLog
+++ b/sys-devel/omni/ChangeLog
@@ -1,29 +1,6 @@
 # ChangeLog for sys-devel/omni
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/omni/ChangeLog,v 1.7 2005/08/11 23:40:39 robbat2 Exp $
-
-*omni-1.6-r1 (11 Aug 2005)
-
-  11 Aug 2005; Robin H. Johnson <robbat2@gentoo.org> +omni-1.6-r1.ebuild:
-  Clean up ebuild. License does NOT restrict redistribution, so lets make life
-  easier again. Put all docs in the correct place, instead of under
-  /usr/lib/openmp/*.
-
-  23 Jun 2004; Aron Griffis <agriffis@gentoo.org> omni-1.4a.ebuild,
-  omni-1.6.ebuild:
-  QA - fix use invocation
-
-  11 Feb 2004; Seemant Kulleen <seemant@gentoo.org> omni-1.4a.ebuild,
-  omni-1.6.ebuild:
-  HOMEPAGE correction thanks to xzcvczx in #gentoo-hardened
-
-*omni-1.6 (06 Nov 2003)
-
-  06 Nov 2003; Olivier Crete <tester@gentoo.org> omni-1.6.ebuild:
-  Added omni 1.6
-
-  20 Oct 2003; Olivier Crete <tester@gentoo.org> omni-1.4a.ebuild:
-  Fixed up ebuild for omni 1.4a and marked stable
+# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/omni/ChangeLog,v 1.1 2003/06/03 13:03:24 tantive Exp $
 
 *omni-1.4a (03 Jun 2003)
 
diff --git a/sys-devel/omni/Manifest b/sys-devel/omni/Manifest
index 401d53446745..7b1b1583e75e 100644
--- a/sys-devel/omni/Manifest
+++ b/sys-devel/omni/Manifest
@@ -1,8 +1,3 @@
-MD5 e1258b141ee0c9630a75276591697725 omni-1.6-r1.ebuild 1437
-MD5 2a5d00ec84d9c780586a678e2e642e45 omni-1.6.ebuild 1630
-MD5 ae6755654aafa0a4cb54b4c992a20393 omni-1.4a.ebuild 1630
-MD5 70a35a8cea1bc0da794bb80eb63a655e ChangeLog 1105
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 8049eb2b6498600b07f53ac67e27cced omni-1.4a.ebuild 1751
+MD5 645fec53eb06604ff0d80a86f89ba1ac ChangeLog 352
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-omni-1.4a 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-omni-1.6 0
-MD5 67279cfb76640bbd8fe4b39013138f55 files/digest-omni-1.6-r1 61
diff --git a/sys-devel/omni/metadata.xml b/sys-devel/omni/metadata.xml
index 96a2d586367d..f093d416cbb1 100644
--- a/sys-devel/omni/metadata.xml
+++ b/sys-devel/omni/metadata.xml
@@ -1,3 +1,5 @@
+ [32;01m*[0m Generated metadata.xml:
+
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/sys-devel/omni/omni-1.4a.ebuild b/sys-devel/omni/omni-1.4a.ebuild
index ea3acf5cc752..e402415d8bc8 100644
--- a/sys-devel/omni/omni-1.4a.ebuild
+++ b/sys-devel/omni/omni-1.4a.ebuild
@@ -1,40 +1,37 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/omni/omni-1.4a.ebuild,v 1.6 2004/06/24 22:48:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/omni/omni-1.4a.ebuild,v 1.1 2003/06/03 13:03:24 tantive Exp $
 
-IUSE="java doc"
-
-MY_P=Omni-${PV}
-S=${WORKDIR}/${MY_P}
 DESCRIPTION="The Omni OpenMP Compiler"
-HOMEPAGE="http://phase.hpcc.jp/Omni/home.html"
-
-SLOT="0"
+HOMEPAGE="http://phase.etl.go.jp/Omni/"
 LICENSE="Omni"
-KEYWORDS="x86"
+SLOT="0"
+KEYWORDS="~x86"
+S=${WORKDIR}/Omni-${PV}
+A=Omni-${PV}.tar.gz
 
-RESTRICT="fetch"
+IUSE="java doc"
 
 DEPEND="java? ( virtual/jdk
-	app-arch/zip )
+		app-arch/zip )
 	sys-apps/sed"
 
 RDEPEND="java? ( virtual/jdk )"
 
 src_unpack() {
 
-	if [ ! -e ${DISTDIR}/${MY_P}.tar.gz ] ; then
-		einfo "Due to license issues you have to download"
-		einfo "the appropriate Omni archive:"
-		einfo "http://phase.etl.go.jp/Omni/Omni-release.html"
-		einfo "Please get the file "${MY_P}.tar.gz
-		einfo ""
-		einfo "The archive should be placed into ${DISTDIR}."
+        if [ ! -e ${DISTDIR}/${A} ] ; then
+                einfo "Due to license issues you have to download"
+                einfo "the appropriate Omni archive:"
+                einfo "http://phase.etl.go.jp/Omni/Omni-release.html"
+		einfo "Please get the file "${A}
+                einfo ""
+                einfo "The archive should be placed into ${DISTDIR}."
 
-		die "package archive not found"
-	fi
+                die "package archive not found"
+        fi
 
-	unpack ${MY_P}.tar.gz
+	unpack ${A}
 
 
 }
@@ -45,8 +42,9 @@ src_compile() {
 	myconf=""
 
 	# There is no configure script for the doc
-	if ! use doc  ; then
-	    dosed s/doc// Makefile.in
+	if [ ! `use doc` ]  ; then 
+	    mv Makefile.in Makefile.in.orig
+	    sed s/doc// Makefile.in.orig > Makefile.in
 	fi
 
 	use java && myconf="${myconf} --with-jvm=yes"
@@ -69,6 +67,6 @@ src_install() {
 	dodir /usr/share/doc/
 	use doc && mv ${D}usr/lib/openmp/doc ${D}usr/share/doc/${P}
 	use doc && mv ${D}usr/lib/openmp/examples ${D}usr/share/doc/${P}
-
+	
 	dodoc README COPYRIGHT LICENSE
 }
diff --git a/sys-devel/omni/omni-1.6.ebuild b/sys-devel/omni/omni-1.6.ebuild
index 49ca681a539a..0683a1717dc6 100644
--- a/sys-devel/omni/omni-1.6.ebuild
+++ b/sys-devel/omni/omni-1.6.ebuild
@@ -1,22 +1,20 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/omni/omni-1.6.ebuild,v 1.4 2004/06/24 22:48:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/omni/omni-1.6.ebuild,v 1.1 2003/11/06 11:53:48 tester Exp $
 
-IUSE="java doc"
-
-MY_P=Omni-${PV}
-S=${WORKDIR}/${MY_P}
 DESCRIPTION="The Omni OpenMP Compiler"
-HOMEPAGE="http://phase.hpcc.jp/Omni/home.html"
-
-SLOT="0"
+HOMEPAGE="http://phase.etl.go.jp/Omni/"
 LICENSE="Omni"
+SLOT="0"
 KEYWORDS="~x86"
-
+MY_P=Omni-${PV}
+S=${WORKDIR}/${MY_P}
 RESTRICT="fetch"
 
+IUSE="java doc"
+
 DEPEND="java? ( virtual/jdk
-	app-arch/zip )
+		app-arch/zip )
 	sys-apps/sed"
 
 RDEPEND="java? ( virtual/jdk )"
@@ -45,7 +43,7 @@ src_compile() {
 	myconf=""
 
 	# There is no configure script for the doc
-	if ! use doc  ; then
+	if [ ! `use doc` ]  ; then
 	    dosed s/doc// Makefile.in
 	fi
 
diff --git a/sys-devel/patch/ChangeLog b/sys-devel/patch/ChangeLog
index b275e4402b73..5674906d8bb7 100644
--- a/sys-devel/patch/ChangeLog
+++ b/sys-devel/patch/ChangeLog
@@ -1,93 +1,6 @@
 # ChangeLog for sys-devel/patch
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/patch/ChangeLog,v 1.32 2005/09/01 05:54:19 vapier Exp $
-
-  07 May 2005; Mike Frysinger <vapier@gentoo.org> patch-2.5.9-r1.ebuild:
-  Install as gpatch on non-GNU systems #91560.
-
-*patch-2.5.9-r1 (16 Nov 2004)
-
-  16 Nov 2004; Mike Frysinger <vapier@gentoo.org> +files/2.5.9-deb-cr.patch,
-  +patch-2.5.9-r1.ebuild:
-  Version bump with debian patch #49823 by JoWilly.
-
-  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  patch-2.5.4-r5.ebuild, patch-2.5.9.ebuild:
-  virtual/glibc -> virtual/libc
-
-  24 Jun 2004; Aron Griffis <agriffis@gentoo.org> patch-2.5.4-r5.ebuild,
-  patch-2.5.9.ebuild:
-  QA - fix use invocation. This also fixes an ebuild error due in part to the
-  less readable use syntax. It was written [ "is-ldflags -pie" ] when it should
-  have been [ "`is-ldflags -pie`" ]. The way it was written would have always
-  evaluated to true.
-
-  22 Jun 2004; <solar@gentoo.org> patch-2.5.9.ebuild:
-  Fixed unary operator problem because LDFLAGS_PIE does not exist in most of the
-  cases. Fixed overwrite of LDFLAGS=
-
-  08 May 2004; Danny van Dyk <kugelfang@gentoo.org> patch-2.5.9.ebuild:
-  Filtering "-pie" from LDFLAGS and appending manually to the Makefile for amd64.
-
-  29 Mar 2004; Jon Portnoy <avenj@gentoo.org> patch-2.5.9.ebuild :
-  Added strip-flags, bug #42698.
-
-  21 Oct 2003; Martin Holzer <mholzer@gentoo.org> patch-2.5.9.ebuild:
-  Adding gentoo mirrors. Closes #30106 .
-
-  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> patch-2.5.9.ebuild :
-  ia64 keywords.
-
-  03 Aug 2003; Martin Schlemmer <azarah@gentoo.org> patch-2.5.9.ebuild:
-  Bump to stable.
-
-*patch-2.5.9 (17 Jun 2003)
-
-  06 Jul 2003; Joshua Kinard <kumba@gentoo.org> patch-2.5.9.ebuild:
-  Changed ~mips to mips in KEYWORDS
-
-  01 Jul 2003; Todd Sunderlin <todd@gentoo.org> patch-2.5.9.ebulid:
-  set stable on sparc
-
-  17 Jun 2003; Seemant Kulleen <seemant@gentoo.org> patch-2.5.4-r4.ebuild,
-  patch-2.5.4-r5.ebuild, patch-2.5.9.ebuild:
-  bumped -r5 to stable, and put 2.5.9 into ~arch testing. Thanks to Rach for
-  informing about this new version.
-
-  30 May 2003; <msterret@gentoo.org> patch-2.5.4-r5.ebuild:
-  Added static to IUSE
-
-  01 May 2003; <msterret@gentoo.org> patch-2.5.4-r5.ebuild:
-  added IUSE
-  some suggested changes from agriffis:
-  	don't export CFLAGS; that's done automatically
-  	use emake
-  	use einstall
-  other small cleanups
-
-*patch-2.5.4-r5 (01 May 2003)
-
-  13 May 2003; <msterret@gentoo.org> patch-2.5.4-r5.ebuild:
-  new patch ebuild that doesn't use try, but uses || die instead
-
-  18 Feb 2003; Zach Welch <zwelch@gentoo.org> patch-2.5.4-r4.ebuild :
-  Added hppa to keywords.
-
-  07 Feb 2003; Guy Martin <gmsoft@gentoo.org> patch-2.5.4-r4.ebuild :
-  Added hppa to keywords.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
-
-*patch-2.5.4-r4 (15 Feb 2002)
-
-  18 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
-  Added mips to keywords
-
-  15 Feb 2002; M.Thibaut <murphy@gentoo.org> ChangeLog :
-
-  Added configuration flags that ensure correct compilation of the program
-  on all Linux platforms (more notably 64-bit ones). Fixes bug 1726
-  "fseek: invalid argument" on sparc64 machines with sparc32 userland.
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/patch/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
 
 *patch-2.5.4-r3 (1 Feb 2002)
 
diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest
index d9e06fe9d1e1..55c23c8f738d 100644
--- a/sys-devel/patch/Manifest
+++ b/sys-devel/patch/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 1a238c554d76e5a610a234935f6745ff patch-2.5.9.ebuild 1438
-MD5 4f8622f6d61dc78dcc5069d9dcb573b5 ChangeLog 3745
-MD5 0e6d848f04afec9ccd77139044915be0 patch-2.5.9-r1.ebuild 1119
-MD5 1e629202590bd2a4586fb1e4231e50e2 files/patch-2.5.9-cr-stripping.patch 1355
-MD5 7113f2413944cb06cecdd0c57ab54078 files/digest-patch-2.5.9 63
-MD5 7113f2413944cb06cecdd0c57ab54078 files/digest-patch-2.5.9-r1 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDFpeqgIKl8Uu19MoRAtzKAJ4oBn5YQ2R/UUTg2k3R7wN9LSQttwCfQPv0
-1Xx5X2OhL/I+JnB6HSmIc4M=
-=6HvZ
------END PGP SIGNATURE-----
+MD5 fe37df8ffc1fa02c8f7588542240992a ChangeLog 1485
+MD5 50fbe09e2332a6cd62000c016bc48f11 patch-2.5.4-r3.ebuild 914
+MD5 bcf8b9c8bc2b34e71c0c31db240ef2f2 patch-2.5.4-r4.ebuild 1033
+MD5 609f73cdcbf3f910cb69c512fd0d85d4 patch-2.5.4-r5.ebuild 1092
+MD5 d8308835b63cc0644a67523856ef2df8 files/digest-patch-2.5.4-r3 63
+MD5 d8308835b63cc0644a67523856ef2df8 files/digest-patch-2.5.4-r4 63
+MD5 d8308835b63cc0644a67523856ef2df8 files/digest-patch-2.5.4-r5 63
diff --git a/sys-devel/patch/metadata.xml b/sys-devel/patch/metadata.xml
index 96a2d586367d..f093d416cbb1 100644
--- a/sys-devel/patch/metadata.xml
+++ b/sys-devel/patch/metadata.xml
@@ -1,3 +1,5 @@
+ [32;01m*[0m Generated metadata.xml:
+
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/sys-devel/patch/patch-2.5.9-r1.ebuild b/sys-devel/patch/patch-2.5.9-r1.ebuild
index 86e97b940e4f..7a4dc57d89d8 100644
--- a/sys-devel/patch/patch-2.5.9-r1.ebuild
+++ b/sys-devel/patch/patch-2.5.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/patch/patch-2.5.9-r1.ebuild,v 1.8 2005/09/01 05:54:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/patch/patch-2.5.9-r1.ebuild,v 1.1 2004/11/16 07:08:00 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -12,15 +12,15 @@ SRC_URI="mirror://gentoo/${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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="build static"
 
-DEPEND=""
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/patch-2.5.9-cr-stripping.patch
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-deb-cr.patch
 }
 
 src_compile() {
@@ -28,9 +28,19 @@ src_compile() {
 	append-flags -DLINUX -D_XOPEN_SOURCE=500
 	use static && append-ldflags -static
 
-	local myconf=""
-	[[ ${USERLAND} != "GNU" ]] && myconf="--program-prefix=g"
-	ac_cv_sys_long_file_names=yes econf ${myconf} || die
+	# workaround for hardened on amd64, 1st part
+	if use amd64 && is-ldflags -pie; then
+		einfo Stripping "-pie" from LDFLAGS, adding it to Makefile manually
+		filter-ldflags -pie
+		append-flags -fPIC
+		LDFLAGS_PIE="1"
+	fi
+	ac_cv_sys_long_file_names=yes econf || die
+	# workaround for hardened on amd64, 2nd part
+	if [ "${LDFLAGS_PIE}" = "1" ]; then
+		einfo "Patching Makefile..."
+		sed -i -e 's/^LDFLAGS =/& -pie/' Makefile || die "Patching Makefile failed!"
+	fi
 
 	emake || die "emake failed"
 }
diff --git a/sys-devel/patch/patch-2.5.9.ebuild b/sys-devel/patch/patch-2.5.9.ebuild
index 05480c391221..b1590e7a75ea 100644
--- a/sys-devel/patch/patch-2.5.9.ebuild
+++ b/sys-devel/patch/patch-2.5.9.ebuild
@@ -1,47 +1,35 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/patch/patch-2.5.9.ebuild,v 1.23 2005/03/04 04:52:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/patch/patch-2.5.9.ebuild,v 1.1 2003/06/18 01:38:26 seemant Exp $
 
-inherit flag-o-matic
+IUSE="build static"
 
+S=${WORKDIR}/${P}
 DESCRIPTION="Utility to apply diffs to files"
 HOMEPAGE="http://www.gnu.org/software/patch/patch.html"
-#SRC_URI="mirror://gnu/patch/${P}.tar.gz"
-#Using own mirrors until gnu has md5sum and all packages up2date
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+SRC_URI="http://alpha.gnu.org/gnu/patch/${P}.tar.gz"
 
-LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="build static"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
 
-DEPEND=""
+DEPEND="virtual/glibc"
 
 src_compile() {
-	strip-flags
 	CFLAGS="$CFLAGS -DLINUX -D_XOPEN_SOURCE=500"
-	# workaround for hardened on amd64, 1st part
-	if use amd64 && is-ldflags -pie; then
-		einfo Stripping "-pie" from LDFLAGS, adding it to Makefile manually
-		filter-ldflags -pie
-		append-flags -fPIC
-		LDFLAGS_PIE="1"
-	fi
 	ac_cv_sys_long_file_names=yes \
 		./configure --host=${CHOST} --prefix=/usr --mandir=/usr/share/man
-	# workaround for hardened on amd64, 2nd part
-	if [ "${LDFLAGS_PIE}" = "1" ]; then
-		einfo "Patching Makefile..."
-		sed -i -e 's/^LDFLAGS =/& -pie/' Makefile || die "Patching Makefile failed!"
+	if [ -z "`use static`" ]; then
+		emake || die "emake failed"
+	else
+		emake LDFLAGS=-static || die "emake failed"
 	fi
-	use static && append-ldflags -static
-	emake LDFLAGS="${LDFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	einstall || die
-	if ! use build ; then
-		dodoc AUTHORS ChangeLog NEWS README
+	einstall
+	if [ -z "`use build`" ]; then
+		dodoc AUTHORS COPYING ChangeLog NEWS README
 	else
 		rm -rf ${D}/usr/share/man
 	fi
diff --git a/sys-devel/pmake/ChangeLog b/sys-devel/pmake/ChangeLog
index c0daf2da525f..48a35fd94049 100644
--- a/sys-devel/pmake/ChangeLog
+++ b/sys-devel/pmake/ChangeLog
@@ -1,97 +1,6 @@
 # ChangeLog for sys-devel/pmake
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/pmake/ChangeLog,v 1.26 2005/08/01 21:31:21 kito Exp $
-
-  01 Aug 2005; Kito <kito@gentoo.org> pmake-1.111.1.ebuild:
-  ~ppc-macos, add conditional to install bsdmake symlinks on darwin
-
-  29 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> pmake-1.98.ebuild:
-  Stable on amd64.
-
-*pmake-1.111.1 (29 Jul 2005)
-
-  29 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> +pmake-1.111.1.ebuild:
-  New version (latest from Debian testing). Install as make for BSD userland
-  systems, install mk files only on GNU userland systems. Maintainership took
-  over by bsd herd.
-
-  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> pmake-1.98.ebuild:
-  Stable on ppc.
-
-  12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> pmake-1.98.ebuild:
-  Stable on alpha.
-
-  09 May 2005; Aron Griffis <agriffis@gentoo.org> pmake-1.98.ebuild:
-  stable on ia64
-
-  07 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> pmake-1.98.ebuild:
-  Stable on sparc
-
-  06 May 2005; Aaron Walker <ka0ttic@gentoo.org> pmake-1.98.ebuild:
-  Stable on x86.
-
-*pmake-1.98 (08 Feb 2005)
-
-  08 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> metadata.xml,
-  +files/pmake-1.98-skipdots.patch, +pmake-1.98.ebuild:
-  Version bump.
-
-  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
-  pmake-1.45-r3.ebuild:
-  Masked pmake-1.45-r3.ebuild stable for ppc
-
-  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> pmake-1.45-r2.ebuild,
-  pmake-1.45-r3.ebuild, pmake-1.45-r4.ebuild:
-  virtual/glibc -> virtual/libc
-
-  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> pmake-1.45-r2.ebuild:
-  kill sparc64 use flag
-
-  09 Jun 2004; Luca Barbato <lu_zero@gentoo.org> pmake-1.45-r4.ebuild:
-  Marked ppc
-
-  07 May 2004; Gustavo Zacarias <gustavoz@gentoo.org> pmake-1.45-r4.ebuild:
-  Stable on sparc wrt bug #50378
-
-  07 May 2004; Ilya A. Volynets-Evenbaks <iluxa@gentoo.org>
-  pmake-1.45-r4.ebuild:
-  add ~mips
-
-*pmake-1.45-r4 (05 Apr 2004)
-
-  05 Apr 2004; Aron Griffis <agriffis@gentoo.org> pmake-1.45-r4.ebuild,
-  files/skipdots.patch:
-  Don't assume that . and .. are the first two entries returned by readdir.
-  Thanks to Bob Miller in bug 45998 for the patch
-
-  25 Feb 2004; Jason Wever <weeve@gentoo.org> pmake-1.45-r3.ebuild:
-  Added ~sparc keyword.
-
-*pmake-1.45-r3 (07 Feb 2004)
-
-  07 Feb 2004; <agriffis@gentoo.org> pmake-1.45-r3.ebuild:
-  Clean up this ebuild. Fix the arch support, which was messy and (I think)
-  wrong because CFLAGS was being overridden without including the defines. This
-  fixes bug 39159
-
-  15 Jan 2004; Jon Portnoy <avenj@gentoo.org> pmake-1.45-r2.ebuild :
-  Stable on AMD64.
-
-  02 Oct 2003; Brad House <brad_mssw@gentoo.org> pmake-1.45-r2.ebuild:
-  make pmake build on amd64. patch from russ@zerotech.net
-  add ~amd64 flag
-
-  28 May 2003; Tavis Ormandy <taviso@gentoo.org> pmake-1.45-r2.ebuild:
-  marking alpha.
-
-  27 Apr 2003; Martin Schlemmer <azarah@gentoo.org> pmake-1.45-r2.ebuild:
-  Get epatch to actually apply the patches.  For this version 01 patch
-  is no longer valid.
-
-*pmake-1.45-r2 (25 Mar 2003)
-
-  25 Mar 2003; Aron Griffis <agriffis@gentoo.org> pmake-1.45-r2.ebuild:
-  Add ~alpha to KEYWORDS
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/pmake/ChangeLog,v 1.1 2002/12/03 09:45:28 bcowan Exp $
 
 *pmake-1.4.5-r2 (27 Nov 2002)
 
diff --git a/sys-devel/pmake/Manifest b/sys-devel/pmake/Manifest
index 73404417cc28..619a7e5fc08a 100644
--- a/sys-devel/pmake/Manifest
+++ b/sys-devel/pmake/Manifest
@@ -1,11 +1,5 @@
-MD5 e7f58943f8cc81c26d2617dddee989fb ChangeLog 3439
-MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
-MD5 94c1cbdd33f5c63b3785337d5f8c622c pmake-1.111.1.ebuild 2342
-MD5 4cd1d984bba137c30bc8f99818124ddd pmake-1.45-r4.ebuild 1706
-MD5 62bb65f5cb25fd39aeea7dc15c3e2d01 pmake-1.98.ebuild 1899
+MD5 a4bd5f631334e4b2a73791994227c7c1 ChangeLog 725
+MD5 0d58319188cd425ab1e38f7512585dc1 pmake-1.45-r2.ebuild 1569
+MD5 56b250e5c99455640556fcb776b9bd7e files/01_all_groffpatch.patch 485
 MD5 1095ca9c07bda375bf9674fe20d79ba6 files/02_all_mktemp.patch 406
-MD5 1078bf3b75a5e56a467359e69f73ed6b files/digest-pmake-1.111.1 133
-MD5 aa2eb71443dc4352bdf910fcbaf9f05e files/digest-pmake-1.45-r4 65
-MD5 090bfd2a45a464588a47793b37bc75d3 files/digest-pmake-1.98 131
-MD5 32a9d3f1baee80b6b3dfa6afd27e3b75 files/pmake-1.98-skipdots.patch 513
-MD5 456fc1935fead6cfc1235eddf6259847 files/skipdots.patch 677
+MD5 aa2eb71443dc4352bdf910fcbaf9f05e files/digest-pmake-1.45-r2 65
diff --git a/sys-devel/pmake/metadata.xml b/sys-devel/pmake/metadata.xml
index ecedda4aa2cc..f093d416cbb1 100644
--- a/sys-devel/pmake/metadata.xml
+++ b/sys-devel/pmake/metadata.xml
@@ -1,5 +1,7 @@
+ [32;01m*[0m Generated metadata.xml:
+
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<herd>base-system</herd>
 </pkgmetadata>
diff --git a/sys-devel/pmake/pmake-1.111.1.ebuild b/sys-devel/pmake/pmake-1.111.1.ebuild
index ac70181cf171..d7ca74778a15 100644
--- a/sys-devel/pmake/pmake-1.111.1.ebuild
+++ b/sys-devel/pmake/pmake-1.111.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/pmake/pmake-1.111.1.ebuild,v 1.2 2005/08/01 21:31:21 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/pmake/pmake-1.111.1.ebuild,v 1.1 2005/07/29 12:02:41 flameeyes Exp $
 
 inherit eutils toolchain-funcs versionator
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://debian/pool/main/p/pmake/${DEBIAN_SOURCE}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc-macos ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND=""
@@ -69,8 +69,5 @@ src_install() {
 	if [[ "${USERLAND}" == "BSD" ]]; then
 		dosym pmake /usr/bin/make
 		dosym pmake.1.gz /usr/share/man/man1/make.1.gz
-	elif [[ "${USERLAND}" == "Darwin" ]]; then
-		dosym pmake /usr/bin/bsdmake
-		doym pmake.1.gz /usr/share/man/man1/bsdmake.1.gz
 	fi
 }
diff --git a/sys-devel/pmake/pmake-1.45-r4.ebuild b/sys-devel/pmake/pmake-1.45-r4.ebuild
index aa93cbeda131..af55d1cde496 100644
--- a/sys-devel/pmake/pmake-1.45-r4.ebuild
+++ b/sys-devel/pmake/pmake-1.45-r4.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/pmake/pmake-1.45-r4.ebuild,v 1.9 2005/07/07 00:28:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/pmake/pmake-1.45-r4.ebuild,v 1.1 2004/04/05 04:20:55 agriffis Exp $
 
 inherit eutils
+EPATCH_SOURCE="${FILESDIR}"
+EPATCH_SUFFIX="patch"
 
 DESCRIPTION="BSD build tool to create programs in parallel"
 HOMEPAGE="http://www.netbsd.org/"
@@ -10,10 +12,9 @@ SRC_URI="mirror://gentoo/${PN}_${PV}-11.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc sparc x86"
-IUSE=""
+KEYWORDS="x86 ~ppc alpha ia64 amd64 ~sparc"
 
-RDEPEND="virtual/libc"
+RDEPEND="virtual/glibc"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
diff --git a/sys-devel/pmake/pmake-1.98.ebuild b/sys-devel/pmake/pmake-1.98.ebuild
index 22e47389c43d..44e0a748264f 100644
--- a/sys-devel/pmake/pmake-1.98.ebuild
+++ b/sys-devel/pmake/pmake-1.98.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/pmake/pmake-1.98.ebuild,v 1.8 2005/07/29 13:14:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/pmake/pmake-1.98.ebuild,v 1.1 2005/02/08 17:12:46 ka0ttic Exp $
 
 inherit eutils toolchain-funcs
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/main/p/pmake/${MY_P}.orig.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc sparc x86"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~amd64 ~ia64"
 IUSE=""
 
 RDEPEND="virtual/libc"
diff --git a/sys-devel/ppc32/ChangeLog b/sys-devel/ppc32/ChangeLog
index e5742e77ef63..e12a5e9a8a71 100644
--- a/sys-devel/ppc32/ChangeLog
+++ b/sys-devel/ppc32/ChangeLog
@@ -1,9 +1,6 @@
 # ChangeLog for sys-devel/ppc32
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/ppc32/ChangeLog,v 1.2 2005/07/07 03:14:31 dostrow Exp $
-
-  07 Jul 2005; Daniel Ostrow <dostrow@gentoo.org> ppc32-1.1.ebuild:
-  Mark ppc64 for catalyst use.
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/ppc32/ChangeLog,v 1.1 2005/07/06 04:39:46 dostrow Exp $
 
 *ppc32-1.1 (06 Jul 2005)
 
diff --git a/sys-devel/ppc32/Manifest b/sys-devel/ppc32/Manifest
index cd1d0847c494..ab4e63b42729 100644
--- a/sys-devel/ppc32/Manifest
+++ b/sys-devel/ppc32/Manifest
@@ -1,4 +1,4 @@
-MD5 ce91af3546a198746b6e30466d52fe43 ChangeLog 460
-MD5 42dff36e2f2550b6c90ad3b00b5e341e files/digest-ppc32-1.1 56
+MD5 d1a3f44be851f29a6e987ebd1dbf6b18 ChangeLog 272
 MD5 f17b8454f14e314375a48337226a03d6 metadata.xml 424
-MD5 468e1092108bb2bc310ce201955b9c96 ppc32-1.1.ebuild 763
+MD5 4b1a3f00c1bd00f8ca7e4849bfb20aac ppc32-1.1.ebuild 665
+MD5 42dff36e2f2550b6c90ad3b00b5e341e files/digest-ppc32-1.1 56
diff --git a/sys-devel/ppc32/ppc32-1.1.ebuild b/sys-devel/ppc32/ppc32-1.1.ebuild
index a46acc69ebff..89e38b334a4b 100644
--- a/sys-devel/ppc32/ppc32-1.1.ebuild
+++ b/sys-devel/ppc32/ppc32-1.1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/ppc32/ppc32-1.1.ebuild,v 1.3 2005/08/31 18:11:25 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/ppc32/ppc32-1.1.ebuild,v 1.1 2005/07/06 04:39:46 dostrow Exp $
 
 inherit eutils toolchain-funcs
 
 DESCRIPTION="A PPC32 compilation environment."
 HOMEPAGE="http://dev.gentoo.org/~dostrow/ppc32"
-SRC_URI="mirror://gentoo/${P}.tgz"
+SRC_URI="mirror://gentoo.org/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ppc ppc64"
+KEYWORDS="-* ppc"
 IUSE=""
 
 DEPEND="virtual/libc"
diff --git a/sys-devel/prelink/ChangeLog b/sys-devel/prelink/ChangeLog
index a43e72272ad4..bcf43fbd20a1 100644
--- a/sys-devel/prelink/ChangeLog
+++ b/sys-devel/prelink/ChangeLog
@@ -1,144 +1,8 @@
-# ChangeLog for sys-devel/prelink
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/ChangeLog,v 1.42 2005/07/20 17:50:00 azarah Exp $
+# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/ChangeLog,v 1.1 2002/11/15 14:49:27 cretin Exp $
 
-*prelink-20050610 (20 Jul 2005)
-
-  20 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
-  +prelink-20050610.ebuild:
-  Update version, bug #99389.
-
-*prelink-20050314 (19 May 2005)
-
-  19 May 2005; Martin Schlemmer <azarah@gentoo.org>
-  +files/prelink-20050314-amd64-gcc4.patch, +prelink-20050314.ebuild:
-  Update version.  Fix building on amd64 with gcc4.
-
-*prelink-20050207 (13 Mar 2005)
-
-  13 Mar 2005; Martin Schlemmer <azarah@gentoo.org>
-  +prelink-20050207.ebuild:
-  Update version. Add the blacklisted stuff from Fedora. Revamp the generation
-  of the env.d file.
-
-  11 Mar 2005; Heinrich Wendel <lanius@gentoo.org> prelink-20041123.ebuild:
-  stable on x86,amd64
-
-*prelink-20041123 (12 Feb 2005)
-
-  12 Feb 2005; Heinrich Wendel <lanius@gentoo.org> +prelink-20041123.ebuild:
-  version bump
-
-  10 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> prelink-20040317.ebuild,
-  prelink-20040707.ebuild:
-  Added in a message with a link to the Prelink Guide, bug #77337
-
-  09 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
-  prelink-20040707.ebuild:
-  Stable on alpha.
-
-  23 Oct 2004; Stefan Jones <cretin@gentoo.org> :
-  Mark Stable on x86
-
-  14 Oct 2004; Stefan Jones <cretin@gentoo.org> :
-  Run env-update after install and do not install prelink.conf
-
-*prelink-20040707 (09 Sep 2004)
-
-  10 Sep 2004; Stefan Jones <cretin@gentoo.org> :
-  Ready for big time, added env.d entry
-
-  09 Sep 2004; Stefan Jones <cretin@gentoo.org> :
-  New Version and add experimental reexec of init
-  Bugs #42929 and #56396
-
-*prelink-20040317 (05 Apr 2004)
-
-  15 Apr 2004; Stefan Jones <cretin@gentoo.org> :
-  Add dep for glibc-2.3.2-r9 as per bug 47644
-
-  13 Apr 2004; Stefan Jones <cretin@gentoo.org> :
-  Add dep for elfutils-0.94 as per bug 47644
-
-  11 Apr 2004; Stefan Jones <cretin@gentoo.org> :
-  Mark as stable for all remaining archs
-
-  09 Apr 2004; Stefan Jones <cretin@gentoo.org> :
-  Put in stable to fix bugs
-  
-  05 Apr 2004; Stefan Jones <cretin@gentoo.org> :
-  New version from what was Red Hat rawhide, see if it fixes 45225
-
-*prelink-20040216 (24 Feb 2004)
-
-  24 Feb 2004; Stefan Jones <cretin@gentoo.org> :
-  New version from what was Red Hat rawhide.
-
-*prelink-20031012 (20 Oct 2003)
-
-  20 Oct 2003; Stefan Jones <cretin@gentoo.org> :
-  New version from Red Hat rawhide.
-
-*prelink-20030902 (24 Sep 2003)
-
-  24 Sep 2003; Stefan Jones <cretin@gentoo.org> :
-  New version from Red Hat rawhide.
-
-*prelink-20030811 (19 Aug 2003)
-
-  27 Aug 2003; Stefan Jones <cretin@gentoo.org> :
-  mark stable as it fixes bug #19285
-
-  19 Aug 2003; Stefan Jones <cretin@gentoo.org> :
-  New version from Red Hat rawhide.
-
-*prelink-20030505 (18 May 2003)
-
-  21 May 2003; Stefan Jones <cretin@gentoo.org> :
-  Added the glibc231 patch so it now compiles on older glibc versions.
-
-  18 May 2003; Martin Schlemmer <azarah@gentoo.org> prelink-20030505.ebuild,
-  files/prelink-20030505-no-undosyslibs-test.patch:
-  New version.
-
-  28 Apr 2003; Daniel Ahlberg <aliz@gentoo.org> prelink-20030217.ebuild :
-  Added installation of config file.
-
-09 Mar 2003; Stefan Jones <cretin@gentoo.org> prelink-*.ebuild :
-  Removed sparc from KEYWORDS as it is not supported by anyone.
-
-*prelink-20030217 (07 Mar 2003)
-
-  14 Apr 2003; Stefan Jones <cretin@gentoo.org> :
-  Added patch so compiles under sys-libs/glibc-2.3.1, moved to stable.
-
-  09 Mar 2003; Stefan Jones <cretin@gentoo.org> prelink-20030217.ebuild :
-  Changed DEPEND to glibc-2.3.2
-
-  07 Mar 2003; Stefan Jones <cretin@gentoo.org> prelink-20030217.ebuild :
-  New version from redhat rawhide.
-
-*prelink-20021213 (02 Jan 2003)
-
-  14 Apr 2003; Stefan Jones <cretin@gentoo.org> :
-  Put in stable, it is less buggier than last one
-  
-  02 Jan 2003; Martin Schlemmer <azarah@gentoo.org> prelink-20021213.ebuild :
-  Update version.
-
-*prelink-20021002-r1 (05 Dec 2002)
-
-  13 Apr 2003: Stefan Jones <cretin@gentoo.org> :
-  Added prelink-20021002-copyreloc.patch from bug #14924
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> :
-  Changed sparc ~sparc keywords.
- 
-  05 Dec 2002; Martin Schlemmer <azarah@gentoo.org> prelink-20021002-r1.ebuild :
-  Do not run the undosyslibs.sh test, as it always fails if glibc is prelinked.
-  Thanks to Stefan Jones <cretin@gentoo.org> for this info/fix.
-
-*prelink-20021002 (15 Nov 2002)
+*prelink-20021002 (15 Nov 2002):
 	
-  15 Nov 2002; Stefan Jones <cretin@gentoo.org> prelink-20021002.ebuild :
-  Initial masked ebuild you your hacking and breaking pleasure!
+	15 Nov 2002; Stefan Jones <cretin@gentoo.org> prelink-20021002.ebuild :
+	Initial masked ebuild you your hacking and breaking pleasure!
diff --git a/sys-devel/prelink/Manifest b/sys-devel/prelink/Manifest
index b1202822b8cd..8faac9d70ebf 100644
--- a/sys-devel/prelink/Manifest
+++ b/sys-devel/prelink/Manifest
@@ -1,18 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 47b7b741ab3aa2749cfdad8aeb69c358 prelink-20050314.ebuild 1849
-MD5 369b8c64b5baf0307cea6695e6fde1fd prelink-20050610.ebuild 1811
-MD5 21e12894bf571d97385d6a8e58817450 ChangeLog 4573
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 23dd82792b9637171b3f2fffc51eeea9 files/prelink-20040707-init.patch 1471
-MD5 e044ee8e67c7ef50523a1ccd4dd08e90 files/digest-prelink-20050314 69
-MD5 f624545fb4e6fe08e8fb45d9ace1d32f files/digest-prelink-20050610 69
-MD5 e7b084a6fd6b4ef980a0d67d79ee8733 files/prelink-20050314-amd64-gcc4.patch 6816
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC3o9z1ZcsMnZjRyIRAnEmAJ9IITzot7U32boEpvvvBfeLdLOtvwCgr1Xu
-w+N/kaKoWqltJMJIl8FmBsE=
-=ymHi
------END PGP SIGNATURE-----
+MD5 a05a6b77fe32bfaf4ac5097edcee9626 ChangeLog 1692
+MD5 ca0a6873ed5b3b0d5a4fc1a45c713a88 prelink-20021002-r1.ebuild 1108
+MD5 8cbd488f531d2427d91a4ad00d0e605e prelink-20021002.ebuild 953
+MD5 0f0f4bdd4ff94c84bcd94e67b6266507 prelink-20021213.ebuild 988
+MD5 8c118db1899960bf727ddc0a25b69d48 prelink-20030217.ebuild 989
+MD5 0a9612d9b23bb38185b6dc6f6c3fedf9 prelink-20030505.ebuild 1009
+MD5 6693cfcbba88d4b8ae0bc1a334e4d780 .prelink-20030505.ebuild.swp 12288
+MD5 845308ce8b158654f5fb63acc604c0ee files/digest-prelink-20021002 69
+MD5 845308ce8b158654f5fb63acc604c0ee files/digest-prelink-20021002-r1 69
+MD5 20113771c3a7830d20df1aa4fd6d205f files/prelink-no-undosyslibs-test.patch 562
+MD5 20c61e40290cdaeb7a51ea64aa5e39c4 files/digest-prelink-20030217 69
+MD5 d9e05068478270d99e476272220a2fa1 files/digest-prelink-20021213 69
+MD5 74e9570d9acba20fce8600525e1c1826 files/prelink-20021213-no-undosyslibs-test.patch 609
+MD5 39f05d506ac0a5d39d5d2ef0ef020616 files/prelink-20030217-no-undosyslibs-test.patch 624
+MD5 30d5e9dc1f009b9a471276904d962030 files/prelink-20021002-copyreloc.patch 338
+MD5 874604d665fcc861ed043ddae21ff9e3 files/prelink-20030217-glibc231.patch 2846
+MD5 f54f54ef5eb06e1c718401f23efd962d files/digest-prelink-20030505 69
diff --git a/sys-devel/prelink/metadata.xml b/sys-devel/prelink/metadata.xml
index 96a2d586367d..f093d416cbb1 100644
--- a/sys-devel/prelink/metadata.xml
+++ b/sys-devel/prelink/metadata.xml
@@ -1,3 +1,5 @@
+ [32;01m*[0m Generated metadata.xml:
+
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/sys-devel/prelink/prelink-20050314.ebuild b/sys-devel/prelink/prelink-20050314.ebuild
index fbe4dbe0b72d..514576b3f7ca 100644
--- a/sys-devel/prelink/prelink-20050314.ebuild
+++ b/sys-devel/prelink/prelink-20050314.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/prelink-20050314.ebuild,v 1.2 2005/05/27 18:01:02 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/prelink-20050314.ebuild,v 1.1 2005/05/19 22:51:14 azarah Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64 ppc alpha"
+KEYWORDS="~x86 ~amd64 ~ppc ~alpha"
 IUSE=""
 
 DEPEND=">=dev-libs/elfutils-0.100
diff --git a/sys-devel/sparc32/ChangeLog b/sys-devel/sparc32/ChangeLog
index 5c4a494915b9..f8735bc994a8 100644
--- a/sys-devel/sparc32/ChangeLog
+++ b/sys-devel/sparc32/ChangeLog
@@ -1,51 +1,14 @@
 # ChangeLog for sys-devel/sparc32
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparc32/ChangeLog,v 1.11 2005/03/23 17:34:44 eradicator Exp $
-
-  23 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  sparc32-1.1-r3.ebuild:
-  Use correct toolchain compiler.
-
-*sparc32-1.1-r3 (19 Dec 2004)
-
-  19 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  +files/sparc32-1.1-linux32.patch, +sparc32-1.1-r3.ebuild:
-  Added patch/symlinks for linux{32,64} to work with the same exec name as
-  sys-apps/linux32... makes env-switching scripts play nicer cross platform.
-
-  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  sparc32-1.1-r1.ebuild, sparc32-1.1-r2.ebuild:
-  virtual/glibc -> virtual/libc
-
-*sparc32-1.1-r2 (05 May 2004)
-
-  05 May 2004; Joshua Kinard <kumba@gentoo.org>
-  +files/sparc32-1.1-no-kern-headers.patch, sparc32-1.1-r1.ebuild,
-  +sparc32-1.1-r2.ebuild, sparc32-1.1.ebuild:
-  Keyword/Copyright date cleanups for -r0 and -r1. -r2 has a new patch that
-  avoids the use of kernel headers and uses the personality calls provided by
-  glibc itself.
-
-*sparc32-1.1-r1 (07 Oct 2003)
-
-  07 Oct 2003; Jason Wever <weeve@gentoo.org> sparc32-1.1-r1.ebuild:
-  rev bump, cleaned up ebuild submitted by Matsuu Takuto <matsuu@gentoo.org>,
-  fixes bug #30547.
-
-  16 Aug 2003; Jason Wever <weeve@gentoo.org> metadata.xml:
-  Added metadata.xml
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparc32/ChangeLog,v 1.1 2002/08/25 13:30:44 murphy Exp $
 
 *sparc32-1.1 (20 Aug 2002)
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 
-  27 Sep 2002; Maarten Thibaut <murphy@gentoo.org> sparc32-1.1.ebuild: Adding
-  SLOT statement as reminded by George Shapovalov <georges@its.caltech.edu>.
+  21 Aug 2002; Sean Summers <ebuild-sparc32@generalprotectionfault.com>
 
-  21 Aug 2002; Sean Summers <ebuild-sparc32@generalprotectionfault.com> sparc32-1.1.ebuild:
   Included patches from Jakub Jelinek's <jakub@redhat.com> RPM spec.
   Found at ftp://auroralinux.org/pub/aurora/build-0.31/en/os/sparc/SRPMS/
 
-  20 Aug 2002; Sean Summers <ebuild-sparc32@generalprotectionfault.com> sparc32-1.1.ebuild:
+  20 Aug 2002; Sean Summers <ebuild-sparc32@generalprotectionfault.com>
+
   Initial package
 
diff --git a/sys-devel/sparc32/Manifest b/sys-devel/sparc32/Manifest
index b9a66ca3b6d9..e69de29bb2d1 100644
--- a/sys-devel/sparc32/Manifest
+++ b/sys-devel/sparc32/Manifest
@@ -1,24 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 346efa36a8c1d7e3e909c9684baf7be4 ChangeLog 2024
-MD5 a3aba6d4a459cd3452dab3ee616b6dd9 metadata.xml 412
-MD5 5dff3c3ba6dbb74e18ae379820f33dc9 sparc32-1.1-r1.ebuild 642
-MD5 d88451a7ab108ee9c506834bf7b72f50 sparc32-1.1-r2.ebuild 659
-MD5 b17a0d2d9869275a66d73c70d2382d9f sparc32-1.1-r3.ebuild 901
-MD5 22291591eb38a3620021c01017449090 sparc32-1.1.ebuild 591
-MD5 1eee7426cb56176b09fbf91cfdcd8157 files/digest-sparc32-1.1 58
-MD5 1eee7426cb56176b09fbf91cfdcd8157 files/digest-sparc32-1.1-r1 58
-MD5 1eee7426cb56176b09fbf91cfdcd8157 files/digest-sparc32-1.1-r2 58
-MD5 1eee7426cb56176b09fbf91cfdcd8157 files/digest-sparc32-1.1-r3 58
-MD5 b76985155a715ac1a94ec01f6415f54f files/sparc32-1.1-fhs.patch 748
-MD5 5ea48e6b729c050e570294ab64cdb34c files/sparc32-1.1-include.patch 1169
-MD5 024daa894ba58b9d79e388e4bcf375d5 files/sparc32-1.1-linux32.patch 611
-MD5 90dd145372baffc21ee0bae867fe79ea files/sparc32-1.1-no-kern-headers.patch 665
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCQajNArHZZzCEUG0RAuUvAJ9d3lZdT7zmWvdNBJe7qK9h6bE0WACgg62s
-j5N2U/jDPcXaod7VGMohzqI=
-=TqFJ
------END PGP SIGNATURE-----
diff --git a/sys-devel/sparc32/metadata.xml b/sys-devel/sparc32/metadata.xml
index 73d3fdc04f36..80c8cb5cda19 100644
--- a/sys-devel/sparc32/metadata.xml
+++ b/sys-devel/sparc32/metadata.xml
@@ -7,6 +7,6 @@
   <name>Sparc Team</name>
 </maintainer>
 <longdescription>
-sparc32 is a utility from Debian GNU/Linux that changes the output of uname to look like it's running on a 32-bit sparc computer.
+sparc32 is a utility from Dabian GNU/Linux that changes the output of uname to look like it's running on a 32-bit sparc computer.
 </longdescription>
 </pkgmetadata>
diff --git a/sys-devel/sparc32/sparc32-1.1-r1.ebuild b/sys-devel/sparc32/sparc32-1.1-r1.ebuild
index d787241e92d5..39a2b7ab693e 100644
--- a/sys-devel/sparc32/sparc32-1.1-r1.ebuild
+++ b/sys-devel/sparc32/sparc32-1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparc32/sparc32-1.1-r1.ebuild,v 1.5 2004/07/02 08:42:56 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparc32/sparc32-1.1-r1.ebuild,v 1.1 2003/10/07 19:18:03 weeve Exp $
 
 inherit eutils
 
@@ -10,10 +10,10 @@ SRC_URI="ftp://ftp.auxio.org/pub/linux/SOURCES/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* sparc"
+KEYWORDS="sparc  -x86 -ppc"
 IUSE=""
 
-DEPEND="virtual/libc"
+DEPEND="virtual/glibc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-devel/sparc32/sparc32-1.1-r2.ebuild b/sys-devel/sparc32/sparc32-1.1-r2.ebuild
index 060edf429124..d1952a2e5349 100644
--- a/sys-devel/sparc32/sparc32-1.1-r2.ebuild
+++ b/sys-devel/sparc32/sparc32-1.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparc32/sparc32-1.1-r2.ebuild,v 1.3 2004/07/02 08:42:56 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparc32/sparc32-1.1-r2.ebuild,v 1.1 2004/05/05 08:05:38 kumba Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="-* ~sparc"
 IUSE=""
 
-DEPEND="virtual/libc"
+DEPEND="virtual/glibc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-devel/sparc32/sparc32-1.1-r3.ebuild b/sys-devel/sparc32/sparc32-1.1-r3.ebuild
index c61e7428365a..7f07535743e6 100644
--- a/sys-devel/sparc32/sparc32-1.1-r3.ebuild
+++ b/sys-devel/sparc32/sparc32-1.1-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparc32/sparc32-1.1-r3.ebuild,v 1.2 2005/03/23 17:34:44 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparc32/sparc32-1.1-r3.ebuild,v 1.1 2004/12/19 11:18:02 eradicator Exp $
 
-inherit eutils toolchain-funcs
+inherit eutils
 
 DESCRIPTION="A SPARC32 compilation environment."
 HOMEPAGE=""
@@ -23,7 +23,7 @@ src_unpack() {
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" || die
+	emake || die
 }
 
 src_install () {
diff --git a/sys-devel/sparc32/sparc32-1.1.ebuild b/sys-devel/sparc32/sparc32-1.1.ebuild
index 90b3b41dfa1e..1e4215188608 100644
--- a/sys-devel/sparc32/sparc32-1.1.ebuild
+++ b/sys-devel/sparc32/sparc32-1.1.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparc32/sparc32-1.1.ebuild,v 1.9 2004/07/15 03:36:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparc32/sparc32-1.1.ebuild,v 1.1 2002/08/25 13:30:44 murphy Exp $
 
 DESCRIPTION="A SPARC32 compilation environment."
 LICENSE="GPL-2"
 SRC_URI="ftp://ftp.auxio.org/pub/linux/SOURCES/${P}.tgz"
-SLOT="0"
 
-KEYWORDS="-* sparc"
-IUSE=""
+S=${WORKDIR}/${P}
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-devel/sparse/Manifest b/sys-devel/sparse/Manifest
index 688bd13b7f86..577e75f86296 100644
--- a/sys-devel/sparse/Manifest
+++ b/sys-devel/sparse/Manifest
@@ -1,16 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 411b5dba346ef3ec6286d2049e49787f ChangeLog 358
+MD5 778800e7e1bd9d4f0fbfd077953af640 ChangeLog 271
 MD5 1185d0d80ae45ba7cc96254a4b0b8462 files/digest-sparse-2005.10.28 69
 MD5 09adef9c41d44b360b856a5913d179f3 metadata.xml 220
-MD5 f0e687ab88a42372752afb3448eed6d4 sparse-2005.10.28.ebuild 638
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iQCVAwUBQ2Fgzp4WFLgrx1GWAQLKoAP9GmbRqNw/IyWrGiRlzDd90jdzVlrxSLhc
-GihEValbeUUxZkR9+9glnbhhXpns4YGrp3QiegXSzPx7vm2+iz3MyHjqgKz4K29b
-ApwSVr6Y0lfwgkskuyNMDsbMgimQUFh4CBysXPh4Rk8PCY3r1gv79gV20xafwkpB
-DoDY2eLJ6Qo=
-=5FDW
------END PGP SIGNATURE-----
+MD5 1a25378025e5e7785825645191f92c87 sparse-2005.10.28.ebuild 536
diff --git a/sys-devel/subterfugue/ChangeLog b/sys-devel/subterfugue/ChangeLog
index 35c179dd09c5..55990e5d8cb4 100644
--- a/sys-devel/subterfugue/ChangeLog
+++ b/sys-devel/subterfugue/ChangeLog
@@ -1,9 +1,6 @@
-# ChangeLog for sys-devel/subterfugue
+# ChangeLog for sys-apps/subterfugue
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/subterfugue/ChangeLog,v 1.3 2005/09/08 15:20:26 blubb Exp $
-
-  08 Sep 2005; Simon Stelling <blubb@gentoo.org> subterfugue-0.2.1a.ebuild:
-  setting -amd64
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/subterfugue/ChangeLog,v 1.1 2005/03/05 00:32:03 ciaranm Exp $
 
 *subterfugue-0.2.1a (05 Mar 2005)
 
diff --git a/sys-devel/subterfugue/Manifest b/sys-devel/subterfugue/Manifest
index 9c3b2202a05c..e95157fecddc 100644
--- a/sys-devel/subterfugue/Manifest
+++ b/sys-devel/subterfugue/Manifest
@@ -1,6 +1,16 @@
-MD5 a65d898222e697e3df0f70b339128c43 ChangeLog 1926
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a63dbdd4c0e7ea4568415794cc95686e subterfugue-0.2.1a.ebuild 1523
+MD5 93ff3f934010f287b9e35471455db1cb ChangeLog 1563
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 a0f5724aabfe1c6b9c1dd2027e42152b subterfugue-0.2.1a.ebuild 1522
-MD5 280505cf0a93d7421f64d2e48f4ad419 files/digest-subterfugue-0.2.1a 66
-MD5 256769a72fc0352e9c2539b7f320cbea files/subterfugue-0.2.1a-gcc33.patch 591
 MD5 7e3351bf87121d72b46ae2af34b6df22 files/subterfugue-0.2.1a-setup.py 460
+MD5 256769a72fc0352e9c2539b7f320cbea files/subterfugue-0.2.1a-gcc33.patch 591
+MD5 280505cf0a93d7421f64d2e48f4ad419 files/digest-subterfugue-0.2.1a 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBo4uVI1lqEGTUzyQRAgyNAJ4kbZIm7TTqMsih6rW0Rb6MYxaXawCg2S5j
+31d3SwlE4ZDYWWKTmL2lVQw=
+=zlWR
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/subterfugue/subterfugue-0.2.1a.ebuild b/sys-devel/subterfugue/subterfugue-0.2.1a.ebuild
index 48798ca11d78..2c1bfb17eddd 100644
--- a/sys-devel/subterfugue/subterfugue-0.2.1a.ebuild
+++ b/sys-devel/subterfugue/subterfugue-0.2.1a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/subterfugue/subterfugue-0.2.1a.ebuild,v 1.2 2005/09/08 15:20:26 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/subterfugue/subterfugue-0.2.1a.ebuild,v 1.1 2005/03/05 00:32:03 ciaranm Exp $
 
 inherit distutils eutils
 
@@ -9,7 +9,7 @@ IUSE="gtk"
 DESCRIPTION="strace meets expect"
 SRC_URI="mirror://sourceforge/subterfugue/${P}.tgz"
 HOMEPAGE="http://www.subterfugue.org/"
-KEYWORDS="-amd64 -ppc x86"
+KEYWORDS="x86 amd64 -ppc"
 SLOT="0"
 LICENSE="GPL-2"
author	Chris White <chriswhite@gentoo.org>	2005-11-30 09:38:30 +0000
committer	Chris White <chriswhite@gentoo.org>	2005-11-30 09:38:30 +0000
commit	67c8b060271109f68d8b0a44de61d297ddfbe2e7 (patch)
tree	42ce8164da9dd6d55caa82dfe6832b4a2a0a6ad5 /sys-devel
parent	* empty log message * (diff)
download	gentoo-2-67c8b060271109f68d8b0a44de61d297ddfbe2e7.tar.gz gentoo-2-67c8b060271109f68d8b0a44de61d297ddfbe2e7.tar.bz2 gentoo-2-67c8b060271109f68d8b0a44de61d297ddfbe2e7.zip