fix my name

5 files changed, 34 insertions, 25 deletions

diff --git a/app-misc/celestia/celestia-1.2.5.ebuild b/app-misc/celestia/celestia-1.2.5.ebuild
index 2796c59a3e86..1c23913395f9 100644
--- a/app-misc/celestia/celestia-1.2.5.ebuild
+++ b/app-misc/celestia/celestia-1.2.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/celestia/celestia-1.2.5.ebuild,v 1.2 2003/02/13 08:54:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/celestia/celestia-1.2.5.ebuild,v 1.3 2003/04/05 21:52:42 danarmak Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic kde-functions
 
-IUSE="gtk gnome"
+IUSE="gnome"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Celestia is a free real-time space simulation that lets you experience our universe in three dimensions"
@@ -15,20 +15,15 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86"
 
-DEPEND="gtk? ( =x11-libs/gtk+-1.2*
-	<x11-libs/gtkglarea-1.99.0 )
-	gnome? ( =gnome-base/gnome-libs-1.4* )
-	>=media-libs/glut-3.7-r2
+# gnome and kde interfaces are exlcusive; gnome takes precedence
+DEPEND=">=media-libs/glut-3.7-r2
 	virtual/glu
 	media-libs/jpeg
-	media-libs/libpng"
-
-#src_unpack() {
-#	unpack ${A}
-#	cd ${S}
-#
-#	patch -p1 < ${FILESDIR}/celestia-gcc3.patch
-#}
+	media-libs/libpng
+	gnome? ( =x11-libs/gtk+-1.2*
+		<x11-libs/gtkglarea-1.99.0 
+		=gnome-base/gnome-libs-1.4* )
+	!gnome? ( >=kde-base/kdelibs-3.0.5 )"
 
 pkg_setup() {
 	einfo	"Please note:"
@@ -37,6 +32,13 @@ pkg_setup() {
 	einfo	"opengl-update xfree"
 	einfo	"emerge celestia"
 	einfo	"opengl-update nvidia"
+	einfo	"------------"
+	einfo	"NOTE: the gnome and kde GUIs are mutually exclusive. If you're getting"
+	einfo 	"the wrong one, run either:"
+	einfo	"'USE=gnome emerge celestia' (for the gnome interface)"
+	einfo	"or:"
+	einfo	"'USE=-gnome emerge celestia' (for the kde interface)"
+	einfo	"as appropriate."
 }
 
 src_compile() {
@@ -45,8 +47,15 @@ src_compile() {
 	filter-flags "-funroll-loops -frerun-loop-opt"
 
 	# currently celestia's "gtk support" requires gnome
-	use gtk || myconf="--without-gtk"
-	use gnome || myconf="--without-gtk"
+	if [ -n "`use gnome`" ]; then
+	    myconf="$myconf --with-gtk --withou-kde"
+	else
+	    myconf="--with-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
 
diff --git a/app-misc/kdiff3/ChangeLog b/app-misc/kdiff3/ChangeLog
index 3eb200e3728a..0d3acb763f6f 100644
--- a/app-misc/kdiff3/ChangeLog
+++ b/app-misc/kdiff3/ChangeLog
@@ -1,10 +1,10 @@
 # ChangeLog for app-misc/kdiff3
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/kdiff3/ChangeLog,v 1.3 2003/04/05 21:40:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/kdiff3/ChangeLog,v 1.4 2003/04/05 21:52:42 danarmak Exp $
 
 *kdiff3-0.931 (30 Jan 2003)
 
-  06 Apr 2003; root <root@gentoo.org> kdiff3-0.931.ebuild:
+  06 Apr 2003; Dan Armak <danarmak@gentoo.org> kdiff3-0.931.ebuild:
   Add stable x86 keyword.
 
   30 Jan 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
diff --git a/app-misc/kfish/ChangeLog b/app-misc/kfish/ChangeLog
index d82e3d293c7d..7a1bab07e9f0 100644
--- a/app-misc/kfish/ChangeLog
+++ b/app-misc/kfish/ChangeLog
@@ -1,10 +1,10 @@
 # ChangeLog for app-misc/kfish
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/kfish/ChangeLog,v 1.3 2003/04/05 21:40:45 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/kfish/ChangeLog,v 1.4 2003/04/05 21:52:42 danarmak Exp $
 
 *kfish-2.01 (06 Apr 2003)
 
-  06 Apr 2003; root <root@gentoo.org> kfish-2.01.ebuild:
+  06 Apr 2003; Dan Armak <danarmak@gentoo.org> kfish-2.01.ebuild:
   Add stable x86 keyword.
 
 *kfish-1.0 (11 Aug 2002)
diff --git a/app-misc/krename/ChangeLog b/app-misc/krename/ChangeLog
index 4dc2f6b5ba48..1b04e0d1ab85 100644
--- a/app-misc/krename/ChangeLog
+++ b/app-misc/krename/ChangeLog
@@ -1,10 +1,10 @@
 # ChangeLog for app-misc/krename
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/krename/ChangeLog,v 1.15 2003/04/05 21:41:48 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/krename/ChangeLog,v 1.16 2003/04/05 21:52:42 danarmak Exp $
 
 *krename-2.5.5 (28 Mar 2003)
 
-  06 Apr 2003; root <root@gentoo.org> krename-2.5.5.ebuild:
+  06 Apr 2003; Dan Armak <danarmak@gentoo.org> krename-2.5.5.ebuild:
   Add stable x86 keyword.
 
   28 Mar 2003; Seemant Kulleen <seemant@gentoo.org> krename-2.5.5.ebuild:
diff --git a/app-misc/krusader/ChangeLog b/app-misc/krusader/ChangeLog
index accebbd0609c..16c33865c6a0 100644
--- a/app-misc/krusader/ChangeLog
+++ b/app-misc/krusader/ChangeLog
@@ -1,10 +1,10 @@
 # ChangeLog for app-misc/krusader
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/krusader/ChangeLog,v 1.11 2003/04/05 21:42:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/krusader/ChangeLog,v 1.12 2003/04/05 21:52:42 danarmak Exp $
 
 *krusader-1.12_beta1 (02 Jan 2003)
 
-  06 Apr 2003; root <root@gentoo.org> krusader-1.12_beta1.ebuild:
+  06 Apr 2003; Dan Armak <danarmak@gentoo.org> krusader-1.12_beta1.ebuild:
   Add stable x86 keyword.
 
   02 Jan 2003; Hannes Mehnert <hannes@gentoo.org> krusader-1.12_beta1.ebuild: