version bump; only fixes in the build system. Added patches to avoid dependency checks of the program itself. Maybe helps people to link with --as-needed

(Portage version: 2.1.1-r2)

6 files changed, 166 insertions, 1 deletions

diff --git a/x11-misc/gaia/ChangeLog b/x11-misc/gaia/ChangeLog
index d5f3c7d56f2e..9ed49d336560 100644
--- a/x11-misc/gaia/ChangeLog
+++ b/x11-misc/gaia/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-misc/gaia
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gaia/ChangeLog,v 1.11 2006/12/05 08:16:05 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gaia/ChangeLog,v 1.12 2006/12/06 11:47:39 opfer Exp $
+
+*gaia-0.1.2 (06 Dec 2006)
+
+  06 Dec 2006; Christian Faulhammer <opfer@gentoo.org>
+  +files/gaia-0.1.2-font_inclusion.patch,
+  +files/gaia-0.1.2-remove_dep_checks_gaia.patch,
+  +files/gaia-0.1.2-remove_dep_checks_wwfetch.patch, +gaia-0.1.2.ebuild:
+  version bump; only fixes in the build system. Added patches to avoid
+  dependency checks of the program itself. Maybe helps people to link with
+  --as-needed
 
   05 Dec 2006; Christian Faulhammer <opfer@gentoo.org> gaia-0.1.1.ebuild:
   Let install phase respect custom CFLAGS too
