new version; cleanup

8 files changed, 30 insertions, 178 deletions

diff --git a/sys-devel/binutils/ChangeLog b/sys-devel/binutils/ChangeLog
index e37358e784fb..9da915ec8080 100644
--- a/sys-devel/binutils/ChangeLog
+++ b/sys-devel/binutils/ChangeLog
@@ -1,6 +1,8 @@
 # ChangeLog for sys-devel/binutils
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/ChangeLog,v 1.2 2002/03/12 13:48:37 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/ChangeLog,v 1.3 2002/03/21 17:17:54 azarah Exp $
+
+*binutils-2.12.90.0.1 (21 Mar 2002)
 
 *binutils-2.11.92.0.12.3-r2 (12 Mar 2002)
 
diff --git a/sys-devel/binutils/binutils-2.11.90.0.7.ebuild b/sys-devel/binutils/binutils-2.11.90.0.7.ebuild
deleted file mode 100644
index be5579432659..000000000000
--- a/sys-devel/binutils/binutils-2.11.90.0.7.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: System Team <system@gentoo.org>
-# Author: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.11.90.0.7.ebuild,v 1.4 2001/09/10 16:54:13 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Tools necessary to build programs"
-SRC_URI="http://ftp.kernel.org/pub/linux/devel/binutils/${P}.tar.gz"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
-	./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} --without-included-gettext || die
-    if [ "`use static`" ]
-    then
-        emake -e LDFLAGS=-all-static || die
-    else
-	    emake || die
-    fi
-}
-
-src_install() {
-	make prefix=${D}/usr mandir=${D}/usr/share/man install || die
-    #c++filt is included with gcc -- what are these GNU people thinking?
-	rm ${D}/usr/bin/c++filt ${D}/usr/share/man/man1/c++filt*
-	
-	#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
-	
-	#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
-	cd ${S}
-	if [ -z "`use build`" ]
-    then
-	    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*
-    else
-        rm -rf ${D}/usr/share/man
-    fi
-}
-
-
-
diff --git a/sys-devel/binutils/binutils-2.11.92.0.12.3.ebuild b/sys-devel/binutils/binutils-2.11.92.0.12.3.ebuild
deleted file mode 100644
index ad737eea2838..000000000000
--- a/sys-devel/binutils/binutils-2.11.92.0.12.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: System Team <system@gentoo.org>
-# Author: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.11.92.0.12.3.ebuild,v 1.1 2001/12/22 05:10:25 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Tools necessary to build programs"
-SRC_URI="http://ftp.kernel.org/pub/linux/devel/binutils/${P}.tar.bz2"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
-	local myconf
-	if [ -z "`use nls`" ]
-	then
-		myconf="--disable-nls"
-	fi
-	./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} ${myconf} || die
-	if [ "`use static`" ]
-	then
-		emake -e LDFLAGS=-all-static || die
-	else
-		emake || die
-	fi
-}
-
-src_install() {
-	make prefix=${D}/usr mandir=${D}/usr/share/man install || die
-    #c++filt is included with gcc -- what are these GNU people thinking?
-	rm ${D}/usr/bin/c++filt ${D}/usr/share/man/man1/c++filt*
-	
-	#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
-	
-	#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
-	cd ${S}
-	if [ -z "`use build`" ]
-    then
-	    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*
-    else
-        rm -rf ${D}/usr/share/man
-    fi
-	
-}
-
-
-
diff --git a/sys-devel/binutils/binutils-2.11.92.0.12.3-r1.ebuild b/sys-devel/binutils/binutils-2.12.90.0.1.ebuild
index 3f9fd4edfdfc..bdf05a011e96 100644
--- a/sys-devel/binutils/binutils-2.11.92.0.12.3-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.12.90.0.1.ebuild
@@ -1,36 +1,45 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: System Team <system@gentoo.org>
 # Author: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.11.92.0.12.3-r1.ebuild,v 1.2 2001/12/27 02:43:17 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.12.90.0.1.ebuild,v 1.1 2002/03/21 17:17:54 azarah Exp $
