diff options
| author |   Christian Faulhammer <opfer@gentoo.org> | 2008-05-29 12:06:19 +0000 |
|---|---|---|
| committer | Christian Faulhammer <opfer@gentoo.org> | 2008-05-29 12:06:19 +0000 |
| commit | 23360f1dd5d879799ab5838690fac8960688a368 (patch) | |
| tree | 51edb462d0b365a366cc2a203110f6a47e23e066 /x11-misc/gaia | |
| parent | Fix compilation with wxGTK USE=odbc by Arttu Valo, bug #213872 (diff) | |
| download | gentoo-2-23360f1dd5d879799ab5838690fac8960688a368.tar.gz gentoo-2-23360f1dd5d879799ab5838690fac8960688a368.tar.bz2 gentoo-2-23360f1dd5d879799ab5838690fac8960688a368.zip | |
fix compatability with scons >=0.98.3 as reported by coldwind in bug 223997
(Portage version: 2.1.4.4)
Diffstat (limited to 'x11-misc/gaia')
| -rw-r--r-- | x11-misc/gaia/ChangeLog | 6 | ||||
| -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 | 4 |
3 files changed, 44 insertions, 2 deletions
diff --git a/x11-misc/gaia/ChangeLog b/x11-misc/gaia/ChangeLog index abade3a73610..505d76114f70 100644 --- a/x11-misc/gaia/ChangeLog +++ b/x11-misc/gaia/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/gaia # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/gaia/ChangeLog,v 1.18 2008/05/11 18:57:35 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/gaia/ChangeLog,v 1.19 2008/05/29 12:06:18 opfer Exp $ + + 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 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 new file mode 100644 index 000000000000..72ecca59c41d --- /dev/null +++ b/x11-misc/gaia/files/gaia-0.1.2-scons-0.98.patch @@ -0,0 +1,36 @@ +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 index 6ad2746826a3..ea8929a261fd 100644 --- a/x11-misc/gaia/gaia-0.1.2.ebuild +++ b/x11-misc/gaia/gaia-0.1.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 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.8 2008/05/11 18:57:35 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/gaia/gaia-0.1.2.ebuild,v 1.9 2008/05/29 12:06:18 opfer Exp $ inherit eutils @@ -27,6 +27,8 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}-scons-0.98.patch" # the binary would fail with a wrong hard coded path for font.png cd "${S}/programs/gaia/" |