Reenabled gnome and gtk UIs

4 files changed, 103 insertions, 1 deletions

diff --git a/app-sci/celestia/ChangeLog b/app-sci/celestia/ChangeLog
index 309623c4b1db..4f616c546e9c 100644
--- a/app-sci/celestia/ChangeLog
+++ b/app-sci/celestia/ChangeLog
@@ -1,6 +1,13 @@
 # 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.13 2004/08/08 19:34:00 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/celestia/ChangeLog,v 1.14 2004/08/09 01:30:31 morfic Exp $
+
+*celestia-1.3.2_pre20040731-r1 (08 Aug 2004)
+
+  08 Aug 2004; Daniel Goller <morfic@gentoo.org>
+  +celestia-1.3.2_pre20040731-r1.ebuild:
+  Fix gtk and gnome UI
+  Special Thanks to Bret Towe
 
   08 Aug 2004; Olivier Fisette <ribosome@gentoo.org>
   celestia-1.3.2_pre20040731.ebuild:
diff --git a/app-sci/celestia/Manifest b/app-sci/celestia/Manifest
index 09c53013e01d..04102135d946 100644
--- a/app-sci/celestia/Manifest
+++ b/app-sci/celestia/Manifest
@@ -6,6 +6,7 @@ MD5 0f4d71adea6a063dd7b7924cb7b9e095 celestia-1.3.0.ebuild 2099
 MD5 37d57ce127cac40a86d659e16afc6783 ChangeLog 3550
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 fa6a82f3973d8db6823bda1dcca14677 celestia-1.2.4.ebuild 1193
+MD5 aefa42185b32f990e3e3b6b2ffe4aa19 celestia-1.3.2_pre20040731-r1.ebuild 2500
 MD5 4282911b2e0db55c52e0b7b394b21c65 celestia-1.3.2_pre20040731.ebuild 2985
 MD5 48aea4af15487f0c322ff982360d7ee8 files/celestia-1.3.1-gtkmain.patch 2501
 MD5 f34ba9f68bc1c0e8487c8e27ba984333 files/digest-celestia-1.2.2 68
@@ -17,3 +18,4 @@ MD5 95f9f0d84c71195fe1f00ba37ea79c0e files/digest-celestia-1.3.0-r1 68
 MD5 318b4452af1f7b12deb515e84ca6848a files/celestia-gcc3.patch 4576
 MD5 dc73960da16b895c574e12aa0066553e files/digest-celestia-1.3.2_pre20040731 72
 MD5 f96a6eb019a59bf1a643b96c43657af8 files/resmanager.h.patch 893
+MD5 dc73960da16b895c574e12aa0066553e files/digest-celestia-1.3.2_pre20040731-r1 72
diff --git a/app-sci/celestia/celestia-1.3.2_pre20040731-r1.ebuild b/app-sci/celestia/celestia-1.3.2_pre20040731-r1.ebuild
new file mode 100644
index 000000000000..01a8319e1a6f
--- /dev/null
+++ b/app-sci/celestia/celestia-1.3.2_pre20040731-r1.ebuild
@@ -0,0 +1,92 @@
+# 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-r1.ebuild,v 1.1 2004/08/09 01:30:31 morfic Exp $
+
+inherit eutils flag-o-matic gnome2
+
+IUSE="kde gnome gtk"
+
+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"
+
+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? ( gtk? ( =x11-libs/gtk+-1.2*
+				=x11-libs/gtkglext-1.0*
+				<x11-libs/gtkglarea-1.99.0 )
+			gnome? ( =gnome-base/gnome-libs-1.4* )
+		)
+	kde? ( >=kde-base/kdelibs-3.0.5 )"
+
+
+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"
+}
+
+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
+
+}
+
+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"
+		set-kdedir 3
+		set-qtdir 3
+		export kde_widgetdir="$KDEDIR/lib/kde3/plugins/designer"
+	elif use gnome; then
+		myconf="$myconf --with-gnome"
+	elif use gtk; then
+		myconf="$myconf --with-gtk"
+	else
+		die "!!! You need to choose either USE=kde or USE=i\"-kde gnomei\""
+	fi
+
+	./configure --prefix=/usr ${myconf} || die
+
+	emake all || die
+}
+
+src_install() {
+	if use gnome; then
+		gnome2_src_install
+	else
+		make install prefix=${D}/usr
+	fi
+	# 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-r1 b/app-sci/celestia/files/digest-celestia-1.3.2_pre20040731-r1
new file mode 100644
index 000000000000..b35429d11913
--- /dev/null
+++ b/app-sci/celestia/files/digest-celestia-1.3.2_pre20040731-r1
@@ -0,0 +1 @@
+MD5 2b223746722b849ad7cdc18b58c4f7f0 celestia-cvs.20040731.tgz 16319378