remove code from global scope and clean up

25 files changed, 118 insertions, 265 deletions

diff --git a/sys-devel/binutils/binutils-2.11.92.0.12.3-r2.ebuild b/sys-devel/binutils/binutils-2.11.92.0.12.3-r2.ebuild
index fc76c10f2182..52b3aed1013a 100644
--- a/sys-devel/binutils/binutils-2.11.92.0.12.3-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.11.92.0.12.3-r2.ebuild
@@ -1,35 +1,34 @@
 # 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.11.92.0.12.3-r2.ebuild,v 1.19 2004/07/15 03:10:40 agriffis Exp $
-
-IUSE="nls static build"
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.11.92.0.12.3-r2.ebuild,v 1.20 2004/08/14 02:27:55 vapier Exp $
 
 DESCRIPTION="Tools necessary to build programs"
+HOMEPAGE="http://sources.redhat.com/binutils/"
 SRC_URI="mirror://kernel/linux/devel/binutils/${P}.tar.bz2"
+
 LICENSE="GPL-2 LGPL-2 BINUTILS"
 SLOT="0"
 KEYWORDS="x86 sparc"
-HOMEPAGE="http://sources.redhat.com/binutils/"
+IUSE="nls static build"
 
 DEPEND="virtual/libc
-		nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${P}.tar.bz2
 	cd ${S}
