Version bump. Fixed a few unicode guide (bug #271613), kde deps (bug

  #254010). The lua script engine is now mandatory (might be an upstream
  bug). Closing also bug #278469, thanks Juan Aguado for his work.
Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

6 files changed, 195 insertions, 6 deletions

diff --git a/sci-astronomy/celestia/ChangeLog b/sci-astronomy/celestia/ChangeLog
index 2d7d7291e6cc..9fb77271d78d 100644
--- a/sci-astronomy/celestia/ChangeLog
+++ b/sci-astronomy/celestia/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-astronomy/celestia
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.50 2009/05/24 09:40:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.51 2009/08/12 17:04:35 bicatali Exp $
+
+*celestia-1.6.0 (21 Jul 2009)
+
+  21 Jul 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  celestia-1.5.1.ebuild, +celestia-1.6.0.ebuild,
+  +files/celestia-1.6.0-cfg.patch:
+  Version bump. Fixed a few unicode guide (bug #271613), kde deps (bug
+  #254010). The lua script engine is now mandatory (might be an upstream
+  bug). Closing also bug #278469, thanks Juan Aguado for his work.
 
   24 May 2009; Samuli Suominen <ssuominen@gentoo.org>
   -celestia-1.4.1-r2.ebuild, -files/celestia-1.4.1-3dsmodels.patch,
diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index fe0e88e9a00b..211baf94d693 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -1,12 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX celestia-1.4.1-as-needed.patch 406 RMD160 3d466263828351e668858ab0d3d66219fa6d2e91 SHA1 5263f2815101e2f417e6c94402365fa1f705cd90 SHA256 369e0a679fba546d85bc8ab41abe72180568f210c55f333dc5c67b38a1e5e705
 AUX celestia-1.4.1-cfg.patch 425 RMD160 58ee9017aa389ffd0aa3eeafa2760e8470f8190c SHA1 20183c664d0c62b2e04c0f0ca09eb59c80b4da13 SHA256 5f3ac8eba91d5491d8500c7f25b2c324d03e9a6a6d5641a1ba62086ddca0d374
 AUX celestia-1.5.0-desktop.patch 1594 RMD160 04ef01761f3aee6448ee60e06bb6ea508c0920e6 SHA1 5b739ac3b53bf5d8d3d74188b8ad650c6fdc165c SHA256 2f989391f775e3435f0e0e570f747e0d8f38b310ea8ad92ba75099c59203171d
 AUX celestia-1.5.1-arts.patch 1806 RMD160 af88ff314193c55d56223489f53d46125ea5073d SHA1 d98a9f4b9d7c376922f93243c39fab4cbb5a1ac7 SHA256 ff4bdca96577babaf90df1c965bb67f5cf32dbde527ba2644431e8c29ae87ce3
 AUX celestia-1.5.1-gcc44.patch 1003 RMD160 3a7444ee0750ee32113fb54f0dc74042cdd8d836 SHA1 0444f9bd8a49c4ec905417aff2a2fb4c4aae73bc SHA256 1dab8e91cc720d826f06b4fe53de4b42e9d635818050a791f0cdefc7110daf5c
 AUX celestia-1.5.1-kde-3.5.patch 1018 RMD160 c39ded08b1fe0caf8eb4f1b2efe3366aeea61935 SHA1 564c5c91ca287382aff31c28a9e762f4e60bf28a SHA256 a4a7281747a9f493f3354f1f1b84f7159b49c1c89f6dd2bf669756c8e8e4ee8f
