- 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>

4 files changed, 223 insertions, 17 deletions

diff --git a/sys-devel/binutils/ChangeLog b/sys-devel/binutils/ChangeLog
index 9c4844d2e350..5f6bc5356587 100644
--- a/sys-devel/binutils/ChangeLog
+++ b/sys-devel/binutils/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for sys-devel/binutils
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/ChangeLog,v 1.110 2004/04/16 03:33:03 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/ChangeLog,v 1.111 2004/04/19 04:24:06 solar Exp $
+
+*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)
 
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index dc039ec37fac..e4cb26a19b03 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -1,4 +1,4 @@
-MD5 f4f7f65654ac566ac4ca0072d3e4fbbd ChangeLog 23947
+MD5 4418f9e4a7ded8f0660a8b3e6dd137ec ChangeLog 25315
 MD5 da40f04058c215a45279b51798b1084e binutils-2.11.92.0.12.3-r2.ebuild 3044
 MD5 531a75f2ef944442c80e56c440128051 binutils-2.11.92.0.7.ebuild 2322
 MD5 e83ad71e707b1d349c3ddf14f8d1e0fd binutils-2.12.90.0.15.ebuild 3471
@@ -15,36 +15,38 @@ MD5 cd55b1922435995136269daf5f7a9561 binutils-2.14.90.0.6-r7.ebuild 6708
 MD5 ed2d18cc790be6727df44072d0be509e binutils-2.14.90.0.7-r1.ebuild 5618
 MD5 54deee8e1088849d9b9cac2d7c27b89c binutils-2.14.90.0.7-r2.ebuild 6161
 MD5 c59106cd38ab0015e047e65272f488aa binutils-2.14.90.0.7-r3.ebuild 6193
+MD5 b379f7283cd9fbfac3a5f6b75cc23391 binutils-2.14.90.0.8-r1.ebuild 4621
 MD5 56ab0258822da49a2de67ed22cab0a1c binutils-2.14.90.0.7-r4.ebuild 6432
 MD5 dc88d8907839908aa761867bf0b60e03 binutils-2.14.90.0.7.ebuild 5566
-MD5 b379f7283cd9fbfac3a5f6b75cc23391 binutils-2.14.90.0.8-r1.ebuild 4621
 MD5 708ab7fe6d7c57bd30019260d5cb6627 binutils-2.14.90.0.8.ebuild 4586
-MD5 ca82c6101c9d63f85e4ef891389da281 binutils-2.15.90.0.1.1.ebuild 4496
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 127090927e452b7f828e38b0610887d6 binutils-2.15.90.0.3-r1.ebuild 4854
+MD5 ca82c6101c9d63f85e4ef891389da281 binutils-2.15.90.0.1.1.ebuild 4496
 MD5 0fee1b2d003112814884b0701639fad3 binutils-2.15.90.0.3.ebuild 4487
 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 e3effee7a8054f5e0344034c596cb6fc files/binutils-2.14.amd64-32bit-path-fix.patch 456
 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 6c32de9a9503293bb03048f09dadc182 files/digest-binutils-2.11.92.0.7 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 bac15ed517ba3cc1eb3c08f463654aad files/digest-binutils-2.14.90.0.2 75
 MD5 c2028bfe76e16c23a00a4ad36a5a36f2 files/digest-binutils-2.14.90.0.4.1-r1 77
 MD5 f2fca878c36319fd0efd1606f4baf24e files/digest-binutils-2.14.90.0.5-r1 75
+MD5 3b32997c2ca6b9893839c439e077e82d files/digest-binutils-2.14.90.0.6-r7 75
 MD5 3b32997c2ca6b9893839c439e077e82d files/digest-binutils-2.14.90.0.6-r2 75
 MD5 3b32997c2ca6b9893839c439e077e82d files/digest-binutils-2.14.90.0.6-r3 75
-MD5 3b32997c2ca6b9893839c439e077e82d files/digest-binutils-2.14.90.0.6-r6 75
-MD5 3b32997c2ca6b9893839c439e077e82d files/digest-binutils-2.14.90.0.6-r7 75
+MD5 e3effee7a8054f5e0344034c596cb6fc files/binutils-2.14.amd64-32bit-path-fix.patch 456
 MD5 c19b60c5d77c4e0779d7820598b3b749 files/digest-binutils-2.14.90.0.7 75
 MD5 c19b60c5d77c4e0779d7820598b3b749 files/digest-binutils-2.14.90.0.7-r1 75
