celestia-1.4.1-r1: fixed bugs #128218, #130091, #142786, and #162777

Package-Manager: portage-2.1.1-r2

11 files changed, 449 insertions, 19 deletions

diff --git a/sci-astronomy/celestia/ChangeLog b/sci-astronomy/celestia/ChangeLog
index 8723083af2c1..d3ab7c831717 100644
--- a/sci-astronomy/celestia/ChangeLog
+++ b/sci-astronomy/celestia/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for sci-astronomy/celestia
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.24 2006/10/20 20:12:28 gustavoz Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.25 2007/02/03 17:05:39 bicatali Exp $
+
+*celestia-1.4.1-r1 (03 Feb 2007)
+
+  03 Feb 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/celestia-1.4.1-cfg.patch, +files/celestia-1.4.1-kde-datadir.patch,
+  +files/celestia-1.4.1-lua.patch, +files/celestia-1.4.1-lua51.patch,
+  +files/celestia-1.4.1-strictalias.patch, metadata.xml,
+  +celestia-1.4.1-r1.ebuild:
+  Some cleaning in the ebuild. Added more patches for lua, a default 
+  config file, longdescription in metadata.xml.
+  Fixed bugs #128218, #142786 and #162777 (with the kde-datadir patch)
+  Fixed bug #130091 with a filter on as-needed
+  Tested with kde and gtk only on amd64 and x86 (not yet with gnome).
 
   20 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org> celestia-1.4.1.ebuild:
   Stable on sparc
diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index fc84bf388e3a..08f0488320a5 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -5,10 +5,30 @@ AUX celestia-1.3.2-noarts.patch 3566 RMD160 32cc8eacfe3cd571d8d16ab99730436e9803
 MD5 f659f2616eeaaa4d3b6422e586d2bfa2 files/celestia-1.3.2-noarts.patch 3566
 RMD160 32cc8eacfe3cd571d8d16ab99730436e98033e6e files/celestia-1.3.2-noarts.patch 3566
 SHA256 d6e58016dca095d949b6492aeb12fa8b881ae1b47ac2858ff89f20b393b912ad files/celestia-1.3.2-noarts.patch 3566
+AUX celestia-1.4.1-cfg.patch 425 RMD160 58ee9017aa389ffd0aa3eeafa2760e8470f8190c SHA1 20183c664d0c62b2e04c0f0ca09eb59c80b4da13 SHA256 5f3ac8eba91d5491d8500c7f25b2c324d03e9a6a6d5641a1ba62086ddca0d374
+MD5 22a1bf9a9a88862f7836f98fe52cdab1 files/celestia-1.4.1-cfg.patch 425
+RMD160 58ee9017aa389ffd0aa3eeafa2760e8470f8190c files/celestia-1.4.1-cfg.patch 425
+SHA256 5f3ac8eba91d5491d8500c7f25b2c324d03e9a6a6d5641a1ba62086ddca0d374 files/celestia-1.4.1-cfg.patch 425
 AUX celestia-1.4.1-gcc-4.1.patch 1191 RMD160 b9bfae5bc1b5bf93a95760e3fd558645668cdca6 SHA1 40611ff5e1cda402cc8d3f5b064116c43c7b57c3 SHA256 ea26fe154cf92c613c54edd5e0e51c1b8562ee5ccd74ab191a8a386cd8986e67
 MD5 5f63556bba262455321ec2a466ef3bf8 files/celestia-1.4.1-gcc-4.1.patch 1191
 RMD160 b9bfae5bc1b5bf93a95760e3fd558645668cdca6 files/celestia-1.4.1-gcc-4.1.patch 1191
 SHA256 ea26fe154cf92c613c54edd5e0e51c1b8562ee5ccd74ab191a8a386cd8986e67 files/celestia-1.4.1-gcc-4.1.patch 1191
