New revision with gcc-4.3 patch (fixes bug #226365).

(Portage version: 2.1.4.4)

3 files changed, 79 insertions, 1 deletions

diff --git a/sci-astronomy/stellarium/ChangeLog b/sci-astronomy/stellarium/ChangeLog
index 83d7a5d87e5a..fc722be0e843 100644
--- a/sci-astronomy/stellarium/ChangeLog
+++ b/sci-astronomy/stellarium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-astronomy/stellarium
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/ChangeLog,v 1.41 2008/06/12 06:55:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/ChangeLog,v 1.42 2008/06/14 12:15:48 markusle Exp $
+
+*stellarium-0.9.1-r1 (14 Jun 2008)
+
+  14 Jun 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/stellarium-0.9.1-gcc4.3.patch, +stellarium-0.9.1-r1.ebuild:
+  New revision with gcc-4.3 patch (fixes bug #226365).
 
   12 Jun 2008; Michael Sterrett <mr_bones_@gentoo.org>
   -files/stellarium-0.8.2-amd64.patch, -stellarium-0.8.2.ebuild,
diff --git a/sci-astronomy/stellarium/files/stellarium-0.9.1-gcc4.3.patch b/sci-astronomy/stellarium/files/stellarium-0.9.1-gcc4.3.patch
new file mode 100644
index 000000000000..cc6b5a1f921f
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.9.1-gcc4.3.patch
@@ -0,0 +1,11 @@
+diff -Naur stellarium-0.9.1/src/StringArray.cpp stellarium-0.9.1.new/src/StringArray.cpp
+--- stellarium-0.9.1/src/StringArray.cpp	2008-01-17 09:15:35.000000000 -0500
++++ stellarium-0.9.1.new/src/StringArray.cpp	2008-06-14 07:50:18.000000000 -0400
+@@ -20,6 +20,7 @@
+ #include "StringArray.hpp"
+ 
+ #include <list>
++#include <cstdlib>
+ #include <iostream>
+ #include <QFile>
+ 
diff --git a/sci-astronomy/stellarium/stellarium-0.9.1-r1.ebuild b/sci-astronomy/stellarium/stellarium-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..3e04796c1247
--- /dev/null
+++ b/sci-astronomy/stellarium/stellarium-0.9.1-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/stellarium-0.9.1-r1.ebuild,v 1.1 2008/06/14 12:15:48 markusle Exp $
+
+EAPI=1
+inherit toolchain-funcs eutils qt4
+
+DESCRIPTION="Stellarium renders 3D photo-realistic skies in real time."
+HOMEPAGE="http://www.stellarium.org/"
+SRC_URI="mirror://sourceforge/stellarium/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="nls"
+
+RDEPEND="virtual/opengl
+	virtual/glu
+	media-libs/libpng
+	media-libs/freetype
+	dev-libs/boost
+	media-libs/jpeg
+	net-misc/curl
+	>=x11-libs/qt-4.2:4
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	>=dev-util/cmake-2.4.6
+	nls? ( sys-devel/gettext )
+	x11-libs/libXt"
+
+# bug #186194
+QT4_BUILT_WITH_USE_CHECK="opengl"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc4.3.patch
+	if ! use nls ; then
+		sed -i \
+			-e 's/ENABLE_NLS 1/ENABLE_NLS 0/' \
+			CMakeLists.txt \
+			|| die "sed failed"
+	fi
+}
+
+src_compile() {
+	CC=$(tc-getCC) \
+	CXX=$(tc-getCXX) \
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		|| die "cmake failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	use nls || rm -rf "${D}/usr/share/locale"
+	newicon data/icon.bmp ${PN}.bmp
+	make_desktop_entry ${PN} Stellarium /usr/share/pixmaps/${PN}.bmp "Education;Science;Astronomy;"
+	dodoc AUTHORS ChangeLog README
+}