Ebuild for working Celestia

5 files changed, 138 insertions, 17 deletions

diff --git a/app-sci/celestia/ChangeLog b/app-sci/celestia/ChangeLog
index da729d020273..ee0bd5c32ec9 100644
--- a/app-sci/celestia/ChangeLog
+++ b/app-sci/celestia/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-sci/celestia
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/celestia/ChangeLog,v 1.9 2004/06/24 21:54:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/celestia/ChangeLog,v 1.10 2004/08/05 03:54:48 morfic Exp $
+
+*celestia-1.3.2_pre20040731 (04 Aug 2004)
+
+  04 Aug 2004; Daniel Goller <morfic@gentoo.org> +files/resmanager.h.patch,
+  +celestia-1.3.2_pre20040731.ebuild:
+  CVS version actually runs after compilation, committing
+  Fixes numerous bugs
+  Thanks to  Polynomial-C@gmx.de (ebuild) and Bret Towe (patch)
 
   17 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
   celestia-1.3.0-r1.ebuild, celestia-1.3.1.ebuild:
diff --git a/app-sci/celestia/Manifest b/app-sci/celestia/Manifest
index 0959063e5167..2f98aa6029b2 100644
--- a/app-sci/celestia/Manifest
+++ b/app-sci/celestia/Manifest
@@ -1,16 +1,3 @@
-MD5 4f9ff1f859899ca41f510d245af7d109 celestia-1.3.0-r1.ebuild 2222
-MD5 881ad207128ff8ef475049306d2249a8 celestia-1.3.1.ebuild 2308
-MD5 d20e8587f2542c371cae819139402da9 celestia-1.2.5.ebuild 1922
-MD5 a0d7c588e306fac39f80cc29b8eb9a09 celestia-1.2.2.ebuild 1040
-MD5 0f4d71adea6a063dd7b7924cb7b9e095 celestia-1.3.0.ebuild 2099
-MD5 0d4d14e1d1d9e195e8e14823fa957e7c ChangeLog 2782
-MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 fa6a82f3973d8db6823bda1dcca14677 celestia-1.2.4.ebuild 1193
-MD5 48aea4af15487f0c322ff982360d7ee8 files/celestia-1.3.1-gtkmain.patch 2501
-MD5 f34ba9f68bc1c0e8487c8e27ba984333 files/digest-celestia-1.2.2 68
-MD5 5c370faab90b777deeb29bd02fd40b15 files/digest-celestia-1.2.4 68
-MD5 96739b584d48f639583eb750463a44ea files/digest-celestia-1.2.5 68
-MD5 95f9f0d84c71195fe1f00ba37ea79c0e files/digest-celestia-1.3.0 68
-MD5 03b2de07240ae616efd0d19d150b65bb files/digest-celestia-1.3.1 68
-MD5 95f9f0d84c71195fe1f00ba37ea79c0e files/digest-celestia-1.3.0-r1 68
-MD5 318b4452af1f7b12deb515e84ca6848a files/celestia-gcc3.patch 4576
+MD5 2eee5686010471421b73f8499f62ffa8 celestia-1.3.2_pre20040731.ebuild 3279
+MD5 f96a6eb019a59bf1a643b96c43657af8 files/resmanager.h.patch 893
+MD5 dc73960da16b895c574e12aa0066553e files/digest-celestia-1.3.2_pre20040731 72
diff --git a/app-sci/celestia/celestia-1.3.2_pre20040731.ebuild b/app-sci/celestia/celestia-1.3.2_pre20040731.ebuild
new file mode 100644
index 000000000000..7d0fe2262f71
--- /dev/null
+++ b/app-sci/celestia/celestia-1.3.2_pre20040731.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-sci/celestia/celestia-1.3.2_pre20040731.ebuild,v 1.1 2004/08/05 03:54:48 morfic Exp $
+
+
+inherit eutils flag-o-matic kde-functions
+
+#IUSE="kde gnome"
+IUSE="kde"
+
+SNAPSHOT="${PV/*_pre}"
+S="${WORKDIR}/${P/_*}"
+DESCRIPTION="Celestia is a free real-time space simulation that lets you experience our universe in three dimensions"
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="http://celestia.teyssier.org/download/daily/${PN}-cvs.${SNAPSHOT}.tgz"
+HOMEPAGE="http://www.shatters.net/celestia"
+RESTRICT="nomirror"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="-* ~x86"
+
+# gnome and kde interfaces are exlcusive
+DEPEND=">=media-libs/glut-3.7-r2
+	virtual/glu
+	media-libs/jpeg
+	media-libs/libpng
+	kde? ( >=kde-base/kdelibs-3.0.5 )"
+#	!kde? ( gnome? ( =x11-libs/gtk+-1.2*
+#				=gnome-base/gnome-libs-1.4*
+#				<x11-libs/gtkglarea-1.99.0 ) )
+
+pkg_setup() {
+	# Set up X11 implementation
+	X11_IMPLEM_P="$(portageq best_version "${ROOT}" virtual/x11)"
+	X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
+	X11_IMPLEM="${X11_IMPLEM##*\/}"
+
+	einfo	"Please note:"
+	einfo	"if you experience problems building celestia with nvidia drivers,"
+	einfo	"you can try:"
+	einfo	"opengl-update ${X11_IMPLEM}"
+	einfo	"emerge celestia"
+	einfo	"opengl-update nvidia"
+	einfo	"------------"
+	einfo	"NOTE: the gnome and kde GUIs are mutually exclusive, kde is"
+	einfo	"recommended. If you're getting the wrong one, run either:"
+	einfo	"'USE=\"gnome -kde\" emerge celestia' (for the gnome interface)"
+	einfo	"or:"
+	einfo	"'USE=\"kde\" emerge celestia' (for the kde interface)"
+	einfo	"as appropriate."
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# the patch didn't apply correcty. Had no time to check if the patch 
+	# is no longer necessary
+#	epatch ${FILESDIR}/${PN}-1.3.1-gtkmain.patch
+	# adding gcc-3.4 support as posted in
+	# (http://bugs.gentoo.org/show_bug.cgi?id=53479#c2)
+	epatch ${FILESDIR}/resmanager.h.patch || die
+
+	# alright this snapshot seems to have some trouble with installing a 
+	# file properly. It wants to install celestia.schemas in / which leads
+	# to an ACCESS VIOLATION. Unfortunately this file even gets installed
+	# when no gtk/gnome is enabled
+	# The following lines prevents this but thinkabout as a dirty hack
+	cd ${S}/src/celestia/gtk || die
+	sed -i -e 's:GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@:GCONF_SCHEMA_FILE_DIR = $(pkgdatadir)/schemas:g' Makefile.in || die
+	sed -i -e 's:GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@:GCONF_SCHEMA_FILE_DIR = $(pkgdatadir)/schemas:g' data/Makefile.in || die
+	cd ${S} || die
+
+}
+
+src_compile() {
+	local myconf
+
+	filter-flags "-funroll-loops -frerun-loop-opt"
+	addwrite ${QTDIR}/etc/settings
+	# currently celestia's "gtk support" requires gnome
+	if  use kde ; then
+	    myconf="$myconf --with-kde --without-gtk"
+#	elif  use gnome ; then
+#	    myconf="--without-kde --with-gtk"
+	else
+		myconf="--without-kde --without-gtk"
+	    # fix for badly written configure script
+	    set-kdedir 3
+	    set-qtdir 3
+	    export kde_widgetdir="$KDEDIR/lib/kde3/plugins/designer"
+	fi
+
+	./configure --prefix=/usr ${myconf} || die
+
+	emake all || die
+}
+
+src_install() {
+	make install prefix=${D}/usr
+
+	# removed NEWS as it is not included in this snapshot
+	dodoc AUTHORS COPYING README TODO controls.txt
+	dohtml manual/*.html manual/*.css
+}
diff --git a/app-sci/celestia/files/digest-celestia-1.3.2_pre20040731 b/app-sci/celestia/files/digest-celestia-1.3.2_pre20040731
new file mode 100644
index 000000000000..b35429d11913
--- /dev/null
+++ b/app-sci/celestia/files/digest-celestia-1.3.2_pre20040731
@@ -0,0 +1 @@
+MD5 2b223746722b849ad7cdc18b58c4f7f0 celestia-cvs.20040731.tgz 16319378
diff --git a/app-sci/celestia/files/resmanager.h.patch b/app-sci/celestia/files/resmanager.h.patch
new file mode 100644
index 000000000000..e1c835770a35
--- /dev/null
+++ b/app-sci/celestia/files/resmanager.h.patch
@@ -0,0 +1,20 @@
+--- resmanager.h.old	2004-06-09 18:53:52.357752656 -0500
++++ celestia-1.3.1/src/celutil/resmanager.h	2004-06-09 18:52:12.144987312 -0500
+@@ -72,7 +72,7 @@
+         {
+             ResourceHandle h = handles.size();
+             resources.insert(resources.end(), info);
+-            handles.insert(ResourceHandleMap::value_type(info, h));
++            handles.insert(typename ResourceHandleMap::value_type(info, h));
+             return h;
+         }
+     }
+@@ -105,7 +105,7 @@
+                     else
+                     {
+                         resources[h].state = ResourceLoaded;
+-                        loadedResources.insert(NameMap::value_type(resources[h].resolvedName, resources[h].resource));
++                        loadedResources.insert(typename NameMap::value_type(resources[h].resolvedName, resources[h].resource));
+                     }
+                 }
+             }