Revbump to fix a problem when choosing the reference file for touch on crosscompilers and let postinst fix spec->specs in the conf files.

(Portage version: 2.0.53_rc3)

6 files changed, 66 insertions, 14 deletions

diff --git a/app-admin/eselect-compiler/ChangeLog b/app-admin/eselect-compiler/ChangeLog
index 7f0042340ac7..955cb1345126 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.5 2005/10/05 08:24:29 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-compiler/ChangeLog,v 1.6 2005/10/05 09:08:08 eradicator Exp $
+
+*eselect-compiler-2.0.0_beta2-r1 (05 Oct 2005)
+
+  05 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/eselect-compiler-2.0.0_beta2-ref.patch,
+  +files/eselect-compiler-2.0.0_beta2-specs.patch,
+  -eselect-compiler-2.0.0_beta2.ebuild,
+  +eselect-compiler-2.0.0_beta2-r1.ebuild:
+  Revbump to fix a problem when choosing the reference file for touch on
+  crosscompilers and let postinst fix spec->specs in the conf files.
 
   05 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
   eselect-compiler-2.0.0_beta2.ebuild:
diff --git a/app-admin/eselect-compiler/Manifest b/app-admin/eselect-compiler/Manifest
index 5392e7ca2cb1..d789bd2e833a 100644
--- a/app-admin/eselect-compiler/Manifest
+++ b/app-admin/eselect-compiler/Manifest
@@ -1,14 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 26ab8354ce0d692d3e94c5cb8cfdc15d ChangeLog 1215
+MD5 a8a8250bbbaaef397aef9d336c8a24e5 eselect-compiler-2.0.0_beta2-r1.ebuild 1691
 MD5 98e03aec8bef842f5c2eb3b44f7b12c2 eselect-compiler-2.0.0_beta2.ebuild 1439
 MD5 c7cf3a3617d90adfaacc7c2c012ddfb0 files/digest-eselect-compiler-2.0.0_beta2 79
+MD5 c7cf3a3617d90adfaacc7c2c012ddfb0 files/digest-eselect-compiler-2.0.0_beta2-r1 79
+MD5 381e44a2470aea23417bf589716517f0 files/eselect-compiler-2.0.0_beta2-ref.patch 836
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDQ43iOpjtAl+gMRURAgMWAJ982AmRiiX1Ve/uvojslmH1HDXHFwCfaek3
-A0AsrmsZT1WKlXVHXx09IWQ=
-=dW6C
------END PGP SIGNATURE-----
diff --git a/app-admin/eselect-compiler/eselect-compiler-2.0.0_beta2.ebuild b/app-admin/eselect-compiler/eselect-compiler-2.0.0_beta2-r1.ebuild
index 6de0627f4f5c..f11f8cb3b980 100644
--- a/app-admin/eselect-compiler/eselect-compiler-2.0.0_beta2.ebuild
+++ b/app-admin/eselect-compiler/eselect-compiler-2.0.0_beta2-r1.ebuild
@@ -1,6 +1,8 @@
 # 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.ebuild,v 1.3 2005/10/05 08:24:29 eradicator Exp $
+# $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 $
+
+inherit eutils
 
 DESCRIPTION="Utility to configure the active toolchain compiler"
 HOMEPAGE="http://www.gentoo.org/"
@@ -18,10 +20,17 @@ IUSE=""
 
 RDEPEND="app-admin/eselect"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-ref.patch
+	epatch ${FILESDIR}/${P}-specs.patch
+}
+
 pkg_postinst() {
-	# Some toolchain.eclass installed confs on amd64 had chost instead of
-	# ctarget.
+	# Some toolchain.eclass installed confs aren't quite right
 	sed -i 's:chost:ctarget:g' ${ROOT}/etc/eselect/compiler/*
+	sed -i 's:spec=:specs=:g' ${ROOT}/etc/eselect/compiler/*
 
 	# Migrate from the old configs
 	if [[ ! -f "${ROOT}/etc/eselect/compiler/selection.conf" ]] ; then
@@ -38,6 +47,9 @@ pkg_postinst() {
 	if rm -f ${ROOT}/etc/env.d/05gcc* &> /dev/null ; then
 		ewarn "You should source /etc/profile in your open shells."
 	fi
+
+	ewarn "Thanks for beta testing eselect-compiler.  If you have any problems,"
+	ewarn "please contact eradicator@gentoo.org."
 }
 
 src_install() {
diff --git a/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_beta2 b/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_beta2-r1
index 72093159868e..72093159868e 100644
--- a/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_beta2
+++ b/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_beta2-r1
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
new file mode 100644
index 000000000000..bf0d3599dead
--- /dev/null
+++ b/app-admin/eselect-compiler/files/eselect-compiler-2.0.0_beta2-ref.patch
@@ -0,0 +1,24 @@
+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
new file mode 100644
index 000000000000..218cb6d3d2da
--- /dev/null
+++ b/app-admin/eselect-compiler/files/eselect-compiler-2.0.0_beta2-specs.patch
@@ -0,0 +1,13 @@
+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