Use sysroot-ed path for the include dir.

Package-Manager: portage-2.1_pre7-r4

5 files changed, 28 insertions, 22 deletions

diff --git a/sys-devel/binutils-config/ChangeLog b/sys-devel/binutils-config/ChangeLog
index e301e84a3f17..934e9b1c32a4 100644
--- a/sys-devel/binutils-config/ChangeLog
+++ b/sys-devel/binutils-config/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/binutils-config
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.19 2006/03/30 13:50:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.20 2006/04/10 02:15:29 vapier Exp $
+
+*binutils-config-1.8-r7 (10 Apr 2006)
+
+  10 Apr 2006; Mike Frysinger <vapier@gentoo.org> files/binutils-config-1.8,
+  -binutils-config-1.8-r6.ebuild, +binutils-config-1.8-r7.ebuild:
+  Use sysroot-ed path for the include dir.
 
   30 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
   binutils-config-1.8-r6.ebuild:
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index db24ff2c0c39..5b29871cacdc 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 2f1393136bbae1eb82ba0e2aae6023cc ChangeLog 3545
-RMD160 6ae7fe2e8210c61216c3bb31f833e0e164319019 ChangeLog 3545
-SHA256 396de175158f1a4c772ccda60e1e6db2b3eebb78562b01bacec6ed9b429e4395 ChangeLog 3545
-MD5 bdcfb966ea96cc8dd990649559be472d binutils-config-1.8-r6.ebuild 575
-RMD160 00ea7c09d0b293d9c0091a5ae407d53a022e1ba0 binutils-config-1.8-r6.ebuild 575
-SHA256 266e308d5e79509e845d1148fae6a022cadf0a0cc31bfc23ac65806feff8fb83 binutils-config-1.8-r6.ebuild 575
-MD5 43c7ead858241a2576a39a7e5849a98c files/binutils-config-1.8 10055
-RMD160 71ecfff1daeb1b1729c89d2d0aa3030e3cf2c0e1 files/binutils-config-1.8 10055
-SHA256 8de6a37984f851b549ebf640b9aeddfffbde51010c50fb877bd8ec7f5ce05f48 files/binutils-config-1.8 10055
+MD5 44a90e28818ffabd7cb493c2e30b0346 ChangeLog 3768
+RMD160 53251c1bb872435e4f12b686c32536f905c8e059 ChangeLog 3768
+SHA256 9336115b758abb56ff8e9bff47c6d8fd922b92b694fb575c03ac21220b11b8bb ChangeLog 3768
+MD5 5c065fbfad62f4fa969c3ade59bea58a binutils-config-1.8-r7.ebuild 572
+RMD160 ad5b5a729de7841ff268e1e88a945440ccbe3b71 binutils-config-1.8-r7.ebuild 572
+SHA256 cf8484c6f46b796de428dd5ce081aa14f1babf6247430517e5d796c0c26382b3 binutils-config-1.8-r7.ebuild 572
+MD5 8063d22c39a76899105ca802cbc860ed files/binutils-config-1.8 10077
+RMD160 c5b93f82339633b0f3cc7b3a4ef222d3499e7645 files/binutils-config-1.8 10077
+SHA256 7be40114277fdd0407d20cfed827e3d42d41826bf597277dd91c55211a0af674 files/binutils-config-1.8 10077
 MD5 953efbc2a688428dfb75ecfa3c2d3d43 files/binutils-config.8 2989
 RMD160 afb26717c9466456bbbdf6a3d6b93aeb63ff9416 files/binutils-config.8 2989
 SHA256 ffc462de3eaa865f77f00e36275a0a9b0b51782d9d4d5fcfad18583a13adf6e5 files/binutils-config.8 2989
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-binutils-config-1.8-r6 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-binutils-config-1.8-r6 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-binutils-config-1.8-r6 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-binutils-config-1.8-r7 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-binutils-config-1.8-r7 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-binutils-config-1.8-r7 0
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
 SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a metadata.xml 162
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEOaGZ2+ySkm8kpY0RAsUpAJwKY6RtVX+Wvd7u5tWGLv2tbbyFGQCfclEq
-bKRoLjUjcWV/ewFy/3HX5yY=
-=d8pk
+iD8DBQFEOb/M2+ySkm8kpY0RAokCAJ0S+++vji/5Y0ZREMn8gFAbS/jd3QCfb9in
+EINejlrfZ7PiEg+EcbONdXU=
+=VP18
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/binutils-config/binutils-config-1.8-r6.ebuild b/sys-devel/binutils-config/binutils-config-1.8-r7.ebuild
index 0bc96350626b..9e397f88a1cb 100644
--- a/sys-devel/binutils-config/binutils-config-1.8-r6.ebuild
+++ b/sys-devel/binutils-config/binutils-config-1.8-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/binutils-config-1.8-r6.ebuild,v 1.2 2006/03/30 13:50:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/binutils-config-1.8-r7.ebuild,v 1.1 2006/04/10 02:15:29 vapier Exp $
 
 DESCRIPTION="Utility to change the binutils version being used"
 HOMEPAGE="http://www.gentoo.org/"