diff --git a/x11-misc/gaia/files/digest-gaia-0.1.2 b/x11-misc/gaia/files/digest-gaia-0.1.2
new file mode 100644
index 000000000000..2951485025bb
--- /dev/null
+++ b/x11-misc/gaia/files/digest-gaia-0.1.2
@@ -0,0 +1,3 @@
+MD5 b9bd7fd9b035e843788c6a6f25baf07f gaia-0.1.2.tar.bz2 60241
+RMD160 df1a050a7f8187a7e7196cb160a453a0ebbbf41d gaia-0.1.2.tar.bz2 60241
+SHA256 9174671fa3e88f6f10d6e5acfe1d18e8e4d6177fa0e288632b4b70f978864c95 gaia-0.1.2.tar.bz2 60241
diff --git a/x11-misc/gaia/files/gaia-0.1.2-font_inclusion.patch b/x11-misc/gaia/files/gaia-0.1.2-font_inclusion.patch
new file mode 100644
index 000000000000..2fb715aa2166
--- /dev/null
+++ b/x11-misc/gaia/files/gaia-0.1.2-font_inclusion.patch
@@ -0,0 +1,11 @@
+--- /tmp/Main.cc	2006-12-04 10:24:55.000000000 +0100
++++ Main.cc	2006-12-04 10:25:12.000000000 +0100
+@@ -345,7 +345,7 @@
+ 		last_frame = timer->GetFrame();
+ 
+ 		/* preloaded textures */
+-		PreloadedTextureManager::Instance()->LoadPNG(TEXTURE_FONT, DATADIR "/font.png");
++		PreloadedTextureManager::Instance()->LoadPNG(TEXTURE_FONT, "/usr/share/gaia/font.png");
+ 
+ 		/* sources */
+ 		debug("Initializing tile storage\n");
diff --git a/x11-misc/gaia/files/gaia-0.1.2-remove_dep_checks_gaia.patch b/x11-misc/gaia/files/gaia-0.1.2-remove_dep_checks_gaia.patch
new file mode 100644
index 000000000000..7e378483fbd4
--- /dev/null
+++ b/x11-misc/gaia/files/gaia-0.1.2-remove_dep_checks_gaia.patch
@@ -0,0 +1,46 @@
+--- /tmp/SConscript	2006-12-06 12:09:48.000000000 +0100
++++ /tmp/gaia-0.1.2/programs/gaia/SConscript	2006-12-06 12:10:17.000000000 +0100
+@@ -27,43 +27,6 @@
+ 	config = env.Configure(log_file = '/dev/null')
+ 	config_ok = True
+ 
+-	if not config.CheckHeader('SDL.h'):
+-		print "You need to install SDL development libraries"
+-		config_ok = False
+-
+-	if not config.CheckHeader('GL/gl.h'):
+-		print "You need to install GL development libraries"
+-		config_ok = False
+-
+-	if not config.CheckHeader( [ 'stdio.h', 'jpeglib.h' ] ):
+-		print "You need to install jpeg development libraries"
+-		config_ok = False
+-
+-	if not config.CheckHeader('png.h'):
+-		print "You need to install png development libraries"
+-		config_ok = False
+-
+-	if int(env['gpsd']) and not config.CheckHeader('gps.h'):
+-		print "You need to install libgps from gpsd package (http://gpsd.berlios.de/), or turn off gpsd support with `gpsd=0' option (you'll still be able to use GPS)"
+-		config_ok = False
+-
+-
+-	if not config.CheckLib('curl'):
+-		print "You need to install libcurl development libraries"
+-		config_ok = False
+-
+-	if not config.CheckLib('jpeg'):
+-		print "You need to install jpeg development libraries"
+-		config_ok = False
+-
+-	if not config.CheckLib('png'):
+-		print "You need to install png development libraries"
+-		config_ok = False
+-
+-	if int(env['gpsd']) and not config.CheckLib('gps'):
+-		print "You need to install libgps from gpsd package (http://gpsd.berlios.de/), or turn off gpsd support with `gpsd=0' option (you'll still be able to use GPS)"
+-		config_ok = False
+-
+ 	if not config_ok:
+ 		Exit(1)
+ 
diff --git a/x11-misc/gaia/files/gaia-0.1.2-remove_dep_checks_wwfetch.patch b/x11-misc/gaia/files/gaia-0.1.2-remove_dep_checks_wwfetch.patch
new file mode 100644
index 000000000000..667006a98705
--- /dev/null
+++ b/x11-misc/gaia/files/gaia-0.1.2-remove_dep_checks_wwfetch.patch
@@ -0,0 +1,13 @@
+--- /tmp/SConscript	2006-12-06 12:18:54.000000000 +0100
++++ /tmp/gaia-0.1.2/lib/wwfetch/SConscript	2006-12-06 12:19:09.000000000 +0100
+@@ -14,10 +14,6 @@
+ 	config = env.Configure(log_file = '/dev/null')
+ 	config_ok = True
+ 
+-	if not config.CheckHeader('curl/curl.h'):
+-		print "You need to install the cURL development libraries"
+-		config_ok = False
+-
+ 	if not config_ok:
+ 		Exit(1)
+ 
diff --git a/x11-misc/gaia/gaia-0.1.2.ebuild b/x11-misc/gaia/gaia-0.1.2.ebuild
new file mode 100644
index 000000000000..4c815af47292
--- /dev/null
+++ b/x11-misc/gaia/gaia-0.1.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gaia/gaia-0.1.2.ebuild,v 1.1 2006/12/06 11:47:39 opfer Exp $
+
+inherit eutils
+
+DESCRIPTION="opensource 3D interface to the planet, based on NASA World Wind data"
+HOMEPAGE="http://gaia.serezhkin.com/
+	http://sourceforge.net/projects/gaia-clean"
+SRC_URI="mirror://sourceforge/gaia-clean/${P}.tar.bz2"
+
+
+SLOT="0"
+LICENSE="GPL-2"
+
+IUSE="gps doc"
+KEYWORDS="~x86"
+
+RDEPEND="media-libs/jpeg
+	media-libs/libpng
+	>=media-libs/libsdl-1.2
+	net-misc/curl
+	virtual/opengl
+	gps? ( sci-geosciences/gpsd )
+	doc? ( app-doc/doxygen )"
+
+DEPEND="${RDEPEND}
+	dev-util/scons"
+
+src_unpack() {
+	unpack ${A}
+
+	# the binary would fail with a wrong hard coded path for font.png
+	cd ${S}/programs/gaia/
+	epatch "${FILESDIR}/${P}-font_inclusion.patch"
+
+	# when linked with --as-needed it will fail checking the deps, so we just
+	# remove them, as we have our own dependency checks
+	cd ${S}/programs/gaia/
+	epatch "${FILESDIR}/${P}-remove_dep_checks_gaia.patch"
+	cd ${S}/lib/wwfetch/
+	epatch "${FILESDIR}/${P}-remove_dep_checks_wwfetch.patch"
+}
+
+src_compile() {
+	# Due to an error in the build script, the variable CCFLAGS is expected,
+	# setting it here is simpler than patching
+	export CCFLAGS=${CFLAGS}
+	# respect variables from the environment
+	local myconf="use_env=yes"
+
+	if use gps; then
+		myconf="${myconf} gpsd=yes"
+	fi
+
+	scons ${MAKEOPTS} ${myconf} || die
+
+	use doc && doxygen
+}
+
+src_install() {
+	dodir /usr/bin/
+	dodir /usr/share/gaia/
+
+	dodoc TODO README ChangeLog
+
+	if use doc; then
+		insinto /usr/share/doc/${P}/html/
+		doins ${S}/doc/html/*
+	fi
+
+	# local defines if there is installation requested, while prefix determines the
+	# target 
+	export CCFLAGS=${CFLAGS}
+	scons local=no  prefix="${D}/usr" install
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Please set color depth of X11 to 24 or 32 bpp"
+	einfo
+}
\ No newline at end of file