use emake in src_install, drop prepman since newer portage is smarter about finding...

diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass
index 561d8847986e7148be1c916bf556d4dbf126c9a3..c981a2d3a5169fd07a1f13e53300273d69acf7fa 100644 (file)
--- a/eclass/toolchain-binutils.eclass
+++ b/eclass/toolchain-binutils.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.71 2007/03/04 21:03:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.72 2007/03/24 07:11:40 vapier Exp $
 #
 # Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
 #
@@ -243,9 +243,17 @@ toolchain-binutils_src_install() {
        local x d
 
        cd "${MY_BUILDDIR}"
-       make DESTDIR="${D}" tooldir="${LIBPATH}" install || die
+       emake DESTDIR="${D}" tooldir="${LIBPATH}" install || die
        rm -rf "${D}"/${LIBPATH}/bin
 
+       # Newer versions of binutils get fancy with ${LIBPATH} #171905
+       cd "${D}"/${LIBPATH}
+       for d in ../* ; do
+               [[ ${d} == ../${BVER} ]] && continue
+               mv ${d}/* . || die
+               rmdir ${d} || die
+       done
+
        # Now we collect everything intp the proper SLOT-ed dirs
        # When something is built to cross-compile, it installs into
        # /usr/$CHOST/ by default ... we have to 'fix' that :)
@@ -267,7 +275,6 @@ toolchain-binutils_src_install() {
                mv "${D}"/${LIBPATH}/lib/* "${D}"/${LIBPATH}/
                rm -r "${D}"/${LIBPATH}/lib
        fi
-       prepman ${DATAPATH}
 
        # Insert elf2flt where appropriate
        if [[ -x ${WORKDIR}/elf2flt-${ELF2FLT_VER}/elf2flt ]] ; then