Version bump

5 files changed, 173 insertions, 6 deletions

diff --git a/app-sci/celestia/ChangeLog b/app-sci/celestia/ChangeLog
index cccd4b9ef851..193230d5ab4a 100644
--- a/app-sci/celestia/ChangeLog
+++ b/app-sci/celestia/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-sci/celestia
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/celestia/ChangeLog,v 1.4 2004/04/12 01:21:49 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/celestia/ChangeLog,v 1.5 2004/04/22 11:12:34 phosphan Exp $
+
+*celestia-1.3.1 (22 Apr 2004)
+
+  22 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> celestia-1.3.1.ebuild,
+  files/celestia-1.3.1-gtkmain.patch:
+  Version bump, see bug #38184 about problems
 
   11 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
   celestia-1.3.0-r1.ebuild, celestia-1.3.0.ebuild:
diff --git a/app-sci/celestia/Manifest b/app-sci/celestia/Manifest
index 802fc0578ddb..8edb210e3ee2 100644
--- a/app-sci/celestia/Manifest
+++ b/app-sci/celestia/Manifest
@@ -1,13 +1,16 @@
-MD5 f1c0daef87c207d41a216066cbf1c3b8 ChangeLog 2250
-MD5 3fc1b2e7d54b3d27a340cb5b087cfa77 celestia-1.2.2.ebuild 1067
-MD5 89ed818b38b994f8b1d33c116d50b416 celestia-1.2.4.ebuild 1220
-MD5 81ee87e1671c89c7e7b9fdfa17ca7457 celestia-1.2.5.ebuild 1960
 MD5 37f351642d5335a094eee8f1ff9aa4f2 celestia-1.3.0-r1.ebuild 2254
+MD5 61d4c32371ae91f2341b8c52c37cb7d7 celestia-1.3.1.ebuild 2331
+MD5 81ee87e1671c89c7e7b9fdfa17ca7457 celestia-1.2.5.ebuild 1960
+MD5 3fc1b2e7d54b3d27a340cb5b087cfa77 celestia-1.2.2.ebuild 1067
 MD5 ca2d92251c7d227c4e1db0816630a1f1 celestia-1.3.0.ebuild 2120
