Change glut to use virtual/glut #93449, clean up the ebuild a bit, and if user hasnt selected gtk/kde/gnome, default to gtk since it is the lightest depend.

Package-Manager: portage-2.0.51.22-r1

3 files changed, 40 insertions, 37 deletions

diff --git a/sci-astronomy/celestia/ChangeLog b/sci-astronomy/celestia/ChangeLog
index e74076b18940..71105e70e8c5 100644
--- a/sci-astronomy/celestia/ChangeLog
+++ b/sci-astronomy/celestia/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-astronomy/celestia
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.2 2004/12/24 19:51:24 swegener Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.3 2005/07/17 07:27:25 vapier Exp $
+
+  17 Jul 2005; Mike Frysinger <vapier@gentoo.org> celestia-1.3.2.ebuild:
+  Change glut to use virtual/glut #93449, clean up the ebuild a bit, and if
+  user hasnt selected gtk/kde/gnome, default to gtk since it is the lightest
+  depend.
 
 *celestia-1.3.2 (23 Dec 2004)
 
diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index 1a8f651ab887..ececc2b9822b 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 78b99dfa4ce3dcba6aa3f2ffb5c338da ChangeLog 5655
-MD5 0bef0a97c670c1822c789c91f480a2d3 celestia-1.3.2.ebuild 3093
-MD5 f659f2616eeaaa4d3b6422e586d2bfa2 files/celestia-1.3.2-noarts.patch 3566
+MD5 1b55bd73a1313e288a88762af6cd0fb7 metadata.xml 330
+MD5 36ad779eed4affe5b2b8f45181dc3696 celestia-1.3.2.ebuild 3054
+MD5 d3d0c93970f9d603b0cbad036aa83811 ChangeLog 5890
 MD5 d4ff8e51fb3a546279e7442cf24e07d7 files/digest-celestia-1.3.2 68
 MD5 f96a6eb019a59bf1a643b96c43657af8 files/resmanager.h.patch 893
-MD5 1b55bd73a1313e288a88762af6cd0fb7 metadata.xml 330
+MD5 f659f2616eeaaa4d3b6422e586d2bfa2 files/celestia-1.3.2-noarts.patch 3566
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC1SYbI1lqEGTUzyQRAqmsAJ42p0cBwPMcyOf6nJLyVm76ESE2hQCcC+sT
-r4ybPkp+MLPnK2l7eaN4Bsk=
-=Ermd
+iD8DBQFC2gjKgIKl8Uu19MoRAihVAJ0cC+z/eg8Jo1I18h2PUq7JTJfZvACfetGF
+1+h+ZXsAla1IWX6PiFOg59g=
+=A9jb
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/celestia/celestia-1.3.2.ebuild b/sci-astronomy/celestia/celestia-1.3.2.ebuild
index fc23cbc66655..f7adf6da0d58 100644
--- a/sci-astronomy/celestia/celestia-1.3.2.ebuild
+++ b/sci-astronomy/celestia/celestia-1.3.2.ebuild
@@ -1,44 +1,46 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.3.2.ebuild,v 1.2 2005/07/13 14:32:35 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.3.2.ebuild,v 1.3 2005/07/17 07:27:25 vapier Exp $
 
 inherit eutils flag-o-matic gnome2 kde-functions
 
-DESCRIPTION="Celestia is a free real-time space simulation that lets you experience our universe in three dimensions"
+DESCRIPTION="real-time space simulation that lets you experience our universe in three dimensions"
 HOMEPAGE="http://www.shatters.net/celestia/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc amd64"
+KEYWORDS="amd64 ppc x86"
 IUSE="gnome gtk kde arts"
 
-DEPEND=">=media-libs/glut-3.7.1
+DEPEND="virtual/glut
 	virtual/glu
 	media-libs/jpeg
 	media-libs/libpng
 	dev-lang/lua
-	gtk? (	>=x11-libs/gtk+-2.0
-			>=x11-libs/gtkglext-1.0 )
+	gtk? ( >=x11-libs/gtk+-2.0 >=x11-libs/gtkglext-1.0 )
+	!gnome? ( !kde? ( >=x11-libs/gtk+-2.0 >=x11-libs/gtkglext-1.0 ) )
 	gnome? ( >=gnome-base/libgnomeui-2.0 )
-	kde? ( >=kde-base/kdelibs-3.0.5 )"
+	kde? (
+		>=kde-base/kdelibs-3.0.5
+		arts? ( kde-base/arts )
+	)"
 
 pkg_setup() {
 	# Check for one for the following use flags to be set.
-	if use kde; then
+	if use kde ; then
 		einfo "USE=\"kde\" detected. This will override any gnome/gtk USE preferences."
 		export MYMAKE="kde"
-	elif use gnome; then
+	elif use gnome ; then
 		einfo "USE=\"gnome\" detected."
 		export MYMAKE="gnome"
-	elif use gtk; then
+	elif use gtk ; then
 		einfo "USE=\"gtk\" detected."
 		export MYMAKE="gtk"
 	else
-		eerror "You must set at least one of USE=\"{kde/gnome/gtk}\""
-		ewarn "Please set one of the USE flags end re-emerge"
-		ewarn "ie. 'env USE=\"kde\" emerge celestia"
-		die "No valid USE flags set"
+		ewarn "You should set at least one of USE=\"{kde/gnome/gtk}\""
+		ewarn "Defaulting to gtk support."
+		export MYMAKE="gtk"
 	fi
 
 	# Get X11 implementation
@@ -56,17 +58,13 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# adding gcc-3.4 support as posted in
 	# (http://bugs.gentoo.org/show_bug.cgi?id=53479#c2)
-	epatch ${FILESDIR}/resmanager.h.patch \
-	|| die "patching gcc 3.4 support failed"
+	epatch "${FILESDIR}"/resmanager.h.patch \
 
-	if use !arts;
-	then
-		epatch ${FILESDIR}/celestia-1.3.2-noarts.patch
-	fi
+	! use arts && epatch "${FILESDIR}"/celestia-1.3.2-noarts.patch
 
 	if [ "${MYMAKE}" != "gnome" ]; then
 		# alright this snapshot seems to have some trouble with installing a
@@ -92,10 +90,10 @@ src_compile() {
 		export kde_widgetdir="$KDEDIR/lib/kde3/plugins/designer"
 	fi
 
-	./configure --prefix=/usr \
-				--with-lua \
-				--with-${MYMAKE} || die
-
+	./configure \
+		--prefix=/usr \
+		--with-lua \
+		--with-${MYMAKE} || die "configure failed"
 	emake all || die
 }
 
@@ -103,9 +101,9 @@ src_install() {
 	if [ "${MYMAKE}" = "gnome" ]; then
 		gnome2_src_install
 	else
-		make install prefix=${D}/usr
+		make install prefix="${D}"/usr || die
 	fi
 
-	dodoc AUTHORS COPYING README TODO controls.txt
+	dodoc AUTHORS README TODO controls.txt
 	dohtml manual/*.html manual/*.css
 }