Revision bump to fix CHOST/crosscompile problems per bug #275756 and bug #303545.

Package-Manager: portage-2.2_rc83/cvs/Linux x86_64

5 files changed, 38 insertions, 9 deletions

diff --git a/sys-devel/icecream/ChangeLog b/sys-devel/icecream/ChangeLog
index 09a95a007e92..19aadb9c6196 100644
--- a/sys-devel/icecream/ChangeLog
+++ b/sys-devel/icecream/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-devel/icecream
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/ChangeLog,v 1.38 2010/09/11 12:30:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/ChangeLog,v 1.39 2010/09/18 10:24:22 scarabeus Exp $
+
+*icecream-0.9.6-r1 (18 Sep 2010)
+
+  18 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/0.9.6-crosscompile.patch, -icecream-0.9.6.ebuild,
+  +icecream-0.9.6-r1.ebuild, files/icecream-create-env:
+  Revision bump to fix CHOST/crosscompile problems per bug #275756 and bug
+  #303545.
 
 *icecream-0.9.6 (11 Sep 2010)
 
diff --git a/sys-devel/icecream/Manifest b/sys-devel/icecream/Manifest
index 858a38097edf..64dfd020a45c 100644
--- a/sys-devel/icecream/Manifest
+++ b/sys-devel/icecream/Manifest
@@ -1,10 +1,11 @@
+AUX 0.9.6-crosscompile.patch 471 RMD160 4dbea92702b7a7170e7d8593265156de75545dc2 SHA1 088469d36da0dda0861f741a92b32632f906a5c4 SHA256 b0d4f69301cac95f5e3a7a3a91b5470769144e0deb33cb1504b70ad29b8cb783
 AUX 0.9.6-symlinks.patch 614 RMD160 b6882810d96141d46d029b33bd68c29d98ec9662 SHA1 d4d0a6091533698c5b905e0ce490fc0400bfff4d SHA256 4100330fb48453abe7facecff4eb199e5285093df49d082e14050a4c30cb2dfb
 AUX icecream 1724 RMD160 2527e0a0a7c2dc37ef0d0afe64875cd2c3768b80 SHA1 6dc26e75a42571f72b913cc811abe23a15c12a28 SHA256 07b5e4645e99646e1448147ef1e30b4a50f1478b25578ba9e71c6aa2c151ca53
 AUX icecream-conf.d-verbosity.patch 463 RMD160 b08c0f5cfec00b5dcc968bac3b598892055edf6f SHA1 6adc235bb1e6b4a27e9d7610385d6bc8ef6d389d SHA256 c103468c3303809181b554b152a7ee0db041d12dd040d5196cc9da453303c957
 AUX icecream-config 1692 RMD160 2d6c85b86b2c8308c08f5876308165044195fd34 SHA1 42091716b09a2511a31981b2ae2836e9f43ac2e6 SHA256 24acbd8e5b0218ce966e78f451985f72530865f86e5a1ee2b6c92d8bf50ff66b
-AUX icecream-create-env 2083 RMD160 dacf42fe2cb7e0ff7541a37807b9a3f1be50a9ab SHA1 8ebc28004b91e93fd9aca10ce513fd5b8024cd51 SHA256 b3dc943e562deda940335e8e64d65e295f7d1cc8c47139a384979f340dedab14
+AUX icecream-create-env 2129 RMD160 7230eceda65fb955c647545ae0333d73d319eb92 SHA1 dd154e964b2e2a9b1b54e14df61a974aa3fe89e3 SHA256 8c830bbb0a59ed8a13f84afd4fac083a4984e611e9da862ebfb330dd55e434c6
 AUX icecream-gentoo-multilib.patch 1579 RMD160 35671f69f782e326749f8ff50bd25ede3ffca628 SHA1 64c2f0c7b54911735792c5f14c78549d2c3f9a4e SHA256 0efa29f5cb350aa8118cb9c4ba8d62cf675b6af5692ee18e25021f463465fc8a
 DIST icecc-0.9.6.tar.bz2 378702 RMD160 c210061fbe5c2046d13e8c7d78e0a107fd94f761 SHA1 2591652c56a574f985f47719af40ad0484151982 SHA256 d0e6000f2d5e6f4936aa568e5bb3e4f75f836335aed8e3fef5369487df3741a6