+MD5 3b32997c2ca6b9893839c439e077e82d files/digest-binutils-2.14.90.0.6-r6 75
 MD5 c19b60c5d77c4e0779d7820598b3b749 files/digest-binutils-2.14.90.0.7-r2 75
 MD5 c19b60c5d77c4e0779d7820598b3b749 files/digest-binutils-2.14.90.0.7-r3 75
 MD5 c19b60c5d77c4e0779d7820598b3b749 files/digest-binutils-2.14.90.0.7-r4 75
 MD5 4f815f7f13b34c24939c85733607774b files/digest-binutils-2.14.90.0.8 159
 MD5 6ad0d5c00d70532cdb821e34bbc26335 files/digest-binutils-2.14.90.0.8-r1 159
+MD5 350e8ea087f24304388e51538150b406 files/digest-binutils-2.15.90.0.3-r1 159
 MD5 21961bde2db100f277e5afea4ab62556 files/digest-binutils-2.15.90.0.1.1 161
 MD5 7f980af71d28ef3f5f62dcd1153d66d6 files/digest-binutils-2.15.90.0.3 159
 MD5 b811d65855a74369e0faccf7574b886b files/2.13/binutils-2.13.90.0.10-glibc21.patch 2931
@@ -93,8 +95,8 @@ MD5 f8d0738db8174c369f4f3a6185d8f76b files/2.14/binutils-2.14.90.0.4-ppc64-ctors
 MD5 5fa7bd6f7e2c4fa50b74367a85f37541 files/2.14/binutils-2.14.90.0.4-ppc64-prelink.patch 4721
 MD5 e6f5f65fe3a3998c3c2845b92eef79e8 files/2.14/binutils-2.14.90.0.4-pt-gnu-stack.patch 8453
 MD5 e941bf2e41367989d389e2988672f87a files/2.14/binutils-2.14.90.0.4-sparc-nonpic.patch 3147
+MD5 03d6c934577cf40ec75b41bfc38b48a0 files/2.14/binutils-mips-openssl-got-fix.patch 540
 MD5 09fbb09e0296aab8c563a76fbfe88acb files/2.14/binutils-2.14.90.0.5-eh-frame-ro.patch 14717
-MD5 3e14abfac76ec336c6859ad6cdd34ddd files/2.14/binutils-2.14.90.0.5-place-orphan.patch 1870
 MD5 9c5337bbe0b341173304747c1c9279e9 files/2.14/binutils-2.14.90.0.5-ppc64-elfvsb.patch 899
 MD5 ac3d7aa7ac1ff2a7f6979482506a4346 files/2.14/binutils-2.14.90.0.5-ppc64-fdesc.patch 962
 MD5 0d4022656708019a1b010c69dbf2442b files/2.14/binutils-2.14.90.0.5-ppc64-ldr.patch 825
@@ -102,21 +104,21 @@ MD5 8b2e5222b6be2949bad3c41f65a80ec8 files/2.14/binutils-2.14.90.0.5-ppc64-mask.
 MD5 c1a6d53bb2eb89124a74f47b0bca0b89 files/2.14/binutils-2.14.90.0.5-ppc64-pie.patch 581
 MD5 bd68995fbb6476d0ebaded68d3b0cd19 files/2.14/binutils-2.14.90.0.5-ppc64-power4.patch 560
 MD5 d5afbb421242988c33551fdb2054581b files/2.14/binutils-2.14.90.0.5-s390-pie.patch 2016
-MD5 16fb9c43491e0ce0d22c9cba008ca983 files/2.14/binutils-2.14.90.0.6-bfd-elf-interp-3.patch 637
-MD5 2bc2ff3c3e1b608f1c3776246a5000c1 files/2.14/binutils-2.14.90.0.6-bfd-elf-interp-4.patch 1284
-MD5 f9b9a43d7cd42c79b7f8144c6611f31c files/2.14/binutils-2.14.90.0.6-bfd-elf-interp.patch 391
-MD5 951847a76c7f1ad39d4eb7eeff4b9ca2 files/2.14/binutils-2.14.90.0.6-cxx-speedup.patch 24221
-MD5 559bf684bf26c292862d4287f047111c files/2.14/binutils-2.14.90.0.6-dont-crash-on-null-owner.patch 822
-MD5 e3d1a3d9743bd5831241af6920bef2ee files/2.14/binutils-2.14.90.0.6-eh-frame-ro-2.patch 14702
+MD5 3e14abfac76ec336c6859ad6cdd34ddd files/2.14/binutils-2.14.90.0.5-place-orphan.patch 1870
 MD5 09de3fa664f792872af4d6a029909315 files/2.14/binutils-2.14.90.0.6-eh-frame-ro.patch 14503
+MD5 559bf684bf26c292862d4287f047111c files/2.14/binutils-2.14.90.0.6-dont-crash-on-null-owner.patch 822
+MD5 951847a76c7f1ad39d4eb7eeff4b9ca2 files/2.14/binutils-2.14.90.0.6-cxx-speedup.patch 24221
 MD5 8ca75664936a5e5043c6036bacbf88dc files/2.14/binutils-2.14.90.0.6-hppa-static.diff 2764