+AUX celestia-1.6.0-as-needed.patch 633 RMD160 62098acf729e4945966ffbdd5137a8bab69bead4 SHA1 64af299407d05da7d46f16032e6e32b31d050674 SHA256 97843f4f58def3f657e6a5924daeb6116055702d0fc622681d5237e7c5ed1d57
+AUX celestia-1.6.0-cfg.patch 461 RMD160 220506c67e763c9ec579f305f4636af28579d445 SHA1 aff0b44001849448da62dc83615b7235132af1e8 SHA256 868bbbcd761ec9b2ce3e45e3688b0a6d8d2c0d4ea39b520e13271b0063c78dac
 DIST celestia-1.5.1-acinclude.patch.bz2 37015 RMD160 dd4e2d538bf633bee691b6ece0a9381e5643bb2a SHA1 b11454a7d1c8bc8c472337c8a0728cf711d98f3c SHA256 b4ccd6a5c24e0074c698bc7d000e6193d182c3908a130a7da2d727a63d1d28b9
 DIST celestia-1.5.1-gcc43.patch.bz2 4673 RMD160 8aafd3ea0e93965398ff5493865e2632b65d1fcd SHA1 5237b4799c133d44af0d44c14ad6a9a4b5066003 SHA256 070c812969562948314a784e549c423634fc4eece990e820313682417fdb1fc8
 DIST celestia-1.5.1.tar.gz 34144780 RMD160 26f105acfc26a5edccb73fe29c33638804b0f370 SHA1 2d6a117daf6a400ab4c47a5a51c13f2ab601e6db SHA256 5a028dec634c2fd1b2097eb6717f8e6ca5d05052b7f63f5fc205d0cbf254888c
-EBUILD celestia-1.5.1.ebuild 4188 RMD160 b0b27f353b7db63224b7a4846dd1b74026986c46 SHA1 6f8ea7c2c2ac6037cfe9862296e6b7f10c64bdf3 SHA256 5f3fc8aa068a13b7d7caac665e0c238d1c34d4be17df664776714965de57684d
-MISC ChangeLog 13801 RMD160 fc99666e34ffe0a52c149b25bc4f9ce0a1f3f5f4 SHA1 6ab10c5bf4b5f1e27d2449e37fc8df9ad026f5c3 SHA256 03f4d17dc2d78d01afd0aac2ee16bc735401c8180de402d9836baf48cf397fce
+DIST celestia-1.6.0.tar.gz 51848015 RMD160 c26a190071bd06cf2c1ea6ab901469365e00fa8e SHA1 72aa9cc2ef0ee1e4d73ed63ca2638a1ed8af9566 SHA256 9d9785b651cb42b890765f97234eaed3b03bf5e07dfb1be4f123a27260cdbbd4
+EBUILD celestia-1.5.1.ebuild 4469 RMD160 adcb1621f0460891c61ffb2dd6aa81fc5a29ec0f SHA1 609a76bdd45a0f4b0f84c63b12263588bad618a4 SHA256 ef9e3384819509f837d8800e9ec64fde761393fbdcc50ca6b7311dca34b1708d
+EBUILD celestia-1.6.0.ebuild 3493 RMD160 7b511eb48de1db5090bad36d29d96b1ab3fa3787 SHA1 aabb3ae6b72552765397ee2890d88d645acd54a3 SHA256 1b5dc9958c38ab85ae32589cafd66d3cf65f318433003fd4eea8f24af58b840f
+MISC ChangeLog 14182 RMD160 0e369a78da20e6c1564e2daae4ad7901cc3c698c SHA1 111667af056302063aeed9532dcb5f73d14cc62d SHA256 c8b4896754197b271a4860340e0e96ba0922ac0d0af9d18985263cf730529c4b
 MISC metadata.xml 693 RMD160 902eac97368b5aa5d76c277826e42c3d741e9f99 SHA1 d5e786e1754e130bf4c0ff6d6978fb99ccb5f516 SHA256 3081606dbc2705ae14a2e9a9be830925eefc64bf2426bfee13399cc938e588da
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqC9i8ACgkQ1ycZbhPLE2A6iwCeOOhVp4Vi02OpfWl8g2iMGCrG
+bXQAoIkZXR5iiokPXtLXtRru1WayoLpM
+=XfX5
+-----END PGP SIGNATURE-----
diff --git a/sci-astronomy/celestia/celestia-1.5.1.ebuild b/sci-astronomy/celestia/celestia-1.5.1.ebuild
index 1248e81e182e..a3eed1cb7fc0 100644
--- a/sci-astronomy/celestia/celestia-1.5.1.ebuild
+++ b/sci-astronomy/celestia/celestia-1.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.5.1.ebuild,v 1.10 2009/05/24 09:40:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.5.1.ebuild,v 1.11 2009/08/12 17:04:35 bicatali Exp $
 
 EAPI=1
 inherit eutils flag-o-matic gnome2 kde-functions autotools
@@ -23,11 +23,11 @@ RDEPEND="virtual/glu
 		>=x11-libs/gtk+-2.6
 		>=x11-libs/gtkglext-1.0
 	) ) )
