From db8f9fa6db9d9fb76bc19a486957b259267f11eb Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Sat, 20 Apr 2013 14:06:54 +0200
Subject: [PATCH] Cleanup binutils package.

---
 .../binutils/binutils-2.17_110711.recipe      | 69 +++++++------------
 1 file changed, 26 insertions(+), 43 deletions(-)

diff --git a/sys-devel/binutils/binutils-2.17_110711.recipe b/sys-devel/binutils/binutils-2.17_110711.recipe
index c89557682..0ecdbe42c 100644
--- a/sys-devel/binutils/binutils-2.17_110711.recipe
+++ b/sys-devel/binutils/binutils-2.17_110711.recipe
@@ -1,7 +1,7 @@
 SUMMARY="The GNU assembler, linker and binary utilities"
 HOMEPAGE="http://www.gnu.org/software/binutils"
 SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#9f9e588ceb7baa6bc5ac0193fb90212fc7fd667c"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86_gcc2 ?x86"
 LICENSE="
 	GNU GPL v2
@@ -69,8 +69,7 @@ BUILD()
 		--bindir=$prefix/bin --libdir=$prefix/lib \
 		--includedir=$prefix/develop/headers/binutils \
 		--mandir=$prefix/documentation/man \
-		--with-docdir=$prefix/documentation/binutils \
-		--with-htmldir=$prefix/documentation/binutils \
+		--with-htmldir=documentation/html/binutils \
 		--disable-nls --enable-shared=yes
 	make
 }
@@ -79,43 +78,37 @@ INSTALL()
 {
 	cd $binutilsObjectsDir
 	archName=$(grep '^target_alias' Makefile | cut -d= -f2)
-	
+
 	make install
 	make install-html
 
-	base=$prefix
-
 	### HTML documentation ####################################
 	
 	echo "Organizing HTML documentation..."
-	html_base=$base/documentation/binutils/html
-	mkdir -p $html_base
+	html_base=$prefix/documentation/html/binutils
 	cd $html_base
 
-	# libiberty	
-	makeinfo --html "$binutilsDir/libiberty/libiberty.texi"
-	ln -sf libiberty/index.html $html_base/libiberty.html
+	mv as.html as
+	ln -sf as/index.html as.html
+	mv bfd.html bfd
+	ln -sf bfd/index.html bfd.html
+	mv binutils.html binutils
+	ln -sf binutils/index.html binutils.html
+	mv gprof.html gprof
+	ln -sf gprof/index.html gprof.html
+	mv ld.html ld
+	ln -sf ld/index.html ld.html
+	rm standards.html
 
-	# bfd
-	mv $binutilsObjectsDir/bfd/doc/bfd.html $html_base/bfd
-	ln -sf bfd/index.html $html_base/bfd.html
-
-	# binutils
-	mv $binutilsObjectsDir/binutils/doc/binutils.html $html_base/binutils
-	ln -sf binutils/index.html $html_base/binutils.html
+	### Strip #################################################
 	
-	# gas
-	mv $binutilsObjectsDir/gas/doc/as.html $html_base/as
-	ln -sf as/index.html $html_base/as.html
-
-	# gprof
-	mv $binutilsObjectsDir/gprof/gprof.html $html_base/gprof
-	ln -sf gprof/index.html $html_base/gprof.html
-
-	# ld
-	mv $binutilsObjectsDir/ld/ld.html $html_base/ld
-	ln -sf ld/index.html $html_base/ld.html
+	echo "Strip debug info"
 
+	cd $prefix
+	find bin -type f | xargs -r strip --strip-debug
+	strip --strip-debug lib/*.a
+	strip --strip-debug $archInstallDir/$archName/bin/*
+	
 	### Symlinks ##############################################
 
 	echo "Creating required symlinks"
@@ -131,23 +124,13 @@ INSTALL()
 		mkdir -p $prefix/bin
 		ln -sfn ../$relativeArchInstallDir/$archName/bin/* .
 	fi
-	
-	### Strip #################################################
-	
-	echo "Strip debug info"
 
-	cd $base
-	strip --strip-debug i586-pc-haiku/bin/*
-	
-	### Cleanup ###############################################
+	### Cleanup #################################################
 	
 	echo "Cleanup"
-	
-	if [ -d $base/man -o -d $base/info -o -d $base/share ]; then
-		rm -rf $base/man
-		rm -rf $base/info
-		rm -rf $base/share
-	fi
+
+	cd $prefix
+	rm -rf info
 }
 
 DESCRIPTION="