diff options
author | Christian Faulhammer <fauli@gentoo.org> | 2010-07-26 08:02:46 +0000 |
---|---|---|
committer | Christian Faulhammer <fauli@gentoo.org> | 2010-07-26 08:02:46 +0000 |
commit | 3efb956a4120149e4e7c61859ade3be9a1a067c5 (patch) | |
tree | 7379645709a74fa9d96b656ce51f0ae8e6f34863 | |
parent | Updated to latest upstream release (fixes bug 325019). (diff) | |
download | gentoo-2-3efb956a4120149e4e7c61859ade3be9a1a067c5.tar.gz gentoo-2-3efb956a4120149e4e7c61859ade3be9a1a067c5.tar.bz2 gentoo-2-3efb956a4120149e4e7c61859ade3be9a1a067c5.zip |
Remove gaia
-rw-r--r-- | x11-misc/gaia/ChangeLog | 71 | ||||
-rw-r--r-- | x11-misc/gaia/Manifest | 11 | ||||
-rw-r--r-- | x11-misc/gaia/files/gaia-0.1.2-curl-7.18.patch | 20 | ||||
-rw-r--r-- | x11-misc/gaia/files/gaia-0.1.2-font_inclusion.patch | 11 | ||||
-rw-r--r-- | x11-misc/gaia/files/gaia-0.1.2-gcc43.patch | 21 | ||||
-rw-r--r-- | x11-misc/gaia/files/gaia-0.1.2-libpng14.patch | 21 | ||||
-rw-r--r-- | x11-misc/gaia/files/gaia-0.1.2-remove_dep_checks_gaia.patch | 46 | ||||
-rw-r--r-- | x11-misc/gaia/files/gaia-0.1.2-remove_dep_checks_wwfetch.patch | 13 | ||||
-rw-r--r-- | x11-misc/gaia/files/gaia-0.1.2-scons-0.98.patch | 36 | ||||
-rw-r--r-- | x11-misc/gaia/gaia-0.1.2.ebuild | 76 | ||||
-rw-r--r-- | x11-misc/gaia/metadata.xml | 9 |
11 files changed, 0 insertions, 335 deletions
diff --git a/x11-misc/gaia/ChangeLog b/x11-misc/gaia/ChangeLog deleted file mode 100644 index 44e400773b55..000000000000 --- a/x11-misc/gaia/ChangeLog +++ /dev/null @@ -1,71 +0,0 @@ -# ChangeLog for x11-misc/gaia -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/gaia/ChangeLog,v 1.23 2010/03/11 12:35:25 ssuominen Exp $ - - 11 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> gaia-0.1.2.ebuild, - +files/gaia-0.1.2-libpng14.patch: - Fix building with libpng14. - - 28 Nov 2008; Christian Faulhammer <fauli@gentoo.org> metadata.xml: - Change my email address - - 17 Nov 2008; Diego E. Pettenò <flameeyes@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: - Fix patch with absolute paths. - - 11 Jun 2008; Christian Faulhammer <opfer@gentoo.org> - +files/gaia-0.1.2-curl-7.18.patch, +files/gaia-0.1.2-gcc43.patch, - gaia-0.1.2.ebuild: - fix build errors with GCC 4.3 and curl 7.18, thanks to loki_val in bug 225265 - - 29 May 2008; Christian Faulhammer <opfer@gentoo.org> - +files/gaia-0.1.2-scons-0.98.patch, gaia-0.1.2.ebuild: - fix compatability with scons >=0.98.3 as reported by coldwind in bug 223997 - - 11 May 2008; Christian Faulhammer <opfer@gentoo.org> gaia-0.1.2.ebuild: - put doxygen in build-time dependency as reported on bug 221701 by flameeyes - - 24 Jan 2008; Christian Faulhammer <opfer@gentoo.org> gaia-0.1.2.ebuild: - remove invalid HOMEPAGE and add some quotes - - 16 Apr 2007; Christian Faulhammer <opfer@gentoo.org> gaia-0.1.2.ebuild: - keyworded ~amd64, bug 156097 - - 08 Apr 2007; Joseph Jezak <josejx@gentoo.org> gaia-0.1.2.ebuild: - Marked ~ppc for bug #156097. - - 07 Dec 2006; Christian Faulhammer <opfer@gentoo.org> gaia-0.1.2.ebuild: - removed postinstallation message, as Gaia now works on non-24 or non-32 bit - color settings; also the local=no for installation isn't needed anymore - - 06 Dec 2006; Christian Faulhammer <opfer@gentoo.org> - -files/gaia-0.1.1-correct_doxygen_path.patch, - -files/gaia-0.1.1-font_inclusion.patch, -gaia-0.1.1.ebuild: - clean up old version - -*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 - - 04 Dec 2006; Christian Faulhammer <opfer@gentoo.org> gaia-0.1.1.ebuild: - remove non-x86 keywords and removed s from Homepage URL - -*gaia-0.1.1 (04 Dec 2006) - - 04 Dec 2006; Christian Faulhammer <opfer@gentoo.org> - +files/gaia-0.1.1-correct_doxygen_path.patch, - +files/gaia-0.1.1-font_inclusion.patch, +metadata.xml, +gaia-0.1.1.ebuild: - a new try. This version uses NASA World Wind instead of Google Earth and - should be safe from copyright violations - diff --git a/x11-misc/gaia/Manifest b/x11-misc/gaia/Manifest deleted file mode 100644 index 0694158065ce..000000000000 --- a/x11-misc/gaia/Manifest +++ /dev/null @@ -1,11 +0,0 @@ -AUX gaia-0.1.2-curl-7.18.patch 757 RMD160 70e69019c8d7ec1572a4e74eb4725f2f6991e223 SHA1 5a4349171a06e3220f85665dc2976886138c856a SHA256 21f966965797e90b4e030c5ad647ea330f4c9ae0ee64a3cfd0082134c065511d -AUX gaia-0.1.2-font_inclusion.patch 420 RMD160 b8e5ad61d0965f3f37f45529348a81174f6c5ff2 SHA1 82c0da939040745a6a99b7280179cc5f249e45d2 SHA256 51f5a41d84444467d06876e333b5e413a28593e2029ee92eabee789d6323a67a -AUX gaia-0.1.2-gcc43.patch 491 RMD160 8bdd91b52079b748b2e642e834e7b0572eab4b50 SHA1 ec17facfca64a59b699179b96a587583663f3b65 SHA256 574cb19bb4d2357c256de67bcc271bbf00872208bb6b1d3597bc0357fd82c91e -AUX gaia-0.1.2-libpng14.patch 534 RMD160 e4d9089964c5e25fc9c62c8beb5e866cce358a75 SHA1 b1e43c0a8c93907f179ecdc0a4bd3ca16bb8eeaf SHA256 f8fc10f93be34396282cd8b9dee2893ed28b3dce6554bb906fff3cec5cd6d12d -AUX gaia-0.1.2-remove_dep_checks_gaia.patch 1606 RMD160 05e82dccadf9b5e8cca4390ba80497be922ffb97 SHA1 49c8babc90992f01df75ad7b8aedcf5905c02a8e SHA256 2c021559daa7fdf7c0d2d2f35755de3ca6e6465ee6a7ae153a4c5b4a9edfa6bb -AUX gaia-0.1.2-remove_dep_checks_wwfetch.patch 403 RMD160 d2340c5d0d7c570b86e634d95c4c3c18a224f146 SHA1 d52e7cd29491496c5000267e9586582e51d97fd2 SHA256 6bbb3a1fc4429d93a63f3afc9020b3e19558b7db9ff4f4ce7ab3359f6f27c050 -AUX gaia-0.1.2-scons-0.98.patch 1369 RMD160 67349cf48cf105cfcb3e85fcf14a14f6194cc98f SHA1 e36dae887803b72f241fda057b21b529fb236d99 SHA256 65fdfe7b6902f4f4c2bc55b646e1cbb91b9b4cc5828b901c6c0cd1c45c05d495 -DIST gaia-0.1.2.tar.bz2 60241 RMD160 df1a050a7f8187a7e7196cb160a453a0ebbbf41d SHA1 5a2c65064010c7d00151f6f94b0bf0e2ae796bfa SHA256 9174671fa3e88f6f10d6e5acfe1d18e8e4d6177fa0e288632b4b70f978864c95 -EBUILD gaia-0.1.2.ebuild 1945 RMD160 4ec8436db34570b247fcfc8503fd5c46cc03cc3f SHA1 0e2d67b6b5956edb445c0618457e2e54cb74d560 SHA256 91f82f51956e42aa1047b8206921d4963e5dcce330c808b43df736c277bd8f83 -MISC ChangeLog 2970 RMD160 954143252098d3260f6702896c918bc8cd393af8 SHA1 debeac23f9bdea7520701c359fbb2541976be005 SHA256 4ecef8e24e46735970f67af01c41a650a5c891ad8accce2a18a1eb6c2a703f81 -MISC metadata.xml 266 RMD160 6c7d2ad6c94f4caef0308b4bd1466e721b2828d0 SHA1 7fdcf34937cade65e2a7724dc16673587b6a38aa SHA256 90e5c12283200ba96bf92b033f259712e4c06edcaa33f68017447db1b5bf8b04 diff --git a/x11-misc/gaia/files/gaia-0.1.2-curl-7.18.patch b/x11-misc/gaia/files/gaia-0.1.2-curl-7.18.patch deleted file mode 100644 index 49e138a90116..000000000000 --- a/x11-misc/gaia/files/gaia-0.1.2-curl-7.18.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- gaia-0.1.2.orig/lib/wwfetch/wwfetch_http.c -+++ gaia-0.1.2/lib/wwfetch/wwfetch_http.c -@@ -19,6 +19,8 @@ - - #include "wwfetch_internal.h" - -+#define GAIA_USERAGENT "gaia/" GAIA_VERSION -+ - /** - * Internal function used in curl - * -@@ -96,7 +98,7 @@ - if ((handle->lastcurlerror = curl_easy_setopt(handle->curl, CURLOPT_HTTPHEADER, handle->curlheaders)) != CURLE_OK) - return WWFETCH_CURL_ERROR; - -- if ((handle->lastcurlerror = curl_easy_setopt(handle->curl, CURLOPT_USERAGENT, "gaia/%s", GAIA_VERSION)) != CURLE_OK) -+ if ((handle->lastcurlerror = curl_easy_setopt(handle->curl, CURLOPT_USERAGENT, GAIA_USERAGENT)) != CURLE_OK) - return WWFETCH_CURL_ERROR; - - if ((handle->lastcurlerror = curl_easy_setopt(handle->curl, CURLOPT_URL, url)) != CURLE_OK) 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 deleted file mode 100644 index 2375cbd75498..000000000000 --- a/x11-misc/gaia/files/gaia-0.1.2-font_inclusion.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Main.cc 2006-12-04 10:24:55.000000000 +0100 -+++ b/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-gcc43.patch b/x11-misc/gaia/files/gaia-0.1.2-gcc43.patch deleted file mode 100644 index e52eaf11f407..000000000000 --- a/x11-misc/gaia/files/gaia-0.1.2-gcc43.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- gaia-0.1.2.orig/programs/gaia/GPSSourceNMEA.h -+++ gaia-0.1.2/programs/gaia/GPSSourceNMEA.h -@@ -20,6 +20,8 @@ - #ifndef __GAIA__GPSSOURCENMEA_H__ - #define __GAIA__GPSSOURCENMEA_H__ - -+#include <cstdio> -+#include <cctype> - #include <vector> - #include <string.h> - #include <fcntl.h> ---- gaia-0.1.2.orig/programs/gaia/Hud.h -+++ gaia-0.1.2/programs/gaia/Hud.h -@@ -20,6 +20,7 @@ - #ifndef __GAIA__HUD_H__ - #define __GAIA__HUD_H__ - -+#include <algorithm> - #include <vector> - #include <GL/gl.h> - diff --git a/x11-misc/gaia/files/gaia-0.1.2-libpng14.patch b/x11-misc/gaia/files/gaia-0.1.2-libpng14.patch deleted file mode 100644 index 34560af2b3cb..000000000000 --- a/x11-misc/gaia/files/gaia-0.1.2-libpng14.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- programs/gaia/Texture.cc -+++ programs/gaia/Texture.cc -@@ -276,8 +276,7 @@ - png_byte sig[8] = {0}; - - fread(sig, 8, 1, infile); -- -- if (!png_check_sig(sig, 8)) -+ if (png_sig_cmp(sig, 0, 8)) - throw Exception("bad PNG signature"); - - /* create structures */ -@@ -308,7 +307,7 @@ - switch (color_type) { - case PNG_COLOR_TYPE_GRAY: - if (bit_depth < 8) -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - m_glInternalFormat = GL_LUMINANCE8; - m_glFormat = GL_LUMINANCE; - break; 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 deleted file mode 100644 index fbf41dfb1935..000000000000 --- a/x11-misc/gaia/files/gaia-0.1.2-remove_dep_checks_gaia.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/gaia-0.1.2/programs/gaia/SConscript 2006-12-06 12:09:48.000000000 +0100 -+++ b/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 deleted file mode 100644 index 605a5ce0017b..000000000000 --- a/x11-misc/gaia/files/gaia-0.1.2-remove_dep_checks_wwfetch.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/gaia-0.1.2/lib/wwfetch/SConscript 2006-12-06 12:18:54.000000000 +0100 -+++ b/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/files/gaia-0.1.2-scons-0.98.patch b/x11-misc/gaia/files/gaia-0.1.2-scons-0.98.patch deleted file mode 100644 index 72ecca59c41d..000000000000 --- a/x11-misc/gaia/files/gaia-0.1.2-scons-0.98.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ru ../gaia-0.1.2.orig/lib/wwfetch/SConscript ./lib/wwfetch/SConscript ---- ../gaia-0.1.2.orig/lib/wwfetch/SConscript 2008-05-29 13:59:49.000000000 +0200 -+++ ./lib/wwfetch/SConscript 2008-05-29 14:01:07.000000000 +0200 -@@ -5,7 +5,7 @@ - ####################################### - # ENVIRONMENT - ####################################### --env = env.Copy(); -+env = env.Clone(); - - ####################################### - # CHECKS -diff -ru ../gaia-0.1.2.orig/programs/gaia/SConscript ./programs/gaia/SConscript ---- ../gaia-0.1.2.orig/programs/gaia/SConscript 2008-05-29 13:59:49.000000000 +0200 -+++ ./programs/gaia/SConscript 2008-05-29 14:01:00.000000000 +0200 -@@ -5,7 +5,7 @@ - ####################################### - # ENVIRONMENT - ####################################### --env = env.Copy(); -+env = env.Clone(); - - env.Append(LIBS = [ 'z', 'm', 'jpeg', 'GL', 'GLU' ]); - env.Prepend(CPPPATH = [ '../../lib/wwfetch' ]); -diff -ru ../gaia-0.1.2.orig/SConstruct ./SConstruct ---- ../gaia-0.1.2.orig/SConstruct 2008-05-29 13:59:49.000000000 +0200 -+++ ./SConstruct 2008-05-29 14:00:47.000000000 +0200 -@@ -8,7 +8,7 @@ - ####################################### - # OPTIONS - ####################################### --opts = Options(ARGUMENTS) -+opts = Options(args = ARGUMENTS) - # conditionally build parts of gaia - #opts.Add(BoolOption('gaia', 'Compile gaia OpenGL client', 1)); - diff --git a/x11-misc/gaia/gaia-0.1.2.ebuild b/x11-misc/gaia/gaia-0.1.2.ebuild deleted file mode 100644 index 19b02b0b1038..000000000000 --- a/x11-misc/gaia/gaia-0.1.2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2010 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.11 2010/03/11 12:35:25 ssuominen Exp $ - -inherit eutils - -DESCRIPTION="Opensource 3D interface to the planet, based on NASA World Wind data" -HOMEPAGE="http://sourceforge.net/projects/gaia-clean" -SRC_URI="mirror://sourceforge/gaia-clean/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="gps doc" - -RDEPEND="media-libs/jpeg - media-libs/libpng - >=media-libs/libsdl-1.2 - net-misc/curl - virtual/opengl - gps? ( sci-geosciences/gpsd )" -DEPEND="${RDEPEND} - dev-util/scons - doc? ( app-doc/doxygen )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-scons-0.98.patch \ - "${FILESDIR}"/${P}-gcc43.patch \ - "${FILESDIR}"/${P}-curl-7.18.patch \ - "${FILESDIR}"/${P}-libpng14.patch - - # 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 - - # prefix determines the target directory - export CCFLAGS=${CFLAGS} - scons prefix="${D}/usr" install -} diff --git a/x11-misc/gaia/metadata.xml b/x11-misc/gaia/metadata.xml deleted file mode 100644 index b820a6369914..000000000000 --- a/x11-misc/gaia/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer> - <email>fauli@gentoo.org</email> - <name>Christian Faulhammer</name> - </maintainer> - <herd>no-herd</herd> -</pkgmetadata>
\ No newline at end of file |