+AUX celestia-1.4.1-kde-datadir.patch 1505 RMD160 5acdbeab92d61aeb086e1cc30723daa1ccda5556 SHA1 7825bec1492442939e10c5022da6acb9ebed4506 SHA256 f37a80bd089cc0918bbf50760207993aeafb50bafd2c331ad6e0ea214b448646
+MD5 c55b09c7339307e1d94bc60f46e82365 files/celestia-1.4.1-kde-datadir.patch 1505
+RMD160 5acdbeab92d61aeb086e1cc30723daa1ccda5556 files/celestia-1.4.1-kde-datadir.patch 1505
+SHA256 f37a80bd089cc0918bbf50760207993aeafb50bafd2c331ad6e0ea214b448646 files/celestia-1.4.1-kde-datadir.patch 1505
+AUX celestia-1.4.1-lua.patch 1777 RMD160 64a28941b7b11841575a22dc612fa7befe5850fb SHA1 011f965b2715514f6c4c51bcb4398457259763ad SHA256 4165fb29634b63973364aaab3910d0cfa3b418a718a1975d5cb6a26db1b8f918
+MD5 bd932a22cabe5596da1a5ca255613b9e files/celestia-1.4.1-lua.patch 1777
+RMD160 64a28941b7b11841575a22dc612fa7befe5850fb files/celestia-1.4.1-lua.patch 1777
+SHA256 4165fb29634b63973364aaab3910d0cfa3b418a718a1975d5cb6a26db1b8f918 files/celestia-1.4.1-lua.patch 1777
+AUX celestia-1.4.1-lua51.patch 2411 RMD160 f2a7385f9582ddfa7fc294a776dcd1fea604c580 SHA1 12367dfd5af70d56bfdfb99068e709d89b45dcec SHA256 d311cbd81546221409bea8256c9fc12b1a6da2e504523e39520c28280585b248
+MD5 bf2d3516c6a46ace35d18fc4692aba36 files/celestia-1.4.1-lua51.patch 2411
+RMD160 f2a7385f9582ddfa7fc294a776dcd1fea604c580 files/celestia-1.4.1-lua51.patch 2411
+SHA256 d311cbd81546221409bea8256c9fc12b1a6da2e504523e39520c28280585b248 files/celestia-1.4.1-lua51.patch 2411
+AUX celestia-1.4.1-strictalias.patch 367 RMD160 b3f79ab12e78d742adb9e8e6f71d4df25b444404 SHA1 a0623106c9428522982429f281e844d9d7f5c98f SHA256 f38398fef7dd604669e84e46ffe1cbe6514ada92f581b5b30ac0965223d3db54
+MD5 298430529ddf2fbf0704ad59ac2a9f3a files/celestia-1.4.1-strictalias.patch 367
+RMD160 b3f79ab12e78d742adb9e8e6f71d4df25b444404 files/celestia-1.4.1-strictalias.patch 367
+SHA256 f38398fef7dd604669e84e46ffe1cbe6514ada92f581b5b30ac0965223d3db54 files/celestia-1.4.1-strictalias.patch 367
 AUX makefile.am.patch 684 RMD160 a52c92b13ea2dc706f93b0ea7a0db0c86d24b574 SHA1 51ce0006072122b38ba867d56b428bd610a91de8 SHA256 16a68c52bb2e992afc2eb3c96b252c4597b675772112a5bb2eac6efc58d964b2
 MD5 73a7b2bf8c20c6bb26e3dd39db5583ad files/makefile.am.patch 684
 RMD160 a52c92b13ea2dc706f93b0ea7a0db0c86d24b574 files/makefile.am.patch 684
@@ -17,34 +37,41 @@ AUX resmanager.h.patch 893 RMD160 e6917203264b7a544f05ed0622955bef3bbe328a SHA1
 MD5 f96a6eb019a59bf1a643b96c43657af8 files/resmanager.h.patch 893
 RMD160 e6917203264b7a544f05ed0622955bef3bbe328a files/resmanager.h.patch 893
 SHA256 41164fb00e673f9277dad12f19721ab3dfcda0dc2e7de1b0ca7c9cb86a1786c5 files/resmanager.h.patch 893
-DIST celestia-1.3.2.tar.gz 18091458 RMD160 4f891866be70a2d918bdb75ad4fd7d4dddcef4ce SHA256 70d244150cc4d13fd659f0c0b6f3d6359f183679a61af11fe65fa33f51169c7b
-DIST celestia-1.4.1.tar.gz 23966886 RMD160 c66c2540e329613dace12e5b12b2dae2a4c679e0 SHA256 f9dc34dbc0d53e98534000545802b5ab4a471c3cb3fa08a9c958cbbbeb28d8b5
+DIST celestia-1.3.2.tar.gz 18091458 RMD160 4f891866be70a2d918bdb75ad4fd7d4dddcef4ce SHA1 3407610f3844cd8aaf4f079e1ec5b0c236d3d547 SHA256 70d244150cc4d13fd659f0c0b6f3d6359f183679a61af11fe65fa33f51169c7b
+DIST celestia-1.4.1.tar.gz 23966886 RMD160 c66c2540e329613dace12e5b12b2dae2a4c679e0 SHA1 37863498c43d3078b41027706bfa033bccd949a9 SHA256 f9dc34dbc0d53e98534000545802b5ab4a471c3cb3fa08a9c958cbbbeb28d8b5
 EBUILD celestia-1.3.2.ebuild 3063 RMD160 3693e0d7a28a52d9445c9d92b3693f4ad190e7d3 SHA1 252740f3845fb2fda46f579d694c251b4976d16b SHA256 9f810428bc0a312a687de0cf42e5053947015fa0bf9a0d93ef90b2a9f112a46b
 MD5 6be90f964bc6ca0195b0623338dfd1f0 celestia-1.3.2.ebuild 3063
 RMD160 3693e0d7a28a52d9445c9d92b3693f4ad190e7d3 celestia-1.3.2.ebuild 3063
 SHA256 9f810428bc0a312a687de0cf42e5053947015fa0bf9a0d93ef90b2a9f112a46b celestia-1.3.2.ebuild 3063