-	gnome? ( !kde? (
+	gnome? (
 		>=x11-libs/gtk+-2.6
 		>=x11-libs/gtkglext-1.0
 		>=gnome-base/libgnomeui-2.0
-	) )
+	)
 	kde?  ( !gnome? ( kde-base/kdelibs:3.5 ) )
 	!gtk? ( !gnome? ( !kde? ( virtual/glut ) ) )
 	arts? ( kde-base/arts )
@@ -112,6 +112,12 @@ src_unpack() {
 			iconv -f iso-8859-1 ${i} -t utf8 > ${i}.utf8
 			mv ${i}.utf8 ${i}
 		done
+		iconv -f iso-8859-1 -t utf8 start_de.cel > start_de.cel.utf8
+		iconv -f cp1251 -t utf8 guide_ru.cel > guide_ru.cel.utf8
+		iconv -f SHIFT-JIS -t utf8 guide_ja.cel > guide_ja.cel.utf8
+		mv start_de.cel.utf8 start_de.cel
+		mv guide_ru.cel.utf8 guide_ru.cel
+		mv guide_ja.cel.utf8 guide_ja.cel
 		popd > /dev/null
 	fi
 
diff --git a/sci-astronomy/celestia/celestia-1.6.0.ebuild b/sci-astronomy/celestia/celestia-1.6.0.ebuild
new file mode 100644
index 000000000000..85dee3986b6b
--- /dev/null
+++ b/sci-astronomy/celestia/celestia-1.6.0.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2009 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.1 2009/08/12 17:04:35 bicatali Exp $
+
+EAPI=2
+inherit eutils flag-o-matic gnome2 kde-functions autotools
+
+DESCRIPTION="OpenGL 3D space simulator"
+HOMEPAGE="http://www.shatters.net/celestia/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="arts cairo gnome gtk kde nls pch theora threads"
+
+RDEPEND="virtual/glu
+	media-libs/jpeg
+	media-libs/libpng
+	>=dev-lang/lua-5.0
+	gtk? ( !gnome? ( !kde? (
+		>=x11-libs/gtk+-2.6
+		>=x11-libs/gtkglext-1.0
+	) ) )
+	gnome? (
+		>=x11-libs/gtk+-2.6
+		>=x11-libs/gtkglext-1.0
+		>=gnome-base/libgnomeui-2.0
+	)
+	kde?  ( !gnome? ( kde-base/kdelibs:3.5 ) )
+	!gtk? ( !gnome? ( !kde? ( virtual/glut ) ) )
+	arts? ( kde-base/arts )
+	cairo? ( x11-libs/cairo )
+	theora? ( media-libs/libtheora )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	# Check for one for the following use flags to be set.
+	if ! use gnome && use kde; then
+		einfo "USE=\"kde\" detected."
+		CELESTIA_GUI="kde"
+	elif ! use kde && use gnome; then
+		einfo "USE=\"gnome\" detected."
+		USE_DESTDIR="1"
+		CELESTIA_GUI="gnome"
+	elif ! use kde && ! use gnome && use gtk; then
+		einfo "USE=\"gtk\" detected."
+		CELESTIA_GUI="gtk"
+	elif use kde && use gnome; then
+		einfo "Both gnome and kde support requested. Defaulting to kde"
+		CELESTIA_GUI="kde"
+	else
+		ewarn "If you want to use the full gui, set USE=\"{kde|gnome|gtk}\""
+		ewarn "Defaulting to glut support (no GUI)."
+		CELESTIA_GUI="glut"
+	fi
+}
+
+src_prepare() {
+	# make better desktop files
+	epatch "${FILESDIR}"/${PN}-1.5.0-desktop.patch
+	# add a ~/.celestia for extra directories
+	epatch "${FILESDIR}"/${P}-cfg.patch
+	# as-needed forces to reorganize some files
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	# missing includes with gcc 4.4
+	epatch "${FILESDIR}"/${PN}-1.5.1-gcc44.patch
+	# remove flags to let the user decide
+	for cf in -O2 -ffast-math \
+		-fexpensive-optimizations \
+		-fomit-frame-pointer; do
+		sed -i \
+			-e "s/${cf}//g" \
+			configure.in admin/* || die "sed failed"
+	done
+	# remove an unused gconf macro killing autoconf when no gnome
+	# (not needed without eautoreconf)
+	if ! use gnome; then
+		sed -i \
+			-e '/AM_GCONF_SOURCE_2/d' \
+			configure.in || die "sed failed"
+	fi
+	eautoreconf
+	if [[ ${CELESTIA_GUI} == kde ]]; then
+		REALHOME="${HOME}"
+		mkdir -p "${T}"/fakehome/.kde
+		mkdir -p "${T}"/fakehome/.qt
+		export HOME="${T}"/fakehome
+		[[ -d ${REALHOME}/.ccache ]] && ln -sf "${REALHOME}/.ccache" "${HOME}/"
+		set-kdedir 3
+		export kde_widgetdir="${KDEDIR}/lib/kde3/plugins/designer"
+	fi
+	filter-flags "-funroll-loops -frerun-loop-opt"
+}
+
+src_configure() {
+	# force lua in 1.6.0. seems to be inevitable
+	econf \
+		--disable-rpath \
+		--with-lua \
+		--with-${CELESTIA_GUI} \
+		$(use_with arts) \
+		$(use_enable cairo) \
+		$(use_enable threads threading) \
+		$(use_enable nls) \
+		$(use_enable pch) \
+		$(use_enable theora)
+}
+
+src_install() {
+	if [[ ${CELESTIA_GUI} == gnome ]]; then
+		gnome2_src_install
+	else
+		emake DESTDIR="${D}" install || die "emake install failed"
+		for size in 16 22 32 48 ; do
+			insinto /usr/share/icons/hicolor/${size}x${size}/apps
+			newins "${S}"/src/celestia/kde/data/hi${size}-app-${PN}.png ${PN}.png
+		done
+	fi
+	[[ ${CELESTIA_GUI} == glut ]] && domenu celestia.desktop
+	dodoc AUTHORS README TRANSLATORS *.txt || die
+}
diff --git a/sci-astronomy/celestia/files/celestia-1.6.0-as-needed.patch b/sci-astronomy/celestia/files/celestia-1.6.0-as-needed.patch
new file mode 100644
index 000000000000..81f828902477
--- /dev/null
+++ b/sci-astronomy/celestia/files/celestia-1.6.0-as-needed.patch
@@ -0,0 +1,25 @@
+--- src/celengine/Makefile.am.orig	2009-08-12 17:54:12.000000000 +0100
++++ src/celengine/Makefile.am	2009-08-12 17:54:28.000000000 +0100
+@@ -25,8 +25,6 @@
+ 	body.cpp \
+ 	boundaries.cpp \
+ 	catalogxref.cpp \
+-	cmdparser.cpp \
+-	command.cpp \
+ 	console.cpp \
+ 	constellation.cpp \
+ 	customorbit.cpp \
+--- src/celestia/Makefile.am.orig	2009-08-12 17:53:30.000000000 +0100
++++ src/celestia/Makefile.am	2009-08-12 17:54:56.000000000 +0100
+@@ -24,7 +24,10 @@
+ 	eclipsefinder.cpp\
+ 	favorites.cpp \
+ 	imagecapture.cpp \
+-	url.cpp
++	url.cpp \
++	../celengine/cmdparser.cpp \
++	../celengine/command.cpp 
++
+ 
+ WINSOURCES = \
+ 	avicapture.cpp \
diff --git a/sci-astronomy/celestia/files/celestia-1.6.0-cfg.patch b/sci-astronomy/celestia/files/celestia-1.6.0-cfg.patch
new file mode 100644
index 000000000000..8a4c18143a95
--- /dev/null
+++ b/sci-astronomy/celestia/files/celestia-1.6.0-cfg.patch
@@ -0,0 +1,11 @@
+--- celestia.cfg.orig	2009-07-20 12:52:17.000000000 +0200
++++ celestia.cfg	2009-07-20 12:52:43.000000000 +0200
+@@ -195,7 +195,7 @@
+ # or
+ #   ExtrasDirectories  [ "D:\\celestia-extras" ]
+ #------------------------------------------------------------------------
+-  ExtrasDirectories  [ "extras-standard" "extras" ]
++  ExtrasDirectories  [ "extras-standard" "extras" "~/.celestia" ]
+ 
+ 
+ #------------------------------------------------------------------------