Fix parallel install, fix build with GCC-4.5 wrt bug 317507. Thanks to Philipp <sefi@s-e-f-i.de> for reporting and patch.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 95 insertions, 6 deletions

diff --git a/sci-astronomy/celestia/ChangeLog b/sci-astronomy/celestia/ChangeLog
index 62248df510e2..86b0812114b2 100644
--- a/sci-astronomy/celestia/ChangeLog
+++ b/sci-astronomy/celestia/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-astronomy/celestia
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.62 2010/03/08 18:24:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.63 2010/06/24 17:20:48 xarthisius Exp $
+
+  24 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org> celestia-1.6.0.ebuild,
+  +files/celestia-1.6.0-gcc45.patch,
+  +files/celestia-1.6.0-parallel_install.patch:
+  Fix parallel install, fix build with GCC-4.5 wrt bug 317507. Thanks to
+  Philipp <sefi@s-e-f-i.de> for reporting and patch.
 
   08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> celestia-1.6.0.ebuild,
   +files/celestia-1.6.0-libpng14.patch:
diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index f3996e3afa47..6fd2583a414d 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -1,10 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX celestia-1.4.1-as-needed.patch 406 RMD160 3d466263828351e668858ab0d3d66219fa6d2e91 SHA1 5263f2815101e2f417e6c94402365fa1f705cd90 SHA256 369e0a679fba546d85bc8ab41abe72180568f210c55f333dc5c67b38a1e5e705
 AUX celestia-1.5.0-desktop.patch 1594 RMD160 04ef01761f3aee6448ee60e06bb6ea508c0920e6 SHA1 5b739ac3b53bf5d8d3d74188b8ad650c6fdc165c SHA256 2f989391f775e3435f0e0e570f747e0d8f38b310ea8ad92ba75099c59203171d
 AUX celestia-1.5.1-gcc44.patch 1003 RMD160 3a7444ee0750ee32113fb54f0dc74042cdd8d836 SHA1 0444f9bd8a49c4ec905417aff2a2fb4c4aae73bc SHA256 1dab8e91cc720d826f06b4fe53de4b42e9d635818050a791f0cdefc7110daf5c
 AUX celestia-1.6.0-cfg.patch 461 RMD160 220506c67e763c9ec579f305f4636af28579d445 SHA1 aff0b44001849448da62dc83615b7235132af1e8 SHA256 868bbbcd761ec9b2ce3e45e3688b0a6d8d2c0d4ea39b520e13271b0063c78dac
+AUX celestia-1.6.0-gcc45.patch 1253 RMD160 7735d0b4d40ca8e48da74657664bcd8c6fee12ba SHA1 fe0d4ac9497b1fac4939646c7ddf2855a39fffb5 SHA256 f7abf44ae9bcae090a25e47314921ca36c5fb3aa4426eef9ef29d36562b10f65
 AUX celestia-1.6.0-kde-3.5.patch 962 RMD160 5bfc9f56f00f0a74fc5e8bac0ea92da0515db39a SHA1 b25b2bfebaa1c2cd23c8d350b5849327acc978e3 SHA256 ecbae1130ee36871fe815e298326d628a436e4c2204cac8228b1a1b1cf77c166
 AUX celestia-1.6.0-libpng14.patch 424 RMD160 e3d599cf1a52e4e4cfe5a24055bea7367ac0e02f SHA1 d6376d9a9f1765238ec959d1dba37c4a81b4bb24 SHA256 5df8125dd0080678c87806e21c41789afe5563f05a648c6b3a75edb129fe981a
+AUX celestia-1.6.0-parallel_install.patch 347 RMD160 41ce2490d823914c5faad035b028569b1226ba6a SHA1 70cc8b7c27ee548ab74d4523b0dbb3e399dff8eb SHA256 6ecc8a6069a1f1eeeb97a37e2b8b8dbd5fc92dcb18140d809a119ecae11b37ef
 DIST celestia-1.6.0.tar.gz 51848015 RMD160 c26a190071bd06cf2c1ea6ab901469365e00fa8e SHA1 72aa9cc2ef0ee1e4d73ed63ca2638a1ed8af9566 SHA256 9d9785b651cb42b890765f97234eaed3b03bf5e07dfb1be4f123a27260cdbbd4
