Make it work on 64bit archs again... bug #151306

Package-Manager: portage-2.1.2_pre3-r6

4 files changed, 36 insertions, 10 deletions

diff --git a/sci-astronomy/stellarium/ChangeLog b/sci-astronomy/stellarium/ChangeLog
index 749bfaba210d..770f350fe0f5 100644
--- a/sci-astronomy/stellarium/ChangeLog
+++ b/sci-astronomy/stellarium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-astronomy/stellarium
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/ChangeLog,v 1.24 2006/10/06 21:47:36 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/ChangeLog,v 1.25 2006/10/22 20:52:25 malc Exp $
+
+  22 Oct 2006; <malc@gentoo.org> +files/stellarium-0.8.2-amd64.patch,
+  stellarium-0.8.2.ebuild:
+  amd64 fixlet - bug #151306
 
 *stellarium-0.8.2 (06 Oct 2006)
 
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 2a90464e9bfb..a359819af49d 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -6,6 +6,10 @@ AUX stellarium-0.8.0-gcc41.patch 801 RMD160 b278282356a81fb98b373fa16b7838de020b
 MD5 84d0463f56566dd6688b0e7d17d936d9 files/stellarium-0.8.0-gcc41.patch 801
 RMD160 b278282356a81fb98b373fa16b7838de020b2795 files/stellarium-0.8.0-gcc41.patch 801
 SHA256 deb158aadfadfda338dead97c195c074da9b9b335c3f515b0aa21a64113c3e4c files/stellarium-0.8.0-gcc41.patch 801
+AUX stellarium-0.8.2-amd64.patch 468 RMD160 ce64c6306fcfb35d0e3d408ae76c7ae929fd1706 SHA1 69f3b1550b98930047a3a7f2862e877da2e8d6f5 SHA256 f94dd59858c8ad447d8a1c68fe4e008f89876dbbe16411224ff055cf4e46ae7b
+MD5 2f24ce6e09648cce5277bcb067445a92 files/stellarium-0.8.2-amd64.patch 468
+RMD160 ce64c6306fcfb35d0e3d408ae76c7ae929fd1706 files/stellarium-0.8.2-amd64.patch 468
+SHA256 f94dd59858c8ad447d8a1c68fe4e008f89876dbbe16411224ff055cf4e46ae7b files/stellarium-0.8.2-amd64.patch 468
 DIST stellarium-0.7.1.tar.gz 16572863
 DIST stellarium-0.8.0.tar.gz 18739756 RMD160 f40505461e736ab92183391676bc85355221a8a6 SHA1 9a6de5a0f5d949ab6defadf627a3f6e87dba9ff9 SHA256 df49535f34302b55dbc35d4a81eee15c7fdf7cfb7aff653cd036cc669145c031
 DIST stellarium-0.8.1.tar.gz 18949733 RMD160 8c8363c8778af7486ccfb48c07550ea7b6659c36 SHA1 036c7427544084a9bd9211b83f7ee3b82de6b994 SHA256 4626a613d41f4033b2352891f5034a58ada8d1ce2feabf87b7c675013e83230a
@@ -22,14 +26,14 @@ EBUILD stellarium-0.8.1.ebuild 1041 RMD160 24bda219fe0560a9e301d4c7fc13c7a4f6ab4
 MD5 c871d50699cc45d039dd16c419f191df stellarium-0.8.1.ebuild 1041
 RMD160 24bda219fe0560a9e301d4c7fc13c7a4f6ab4ec7 stellarium-0.8.1.ebuild 1041
 SHA256 95cf2f27956a1a157dbb1d377e8673a0fb92a75dc60ee2a6c33e694e1f0ddb70 stellarium-0.8.1.ebuild 1041
