From: Jeremy Huddleston <eradicator@gentoo.org>
Date: Wed, 5 Oct 2005 10:04:24 +0000 (+0000)
Subject: Fixed get_bins for cross compilers.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c731baf975d8e48ede220fa6dda8094bf39199d2;p=gentoo.git

Fixed get_bins for cross compilers.
Package-Manager: portage-2.0.53_rc3
---

diff --git a/app-admin/eselect-compiler/ChangeLog b/app-admin/eselect-compiler/ChangeLog
index 955cb1345126..a5c418b383d2 100644
--- a/app-admin/eselect-compiler/ChangeLog
+++ b/app-admin/eselect-compiler/ChangeLog
@@ -1,6 +1,14 @@
 # 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.6 2005/10/05 09:08:08 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-compiler/ChangeLog,v 1.7 2005/10/05 10:04:24 eradicator Exp $
+
+*eselect-compiler-2.0.0_beta2-r2 (05 Oct 2005)
+
+  05 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/eselect-compiler-2.0.0_beta2-get_bins.patch,
+  -eselect-compiler-2.0.0_beta2-r1.ebuild,
+  +eselect-compiler-2.0.0_beta2-r2.ebuild:
+  Fixed get_bins for cross compilers.
 
 *eselect-compiler-2.0.0_beta2-r1 (05 Oct 2005)
 
diff --git a/app-admin/eselect-compiler/Manifest b/app-admin/eselect-compiler/Manifest
index 274e7d2be98a..90c016400b21 100644
--- a/app-admin/eselect-compiler/Manifest
+++ b/app-admin/eselect-compiler/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6e7b60299c7fb718fb0774be90f6c56d ChangeLog 1646
-MD5 5c1ff2c5d647220c1d8dc777eba12362 eselect-compiler-2.0.0_beta2-r1.ebuild 1731
-MD5 c7cf3a3617d90adfaacc7c2c012ddfb0 files/digest-eselect-compiler-2.0.0_beta2-r1 79
+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 567094e03359ffc1c95af7356395228d metadata.xml 162
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDQ5gNOpjtAl+gMRURAi1/AKDUA06dDITt6ADVcJh376GD4mvmdwCgjtiY
-mkTRbW2M5jG3+beOVrhhD/Y=
-=sXvv
+iD8DBQFDQ6U9OpjtAl+gMRURAu9IAJ4i20Gh7v3MOzBUg7KdndT9zQ1c1wCfSfJP
+89fvtyVvinOazUYRv/MLb00=
+=nSPd
 -----END PGP SIGNATURE-----
diff --git a/app-admin/eselect-compiler/eselect-compiler-2.0.0_beta2-r1.ebuild b/app-admin/eselect-compiler/eselect-compiler-2.0.0_beta2-r2.ebuild
similarity index 94%
rename from app-admin/eselect-compiler/eselect-compiler-2.0.0_beta2-r1.ebuild
rename to app-admin/eselect-compiler/eselect-compiler-2.0.0_beta2-r2.ebuild
index f11f8cb3b980..cdcc5a4ed02b 100644
--- a/app-admin/eselect-compiler/eselect-compiler-2.0.0_beta2-r1.ebuild
+++ b/app-admin/eselect-compiler/eselect-compiler-2.0.0_beta2-r2.ebuild
@@ -1,6 +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-r1.ebuild,v 1.1 2005/10/05 09:08:08 eradicator Exp $
+# $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
 
@@ -25,6 +25,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-ref.patch
 	epatch ${FILESDIR}/${P}-specs.patch
+	epatch ${FILESDIR}/${P}-get_bins.patch
 }
 
 pkg_postinst() {
diff --git a/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_beta2-r1 b/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_beta2-r2
similarity index 100%
rename from app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_beta2-r1
rename to app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_beta2-r2
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
new file mode 100644
index 000000000000..5427f047f312
--- /dev/null
+++ b/app-admin/eselect-compiler/files/eselect-compiler-2.0.0_beta2-get_bins.patch
@@ -0,0 +1,17 @@
+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