Some more cross compilation fixes.

(Portage version: 2.0.53_rc3)

8 files changed, 15 insertions, 82 deletions

diff --git a/app-admin/eselect-compiler/ChangeLog b/app-admin/eselect-compiler/ChangeLog
index a5c418b383d2..63bc2c804642 100644
--- a/app-admin/eselect-compiler/ChangeLog
+++ b/app-admin/eselect-compiler/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-admin/eselect-compiler
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-compiler/ChangeLog,v 1.7 2005/10/05 10:04:24 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-compiler/ChangeLog,v 1.8 2005/10/06 00:29:46 eradicator Exp $
+
+*eselect-compiler-2.0.0_beta3 (06 Oct 2005)
+
+  06 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/eselect-compiler-2.0.0_beta2-get_bins.patch,
+  -files/eselect-compiler-2.0.0_beta2-ref.patch,
+  -files/eselect-compiler-2.0.0_beta2-specs.patch,
+  -eselect-compiler-2.0.0_beta2-r2.ebuild,
+  +eselect-compiler-2.0.0_beta3.ebuild:
+  Some more cross compilation fixes.
 
 *eselect-compiler-2.0.0_beta2-r2 (05 Oct 2005)
 
diff --git a/app-admin/eselect-compiler/Manifest b/app-admin/eselect-compiler/Manifest
index 90c016400b21..2cedde78fdb4 100644
--- a/app-admin/eselect-compiler/Manifest
+++ b/app-admin/eselect-compiler/Manifest
@@ -1,17 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 6b93305f6496bc7a24190884567ff0c7 ChangeLog 1930
-MD5 cc910404a0747b40263fc37baaba9f6f eselect-compiler-2.0.0_beta2-r2.ebuild 1771
-MD5 c7cf3a3617d90adfaacc7c2c012ddfb0 files/digest-eselect-compiler-2.0.0_beta2-r2 79
-MD5 747f5e598f70f9ae4ea66eb352e4fc21 files/eselect-compiler-2.0.0_beta2-get_bins.patch 580
-MD5 381e44a2470aea23417bf589716517f0 files/eselect-compiler-2.0.0_beta2-ref.patch 836
-MD5 bbad47da67de57c3cf780c0d0ffed175 files/eselect-compiler-2.0.0_beta2-specs.patch 471
+MD5 b245cefd06112c0fa801f5bb7a922a1b eselect-compiler-2.0.0_beta3.ebuild 1603
+MD5 8879aa2f3df6fc851071c73c7bcc2242 files/digest-eselect-compiler-2.0.0_beta3 79
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDQ6U9OpjtAl+gMRURAu9IAJ4i20Gh7v3MOzBUg7KdndT9zQ1c1wCfSfJP
-89fvtyVvinOazUYRv/MLb00=
-=nSPd
------END PGP SIGNATURE-----
diff --git a/app-admin/eselect-compiler/eselect-compiler-2.0.0_beta2-r2.ebuild b/app-admin/eselect-compiler/eselect-compiler-2.0.0_beta3.ebuild
index cdcc5a4ed02b..69a318a9a4e0 100644
--- a/app-admin/eselect-compiler/eselect-compiler-2.0.0_beta2-r2.ebuild
+++ b/app-admin/eselect-compiler/eselect-compiler-2.0.0_beta3.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-compiler/eselect-compiler-2.0.0_beta2-r2.ebuild,v 1.1 2005/10/05 10:04:24 eradicator Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-compiler/eselect-compiler-2.0.0_beta3.ebuild,v 1.1 2005/10/06 00:29:46 eradicator Exp $
 
 DESCRIPTION="Utility to configure the active toolchain compiler"
 HOMEPAGE="http://www.gentoo.org/"
@@ -20,14 +18,6 @@ IUSE=""
 
 RDEPEND="app-admin/eselect"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-ref.patch