+MD5 f9b9a43d7cd42c79b7f8144c6611f31c files/2.14/binutils-2.14.90.0.6-bfd-elf-interp.patch 391
+MD5 e3d1a3d9743bd5831241af6920bef2ee files/2.14/binutils-2.14.90.0.6-eh-frame-ro-2.patch 14702
 MD5 08c39dbaf6d214ea7185a7e54e517445 files/2.14/binutils-2.14.90.0.6-ia64-howto.patch 2130
 MD5 5646b9e2ee56e1db7b52ed0b5d8b4c9b files/2.14/binutils-2.14.90.0.6-ia64-sdata.patch 1209
 MD5 838289404188a5a7a2decc03929d3900 files/2.14/binutils-2.14.90.0.6-ia64-speedup.patch 10849
 MD5 9a8373e9701722d6f950a3e5a812254a files/2.14/binutils-2.14.90.0.6-merge-speedup.patch 20690
 MD5 3cfd8cc4e3ad518ecd23ac97b74b3e73 files/2.14/binutils-2.14.90.0.6-ppc-bfd.patch 30980
 MD5 d8d5ac89b17e62ac2e51374b05ceb9df files/2.14/binutils-2.14.90.0.6-sparc-cfi.patch 11029
-MD5 a911368168c533afc8a3292b66558b03 files/2.14/binutils-2.14.90.0.7-bfd-pt-gnu-segment-fix.patch 1130
+MD5 16fb9c43491e0ce0d22c9cba008ca983 files/2.14/binutils-2.14.90.0.6-bfd-elf-interp-3.patch 637
+MD5 2bc2ff3c3e1b608f1c3776246a5000c1 files/2.14/binutils-2.14.90.0.6-bfd-elf-interp-4.patch 1284
 MD5 8a0fb0b91441ffa6bd3bbea118d4fad8 files/2.14/binutils-2.14.90.0.7-ppc-reloc.patch 43472
 MD5 769e30e09537d7bd8539e404cc3958aa files/2.14/binutils-2.14.90.0.7-tls-section-alignment.patch 37977