+
+# NOTE to Maintainer:  it no longer use perl to build the manpages.
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Tools necessary to build programs"
-SRC_URI="http://ftp.kernel.org/pub/linux/devel/binutils/${P}.tar.bz2 http://www.ibiblio.org/gentoo/distfiles/${PN}-manpages-${PV}.tar.bz2"
-DEPEND="virtual/glibc"
+SRC_URI="http://ftp.kernel.org/pub/linux/devel/binutils/${P}.tar.bz2"
+
+DEPEND="virtual/glibc
+	>=sys-devel/automake-1.6
+	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.
-	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"
+
+	# DO NOT LIBTOOLIZE, AS BINUTILS COME WITH ITS OWN VERSION
+	# OF LIBTOOL!!!!!!!
+
 	./configure --enable-shared \
 		--enable-64-bit-bfd \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--host=${CHOST} \
-		--without-included-gettext || die
+		${myconf} || die
 		
 	if [ "`use static`" ]
 	then
+		make headers -C bfd CFLAGS=-O || die
 		emake -e LDFLAGS=-all-static || die
 	else
+		make headers -C bfd CFLAGS=-O || die
 		emake || die
 	fi
 
@@ -44,7 +53,11 @@ src_compile() {
 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!
@@ -75,9 +88,6 @@ src_install() {
 	cd ${S}
 	if [ -z "`use build`" ]
 	then
-		#install info pages
-		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
@@ -94,12 +104,8 @@ src_install() {
 		docinto opcodes
 		dodoc opcodes/ChangeLog*
 		#install pre-generated manpages
-		rm -f ${D}/usr/share/man/man1/*
-		doman ${S}/man/*.1
 	else
 		rm -rf ${D}/usr/share/man
 	fi
 }
 
-
-
diff --git a/sys-devel/binutils/files/digest-binutils-2.11.90.0.7 b/sys-devel/binutils/files/digest-binutils-2.11.90.0.7
deleted file mode 100644
index 9e405060e310..000000000000
--- a/sys-devel/binutils/files/digest-binutils-2.11.90.0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d80bb57a83a38d77daf40d45379053ed binutils-2.11.90.0.7.tar.gz 9508595
diff --git a/sys-devel/binutils/files/digest-binutils-2.11.92.0.12.3 b/sys-devel/binutils/files/digest-binutils-2.11.92.0.12.3
deleted file mode 100644
index ce10b0860667..000000000000
--- a/sys-devel/binutils/files/digest-binutils-2.11.92.0.12.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 14e7d6e283326662d7287d8cba47cc58 binutils-2.11.92.0.12.3.tar.bz2 8099613
diff --git a/sys-devel/binutils/files/digest-binutils-2.11.92.0.12.3-r1 b/sys-devel/binutils/files/digest-binutils-2.11.92.0.12.3-r1
deleted file mode 100644
index cda554e3e27f..000000000000
--- a/sys-devel/binutils/files/digest-binutils-2.11.92.0.12.3-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 14e7d6e283326662d7287d8cba47cc58 binutils-2.11.92.0.12.3.tar.bz2 8099613
-MD5 eb31a229238366e29387fe8332816ccf binutils-manpages-2.11.92.0.12.3.tar.bz2 52062
diff --git a/sys-devel/binutils/files/digest-binutils-2.12.90.0.1 b/sys-devel/binutils/files/digest-binutils-2.12.90.0.1
new file mode 100644
index 000000000000..3d2a8e73042c
--- /dev/null
+++ b/sys-devel/binutils/files/digest-binutils-2.12.90.0.1
@@ -0,0 +1 @@
+MD5 426c30debcb338cb2dcad2f7ec7e61e7 binutils-2.12.90.0.1.tar.bz2 8716103