-EBUILD celestia-1.6.0.ebuild 2951 RMD160 e4a30b1bf179e6a5baeff36528bb74f9c15b1fab SHA1 28a020f249a0ffd315af6994945e79321238207c SHA256 40de1ca0ec394ba87e000ad2700350cc2dfbafc6bc109c859810b6ac8d7eda3c
-MISC ChangeLog 15745 RMD160 cde88ffb14c9d785bca1f831390679b1f97673f5 SHA1 4e3585e96f895ae2a10079cdb3d044175cccac21 SHA256 3eaafdd5785bb6145e5ac8ba52e8eb791e12e6fec1de1f8489b5e2253e58472b
+EBUILD celestia-1.6.0.ebuild 3029 RMD160 f5667bfee146ee94f762be6e6312c667cefcdbfd SHA1 7c270179e24238cc782023c6dff3bb0b6faae2ba SHA256 c8389db51c52babaaf73a54ac83785d5fa0bcd6e929547ec3eb8dde856736934
+MISC ChangeLog 16035 RMD160 69818de9ef333a067d04c37b6671e89f376515ef SHA1 cba93b24b412aaff74f14bb634cf48317a4cbe34 SHA256 3447ad73550d3d77832c6e9c46b8405bb4fb387684727158a7b4e33815fac054
 MISC metadata.xml 693 RMD160 902eac97368b5aa5d76c277826e42c3d741e9f99 SHA1 d5e786e1754e130bf4c0ff6d6978fb99ccb5f516 SHA256 3081606dbc2705ae14a2e9a9be830925eefc64bf2426bfee13399cc938e588da
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iJwEAQECAAYFAkwjk/oACgkQIiMqcbOVdxRnCAP/elEb8rCZbKXYtAJ8F9xzpf2z
+5wQQTHtTRqHam5FiQbWnziDaJwlISyCRyHvKHzU68Xqqga4uit2b7wekqlMB2Vqz
+ijYLpZqs2UsYPaP9HrjfXsnw+rxFy9FMXCCgtBoOWMPdxdWOEvEzimBT781zEcgn
+Mtpl3iQO75w5wX7YNgo=
+=Tknw
+-----END PGP SIGNATURE-----
diff --git a/sci-astronomy/celestia/celestia-1.6.0.ebuild b/sci-astronomy/celestia/celestia-1.6.0.ebuild
index 6d328679280e..0e659ac101d7 100644
--- a/sci-astronomy/celestia/celestia-1.6.0.ebuild
+++ b/sci-astronomy/celestia/celestia-1.6.0.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/sci-astronomy/celestia/celestia-1.6.0.ebuild,v 1.11 2010/03/08 18:24:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.6.0.ebuild,v 1.12 2010/06/24 17:20:48 xarthisius Exp $
 
 EAPI=2
 inherit eutils flag-o-matic gnome2 autotools
@@ -58,8 +58,10 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.5.1-gcc44.patch
 	# needed for proper detection of kde-3.5 in the presence
 	# of kde4
-	epatch "${FILESDIR}"/${P}-kde-3.5.patch
-	epatch "${FILESDIR}"/${P}-libpng14.patch
+	epatch "${FILESDIR}"/${P}-kde-3.5.patch \
+		"${FILESDIR}"/${P}-libpng14.patch \
+		"${FILESDIR}"/${P}-gcc45.patch \
+		"${FILESDIR}"/${P}-parallel_install.patch
 	# remove flags to let the user decide
 	for cf in -O2 -ffast-math \
 		-fexpensive-optimizations \
diff --git a/sci-astronomy/celestia/files/celestia-1.6.0-gcc45.patch b/sci-astronomy/celestia/files/celestia-1.6.0-gcc45.patch
new file mode 100644
index 000000000000..8ee9adb2aa8a
--- /dev/null
+++ b/sci-astronomy/celestia/files/celestia-1.6.0-gcc45.patch
@@ -0,0 +1,51 @@
+Fixing build with GCC-4.5
+
+http://bugs.gentoo.org/show_bug.cgi?id=317507
+
+Patch written by Philipp <sefi@s-e-f-i.de>
+--- src/celengine/overlay.h
++++ src/celengine/overlay.h
+@@ -12,6 +12,7 @@
+ 
+ #include <string>
+ #include <iostream>
++#include <cstdio>
+ #include <celtxf/texturefont.h>
+ 
+ 
+--- src/celmath/mathlib.h
++++ src/celmath/mathlib.h
+@@ -44,11 +44,6 @@ 
+ template<class T> T radToDeg(T r)
+     return r * 180 / static_cast<T>(PI);
+ }
+ 
+-template<class T> T abs(T x)
+-{
+-    return (x < 0) ? -x : x;
+-}
+-
+ template<class T> T square(T x)
+ {
+     return x * x;
+--- src/celengine/star.cpp
++++ src/celengine/star.cpp
+@@ -10,6 +10,7 @@
+ #include <celmath/mathlib.h>
+ #include <cstring>
+ #include <cassert>
++#include <cstdio>
+ #include "celestia.h"
+ #include "astro.h"
+ #include "orbit.h"
+--- src/celestia/celx_object.cpp
++++ src/celestia/celx_object.cpp
+@@ -773,7 +773,7 @@ static int object_mark(lua_State* l)
+         markAlpha = 1.0f;
+     
+     Color markColorAlpha(0.0f, 1.0f, 0.0f, 0.9f);
+-    markColorAlpha = Color::Color(markColor, markAlpha);
++    markColorAlpha = Color(markColor, markAlpha);
+     
+     const char* markLabel = celx.safeGetString(6, WrongType, "Fifth argument to object:mark must be a string");
+     if (markLabel == NULL)
diff --git a/sci-astronomy/celestia/files/celestia-1.6.0-parallel_install.patch b/sci-astronomy/celestia/files/celestia-1.6.0-parallel_install.patch
new file mode 100644
index 000000000000..e40ca40fd6cd
--- /dev/null
+++ b/sci-astronomy/celestia/files/celestia-1.6.0-parallel_install.patch
@@ -0,0 +1,16 @@
+--- data/Makefile.am
++++ data/Makefile.am
+@@ -11,12 +11,11 @@
+ 
+ pkgdata_DATA = \
+ 	$(wildcard *.ssc) \
+-	$(wildcard *.dat) \
+ 	$(wildcard *.xyz) \
+ 	$(wildcard *.xyzv) \
+ 	$(wildcard *.dsc) \
+ 	$(wildcard *.stc) \
+-	stars.dat
++	asterisms.dat boundaries.dat hdxindex.dat saoxindex.dat starnames.dat stars.dat
+ 
+ EXTRA_DIST = \
+ 	$(pkgdata_DATA) \