-	epatch ${FILESDIR}/${P}-specs.patch
-	epatch ${FILESDIR}/${P}-get_bins.patch
-}
-
 pkg_postinst() {
 	# Some toolchain.eclass installed confs aren't quite right
 	sed -i 's:chost:ctarget:g' ${ROOT}/etc/eselect/compiler/*
diff --git a/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_beta2-r2 b/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_beta2-r2
deleted file mode 100644
index 72093159868e..000000000000
--- a/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_beta2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 95c13089f40f2f0e9e5ddddf021d30c4 compiler-config-2.0.0_beta2.tar.gz 116097
diff --git a/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_beta3 b/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_beta3
new file mode 100644
index 000000000000..75653c927b69
--- /dev/null
+++ b/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_beta3
@@ -0,0 +1 @@
+MD5 7ef3e6d60a258594f74810e3f5273a5f compiler-config-2.0.0_beta3.tar.gz 116249
diff --git a/app-admin/eselect-compiler/files/eselect-compiler-2.0.0_beta2-get_bins.patch b/app-admin/eselect-compiler/files/eselect-compiler-2.0.0_beta2-get_bins.patch
deleted file mode 100644
index 5427f047f312..000000000000
--- a/app-admin/eselect-compiler/files/eselect-compiler-2.0.0_beta2-get_bins.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: compiler.eselect.in
-===================================================================
---- a/src/profile-manager/compiler.eselect.in	(revision 203)
-+++ a/src/profile-manager/compiler.eselect.in	(working copy)
-@@ -90,9 +90,10 @@
- 
- 	local i=0
- 	for file in ${dir}/* ; do
--		basefile="$(basename ${file})"
-+		basefile=$(basename ${file})
-+		basefile=${basefile#${prefix}-}
- 
--		if [[ -x ${file} && ${basefile#${prefix}-} == ${basefile} ]] ; then
-+		if [[ -x ${file} && ! -h ${file} ]] && ! has ${basefile} ${retval} ; then
- 			if (( i == 0 )) ; then
- 				(( i++ ))
- 			else
diff --git a/app-admin/eselect-compiler/files/eselect-compiler-2.0.0_beta2-ref.patch b/app-admin/eselect-compiler/files/eselect-compiler-2.0.0_beta2-ref.patch
deleted file mode 100644
index bf0d3599dead..000000000000
--- a/app-admin/eselect-compiler/files/eselect-compiler-2.0.0_beta2-ref.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: compiler.eselect.in
-===================================================================
---- a/src/profile-manager/compiler.eselect.in	(revision 202)
-+++ a/src/profile-manager/compiler.eselect.in	(working copy)
-@@ -433,10 +433,17 @@
- 		# happy.  See Bug #70548 for more info.
- 		if has ${bin} ${COMPILER_CONFIG_ALIASES} ; then
- 			set_v="COMPILER_CONFIG_ALIAS_${bin}"
--			ref="${ROOT}/${COMPILER_CONFIG_BINPATH}/${!set_v}"
-+			ref="${!set_v}"
- 		else
--			ref="${ROOT}/${COMPILER_CONFIG_BINPATH}/${bin}"
-+			ref="${bin}"
- 		fi
-+
-+		if [[ -f "${ROOT}/${COMPILER_CONFIG_BINPATH}/${ref}" ]] ; then
-+			ref="${ROOT}/${COMPILER_CONFIG_BINPATH}/${ref}"
-+		else
-+			ref="${ROOT}/${COMPILER_CONFIG_BINPATH}/${ctarget}-${ref}"
-+		fi
-+
- 		cp -f "${WRAPPER}" "${bindir}/${ctarget}-${bin}"
- 		touch -r "${ref}" "${bindir}/${ctarget}-${bin}"
- 
diff --git a/app-admin/eselect-compiler/files/eselect-compiler-2.0.0_beta2-specs.patch b/app-admin/eselect-compiler/files/eselect-compiler-2.0.0_beta2-specs.patch
deleted file mode 100644
index 218cb6d3d2da..000000000000
--- a/app-admin/eselect-compiler/files/eselect-compiler-2.0.0_beta2-specs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: compiler.eselect.in
-===================================================================
---- a/src/profile-manager/compiler.eselect.in	(revision 203)
-+++ a/src/profile-manager/compiler.eselect.in	(working copy)
-@@ -678,7 +678,7 @@
- 		[[ -n ${val} ]] && echo "	ldpath=${val}" >> ${conf}
- 
- 		val=$(load_config "${file}" GCC_SPECS)
--		[[ -n ${val} ]] && echo "	spec=${val}" >> ${conf}
-+		[[ -n ${val} ]] && echo "	specs=${val}" >> ${conf}
- 
- 		echo >> ${conf}
- 	done