-EBUILD stellarium-0.8.2.ebuild 1043 RMD160 2cf65c1ff0f3f6dc576843d9b8bf82545e91599e SHA1 3ccaa95df740452843075d63040ccc88f762d7e4 SHA256 a4f8e56e654af8c91ff52d97c2e95943526ed81e5c484619d6a4cb7247a9e16a
-MD5 f730eae2ca6e9b5fe9b0bc9593d7888b stellarium-0.8.2.ebuild 1043
-RMD160 2cf65c1ff0f3f6dc576843d9b8bf82545e91599e stellarium-0.8.2.ebuild 1043
-SHA256 a4f8e56e654af8c91ff52d97c2e95943526ed81e5c484619d6a4cb7247a9e16a stellarium-0.8.2.ebuild 1043
-MISC ChangeLog 5078 RMD160 bb6194ceeb8e4166a73713b7eea8508764edc1d1 SHA1 6ba1949d63b9acc2f4de4e7c5b1a2d66c6d774bc SHA256 95ed4d009b07b72fc5b05c7f04abfc7a678344c17574b056abeba0132837fee4
-MD5 928fb75db31f84a94572275e3cb8768c ChangeLog 5078
-RMD160 bb6194ceeb8e4166a73713b7eea8508764edc1d1 ChangeLog 5078
-SHA256 95ed4d009b07b72fc5b05c7f04abfc7a678344c17574b056abeba0132837fee4 ChangeLog 5078
+EBUILD stellarium-0.8.2.ebuild 1120 RMD160 64c61ff3fd23f3356a4b4f16ae70576c2f309a4e SHA1 bda2b4573340742944141f8ef1edcca22c948caf SHA256 3ec4311bb75706446d2e99ce69f5e935b55aed8b6b85466ceec2a44ffb170f49
+MD5 8f3951d5ec9a2b4b56a4d6749a170ec5 stellarium-0.8.2.ebuild 1120
+RMD160 64c61ff3fd23f3356a4b4f16ae70576c2f309a4e stellarium-0.8.2.ebuild 1120
+SHA256 3ec4311bb75706446d2e99ce69f5e935b55aed8b6b85466ceec2a44ffb170f49 stellarium-0.8.2.ebuild 1120
+MISC ChangeLog 5200 RMD160 f877b1d41d713ee078ef0f40eaff240a9f4e3736 SHA1 51059f5f935279ba2749ae6bd215719a18625c71 SHA256 4a11f0760533c70595ff68c66267c2fc1d2b41712f8dfa1d2d44113030a89381
+MD5 aee5a533d59eac2e6bc59347dc2e1623 ChangeLog 5200
+RMD160 f877b1d41d713ee078ef0f40eaff240a9f4e3736 ChangeLog 5200
+SHA256 4a11f0760533c70595ff68c66267c2fc1d2b41712f8dfa1d2d44113030a89381 ChangeLog 5200
 MISC metadata.xml 219 RMD160 fecd14a4fa5da0463896e0790fdce1eb97a38a3c SHA1 3551aceedf58f0e5c559b879089a2004eb7622b1 SHA256 57cbfc721a61a1b23afd09a26db3f5de274c055b4ca93209d8ed717b79af3c10
 MD5 e4bdac528fd001633aa222d2b42fe048 metadata.xml 219
 RMD160 fecd14a4fa5da0463896e0790fdce1eb97a38a3c metadata.xml 219
diff --git a/sci-astronomy/stellarium/files/stellarium-0.8.2-amd64.patch b/sci-astronomy/stellarium/files/stellarium-0.8.2-amd64.patch
new file mode 100644
index 000000000000..f59ab5e13e2b
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.8.2-amd64.patch
@@ -0,0 +1,11 @@
+--- src/translator.cpp	2006-10-05 09:12:12.000000000 +0100
++++ src/translator.cpp	2006-10-22 21:34:22.000000000 +0100
+@@ -71,7 +71,7 @@
+ 	}
+ 
+ 	//change systemLangName to ISO 639 / ISO 3166.
+-	unsigned int pos = Translator::systemLangName.find(':', 0);
++	std::string::size_type pos = Translator::systemLangName.find(':', 0);
+ 	if(pos != Translator::systemLangName.npos)
+ 	       Translator::systemLangName.resize(pos);
+ 	pos = Translator::systemLangName.find('.', 0);
diff --git a/sci-astronomy/stellarium/stellarium-0.8.2.ebuild b/sci-astronomy/stellarium/stellarium-0.8.2.ebuild
index cf051169f42c..e03b7994097e 100644
--- a/sci-astronomy/stellarium/stellarium-0.8.2.ebuild
+++ b/sci-astronomy/stellarium/stellarium-0.8.2.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/sci-astronomy/stellarium/stellarium-0.8.2.ebuild,v 1.1 2006/10/06 21:47:36 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/stellarium-0.8.2.ebuild,v 1.2 2006/10/22 20:52:25 malc Exp $
 
 inherit eutils flag-o-matic
 
@@ -24,6 +24,13 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	|| ( x11-libs/libXt virtual/x11 )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-amd64.patch"
+}
+
+
 src_compile() {
 	append-flags -fno-strict-aliasing
 	econf \