+EBUILD celestia-1.4.1-r1.ebuild 3897 RMD160 21ad86e2026fbb80128a51b7e84dd004d9147e28 SHA1 4317e0084f20a689949f8fdead03a62e6fc83c5f SHA256 f1674e05f60fa07ea0b3e4328038284945544a247f9c3c82f8405f5d85d59ebc
+MD5 b7df8c49f4650e38a74ae036542ebe81 celestia-1.4.1-r1.ebuild 3897
+RMD160 21ad86e2026fbb80128a51b7e84dd004d9147e28 celestia-1.4.1-r1.ebuild 3897
+SHA256 f1674e05f60fa07ea0b3e4328038284945544a247f9c3c82f8405f5d85d59ebc celestia-1.4.1-r1.ebuild 3897
 EBUILD celestia-1.4.1.ebuild 3325 RMD160 c163639d827920811307a577d8a9dd6b549a5bfe SHA1 a3a5596d735afd4d3afdb18307e3dd9a3a163a05 SHA256 79206ce994a215f5a7e88134fd77b1be5fd500e1da33b406af0548082b1655d7
 MD5 e9c88cb97f349dc353289850713ba793 celestia-1.4.1.ebuild 3325
 RMD160 c163639d827920811307a577d8a9dd6b549a5bfe celestia-1.4.1.ebuild 3325
 SHA256 79206ce994a215f5a7e88134fd77b1be5fd500e1da33b406af0548082b1655d7 celestia-1.4.1.ebuild 3325
-MISC ChangeLog 8662 RMD160 ed2d4afb9ee735ffdbbae9e90c10cd5125bb7d29 SHA1 80fb22625ab217ae82770a835b8ea75315ab28dd SHA256 4a46c29608156e8ee0b8a0ffe680b7c732376014c2fe1add9106585218ca8c57
-MD5 0ee9c74a5e63d20f4542b5a01738756c ChangeLog 8662
-RMD160 ed2d4afb9ee735ffdbbae9e90c10cd5125bb7d29 ChangeLog 8662
-SHA256 4a46c29608156e8ee0b8a0ffe680b7c732376014c2fe1add9106585218ca8c57 ChangeLog 8662
-MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
-MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
-SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 metadata.xml 156
+MISC ChangeLog 9290 RMD160 028b5d06847f582b5ef45bbf9ad72711ad00227c SHA1 7ef617235bf1a91fdc3870cf98e583d61265df5f SHA256 49d9362e8b543e49fbf07dd298cba618faa92a1b088acef24ff5dcd0e219d57e
+MD5 99d0a690d6bd9863dfb8a349675f41a3 ChangeLog 9290
+RMD160 028b5d06847f582b5ef45bbf9ad72711ad00227c ChangeLog 9290
+SHA256 49d9362e8b543e49fbf07dd298cba618faa92a1b088acef24ff5dcd0e219d57e ChangeLog 9290
+MISC metadata.xml 705 RMD160 e20a8f5e0de56e9fa102864cab202a0af6b5172c SHA1 712d9a3efc45acc1873bb2ac49cb00e7d6bf59bf SHA256 bd067e5762b23475ca10fd83e68015c504345c929c45174f50fd8ccd48ad12eb
+MD5 4f929f451f87254297e07e7c46707c1c metadata.xml 705
+RMD160 e20a8f5e0de56e9fa102864cab202a0af6b5172c metadata.xml 705
+SHA256 bd067e5762b23475ca10fd83e68015c504345c929c45174f50fd8ccd48ad12eb metadata.xml 705
 MD5 6e680fec355d84102171d46592db0f2d files/digest-celestia-1.3.2 250
 RMD160 91fe9685beaf43b5cc24cc5bf5d8a1ed187b4114 files/digest-celestia-1.3.2 250
 SHA256 fdacc425387c3b609b1a8e003439862a7373035fe793b38c4824f35a7b5e0218 files/digest-celestia-1.3.2 250
 MD5 34161bf1fac09b84a3ffe3d187aa811d files/digest-celestia-1.4.1 250
 RMD160 b55d9c21cfda86365a1be8dcf84705ca0381ac9a files/digest-celestia-1.4.1 250
 SHA256 d638e17dad65f179f89102c209ecffc06c9383a96420f7a9c31a9cabba357fdf files/digest-celestia-1.4.1 250