-	#man pages are tarred up seperately because building them depends on perl, which isn't installed at
-	#Gentoo Linux bootstrap time.
+	#man pages are tarred up seperately because building them depends
+	#on perl, which isn't installed at Gentoo Linux bootstrap time.
 	mkdir man; cd man
 	tar xjf ${DISTDIR}/${PN}-manpages-${PV}.tar.bz2 || die
 }
 
 src_compile() {
-
 	local myconf
 
-	use nls && \
-		myconf="${myconf} --without-included-gettext" || \
-		myconf="${myconf} --disable-nls"
+	use nls \
+		&& myconf="${myconf} --without-included-gettext" \
+		|| myconf="${myconf} --disable-nls"
 
 	./configure --enable-shared \
 		--enable-64-bit-bfd \
@@ -88,8 +87,7 @@ src_install() {
 	if ! use build
 	then
 		#install info pages
-		make infodir=${D}/usr/share/info \
-			install-info || die
+		make infodir=${D}/usr/share/info install-info || die
 		dodoc COPYING* README
 		docinto bfd
 		dodoc bfd/ChangeLog* bfd/COPYING bfd/README bfd/PORTING bfd/TODO
diff --git a/sys-devel/binutils/binutils-2.11.92.0.7.ebuild b/sys-devel/binutils/binutils-2.11.92.0.7.ebuild
index 5a4ab4df4c13..350b39a75842 100644
--- a/sys-devel/binutils/binutils-2.11.92.0.7.ebuild
+++ b/sys-devel/binutils/binutils-2.11.92.0.7.ebuild
@@ -1,14 +1,15 @@
 # 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.11.92.0.7.ebuild,v 1.18 2004/07/15 03:10:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.11.92.0.7.ebuild,v 1.19 2004/08/14 02:27:55 vapier Exp $
 
 DESCRIPTION="Tools necessary to build programs"
+HOMEPAGE="http://sources.redhat.com/binutils/"
 SRC_URI="mirror://kernel/linux/devel/binutils/${P}.tar.bz2"
+
 LICENSE="GPL-2 LGPL-2 BINUTILS"
 SLOT="0"
 KEYWORDS="x86 sparc"
 IUSE="build nls static"
-HOMEPAGE="http://sources.redhat.com/binutils/"
 
 DEPEND="virtual/libc"
 
diff --git a/sys-devel/binutils/binutils-2.12.90.0.15.ebuild b/sys-devel/binutils/binutils-2.12.90.0.15.ebuild
index 31943e337133..3248f9f4fffc 100644
--- a/sys-devel/binutils/binutils-2.12.90.0.15.ebuild
+++ b/sys-devel/binutils/binutils-2.12.90.0.15.ebuild
@@ -1,11 +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/binutils/binutils-2.12.90.0.15.ebuild,v 1.18 2004/07/15 03:10:40 agriffis Exp $
-
-IUSE="nls bootstrap static build"
-
-# NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
-#                      the manpages, but seems this is incorrect ....
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.12.90.0.15.ebuild,v 1.19 2004/08/14 02:27:55 vapier Exp $
 
 inherit libtool
 
@@ -13,9 +8,10 @@ DESCRIPTION="Tools necessary to build programs"
 SRC_URI="mirror://kernel/linux/devel/binutils/${P}.tar.bz2"
 HOMEPAGE="http://sources.redhat.com/binutils/"
 
-SLOT="0"
 LICENSE="GPL-2 | LGPL-2"
-KEYWORDS="x86 ppc sparc "
+SLOT="0"
+KEYWORDS="x86 ppc sparc"
+IUSE="nls bootstrap static build"
 
 DEPEND="virtual/libc
 	nls? ( sys-devel/gettext )
@@ -26,9 +22,7 @@ DEPEND="virtual/libc
 # This is a hairy one.  Basically depend on dev-lang/perl
 # if "build" or "bootstrap" not in USE.
 
-
 src_compile() {
-
 	local myconf=""
 	use nls && \
 		myconf="${myconf} --without-included-gettext" || \
diff --git a/sys-devel/binutils/binutils-2.13.90.0.16-r1.ebuild b/sys-devel/binutils/binutils-2.13.90.0.16-r1.ebuild
index 2b9f872575b2..1023b3512247 100644
--- a/sys-devel/binutils/binutils-2.13.90.0.16-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.13.90.0.16-r1.ebuild
@@ -1,25 +1,18 @@
 # 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.13.90.0.16-r1.ebuild,v 1.17 2004/07/15 03:10:40 agriffis Exp $
-
-IUSE="nls bootstrap static build"
-
-# NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
-#                      the manpages, but seems this is incorrect ....
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.13.90.0.16-r1.ebuild,v 1.18 2004/08/14 02:27:55 vapier Exp $
 
 inherit eutils libtool flag-o-matic
 
-# Generate borked binaries.  Bug #6730
-filter-flags "-fomit-frame-pointer -fssa"
-
 DESCRIPTION="Tools necessary to build programs"
+HOMEPAGE="http://sources.redhat.com/binutils/"
 SRC_URI="mirror://kernel/linux/devel/binutils/${P}.tar.bz2
 	mirror://kernel/linux/devel/binutils/test/${P}.tar.bz2"
-HOMEPAGE="http://sources.redhat.com/binutils/"
 
-SLOT="0"
 LICENSE="GPL-2 | LGPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc alpha sparc mips hppa"
+IUSE="nls bootstrap static build"
 
 DEPEND="virtual/libc
 	nls? ( sys-devel/gettext )
@@ -31,7 +24,6 @@ DEPEND="virtual/libc
 # if "build" or "bootstrap" not in USE.
 
 src_unpack() {
-
 	unpack ${A}
 
 	cd ${S}
@@ -49,13 +41,15 @@ src_unpack() {
 }
 
 src_compile() {
+	# Generate borked binaries.  Bug #6730
+	filter-flags -fomit-frame-pointer -fssa
 
 	# Add patches for mips
 	if [ "${ARCH}" = "mips" ]
 	then
-			cd ${S}
-			chmod +x mips/README
-			./mips/README
+		cd ${S}
+		chmod +x mips/README
+		./mips/README
 	fi
 
 	local myconf=""
diff --git a/sys-devel/binutils/binutils-2.13.90.0.18-r1.ebuild b/sys-devel/binutils/binutils-2.13.90.0.18-r1.ebuild
index 84d1992f7107..60d127150aeb 100644
--- a/sys-devel/binutils/binutils-2.13.90.0.18-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.13.90.0.18-r1.ebuild
@@ -1,15 +1,9 @@
 # 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.13.90.0.18-r1.ebuild,v 1.16 2004/07/15 03:10:40 agriffis Exp $
-
-# NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
-#                      the manpages, but seems this is incorrect ....
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.13.90.0.18-r1.ebuild,v 1.17 2004/08/14 02:27:55 vapier Exp $
 
 inherit eutils libtool flag-o-matic
 
-# Generate borked binaries.  Bug #6730
-filter-flags "-fomit-frame-pointer -fssa"
-
 DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="http://sources.redhat.com/binutils/"
 SRC_URI="mirror://kernel/linux/devel/binutils/${P}.tar.bz2
@@ -30,14 +24,7 @@ DEPEND="virtual/libc
 # This is a hairy one.  Basically depend on dev-lang/perl
 # if "build" or "bootstrap" not in USE.
 
-
-# filter CFLAGS=".. -O2 .." on arm
-if [ "${ARCH}" = "arm" ]; then
-	CFLAGS="$(echo "${CFLAGS}" | sed -e 's,-O[2-9] ,-O1 ,')"
-fi
-
 src_unpack() {
-
 	unpack ${A}
 
 	cd ${S}
@@ -75,6 +62,10 @@ src_unpack() {
 }
 
 src_compile() {
+	# Generate borked binaries.  Bug #6730
+	filter-flags -fomit-frame-pointer -fssa
+	use arm && replace-flags -O? -O1
+
 	local myconf=""
 
 	use nls && \
diff --git a/sys-devel/binutils/binutils-2.13.90.0.18.ebuild b/sys-devel/binutils/binutils-2.13.90.0.18.ebuild
index 8d92685e4579..f7b98759c2c9 100644
--- a/sys-devel/binutils/binutils-2.13.90.0.18.ebuild
+++ b/sys-devel/binutils/binutils-2.13.90.0.18.ebuild
@@ -1,25 +1,18 @@
 # 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.13.90.0.18.ebuild,v 1.25 2004/07/15 03:10:40 agriffis Exp $
-
-IUSE="nls bootstrap build"
-
-# NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
-#                      the manpages, but seems this is incorrect ....
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.13.90.0.18.ebuild,v 1.26 2004/08/14 02:27:55 vapier Exp $
 
 inherit eutils libtool flag-o-matic
 
-# Generate borked binaries.  Bug #6730
-filter-flags "-fomit-frame-pointer -fssa"
-
 DESCRIPTION="Tools necessary to build programs"
+HOMEPAGE="http://sources.redhat.com/binutils/"
 SRC_URI="mirror://kernel/linux/devel/binutils/${P}.tar.bz2
 	mirror://kernel/linux/devel/binutils/test/${P}.tar.bz2"
-HOMEPAGE="http://sources.redhat.com/binutils/"
 
-SLOT="0"
 LICENSE="GPL-2 | LGPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc alpha sparc ~mips ~hppa "
+IUSE="nls bootstrap build"
 
 DEPEND="virtual/libc
 	nls? ( sys-devel/gettext )
@@ -30,14 +23,7 @@ DEPEND="virtual/libc
 # This is a hairy one.  Basically depend on dev-lang/perl
 # if "build" or "bootstrap" not in USE.
 
-
-# filter CFLAGS=".. -O2 .." on arm
-if [ "${ARCH}" = "arm" ]; then
-	CFLAGS="$(echo "${CFLAGS}" | sed -e 's,-O[2-9] ,-O1 ,')"
-fi
-
 src_unpack() {
-
 	unpack ${A}
 
 	cd ${S}
@@ -61,6 +47,10 @@ src_unpack() {
 }
 
 src_compile() {
+	# Generate borked binaries.  Bug #6730
+	filter-flags -fomit-frame-pointer -fssa
+	use arm && replace-flags -O? -O1
+
 	local myconf=""
 
 	use nls && \
diff --git a/sys-devel/binutils/binutils-2.14.90.0.2.ebuild b/sys-devel/binutils/binutils-2.14.90.0.2.ebuild
index 1991edc31566..300054e72428 100644
--- a/sys-devel/binutils/binutils-2.14.90.0.2.ebuild
+++ b/sys-devel/binutils/binutils-2.14.90.0.2.ebuild
@@ -1,25 +1,18 @@
 # 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.14.90.0.2.ebuild,v 1.20 2004/07/15 03:10:40 agriffis Exp $
-
-IUSE="nls bootstrap build"
-
-# NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
-#                      the manpages, but seems this is incorrect ....
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.2.ebuild,v 1.21 2004/08/14 02:27:55 vapier Exp $
 
 inherit eutils libtool flag-o-matic
 
-# Generate borked binaries.  Bug #6730
-filter-flags "-fomit-frame-pointer -fssa"
-
 DESCRIPTION="Tools necessary to build programs"
+HOMEPAGE="http://sources.redhat.com/binutils/"
 SRC_URI="mirror://kernel/linux/devel/binutils/${P}.tar.bz2
 	mirror://kernel/linux/devel/binutils/test/${P}.tar.bz2"
-HOMEPAGE="http://sources.redhat.com/binutils/"
 
-SLOT="0"
 LICENSE="GPL-2 | LGPL-2"
+SLOT="0"
 KEYWORDS="amd64 x86 ppc -alpha sparc mips -hppa "
+IUSE="nls bootstrap build"
 
 DEPEND="virtual/libc
 	nls? ( sys-devel/gettext )
@@ -30,14 +23,7 @@ DEPEND="virtual/libc
 # This is a hairy one.  Basically depend on dev-lang/perl
 # if "build" or "bootstrap" not in USE.
 
-
-# filter CFLAGS=".. -O2 .." on arm
-if [ "${ARCH}" = "arm" ]; then
-	CFLAGS="$(echo "${CFLAGS}" | sed -e 's,-O[2-9] ,-O1 ,')"
-fi
-
 src_unpack() {
-
 	unpack ${A}
 
 	cd ${S}
@@ -74,6 +60,10 @@ src_unpack() {
 }
 
 src_compile() {
+	# Generate borked binaries.  Bug #6730
+	filter-flags -fomit-frame-pointer -fssa
+	use arm && replace-flags -O? -O1
+
 	local myconf=""
 
 	use nls && \
diff --git a/sys-devel/binutils/binutils-2.14.90.0.4.1-r1.ebuild b/sys-devel/binutils/binutils-2.14.90.0.4.1-r1.ebuild
index e4307340ef74..a4ad78f3d9ea 100644
--- a/sys-devel/binutils/binutils-2.14.90.0.4.1-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.14.90.0.4.1-r1.ebuild
@@ -1,25 +1,18 @@
 # 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.14.90.0.4.1-r1.ebuild,v 1.13 2004/07/15 03:10:40 agriffis Exp $
-
-IUSE="nls bootstrap build"
-
-# NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
-#                      the manpages, but seems this is incorrect ....
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.4.1-r1.ebuild,v 1.14 2004/08/14 02:27:55 vapier Exp $
 
 inherit eutils libtool flag-o-matic
 
-# Generate borked binaries.  Bug #6730
-filter-flags "-fomit-frame-pointer -fssa"
-
 DESCRIPTION="Tools necessary to build programs"
+HOMEPAGE="http://sources.redhat.com/binutils/"
 SRC_URI="mirror://kernel/linux/devel/binutils/${P}.tar.bz2
 	mirror://kernel/linux/devel/binutils/test/${P}.tar.bz2"
-HOMEPAGE="http://sources.redhat.com/binutils/"
 
-SLOT="0"
 LICENSE="GPL-2 | LGPL-2"
+SLOT="0"
 KEYWORDS="~amd64 -x86 -ppc -alpha -sparc mips -hppa "
+IUSE="nls bootstrap build"
 
 DEPEND="virtual/libc
 	nls? ( sys-devel/gettext )
@@ -30,14 +23,7 @@ DEPEND="virtual/libc
 # This is a hairy one.  Basically depend on dev-lang/perl
 # if "build" or "bootstrap" not in USE.
 
-
-# filter CFLAGS=".. -O2 .." on arm
-if [ "${ARCH}" = "arm" ]; then
-	CFLAGS="$(echo "${CFLAGS}" | sed -e 's,-O[2-9] ,-O1 ,')"
-fi
-
 src_unpack() {
-
 	unpack ${A}
 
 	cd ${S}
@@ -98,6 +84,10 @@ src_unpack() {
 }
 
 src_compile() {
+	# Generate borked binaries.  Bug #6730
+	filter-flags -fomit-frame-pointer -fssa
+	use arm && replace-flags -O? -O1
+
 	local myconf=
 
 	use nls && \
diff --git a/sys-devel/binutils/binutils-2.14.90.0.5-r1.ebuild b/sys-devel/binutils/binutils-2.14.90.0.5-r1.ebuild
index 03ce8559347f..c4364cd4b1c8 100644
--- a/sys-devel/binutils/binutils-2.14.90.0.5-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.14.90.0.5-r1.ebuild
@@ -1,25 +1,18 @@
 # 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.14.90.0.5-r1.ebuild,v 1.12 2004/07/15 03:10:41 agriffis Exp $
-
-IUSE="nls bootstrap build"
-
-# NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
-#                      the manpages, but seems this is incorrect ....
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.5-r1.ebuild,v 1.13 2004/08/14 02:27:55 vapier Exp $
 
 inherit eutils libtool flag-o-matic
 
-# Generate borked binaries.  Bug #6730
-filter-flags "-fomit-frame-pointer -fssa"
-
 DESCRIPTION="Tools necessary to build programs"
+HOMEPAGE="http://sources.redhat.com/binutils/"
 SRC_URI="mirror://kernel/linux/devel/binutils/${P}.tar.bz2
 	mirror://kernel/linux/devel/binutils/test/${P}.tar.bz2"
-HOMEPAGE="http://sources.redhat.com/binutils/"
 
-SLOT="0"
 LICENSE="GPL-2 | LGPL-2"
+SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc -alpha ~sparc ~mips -hppa "
+IUSE="nls bootstrap build"
 
 DEPEND="virtual/libc
 	nls? ( sys-devel/gettext )
@@ -30,14 +23,7 @@ DEPEND="virtual/libc
 # This is a hairy one.  Basically depend on dev-lang/perl
 # if "build" or "bootstrap" not in USE.
 
-
-# filter CFLAGS=".. -O2 .." on arm
-if [ "${ARCH}" = "arm" ]; then
-	CFLAGS="$(echo "${CFLAGS}" | sed -e 's,-O[2-9] ,-O1 ,')"
-fi
-
 src_unpack() {
-
 	unpack ${A}
 
 	cd ${S}
@@ -87,6 +73,10 @@ src_unpack() {
 }
 
 src_compile() {
+	# Generate borked binaries.  Bug #6730
+	filter-flags -fomit-frame-pointer -fssa
+	use arm && replace-flags -O? -O1
+
 	local myconf=
 
 	use nls && \
diff --git a/sys-devel/binutils/binutils-2.14.90.0.6-r2.ebuild b/sys-devel/binutils/binutils-2.14.90.0.6-r2.ebuild
index 44525a1959ba..a3edabc51c41 100644
--- a/sys-devel/binutils/binutils-2.14.90.0.6-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.14.90.0.6-r2.ebuild
@@ -1,25 +1,18 @@
 # 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.14.90.0.6-r2.ebuild,v 1.11 2004/07/15 03:10:41 agriffis Exp $
-
-IUSE="nls bootstrap build"
-
-# NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
-#                      the manpages, but seems this is incorrect ....
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.6-r2.ebuild,v 1.12 2004/08/14 02:27:55 vapier Exp $
 
 inherit eutils libtool flag-o-matic
 
-# Generate borked binaries.  Bug #6730
-filter-flags "-fomit-frame-pointer -fssa"
-
 DESCRIPTION="Tools necessary to build programs"
+HOMEPAGE="http://sources.redhat.com/binutils/"
 SRC_URI="mirror://kernel/linux/devel/binutils/${P}.tar.bz2
 	mirror://kernel/linux/devel/binutils/test/${P}.tar.bz2"
-HOMEPAGE="http://sources.redhat.com/binutils/"
 
-SLOT="0"
 LICENSE="GPL-2 | LGPL-2"
+SLOT="0"
 KEYWORDS="~amd64 x86 ~ppc ~alpha ~sparc mips ~hppa "
+IUSE="nls bootstrap build"
 
 DEPEND="virtual/libc
 	nls? ( sys-devel/gettext )
@@ -30,14 +23,7 @@ DEPEND="virtual/libc
 # This is a hairy one.  Basically depend on dev-lang/perl
 # if "build" or "bootstrap" not in USE.
 
-
-# filter CFLAGS=".. -O2 .." on arm
-if [ "${ARCH}" = "arm" ]; then
-	CFLAGS="$(echo "${CFLAGS}" | sed -e 's,-O[2-9] ,-O1 ,')"
-fi
-
 src_unpack() {
-
 	unpack ${A}
 
 	cd ${S}
@@ -84,6 +70,10 @@ src_unpack() {
 }
 
 src_compile() {
+	# Generate borked binaries.  Bug #6730
+	filter-flags -fomit-frame-pointer -fssa
+	use arm && replace-flags -O? -O1
+
 	local myconf=
 
 	use nls && \
diff --git a/sys-devel/binutils/binutils-2.14.90.0.6-r3.ebuild b/sys-devel/binutils/binutils-2.14.90.0.6-r3.ebuild
index e73aab073428..6112fa42558c 100644
--- a/sys-devel/binutils/binutils-2.14.90.0.6-r3.ebuild
+++ b/sys-devel/binutils/binutils-2.14.90.0.6-r3.ebuild
@@ -1,25 +1,18 @@
 # 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.14.90.0.6-r3.ebuild,v 1.13 2004/07/15 03:10:41 agriffis Exp $
-
-IUSE="nls bootstrap build"
-
-# NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
-#                      the manpages, but seems this is incorrect ....
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.6-r3.ebuild,v 1.14 2004/08/14 02:27:55 vapier Exp $
 
 inherit eutils libtool flag-o-matic
 
-# Generate borked binaries.  Bug #6730
-filter-flags "-fomit-frame-pointer -fssa"
-
 DESCRIPTION="Tools necessary to build programs"
+HOMEPAGE="http://sources.redhat.com/binutils/"
 SRC_URI="mirror://kernel/linux/devel/binutils/${P}.tar.bz2
 	mirror://kernel/linux/devel/binutils/test/${P}.tar.bz2"
-HOMEPAGE="http://sources.redhat.com/binutils/"
 
-SLOT="0"
 LICENSE="GPL-2 | LGPL-2"
+SLOT="0"
 KEYWORDS="amd64 ~x86 ~ppc ~alpha ~sparc ~mips ~hppa ia64"
+IUSE="nls bootstrap build"
 
 DEPEND="virtual/libc
 	nls? ( sys-devel/gettext )
@@ -30,14 +23,7 @@ DEPEND="virtual/libc
 # This is a hairy one.  Basically depend on dev-lang/perl
 # if "build" or "bootstrap" not in USE.
 
-
-# filter CFLAGS=".. -O2 .." on arm
-if [ "${ARCH}" = "arm" ]; then
-	CFLAGS="$(echo "${CFLAGS}" | sed -e 's,-O[2-9] ,-O1 ,')"
-fi
-
 src_unpack() {
-
 	unpack ${A}
 
 	cd ${S}
@@ -96,6 +82,10 @@ src_unpack() {
 }
 
 src_compile() {
+	# Generate borked binaries.  Bug #6730
+	filter-flags -fomit-frame-pointer -fssa
+	use arm && replace-flags -O? -O1
+
 	local myconf=
 
 	use nls && \
diff --git a/sys-devel/binutils/binutils-2.14.90.0.6-r6.ebuild b/sys-devel/binutils/binutils-2.14.90.0.6-r6.ebuild
index 0dfcfc483d22..f625adc7a367 100644
--- a/sys-devel/binutils/binutils-2.14.90.0.6-r6.ebuild
+++ b/sys-devel/binutils/binutils-2.14.90.0.6-r6.ebuild
@@ -1,25 +1,18 @@
 # 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.14.90.0.6-r6.ebuild,v 1.11 2004/07/15 03:10:41 agriffis Exp $
-
-IUSE="nls bootstrap build"
-
-# NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
-#                      the manpages, but seems this is incorrect ....
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.6-r6.ebuild,v 1.12 2004/08/14 02:27:55 vapier Exp $
 
 inherit eutils libtool flag-o-matic
 
-# Generate borked binaries.  Bug #6730
-filter-flags "-fomit-frame-pointer -fssa"
-
 DESCRIPTION="Tools necessary to build programs"
+HOMEPAGE="http://sources.redhat.com/binutils/"
 SRC_URI="mirror://kernel/linux/devel/binutils/${P}.tar.bz2
 	mirror://kernel/linux/devel/binutils/test/${P}.tar.bz2"
-HOMEPAGE="http://sources.redhat.com/binutils/"
 
-SLOT="0"
 LICENSE="GPL-2 | LGPL-2"
+SLOT="0"
 KEYWORDS="amd64 x86 ppc alpha sparc ~mips ~hppa ia64"
+IUSE="nls bootstrap build"
 
 DEPEND="virtual/libc
 	nls? ( sys-devel/gettext )
@@ -30,14 +23,7 @@ DEPEND="virtual/libc
 # This is a hairy one.  Basically depend on dev-lang/perl
 # if "build" or "bootstrap" not in USE.
 
-
-# filter CFLAGS=".. -O2 .." on arm
-if [ "${ARCH}" = "arm" ]; then
-	CFLAGS="$(echo "${CFLAGS}" | sed -e 's,-O[2-9] ,-O1 ,')"
-fi
-
 src_unpack() {
-
 	unpack ${A}
 
 	cd ${S}
@@ -115,6 +101,10 @@ src_unpack() {
 }
 
 src_compile() {
+	# Generate borked binaries.  Bug #6730
+	filter-flags -fomit-frame-pointer -fssa
+	use arm && replace-flags -O? -O1
+
 	local myconf=
 
 	use nls && \
diff --git a/sys-devel/binutils/binutils-2.14.90.0.6-r7.ebuild b/sys-devel/binutils/binutils-2.14.90.0.6-r7.ebuild
index 46ac80c684e2..51bfeb9599ba 100644
--- a/sys-devel/binutils/binutils-2.14.90.0.6-r7.ebuild
+++ b/sys-devel/binutils/binutils-2.14.90.0.6-r7.ebuild
@@ -1,9 +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/binutils/binutils-2.14.90.0.6-r7.ebuild,v 1.13 2004/07/28 15:24:09 vapier Exp $
-
-# NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
-#                      the manpages, but seems this is incorrect ....
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.6-r7.ebuild,v 1.14 2004/08/14 02:27:55 vapier Exp $
 
 inherit eutils libtool flag-o-matic
 
diff --git a/sys-devel/binutils/binutils-2.14.90.0.7-r4.ebuild b/sys-devel/binutils/binutils-2.14.90.0.7-r4.ebuild
index 6d5d0da28e72..8489d06eec51 100644
--- a/sys-devel/binutils/binutils-2.14.90.0.7-r4.ebuild
+++ b/sys-devel/binutils/binutils-2.14.90.0.7-r4.ebuild
@@ -1,9 +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/binutils/binutils-2.14.90.0.7-r4.ebuild,v 1.10 2004/07/02 09:31:17 eradicator Exp $
-
-# NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
-#                      the manpages, but seems this is incorrect ....
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.7-r4.ebuild,v 1.11 2004/08/14 02:27:55 vapier Exp $
 
 inherit eutils libtool flag-o-matic
 
diff --git a/sys-devel/binutils/binutils-2.14.90.0.7.ebuild b/sys-devel/binutils/binutils-2.14.90.0.7.ebuild
index e4a9850a2626..01220db9d3b4 100644
--- a/sys-devel/binutils/binutils-2.14.90.0.7.ebuild
+++ b/sys-devel/binutils/binutils-2.14.90.0.7.ebuild
@@ -1,33 +1,24 @@
 # 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.14.90.0.7.ebuild,v 1.14 2004/07/15 03:10:41 agriffis Exp $
-
-IUSE="nls bootstrap build"
-
-# NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
-#                      the manpages, but seems this is incorrect ....
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.7.ebuild,v 1.15 2004/08/14 02:27:55 vapier Exp $
 
 inherit eutils libtool flag-o-matic
 
-# Generate borked binaries.  Bug #6730
-filter-flags "-fomit-frame-pointer -fssa"
-
 DESCRIPTION="Tools necessary to build programs"
+HOMEPAGE="http://sources.redhat.com/binutils/"
 SRC_URI="mirror://kernel/linux/devel/binutils/${P}.tar.bz2
 	mirror://kernel/linux/devel/binutils/test/${P}.tar.bz2"
-HOMEPAGE="http://sources.redhat.com/binutils/"
 
-SLOT="0"
 LICENSE="GPL-2 | LGPL-2"
+SLOT="0"
 KEYWORDS="~amd64 ~x86 -ppc ~alpha ~sparc ~mips -hppa ~ia64"
+IUSE="nls bootstrap build"
 
 DEPEND="virtual/libc
 	nls? ( sys-devel/gettext )
 	!build? ( !bootstrap? ( dev-lang/perl ) )"
 
-
 src_unpack() {
-
 	unpack ${A}
 
 	cd ${S}
@@ -75,6 +66,9 @@ src_unpack() {
 }
 
 src_compile() {
+	# Generate borked binaries.  Bug #6730
+	filter-flags -fomit-frame-pointer -fssa
+
 	local myconf=
 
 	use nls && \
diff --git a/sys-devel/binutils/binutils-2.14.90.0.8-r1.ebuild b/sys-devel/binutils/binutils-2.14.90.0.8-r1.ebuild
index 6225e6588eb0..9d04f3129736 100644
--- a/sys-devel/binutils/binutils-2.14.90.0.8-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.14.90.0.8-r1.ebuild
@@ -1,14 +1,10 @@
 # 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.14.90.0.8-r1.ebuild,v 1.18 2004/07/03 09:13:09 kloeri Exp $
-
-# NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
-#                      the manpages, but seems this is incorrect ....
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.8-r1.ebuild,v 1.19 2004/08/14 02:27:55 vapier Exp $
 
 inherit eutils libtool flag-o-matic
 
 PATCHVER="1.2"
-
 DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="http://sources.redhat.com/binutils/"
 SRC_URI="mirror://kernel/linux/devel/binutils/${P}.tar.bz2
@@ -52,7 +48,7 @@ src_unpack() {
 
 src_compile() {
 	# Generate borked binaries.  Bug #6730
-	filter-flags "-fomit-frame-pointer -fssa"
+	filter-flags -fomit-frame-pointer -fssa
 
 	local myconf=
 	[ ! -z "${CBUILD}" ] && myconf="--build=${CBUILD}"
diff --git a/sys-devel/binutils/binutils-2.14.90.0.8-r2.ebuild b/sys-devel/binutils/binutils-2.14.90.0.8-r2.ebuild
index 1684491fe080..3ddb03d95ff5 100644
--- a/sys-devel/binutils/binutils-2.14.90.0.8-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.14.90.0.8-r2.ebuild
@@ -1,14 +1,10 @@
 # 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.14.90.0.8-r2.ebuild,v 1.9 2004/07/22 12:27:08 solar Exp $
-
-# NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
-#                      the manpages, but seems this is incorrect ....
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.8-r2.ebuild,v 1.10 2004/08/14 02:27:55 vapier Exp $
 
 inherit eutils libtool flag-o-matic gnuconfig
 
 PATCHVER="1.3"
-
 DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="http://sources.redhat.com/binutils/"
 SRC_URI="mirror://kernel/linux/devel/binutils/${P}.tar.bz2
@@ -58,8 +54,8 @@ src_unpack() {
 }
 
 src_compile() {
-	# Generate borked binaries.  Bug #6730, #27456
-	filter-flags "-fomit-frame-pointer" "-fssa" "-freduce-all-givs"
+	# Generate borked binaries.  Bug #6730
+	filter-flags -fomit-frame-pointer -fssa -freduce-all-givs
 
 	gnuconfig_update
 
diff --git a/sys-devel/binutils/binutils-2.14.90.0.8.ebuild b/sys-devel/binutils/binutils-2.14.90.0.8.ebuild
index cd900088675a..6a68384024aa 100644
--- a/sys-devel/binutils/binutils-2.14.90.0.8.ebuild
+++ b/sys-devel/binutils/binutils-2.14.90.0.8.ebuild
@@ -1,36 +1,26 @@
 # 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.14.90.0.8.ebuild,v 1.10 2004/07/15 03:10:41 agriffis Exp $
-
-IUSE="nls bootstrap build"
-
-# NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
-#                      the manpages, but seems this is incorrect ....
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.8.ebuild,v 1.11 2004/08/14 02:27:55 vapier Exp $
 
 inherit eutils libtool flag-o-matic
 
-# Generate borked binaries.  Bug #6730
-filter-flags "-fomit-frame-pointer -fssa"
-
 PATCHVER="1.1"
-
 DESCRIPTION="Tools necessary to build programs"
+HOMEPAGE="http://sources.redhat.com/binutils/"
 SRC_URI="mirror://kernel/linux/devel/binutils/${P}.tar.bz2
 	mirror://kernel/linux/devel/binutils/test/${P}.tar.bz2
 	mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2"
-HOMEPAGE="http://sources.redhat.com/binutils/"
 
-SLOT="0"
 LICENSE="GPL-2 | LGPL-2"
+SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc ~alpha ~sparc -mips ~hppa ~ia64 ~ppc64"
+IUSE="nls bootstrap build"
 
 DEPEND="virtual/libc
 	nls? ( sys-devel/gettext )
 	!build? ( !bootstrap? ( dev-lang/perl ) )"
 
-
 src_unpack() {
-
 	unpack ${A}
 
 	cd ${S}
@@ -57,6 +47,9 @@ src_unpack() {
 }
 
 src_compile() {
+	# Generate borked binaries.  Bug #6730
+	filter-flags -fomit-frame-pointer -fssa -freduce-all-givs
+
 	local myconf=
 
 	use nls && \
diff --git a/sys-devel/binutils/binutils-2.15.90.0.1.1-r1.ebuild b/sys-devel/binutils/binutils-2.15.90.0.1.1-r1.ebuild
index 005c78fa1905..2a36de1f3393 100644
--- a/sys-devel/binutils/binutils-2.15.90.0.1.1-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.15.90.0.1.1-r1.ebuild
@@ -1,14 +1,10 @@
 # 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.90.0.1.1-r1.ebuild,v 1.6 2004/07/02 09:31:17 eradicator Exp $
-
-# NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
-#                      the manpages, but seems this is incorrect ....
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.90.0.1.1-r1.ebuild,v 1.7 2004/08/14 02:27:55 vapier Exp $
 
 inherit eutils libtool flag-o-matic
 
 PATCHVER="1.1"
-
 DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="http://sources.redhat.com/binutils/"
 SRC_URI="mirror://kernel/linux/devel/binutils/${P}.tar.bz2
@@ -53,7 +49,7 @@ src_unpack() {
 
 src_compile() {
 	# Generate borked binaries.  Bug #6730
-	filter-flags "-fomit-frame-pointer -fssa"
+	filter-flags -fomit-frame-pointer -fssa -freduce-all-givs
 
 	local myconf=
 	[ ! -z "${CBUILD}" ] && myconf="--build=${CBUILD}"
diff --git a/sys-devel/binutils/binutils-2.15.90.0.1.1-r3.ebuild b/sys-devel/binutils/binutils-2.15.90.0.1.1-r3.ebuild
index 32a77d33bc57..9e9e77da93a7 100644
--- a/sys-devel/binutils/binutils-2.15.90.0.1.1-r3.ebuild
+++ b/sys-devel/binutils/binutils-2.15.90.0.1.1-r3.ebuild
@@ -1,14 +1,10 @@
 # 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.90.0.1.1-r3.ebuild,v 1.6 2004/07/02 09:31:17 eradicator Exp $
-
-# NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
-#                      the manpages, but seems this is incorrect ....
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.90.0.1.1-r3.ebuild,v 1.7 2004/08/14 02:27:55 vapier Exp $
 
 inherit eutils libtool flag-o-matic
 
 PATCHVER="1.3"
-
 DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="http://sources.redhat.com/binutils/"
 SRC_URI="mirror://kernel/linux/devel/binutils/${P}.tar.bz2
@@ -53,7 +49,7 @@ src_unpack() {
 
 src_compile() {
 	# Generate borked binaries.  Bug #6730
-	filter-flags "-fomit-frame-pointer -fssa"
+	filter-flags -fomit-frame-pointer -fssa
 
 	local myconf=
 	[ ! -z "${CBUILD}" ] && myconf="--build=${CBUILD}"
diff --git a/sys-devel/binutils/binutils-2.15.90.0.3-r3.ebuild b/sys-devel/binutils/binutils-2.15.90.0.3-r3.ebuild
index c1c2c985cb79..e50800723df7 100644
--- a/sys-devel/binutils/binutils-2.15.90.0.3-r3.ebuild
+++ b/sys-devel/binutils/binutils-2.15.90.0.3-r3.ebuild
@@ -1,14 +1,10 @@
 # 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.90.0.3-r3.ebuild,v 1.8 2004/07/02 09:31:17 eradicator Exp $
-
-# NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
-#                      the manpages, but seems this is incorrect ....
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.90.0.3-r3.ebuild,v 1.9 2004/08/14 02:27:55 vapier Exp $
 
 inherit eutils libtool flag-o-matic
 
 PATCHVER="1.3"
-
 DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="http://sources.redhat.com/binutils/"
 SRC_URI="mirror://kernel/linux/devel/binutils/${P}.tar.bz2
diff --git a/sys-devel/binutils/binutils-2.15.91.0.1-r1.ebuild b/sys-devel/binutils/binutils-2.15.91.0.1-r1.ebuild
index a9c0fe8b17cb..be2e266527dc 100644
--- a/sys-devel/binutils/binutils-2.15.91.0.1-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.15.91.0.1-r1.ebuild
@@ -1,14 +1,10 @@
 # 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.91.0.1-r1.ebuild,v 1.7 2004/07/24 17:45:54 lv Exp $
-
-# NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
-#                      the manpages, but seems this is incorrect ....
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.91.0.1-r1.ebuild,v 1.8 2004/08/14 02:27:55 vapier Exp $
 
 inherit eutils libtool flag-o-matic
 
 PATCHVER="1.1"
-
 DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="http://sources.redhat.com/binutils/"
 SRC_URI="mirror://kernel/linux/devel/binutils/${P}.tar.bz2
diff --git a/sys-devel/binutils/binutils-2.15.91.0.1-r2.ebuild b/sys-devel/binutils/binutils-2.15.91.0.1-r2.ebuild
index 637322dbf499..461d744a0807 100644
--- a/sys-devel/binutils/binutils-2.15.91.0.1-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.15.91.0.1-r2.ebuild
@@ -1,14 +1,10 @@
 # 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.91.0.1-r2.ebuild,v 1.6 2004/07/15 03:10:41 agriffis Exp $
-
-# NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
-#                      the manpages, but seems this is incorrect ....
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.91.0.1-r2.ebuild,v 1.7 2004/08/14 02:27:55 vapier Exp $
 
 inherit eutils libtool flag-o-matic gnuconfig
 
 PATCHVER="1.3"
-
 DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="http://sources.redhat.com/binutils/"
 SRC_URI="mirror://kernel/linux/devel/binutils/${P}.tar.bz2
diff --git a/sys-devel/binutils/binutils-2.15.91.0.1.ebuild b/sys-devel/binutils/binutils-2.15.91.0.1.ebuild
index e222f8946fde..9281149ea82e 100644
--- a/sys-devel/binutils/binutils-2.15.91.0.1.ebuild
+++ b/sys-devel/binutils/binutils-2.15.91.0.1.ebuild
@@ -1,14 +1,10 @@
 # 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.91.0.1.ebuild,v 1.4 2004/07/02 09:31:17 eradicator Exp $
-
-# NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
-#                      the manpages, but seems this is incorrect ....
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.91.0.1.ebuild,v 1.5 2004/08/14 02:27:55 vapier Exp $
 
 inherit eutils libtool flag-o-matic
 
 PATCHVER="1.0"
-
 DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="http://sources.redhat.com/binutils/"
 SRC_URI="mirror://kernel/linux/devel/binutils/${P}.tar.bz2
diff --git a/sys-devel/binutils/binutils-2.15.91.0.2.ebuild b/sys-devel/binutils/binutils-2.15.91.0.2.ebuild
index 772012a889a5..045ba0ff3a50 100644
--- a/sys-devel/binutils/binutils-2.15.91.0.2.ebuild
+++ b/sys-devel/binutils/binutils-2.15.91.0.2.ebuild
@@ -1,14 +1,10 @@
 # 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.91.0.2.ebuild,v 1.4 2004/08/11 15:57:28 lv Exp $
-
-# NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
-#                      the manpages, but seems this is incorrect ....
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.91.0.2.ebuild,v 1.5 2004/08/14 02:27:55 vapier Exp $
 
 inherit eutils libtool flag-o-matic gnuconfig
 
 PATCHVER="1.3"
-
 DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="http://sources.redhat.com/binutils/"
 SRC_URI="mirror://kernel/linux/devel/binutils/${P}.tar.bz2