-EBUILD icecream-0.9.6.ebuild 2748 RMD160 1609ca3a73cfa51faaed56f2dc5eeb1060b48b14 SHA1 4845c46361457fae545e4f329b6459361245c863 SHA256 15b4cbfae1d369a66322c717f01da99725101ebc7af20a23f68d4403f7e2115e
-MISC ChangeLog 7577 RMD160 7263a8861834a2dcf1eb24efb8b2eb2341715a70 SHA1 69028338255ec2ffc8c10fa177162bc63d920133 SHA256 55118265a813851831a3b1072174a9d0d01230b4744f3796e469b1945ce83142
+EBUILD icecream-0.9.6-r1.ebuild 2791 RMD160 78007e0e27ec668c481291605f0169df77721ab8 SHA1 53b76e84d0c029a3294609c43f30b006467de4f4 SHA256 6c6cfb29282759ebf11240b7377e3d3b5fa71fa544eb2bd3479f3a80950b22eb
+MISC ChangeLog 7868 RMD160 6ea53d4e9d473a740a39e11ef5968588a9528c27 SHA1 53d6492e0fdbec73f05ff21227f4f5b91cd0b506 SHA256 a827f089868fbbe9f894744866e0b397df5fe31edb702964cc5dd3ae97ab9030
 MISC metadata.xml 160 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 SHA1 1bfdc9d282a84c95e2bdcda19ace5b94e2e67349 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9
diff --git a/sys-devel/icecream/files/0.9.6-crosscompile.patch b/sys-devel/icecream/files/0.9.6-crosscompile.patch
new file mode 100644
index 000000000000..990072bbb8fd
--- /dev/null
+++ b/sys-devel/icecream/files/0.9.6-crosscompile.patch
@@ -0,0 +1,12 @@
+diff -urN icecc-0.9.6.old//client/icecc-create-env icecc-0.9.6//client/icecc-create-env
+--- icecc-0.9.6.old//client/icecc-create-env	2010-09-18 12:10:08.143391700 +0200
++++ icecc-0.9.6//client/icecc-create-env	2010-09-18 12:10:46.574391700 +0200
+@@ -97,7 +97,7 @@
+ 
+ add_file $added_gcc /usr/bin/gcc
+ add_file $added_gxx /usr/bin/g++
+-add_file /usr/bin/as
++add_file `$added_gcc -print-prog-name=as` /usr/bin/as
+ 
+ if test "$is_darwin" = 1; then
+     # add dynamic linker
diff --git a/sys-devel/icecream/files/icecream-create-env b/sys-devel/icecream/files/icecream-create-env
index 632bdc5bd2dd..4ee85f9cfede 100644
--- a/sys-devel/icecream/files/icecream-create-env
+++ b/sys-devel/icecream/files/icecream-create-env
@@ -10,7 +10,7 @@
 #
 #
 # Usage: "./icecream-create-env" creates a native environment(similar to icecc --build-native)
-#		 "./icecream-create-env CHOST" creates a cross-compile environment using the cross-toolchain created by crossdev
+#		 "./icecream-create-env prefix" creates a cross-compile environment using the cross-toolchain created by crossdev
 # Example:
 #        "emerge crossdev && crossdev -t sparc-unknown-linux-gnu && icecream-create-env sparc-unknown-linux"
 
@@ -47,11 +47,18 @@ version="`${prefix}-gcc -dumpversion`"
 tmpdir=`mktemp -d`
 tmpfile=`mktemp`
 
-if [ "`gcc -dumpmachine`" = "${prefix}" ]
+target=`gcc -dumpmachine`
+if [ "x${target}" = "x${prefix}" ]
 then
-	/usr/lib/icecc/icecc-create-env /usr/${prefix}/gcc-bin/${version}/gcc /usr/${prefix}/gcc-bin/${version}/g++ | tee ${tmpfile}
+	/usr/lib/icecc/icecc-create-env \
+		/usr/${prefix}/gcc-bin/${version}/gcc \
+		/usr/${prefix}/gcc-bin/${version}/g++ \
+		| tee ${tmpfile}
 else
-	/usr/lib/icecc/icecc-create-env /usr/${CHOST}/${prefix}/gcc-bin/${version}/${prefix}-gcc /usr/${CHOST}/${prefix}/gcc-bin/${version}/${prefix}-g++ | tee ${tmpfile}
+	/usr/lib/icecc/icecc-create-env \
+		/usr/${target}/${prefix}/gcc-bin/${version}/${prefix}-gcc \
+		/usr/${target}/${prefix}/gcc-bin/${version}/${prefix}-g++ \
+		| tee ${tmpfile}
 fi
 
 # figure out the name of the archive
diff --git a/sys-devel/icecream/icecream-0.9.6.ebuild b/sys-devel/icecream/icecream-0.9.6-r1.ebuild
index 3b1846ae21cc..a2450bb9b66f 100644
--- a/sys-devel/icecream/icecream-0.9.6.ebuild
+++ b/sys-devel/icecream/icecream-0.9.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/icecream-0.9.6.ebuild,v 1.1 2010/09/11 12:30:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/icecream-0.9.6-r1.ebuild,v 1.1 2010/09/18 10:24:22 scarabeus Exp $
 
 EAPI=3
 
@@ -21,6 +21,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}/${PV}-symlinks.patch"
+	"${FILESDIR}/${PV}-crosscompile.patch"
 	"${FILESDIR}/${PN}-conf.d-verbosity.patch"
 	"${FILESDIR}/${PN}-gentoo-multilib.patch"
 )