diff --git a/sys-devel/binutils-config/files/binutils-config-1.8 b/sys-devel/binutils-config/files/binutils-config-1.8
index 79a8993c5e18..27176f3f6dd8 100755
--- a/sys-devel/binutils-config/files/binutils-config-1.8
+++ b/sys-devel/binutils-config/files/binutils-config-1.8
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.8,v 1.12 2006/04/10 00:05:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.8,v 1.13 2006/04/10 02:15:29 vapier Exp $
 
 # Format of /etc/env.d/binutils/:
 #  config-TARGET:	CURRENT=version for TARGET
@@ -127,7 +127,7 @@ switch_profile() {
 		if [[ ${TARGET} == ${HOST} ]] ; then
 			dstinc=${ROOT}/usr/include
 		else
-			dstinc=${ROOT}/usr/${TARGET}/include
+			dstinc=${ROOT}/usr/${TARGET}/usr/include
 		fi
 		mkdir -p "${dstinc}"
 		for x in * ; do
@@ -193,7 +193,7 @@ uninstall_target() {
 		rm -f "${ROOT}"/usr/${TARGET}/bin/${x}
 	done
 	for x in ansidecl.h bfd.h bfdlink.h dis-asm.h symcat.h ; do
-		rm -f "${ROOT}"/usr/${TARGET}/include/${x}
+		rm -f "${ROOT}"/usr/${TARGET}/{usr/,}include/${x}
 	done
 	for x in bfd iberty opcodes ; do
 		rm -f "${ROOT}"/usr/${HOST}/${TARGET}/lib/lib${x}{{-*,}.so,.a,.la}
@@ -202,7 +202,7 @@ uninstall_target() {
 	find "${ROOT}"/usr/${TARGET}/lib -xtype l -exec rm {} \;
 	rmdir "${ROOT}"/usr/${HOST}/${TARGET}/lib "${ROOT}"/usr/${HOST}/${TARGET} 2>/dev/null
 	rm -f "${ROOT}"/usr/${TARGET}/lib/ldscripts
-	rmdir "${ROOT}"/usr/${TARGET}/{bin,include,lib} "${ROOT}"/usr/${TARGET} 2>/dev/null
+	rmdir "${ROOT}"/usr/${TARGET}/{usr/,}{bin,include,lib,usr} "${ROOT}"/usr/${TARGET} 2>/dev/null
 	rmdir "${ROOT}"/var/db/pkg/cross-${TARGET} 2>/dev/null
 
 	rm -f "${ENV_D}"/${TARGET}-*
@@ -305,7 +305,7 @@ while [[ $# -gt 0 ]] ; do
 			exit 0
 			;;
 		-v|--version)
-			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.8,v 1.12 2006/04/10 00:05:26 vapier Exp $"
+			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.8,v 1.13 2006/04/10 02:15:29 vapier Exp $"
 			cvsver=${cvsver##*binutils-config-}
 			echo "binutils-config-${cvsver%%,v *}"
 			exit 0
diff --git a/sys-devel/binutils-config/files/digest-binutils-config-1.8-r6 b/sys-devel/binutils-config/files/digest-binutils-config-1.8-r7
index e69de29bb2d1..e69de29bb2d1 100644
--- a/sys-devel/binutils-config/files/digest-binutils-config-1.8-r6
+++ b/sys-devel/binutils-config/files/digest-binutils-config-1.8-r7