+MD5 221d903d86a97297c06205118b8382ea ChangeLog 2441
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 318b4452af1f7b12deb515e84ca6848a files/celestia-gcc3.patch 4576
+MD5 89ed818b38b994f8b1d33c116d50b416 celestia-1.2.4.ebuild 1220
+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
diff --git a/app-sci/celestia/celestia-1.3.1.ebuild b/app-sci/celestia/celestia-1.3.1.ebuild
new file mode 100644
index 000000000000..cd93ca83837d
--- /dev/null
+++ b/app-sci/celestia/celestia-1.3.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-sci/celestia/celestia-1.3.1.ebuild,v 1.1 2004/04/22 11:12:34 phosphan Exp $
+
+inherit eutils flag-o-matic kde-functions
+
+IUSE="kde gnome"
+
+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"
+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? ( gnome? ( =x11-libs/gtk+-1.2*
+				=gnome-base/gnome-libs-1.4*
+				<x11-libs/gtkglarea-1.99.0 ) )
+	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"
+	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}
+	epatch ${FILESDIR}/${PN}-${PV}-gtkmain.patch
+}
+
+src_compile() {
+	local myconf
+
+	filter-flags "-funroll-loops -frerun-loop-opt"
+	addwrite ${QTDIR}/etc/settings
+	# currently celestia's "gtk support" requires gnome
+	if [ -n "$(use kde)" ]; then
+	    myconf="$myconf --with-kde --without-gtk"
+	elif [ -n "$(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
+
+	dodoc AUTHORS COPYING NEWS README TODO controls.txt
+	dohtml manual/*.html manual/*.css
+}
diff --git a/app-sci/celestia/files/celestia-1.3.1-gtkmain.patch b/app-sci/celestia/files/celestia-1.3.1-gtkmain.patch
new file mode 100644
index 000000000000..f6ab65f86abb
--- /dev/null
+++ b/app-sci/celestia/files/celestia-1.3.1-gtkmain.patch
@@ -0,0 +1,75 @@
+--- celestia-1.3.1/src/celestia/gtkmain.cpp.old	2004-01-21 14:29:11.784232453 -0800
++++ celestia-1.3.1/src/celestia/gtkmain.cpp	2004-01-21 14:34:17.331930870 -0800
+@@ -1330,7 +1330,7 @@
+     Star *selStar =(Star *)gtk_clist_get_row_data(list,row);
+     if (selStar)
+     {
+-        browserSel.select(selStar);
++        browserSel = Selection(selStar);
+ 	return TRUE;
+     }
+     return FALSE;
+@@ -1349,9 +1349,9 @@
+     if ((body=(Body *)gtk_ctree_node_get_row_data(tree,node)))
+     {
+         if (body == (Body *) nearestStar)
+-            browserSel.select((Star *) nearestStar);
++            browserSel = Selection((Star *) nearestStar);
+         else
+-            browserSel.select(body);
++            browserSel = Selection(body);
+ 	return TRUE;
+     }
+     DPRINTF(0, "Unable to find body for this node.\n");
+@@ -1420,7 +1420,7 @@
+     for (unsigned int i = 0; i < currentLength; i++)
+         gtk_clist_remove(GTK_CLIST(clist), 0);
+     currentLength=(*stars).size();
+-    browserSel.select((Star *)(*stars)[0]);
++    browserSel = Selection((Star *)(*stars)[0]);
+     UniversalCoord ucPos = appSim->getObserver().getPosition();
+     
+     for (unsigned int i = 0; i < currentLength; i++)
+@@ -1514,12 +1514,11 @@
+     {
+         sbrowser.refresh();
+         loadNearestStarSystem();
+-        tmpSel=browserSel.star;
+-        browserSel.star=(Star *)nearestStar;
+-        browserSel.body=NULL;
++        tmpSel=(Star*)browserSel.obj;
++        browserSel = Selection((Star *)nearestStar);
+     }
+     else
+-        browserSel.select((Star *)tmpSel);
++        browserSel = Selection((Star *)tmpSel);
+     return(TRUE);
+ }
+ 
+@@ -1529,7 +1528,7 @@
+     GtkWidget *browser= gnome_dialog_new("Celestial Browser",
+ 				         GNOME_STOCK_BUTTON_OK,
+ 				         NULL);
+-    browserSel.select((Star *)NULL);
++    browserSel = Selection((Star *)NULL);
+     if (browser == NULL)
+     {
+ 	DPRINTF(0, "Unable to open celestial browser dialog!\n");
+@@ -1584,7 +1583,7 @@
+     gtk_container_add(GTK_CONTAINER(align),GTK_WIDGET(hbox));
+     sbrowser.setSimulation(appSim);
+     addStars();
+-    tmpSel=browserSel.star;
++    tmpSel=(Star*)browserSel.obj;
+     gtk_signal_connect(GTK_OBJECT(clist), "select-row",
+ 		       GTK_SIGNAL_FUNC(listSelect), NULL);
+     gtk_clist_select_row(GTK_CLIST(clist), 0, 0);
+@@ -1667,7 +1666,7 @@
+     gnome_dialog_run_and_close(GNOME_DIALOG(browser));
+     clist=NULL;
+     ctree=NULL;
+-    browserSel.select((Star *)NULL);
++    browserSel = Selection((Star *)NULL);
+ }
+ 
+ 
diff --git a/app-sci/celestia/files/digest-celestia-1.3.1 b/app-sci/celestia/files/digest-celestia-1.3.1
new file mode 100644
index 000000000000..4f4592b32402
--- /dev/null
+++ b/app-sci/celestia/files/digest-celestia-1.3.1
@@ -0,0 +1 @@
+MD5 fcb73c43f5899f8f7e6d0c619a818a8b celestia-1.3.1.tar.gz 13291363