-MD5 03d6c934577cf40ec75b41bfc38b48a0 files/2.14/binutils-mips-openssl-got-fix.patch 540
+MD5 a911368168c533afc8a3292b66558b03 files/2.14/binutils-2.14.90.0.7-bfd-pt-gnu-segment-fix.patch 1130
diff --git a/sys-devel/binutils/binutils-2.15.90.0.3-r1.ebuild b/sys-devel/binutils/binutils-2.15.90.0.3-r1.ebuild
new file mode 100644
index 000000000000..240940689fb6
--- /dev/null
+++ b/sys-devel/binutils/binutils-2.15.90.0.3-r1.ebuild
@@ -0,0 +1,181 @@
+# 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/binutils-2.15.90.0.3-r1.ebuild,v 1.1 2004/04/19 04:24:06 solar Exp $
+
+# NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
+#                      the manpages, but seems this is incorrect ....
+
+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
+	mirror://kernel/linux/devel/binutils/test/${P}.tar.bz2
+	mirror://gentoo/${PN}-2.15.90.0.3-patches-${PATCHVER}.tar.bz2"
+
+LICENSE="GPL-2 | LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="nls bootstrap build" ; # cross"
+
+DEPEND="virtual/glibc
+	nls? ( sys-devel/gettext )
+	!build? ( !bootstrap? ( dev-lang/perl ) )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# The prescott patch is not ready yet.
+	mkdir ${WORKDIR}/patch/skip
+	mv ${WORKDIR}/patch/05* ${WORKDIR}/patch/skip/
+
+	# w/ relro, move 20_* (replaced by 64_*), and 90_* (replaced by 63_*)
+	mv ${WORKDIR}/patch/{20,90}_* ${WORKDIR}/patch/skip/
+	# w/o relro, move 35_*, 64_* and 63_*
+	#mv ${WORKDIR}/patch/{35,63,64}_* ${WORKDIR}/patch/skip/
+
+	epatch ${WORKDIR}/patch
+
+
+	# Libtool is broken (Redhat).
+	for x in ${S}/opcodes/Makefile.{am,in}
+	do
+		cp ${x} ${x}.orig
+		gawk '
+			{
+				if ($0 ~ /LIBADD/)
+					gsub("../bfd/libbfd.la", "-L../bfd/.libs ../bfd/libbfd.la")
+
+					print
+			}' ${x}.orig > ${x}
+		rm -rf ${x}.orig
+	done
+}
+
+src_compile() {
+	# Generate borked binaries.  Bug #6730
+	filter-flags "-fomit-frame-pointer -fssa"
+
+	local myconf=
+	[ ! -z "${CBUILD}" ] && myconf="--build=${CBUILD}"
+	use nls \
+		&& myconf="${myconf} --without-included-gettext" \
+		|| myconf="${myconf} --disable-nls"
+
+	# untested functionality.
+	# use cross && myconf="${myconf} --targets-all"
+
+	# Filter CFLAGS=".. -O2 .." on arm
+	use arm && replace-flags -O? -O
+
+	# Fix /usr/lib/libbfd.la
+	elibtoolize --portage
+
+	./configure \
+		--enable-shared \
+		--enable-64-bit-bfd \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--host=${CHOST} \
+		${myconf} \
+		|| die
+
+	make configure-bfd || die
+	make headers -C bfd || die
+	emake tooldir="${ROOT}/usr/bin" all || die
+
+	if ! use build
+	then
+		if ! use bootstrap
+		then
+			# Nuke the manpages to recreate them (only use this if we have perl)
+			find . -name '*.1' -exec rm -f {} \; || :
+		fi
+		# Make the info pages (makeinfo included with gcc is used)
+		make info || die
+	fi
+}
+
+src_install() {
+	make prefix=${D}/usr \
+		mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info \
+		install || die
+
+	insinto /usr/include
+	doins include/libiberty.h
+
+	# c++filt is included with gcc -- what are these GNU people thinking?
+	# but not the manpage, so leave that!
+# We install it now, as gcc-3.3 do not have it any longer ...
+#	rm -f ${D}/usr/bin/c++filt #${D}/usr/share/man/man1/c++filt*
+
+	# By default strip has a symlink going from /usr/${CHOST}/bin/strip to
+	# /usr/bin/strip we should reverse it:
+
+	rm ${D}/usr/${CHOST}/bin/strip; mv ${D}/usr/bin/strip ${D}/usr/${CHOST}/bin/strip
+	# The strip symlink gets created in the loop below
+
+	# By default ar, as, ld, nm, ranlib and strip are in two places; create
+	# symlinks.  This will reduce the size of the tbz2 significantly.  We also
+	# move all the stuff in /usr/bin to /usr/${CHOST}/bin and create the
+	# appropriate symlinks.  Things are cleaner that way.
+	cd ${D}/usr/bin
+	local x=
+	for x in * strip
+	do
+	if [ ! -e ../${CHOST}/bin/${x} ]
+		then
+			mv ${x} ../${CHOST}/bin/${x}
+		else
+			rm -f ${x}
+		fi
+		ln -s ../${CHOST}/bin/${x} ${x}
+	done
+
+	if [ -n "${PROFILE_ARCH}" ] && \
+	   [ "${PROFILE_ARCH/64}" != "${PROFILE_ARCH}" ]
+	then
+		dosym ${CHOST} /usr/${CHOST/-/64-}
+
+		for x in `ls ${D}/usr/${CHOST}/bin/`
+		do
+			[ ! -e "${D}/usr/bin/${CHOST}-${x}" ] && \
+				dosym ../${CHOST}/bin/${x} /usr/bin/${CHOST}-${x}
+			dosym ../${CHOST}/bin/${x} /usr/bin/${CHOST/-/64-}-${x}
+		done
+	fi
+
+	cd ${S}
+	if ! use build
+	then
+		make prefix=${D}/usr \
+			mandir=${D}/usr/share/man \
+			infodir=${D}/usr/share/info \
+			install-info || die
+
+		dodoc COPYING* README
+		docinto bfd
+		dodoc bfd/ChangeLog* bfd/COPYING bfd/README bfd/PORTING bfd/TODO
+		docinto binutils
+		dodoc binutils/ChangeLog binutils/NEWS binutils/README
+		docinto gas
+		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/COPYING gas/NEWS gas/README*
+		docinto gprof
+		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO
+		docinto ld
+		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
+		docinto libiberty
+		dodoc libiberty/ChangeLog* libiberty/COPYING.LIB libiberty/README
+		docinto opcodes
+		dodoc opcodes/ChangeLog*
+		# Install pre-generated manpages .. currently we do not ...
+	else
+		rm -rf ${D}/usr/share/man
+	fi
+}
diff --git a/sys-devel/binutils/files/digest-binutils-2.15.90.0.3-r1 b/sys-devel/binutils/files/digest-binutils-2.15.90.0.3-r1
new file mode 100644
index 000000000000..87cf24cd2bd0
--- /dev/null
+++ b/sys-devel/binutils/files/digest-binutils-2.15.90.0.3-r1
@@ -0,0 +1,2 @@
+MD5 1c1af0064ebd3d7bd99905874656a21e binutils-2.15.90.0.3.tar.bz2 10703625
+MD5 438b573df10eb26e163dffd98c8b5968 binutils-2.15.90.0.3-patches-1.1.tar.bz2 56117