+MD5 34161bf1fac09b84a3ffe3d187aa811d files/digest-celestia-1.4.1-r1 250
+RMD160 b55d9c21cfda86365a1be8dcf84705ca0381ac9a files/digest-celestia-1.4.1-r1 250
+SHA256 d638e17dad65f179f89102c209ecffc06c9383a96420f7a9c31a9cabba357fdf files/digest-celestia-1.4.1-r1 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFOS24KRy60XGEcJIRAiYmAJ9ozV9xYdz/+x2B2pUQJMwKV+aT1gCgtA6G
-5HCl/RKLUERreNv9VjXEO8o=
-=PrJU
+iD8DBQFFxMD1Wc/Ciu+QQGkRAluLAJ4772hN9KtDeQjdF3EReDVaNGfERACfWyhv
+C0ya2bUT9XZBSWjAbDEAGv8=
+=wLPB
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/celestia/celestia-1.4.1-r1.ebuild b/sci-astronomy/celestia/celestia-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..42fb544d52bc
--- /dev/null
+++ b/sci-astronomy/celestia/celestia-1.4.1-r1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.4.1-r1.ebuild,v 1.1 2007/02/03 17:05:39 bicatali Exp $
+
+#WANT_AUTOCONF="2.5"
+WANT_AUTOMAKE="1.9"
+
+inherit eutils flag-o-matic gnome2 kde-functions autotools
+
+DESCRIPTION="Space 3D 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="cairo gnome gtk kde arts threads nls lua"
+
+DEPEND="virtual/glu
+	media-libs/jpeg
+	media-libs/libpng
+	gtk? ( !gnome? ( !kde? (
+		>=x11-libs/gtk+-2.6
+		>=x11-libs/gtkglext-1.0
+	) ) )
+	gnome? ( !kde? (
+		>=x11-libs/gtk+-2.6
+		>=x11-libs/gtkglext-1.0
+		>=gnome-base/libgnomeui-2.0
+	) )
+	kde?  ( !gnome? ( >=kde-base/kdelibs-3.0.5 ) )
+	!gtk? ( !gnome? ( !kde? ( virtual/glut ) ) )
+	arts? ( kde-base/arts )
+	lua? ( >=dev-lang/lua-5.0 )
+	cairo? ( x11-libs/cairo )"
+
+pkg_setup() {
+	# Check for one for the following use flags to be set.
+	if ! use gnome && use kde; then
+		einfo "USE=\"kde\" detected."
+		mygui="kde"
+	elif ! use kde && use gnome; then
+		einfo "USE=\"gnome\" detected."
+		USE_DESTDIR="1"
+		mygui="gnome"
+	elif ! use kde && ! use gnome && use gtk; then
+		einfo "USE=\"gtk\" detected."
+		mygui="gtk"
+	elif use kde && use gnome; then
+		einfo "Both gnome and kde support requested. Defaulting to kde"
+		mygui="kde"
+	else
+		ewarn "If you want to use the full gui, set USE=\"{kde/gnome/gtk}\""
+		ewarn "Defaulting to glut support (no GUI)."
+		mygui="glut"
+	fi
+
+	einfo "If you experience problems building celestia with nvidia drivers,"
+	einfo "you can try:"
+	einfo "eselect opengl set xorg-x11"
+	einfo "emerge celestia"
+	einfo "eselect opengl set nvidia"
+}
+
+src_unpack() {
+
+	unpack ${A}
+	cd "${S}"
+
+	# standard set of gcc-4.1 patches
+	epatch "${FILESDIR}/${P}-gcc-4.1.patch"
+	# fix kde datadir in makefile.am and .desktop location
+	epatch "${FILESDIR}/${P}-kde-datadir.patch"
+	#epatch "${FILESDIR}/${P}-makefile.am.patch"
+	# add a ~/.celestia for extra directories
+	epatch "${FILESDIR}/${P}-cfg.patch"
+	# some lua patches on celx.cpp
+	epatch "${FILESDIR}/${P}-lua.patch"
+	# strict aliasing from mandriva
+	epatch "${FILESDIR}/${P}-strictalias.patch"
+
+	# remove agressive flags to let the user decide
+	sed -i \
+		-e 's/-ffast-math -fexpensive-optimizations//g' \
+		configure.in || die "sed failed"
+
+	# remove an unused gconf macro killing autoconf
+	if ! use gnome; then
+		sed -i \
+			-e '/AM_GCONF_SOURCE_2/d' \
+			configure.in || die "sed failed"
+	fi
+
+	# nasty hack for gettext generated file
+	sed -i \
+		-e 's:@MKINSTALLDIRS@:$(top_builddir)/admin/mkinstalldirs:' \
+		po/Makefile.in.in || die "sed failed"
+
+	eautoreconf
+}
+
+src_compile() {
+
+	if [[ "${mygui}" == "kde" ]]; then
+		set-kdedir 3
+		set-qtdir 3
+		export kde_widgetdir="$KDEDIR/lib/kde3/plugins/designer"
+	fi
+	addwrite ${QTDIR}/etc/settings
+
+	filter-flags "-funroll-loops -frerun-loop-opt"
+	filter-ldflags -Wl,--as-needed --as-needed
+
+	econf \
+		--with-${mygui} \
+		--enable-pch \
+		$(use_with arts) \
+		$(use_with lua) \
+		$(use_enable cairo) \
+		$(use_enable threads threading) \
+		$(use_enable nls) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	#dodir /usr/share/celestia
+	if [[ "${mygui}" == "gnome" ]]; then
+		gnome2_src_install
+	else
+		#einstall || die "einstall failed"
+		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
+	dodoc AUTHORS README TODO NEWS TRANSLATORS ChangeLog \
+		CelestiaKeyAssignments.txt KbdMouseJoyControls.txt devguide.txt
+	dohtml coding-standards.html manual/*.html manual/*.css
+	insinto /usr/share/celestia/models/
+	for m in models/*.3ds; do
+		doins ${m}
+	done
+}
diff --git a/sci-astronomy/celestia/files/celestia-1.4.1-cfg.patch b/sci-astronomy/celestia/files/celestia-1.4.1-cfg.patch
new file mode 100644
index 000000000000..61e9419c2d89
--- /dev/null
+++ b/sci-astronomy/celestia/files/celestia-1.4.1-cfg.patch
@@ -0,0 +1,11 @@
+--- celestia.cfg.orig	2006-09-19 11:05:24.000000000 +0100
++++ celestia.cfg	2006-09-19 11:05:50.000000000 +0100
+@@ -150,7 +150,7 @@
+ # or
+ #   ExtrasDirectories  [ "D:\\celestia-extras" ]
+ #------------------------------------------------------------------------
+-  ExtrasDirectories  [ "extras" ]
++  ExtrasDirectories  [ "extras" "~/.celestia" ]
+ 
+ 
+ #------------------------------------------------------------------------
diff --git a/sci-astronomy/celestia/files/celestia-1.4.1-kde-datadir.patch b/sci-astronomy/celestia/files/celestia-1.4.1-kde-datadir.patch
new file mode 100644
index 000000000000..48912f2e2c15
--- /dev/null
+++ b/sci-astronomy/celestia/files/celestia-1.4.1-kde-datadir.patch
@@ -0,0 +1,32 @@
+diff -Nur ../celestia-1.4.1.orig/Makefile.am ./Makefile.am
+--- ../celestia-1.4.1.orig/Makefile.am	2006-02-03 18:04:33.000000000 +0000
++++ ./Makefile.am	2007-02-03 12:46:33.000000000 +0000
+@@ -66,11 +66,11 @@
+ 	)
+ 
+ install-data-hook:
+-	if [ "$(kde_datadir)" -a -d $(kde_datadir)/@PACKAGE@ -a ! -h $(kde_datadir)/@PACKAGE@ ] ; then \
+-		mv -f -b $(kde_datadir)/@PACKAGE@/* $(datadir)/@PACKAGE@/ ; \
+-		rmdir $(kde_datadir)/@PACKAGE@ ; \
++	if [ "$(DESTDIR)$(kde_datadir)" -a -d $(DESTDIR)$(kde_datadir)/@PACKAGE@ -a ! -h $(DESTDIR)$(kde_datadir)/@PACKAGE@ ] ; then \
++		mv -f -b $(DESTDIR)$(kde_datadir)/@PACKAGE@/* $(DESTDIR)$(datadir)/@PACKAGE@/ ; \
++		rmdir $(DESTDIR)$(kde_datadir)/@PACKAGE@ ; \
+ 	fi
+-	if [ "$(kde_datadir)" -a ! -h $(kde_datadir)/@PACKAGE@ ] ; then \
+-		ln -s $(datadir)/@PACKAGE@ $(kde_datadir)/@PACKAGE@ ; \
++	if [ "$(DESTDIR)$(kde_datadir)" -a ! -h $(DESTDIR)$(kde_datadir)/@PACKAGE@ ] ; then \
++		ln -s $(datadir)/@PACKAGE@ $(DESTDIR)$(kde_datadir)/@PACKAGE@ ; \
+ 	fi
+ 
+diff -Nur ../celestia-1.4.1.orig/src/celestia/kde/data/Makefile.am ./src/celestia/kde/data/Makefile.am
+--- ../celestia-1.4.1.orig/src/celestia/kde/data/Makefile.am	2006-01-07 11:15:48.000000000 +0000
++++ ./src/celestia/kde/data/Makefile.am	2007-02-03 12:49:04.000000000 +0000
+@@ -14,7 +14,7 @@
+ mimedir = $(kde_mimedir)/application
+ mime_DATA = x-celestia-script.desktop
+ 
+-appsdir = $(kde_appsdir)/Edutainment/Science
++appsdir = $(datadir)/applications/kde
+ apps_DATA = celestia.desktop
+ 
+ KDE_ICON = celestia
diff --git a/sci-astronomy/celestia/files/celestia-1.4.1-lua.patch b/sci-astronomy/celestia/files/celestia-1.4.1-lua.patch
new file mode 100644
index 000000000000..ed31b8ee0d0c
--- /dev/null
+++ b/sci-astronomy/celestia/files/celestia-1.4.1-lua.patch
@@ -0,0 +1,62 @@
+--- src/celestia/celx.cpp.orig	2006-09-19 11:08:10.000000000 +0100
++++ src/celestia/celx.cpp	2006-09-19 11:07:03.000000000 +0100
+@@ -32,9 +32,7 @@
+ 
+ #include "celx.h"
+ #include "celestiacore.h"
+-extern "C" {
+-#include "lualib.h"
+-}
++#include "lua.hpp"
+ 
+ using namespace std;
+ 
+@@ -532,6 +530,8 @@
+ 
+     status = lua_resume(co, narg);
+     if (status == 0)
++            return 0;
++    else if (status == LUA_YIELD)
+     {
+         int nres = lua_gettop(co);
+ #if 0
+@@ -543,7 +543,7 @@
+     }
+     else
+     {
+-        lua_xmove(co, L, 1);  // move error message
++        lua_xmove(co, L, -1); // move error message
+         return -1;            // error flag
+     }
+ }
+@@ -598,7 +598,7 @@
+         int stackTop = lua_gettop(costate);
+         if (strcmp(c_p, "y") == 0)
+         {
+-            lua_iolibopen(costate);
++            luaL_openlibs(costate);
+             ioMode = IOAllowed;
+         }
+         else
+@@ -713,7 +713,8 @@
+         // no other errors, and execution terminates normally.  There
+         // should be a better way to figure out whether the script ended
+         // normally . . .
+-        if (strcmp(errorMessage, "cannot resume dead coroutine") != 0)
++        if (errorMessage
++            && strcmp(errorMessage, "cannot resume dead coroutine") != 0)
+         {
+             cout << "Error: " << errorMessage << '\n';
+             CelestiaCore* appCore = getAppCore(co);
+@@ -4577,10 +4578,7 @@
+     initMaps();
+ 
+     // Import the base and math libraries
+-    lua_baselibopen(state);
+-    lua_mathlibopen(state);
+-    lua_tablibopen(state);
+-    lua_strlibopen(state);
++    luaL_openlibs(state);
+ 
+     // Add an easy to use wait function, so that script writers can
+     // live in ignorance of coroutines.  There will probably be a significant
diff --git a/sci-astronomy/celestia/files/celestia-1.4.1-lua51.patch b/sci-astronomy/celestia/files/celestia-1.4.1-lua51.patch
new file mode 100644
index 000000000000..7c02999116fe
--- /dev/null
+++ b/sci-astronomy/celestia/files/celestia-1.4.1-lua51.patch
@@ -0,0 +1,75 @@
+diff -Nur celestia-1.4.1.orig/configure.in celestia-1.4.1/configure.in
+--- celestia-1.4.1.orig/configure.in	2006-02-03 18:09:54.000000000 +0000
++++ celestia-1.4.1/configure.in	2006-09-19 10:04:57.000000000 +0100
+@@ -383,7 +383,7 @@
+ AC_MSG_CHECKING([whether to enable Celestia Extension Language])
+ if (test "$enable_lua" != "no"); then
+ 	CXXFLAGS="$CXXFLAGS -DCELX"
+-	LDFLAGS="$LDFLAGS -llualib -llua"
++	LDFLAGS="$LDFLAGS -llua"
+ 	
+ 	if (test "$lua_includes" != "no"); then
+ 		CXXFLAGS="$CXXFLAGS -I$lua_includes"
+diff -Nur celestia-1.4.1.orig/src/celestia/celx.cpp celestia-1.4.1/src/celestia/celx.cpp
+--- celestia-1.4.1.orig/src/celestia/celx.cpp	2006-01-07 00:01:51.000000000 +0000
++++ celestia-1.4.1/src/celestia/celx.cpp	2006-09-19 10:05:06.000000000 +0100
+@@ -32,9 +32,7 @@
+ 
+ #include "celx.h"
+ #include "celestiacore.h"
+-extern "C" {
+-#include "lualib.h"
+-}
++#include "lua.hpp"
+ 
+ using namespace std;
+ 
+@@ -532,6 +530,8 @@
+ 
+     status = lua_resume(co, narg);
+     if (status == 0)
++            return 0;
++    else if (status == LUA_YIELD)
+     {
+         int nres = lua_gettop(co);
+ #if 0
+@@ -543,7 +543,7 @@
+     }
+     else
+     {
+-        lua_xmove(co, L, 1);  // move error message
++        lua_xmove(co, L, -1); // move error message
+         return -1;            // error flag
+     }
+ }
+@@ -598,7 +598,7 @@
+         int stackTop = lua_gettop(costate);
+         if (strcmp(c_p, "y") == 0)
+         {
+-            lua_iolibopen(costate);
++            luaL_openlibs(costate);
+             ioMode = IOAllowed;
+         }
+         else
+@@ -713,7 +713,8 @@
+         // no other errors, and execution terminates normally.  There
+         // should be a better way to figure out whether the script ended
+         // normally . . .
+-        if (strcmp(errorMessage, "cannot resume dead coroutine") != 0)
++        if (errorMessage
++            && strcmp(errorMessage, "cannot resume dead coroutine") != 0)
+         {
+             cout << "Error: " << errorMessage << '\n';
+             CelestiaCore* appCore = getAppCore(co);
+@@ -4577,10 +4578,7 @@
+     initMaps();
+ 
+     // Import the base and math libraries
+-    lua_baselibopen(state);
+-    lua_mathlibopen(state);
+-    lua_tablibopen(state);
+-    lua_strlibopen(state);
++    luaL_openlibs(state);
+ 
+     // Add an easy to use wait function, so that script writers can
+     // live in ignorance of coroutines.  There will probably be a significant
diff --git a/sci-astronomy/celestia/files/celestia-1.4.1-strictalias.patch b/sci-astronomy/celestia/files/celestia-1.4.1-strictalias.patch
new file mode 100644
index 000000000000..3ff59b31686a
--- /dev/null
+++ b/sci-astronomy/celestia/files/celestia-1.4.1-strictalias.patch
@@ -0,0 +1,13 @@
+--- celestia-1.4.1/src/celengine/modelfile.cpp.strictalias	2006-11-22 14:04:15.000000000 +0100
++++ celestia-1.4.1/src/celengine/modelfile.cpp	2006-11-22 14:01:27.000000000 +0100
+@@ -1080,7 +1080,9 @@
+ static float readFloat(istream& in)
+ {
+     int i = readUint(in);
+-    return *((float*) &i);
++    float f;
++    memcpy(&f, &i, sizeof(float));
++    return f;
+ }
+ 
+ 
diff --git a/sci-astronomy/celestia/files/digest-celestia-1.4.1-r1 b/sci-astronomy/celestia/files/digest-celestia-1.4.1-r1
new file mode 100644
index 000000000000..b75d1f3ff9d0
--- /dev/null
+++ b/sci-astronomy/celestia/files/digest-celestia-1.4.1-r1
@@ -0,0 +1,3 @@
+MD5 be1d36fc97a13b9a276249dbc0efac41 celestia-1.4.1.tar.gz 23966886
+RMD160 c66c2540e329613dace12e5b12b2dae2a4c679e0 celestia-1.4.1.tar.gz 23966886
+SHA256 f9dc34dbc0d53e98534000545802b5ab4a471c3cb3fa08a9c958cbbbeb28d8b5 celestia-1.4.1.tar.gz 23966886
diff --git a/sci-astronomy/celestia/metadata.xml b/sci-astronomy/celestia/metadata.xml
index b229aec85b8f..86553ce85b44 100644
--- a/sci-astronomy/celestia/metadata.xml
+++ b/sci-astronomy/celestia/metadata.xml
@@ -2,4 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci</herd>
+<longdescription lang="en">
+Celestia is a free real-time space simulation that lets you experience
+our universe in three dimensions. You can travel throughout the solar
+system, to any of over 100,000 stars, or even beyond the galaxy. All
+travel in Celestia is seamless; the exponential zoom feature lets you
+explore space across a huge range of scales, from galaxy clusters down
+to spacecraft only a few meters across. A 'point-and-goto' interface
+makes it simple to navigate through the universe to the object you
+want to visit.
+</longdescription>
 </pkgmetadata>
diff --git a/sci-astronomy/wcstools/Manifest b/sci-astronomy/wcstools/Manifest
index 7ec5ec923d7f..9c7bdcb8b6fc 100644
--- a/sci-astronomy/wcstools/Manifest
+++ b/sci-astronomy/wcstools/Manifest
@@ -1,4 +1,42 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX wcstools-3.6.6-autotools.patch 4677 RMD160 17b7f30c51f38ee0de8cc6147d51e3efd44b2fc8 SHA1 dd8aff746d019b8831219fa1035df5f5f1222b4e SHA256 94b002431b10f48f6297ec5af4e83877d640cb83ec1c38cbc19a28168f40bed4
+MD5 59743d9cdd05a710d2a8adfef7ce9f6e files/wcstools-3.6.6-autotools.patch 4677
+RMD160 17b7f30c51f38ee0de8cc6147d51e3efd44b2fc8 files/wcstools-3.6.6-autotools.patch 4677
+SHA256 94b002431b10f48f6297ec5af4e83877d640cb83ec1c38cbc19a28168f40bed4 files/wcstools-3.6.6-autotools.patch 4677
+AUX wcstools-3.6.6-codewarn.patch 1305 RMD160 f03359c63df2490504bcb6badb857eea76d06135 SHA1 7ae40e142b8169e4fab5ffb7c8a63593e51ba03b SHA256 1c745bc915923c0b25f02d8f2ca0aa0328f8a88dc57459214e09093e0e6c6479
+MD5 3c5bedd8b41149e8c9a158d3e49965a6 files/wcstools-3.6.6-codewarn.patch 1305
+RMD160 f03359c63df2490504bcb6badb857eea76d06135 files/wcstools-3.6.6-codewarn.patch 1305
+SHA256 1c745bc915923c0b25f02d8f2ca0aa0328f8a88dc57459214e09093e0e6c6479 files/wcstools-3.6.6-codewarn.patch 1305
+DIST wcstools-3.6.2.tar.gz 636003 RMD160 1afdfb238bda4bf02c24191a99b7d538e51ddf77 SHA1 5edce11add7d7bde57a5dc7ea465467c30b3c639 SHA256 956c867ed6a6074249702f3a80256582b2e20b0a41eb37a0d8b59e0d073cd3d0
+DIST wcstools-3.6.6.tar.gz 770420 RMD160 0cdce66766ca7042b6abfc54166c73a57152dce6 SHA1 fa742c43e74893890e93952d2a63f2edafb43802 SHA256 e6aaea1c3a1243091269edfc8c1cd7991bc2e7707f6f9015ee4e750b3ede1a33
+EBUILD wcstools-3.6.2.ebuild 778 RMD160 fb5aebfafe86cfa2858e6230d3de17ac044bf3ea SHA1 47408e8f26026f3ee0aec396efa96cdfc90eac50 SHA256 f2c45fa43c341fcdaf6da97fd71dfef8df28bb6fcc2b37b5436adff4c0b3c28a
 MD5 14a51cb32000395d1b281edfbc702018 wcstools-3.6.2.ebuild 778
-MD5 c8d0f60ec4dfd63cbdbbe80de2814a6c ChangeLog 433
-MD5 0ffcd41aa96cf1bcffd8b539c27957db metadata.xml 157
-MD5 0b93f6bb7c76bb5aab489080d6df7f71 files/digest-wcstools-3.6.2 66
+RMD160 fb5aebfafe86cfa2858e6230d3de17ac044bf3ea wcstools-3.6.2.ebuild 778
+SHA256 f2c45fa43c341fcdaf6da97fd71dfef8df28bb6fcc2b37b5436adff4c0b3c28a wcstools-3.6.2.ebuild 778
+EBUILD wcstools-3.6.6.ebuild 1177 RMD160 70261b672ab0a12db547aca4c38f815463e6f2ec SHA1 7fc25887fb320be4a70e3dfde63d4358eae5a39f SHA256 012ed64e205d05375523f0e17a08bea479db4fecdc6568af3700e7e6b8c2ca6c
+MD5 1baf198da64957c8c5726a12a09ad3db wcstools-3.6.6.ebuild 1177
+RMD160 70261b672ab0a12db547aca4c38f815463e6f2ec wcstools-3.6.6.ebuild 1177
+SHA256 012ed64e205d05375523f0e17a08bea479db4fecdc6568af3700e7e6b8c2ca6c wcstools-3.6.6.ebuild 1177
+MISC ChangeLog 781 RMD160 c6b838999704fb169ddbd0fbc5721cb3ee801f89 SHA1 065641c1cad201926c3b9861e60bcfa69d414b3f SHA256 7b2b7f41d6c849691944f3eef2d340f54a911436480484b5192ce6ca9c7def89
+MD5 bf2e154fac6f4736ae3b0b80b07a632e ChangeLog 781
+RMD160 c6b838999704fb169ddbd0fbc5721cb3ee801f89 ChangeLog 781
+SHA256 7b2b7f41d6c849691944f3eef2d340f54a911436480484b5192ce6ca9c7def89 ChangeLog 781
+MISC metadata.xml 723 RMD160 49c0f1f71c12801e00b02be8b39f46c74cf1890d SHA1 32a6c9c6b8e0ea96a79f2444578233ec1de7af3d SHA256 56010e1e3bae1f5d3210ce32ba4bbbfb6ba7d245c7d2932444f923f71591d288
+MD5 7964d0ff6dd5253f03ca707e97d136c3 metadata.xml 723
+RMD160 49c0f1f71c12801e00b02be8b39f46c74cf1890d metadata.xml 723
+SHA256 56010e1e3bae1f5d3210ce32ba4bbbfb6ba7d245c7d2932444f923f71591d288 metadata.xml 723
+MD5 3d6f88084bf9713f94e74dd012f8823c files/digest-wcstools-3.6.2 244
+RMD160 025285fa95c39362e4a7e33267fdcb3879913fb5 files/digest-wcstools-3.6.2 244
+SHA256 439207c4ee5093c273e70fc0a823220597551ad927eea471a6e39b8e2296628e files/digest-wcstools-3.6.2 244
+MD5 3fa6187487ee3d32157eb1cf13db4c75 files/digest-wcstools-3.6.6 244
+RMD160 d3c77fa24658f641d15b71285b1e4281079b5527 files/digest-wcstools-3.6.6 244
+SHA256 b08f255d2ab0b0f191c15e1a266b720118fc4dd69f10d448480348e86e9ee199 files/digest-wcstools-3.6.6 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFxMF6Wc/Ciu+QQGkRAp7qAJ9iTP2FrB1r+9nhb1cvJMnh8mUAlQCfYl6B
+i7mv7kR5GD+QVbeo0ya9API=
+=6fP9
+-----END PGP SIGNATURE-----