version bump; adds star catalog install (bug #280246) and works with newer QT (bug #297247)

Package-Manager: portage-2.1.7.16/cvs/Linux i686

4 files changed, 82 insertions, 8 deletions

diff --git a/sci-astronomy/stellarium/ChangeLog b/sci-astronomy/stellarium/ChangeLog
index f8f727fc6917..82ebbb8badf9 100644
--- a/sci-astronomy/stellarium/ChangeLog
+++ b/sci-astronomy/stellarium/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-astronomy/stellarium
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/ChangeLog,v 1.54 2009/11/13 18:04:08 mr_bones_ Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/ChangeLog,v 1.55 2010/02/03 07:08:14 mr_bones_ Exp $
+
+*stellarium-0.10.3 (03 Feb 2010)
+
+  03 Feb 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +stellarium-0.10.3.ebuild, metadata.xml:
+  version bump; adds star catalog install (bug #280246) and works with newer
+  QT (bug #297247)
 
   13 Nov 2009; Michael Sterrett <mr_bones_@gentoo.org>
   stellarium-0.10.2.ebuild:
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index f8430ccdcd39..e4fbc316cd93 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -1,4 +1,11 @@
+DIST stars_4_1v0_0.cat 17275482 RMD160 27287e8970c99ee51baeb81de30574a96a1ff21d SHA1 3098174bec4797af54d98d48f60d6bc2ecabaf49 SHA256 e0373d869d08ffac2ba78e7fbe29add6511073cd74a52b9918d8b77fb05827e7
+DIST stars_5_2v0_0.cat 46096018 RMD160 b6a74ea80946ac40521dbf0752c018cd1cc3397f SHA1 358e2f62539d21d775a07ded0dcb70bdc8368265 SHA256 d093e25e8cb8350ef74706d7bf05455d224acb076da87bf1b784b5cf0e0d9931
+DIST stars_6_2v0_0.cat 160019110 RMD160 adef51e800a9c95fc991b7cbc321d324e38597dc SHA1 babcc1d3d12a334e4b3e5d38270460a3e3645d2b SHA256 40a8674dead3178d9f36178f62e128047bb53784fa3ff408e473a5969a4ee379
+DIST stars_7_2v0_0.cat 348268348 RMD160 f317f064d3e334e045f59e18d5239c51a8dfee87 SHA1 c66174cc5963a865a85423ebc637c750c8715730 SHA256 730ca2d9182af5ebd4efcc5f87461ad9156caf79cadf1a79708fa970acb809fe
+DIST stars_8_2v0_0.cat 706781416 RMD160 46d34c9296e43502557ce86a4ae143d5375dad29 SHA1 11d84210340a3c631711c350ab1b6df132c6e4b9 SHA256 91b79dcf97464b4ca0f6c604e745dac2c6ca02e25ed986dbec2de5f6d6e8a1f9
 DIST stellarium-0.10.2.tar.gz 35250510 RMD160 ea88f1ba4c29a3a9087e5ca89a16258e59d12e72 SHA1 aa24cbb8d4a911121108df67483b4c753402928e SHA256 b9fd4bbf2f4390737d6c27de2b6fa26626ebe415a31e41a2e0c9d3855bb677ce
+DIST stellarium-0.10.3.tar.gz 36128838 RMD160 d1dde6d57e77130854621618f7f8035424006e6c SHA1 4298692d95c870eeed3b658bafd6e8ed92e8da4f SHA256 45d126cdc95094000cb41dd9bfaeb8c955461774b83d232a333d7b56edaff5d8
 EBUILD stellarium-0.10.2.ebuild 1197 RMD160 1e3cf8c2491d186021accb04db0f3ffcc08c24e8 SHA1 12315abeb005f309a063feeabcb2da735a38d244 SHA256 af9dbbc6cb3d91ec3e1ce9962e17707aca113c855f8f2df79cfddfc9fe944472
-MISC ChangeLog 8974 RMD160 6e2486676c7b85e1535d9269fc0d9b204768aed9 SHA1 95933571fceb34c9b95e52dd83f0eb27aef77ca2 SHA256 cbd2398954c4006468789e0b04e6f7668979ffac5a71a470767f5e1b3692941f
-MISC metadata.xml 219 RMD160 fecd14a4fa5da0463896e0790fdce1eb97a38a3c SHA1 3551aceedf58f0e5c559b879089a2004eb7622b1 SHA256 57cbfc721a61a1b23afd09a26db3f5de274c055b4ca93209d8ed717b79af3c10
+EBUILD stellarium-0.10.3.ebuild 1664 RMD160 6dcb1829b4c2276a1cc275b9fc311606a1cdf890 SHA1 938ba12b8bc5dc4ce8f0d767ad910c91bfce15d5 SHA256 262ac7aefc2c429932774b03ee700dc3383c8147ea472580ca3c9be8d48efd19
+MISC ChangeLog 9203 RMD160 feb2615124e968ce4a38dc0cf5998ec3ac50ed2c SHA1 656f2d33c07a8f32612b935c3d5600e4a17ec188 SHA256 1a681d181e7c78813b6448240731482744848f5099627b6f70cb4a34994db7e0
+MISC metadata.xml 304 RMD160 0e98a636ce6a98f33c2a840019018e682bc7b54b SHA1 ea2018bcef7df901b77ee4ee803e7743077587a5 SHA256 a2c1ffe593b0dbec47b82b9029c18e46549ee5b7f2397b973bd837090a8db6aa
diff --git a/sci-astronomy/stellarium/metadata.xml b/sci-astronomy/stellarium/metadata.xml
index 26e2eaf0d6cb..ba8614cf1daa 100644
--- a/sci-astronomy/stellarium/metadata.xml
+++ b/sci-astronomy/stellarium/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-<email>mr_bones_@gentoo.org</email>
-</maintainer>
+  <herd>sci</herd>
+  <maintainer>
+    <email>mr_bones_@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="stars">Install extra star catalogs</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-astronomy/stellarium/stellarium-0.10.3.ebuild b/sci-astronomy/stellarium/stellarium-0.10.3.ebuild
new file mode 100644
index 000000000000..ccaa9d5e5016
--- /dev/null
+++ b/sci-astronomy/stellarium/stellarium-0.10.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/stellarium-0.10.3.ebuild,v 1.1 2010/02/03 07:08:14 mr_bones_ Exp $
+
+EAPI=2
+inherit cmake-utils eutils
+
+DESCRIPTION="Stellarium renders 3D photo-realistic skies in real time."
+HOMEPAGE="http://www.stellarium.org/"
+SRC_URI="mirror://sourceforge/stellarium/${P}.tar.gz
+	stars? (
+		mirror://sourceforge/stellarium/stars_4_1v0_0.cat
+		mirror://sourceforge/stellarium/stars_5_2v0_0.cat
+		mirror://sourceforge/stellarium/stars_6_2v0_0.cat
+		mirror://sourceforge/stellarium/stars_7_2v0_0.cat
+		mirror://sourceforge/stellarium/stars_8_2v0_0.cat
+	)"
+
+LICENSE="GPL-2 BitstreamVera"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="nls stars"
+RESTRICT="test"
+
+RDEPEND="virtual/opengl
+	virtual/glu
+	media-libs/libpng
+	media-libs/freetype:2
+	media-libs/jpeg
+	>=x11-libs/qt-core-4.6.0:4
+	x11-libs/qt-gui:4
+	x11-libs/qt-opengl:4
+	x11-libs/qt-script:4
+	x11-libs/qt-svg:4
+	x11-libs/qt-test:4
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	>=dev-util/cmake-2.4.7
+	nls? ( sys-devel/gettext )
+	x11-libs/libXt"
+
+src_configure() {
+	mycmakeargs=$(cmake-utils_use_enable nls NLS)
+	CMAKE_IN_SOURCE_BUILD=1 cmake-utils_src_configure
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	if use stars ; then
+		insinto /usr/share/${PN}/stars/default
+		doins "${DISTDIR}"/stars_[45678]_[12]v0_0*.cat || die "doins failed"
+	fi
+	newicon doc/images/stellarium-logo.png ${PN}.png
+	make_desktop_entry ${PN} Stellarium ${PN} "Education;Science;Astronomy;"
+	dodoc AUTHORS ChangeLog README
+}