fix compatability with scons >=0.98.3 as reported by coldwind in bug 223997

Package-Manager: portage-2.1.4.4

4 files changed, 50 insertions, 7 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/Manifest b/x11-misc/gaia/Manifest
index 26280d8e1722..9f3c98715e32 100644
--- a/x11-misc/gaia/Manifest
+++ b/x11-misc/gaia/Manifest
@@ -4,14 +4,15 @@ Hash: SHA1
 AUX gaia-0.1.2-font_inclusion.patch 421 RMD160 42c4616ae87b8ff1dece465037885fd0999f08f8 SHA1 5406efa34fb1a68002f473a1da747fb744d7ae3b SHA256 623cf4d7c723f1c763282564db7daa13716bc168f742bf07df65eaf6afd34c3d
 AUX gaia-0.1.2-remove_dep_checks_gaia.patch 1587 RMD160 94f7444b8922d3702d5c375f54ca858d9747840c SHA1 b96e8a1f7cfe0ab2f1a3966966b4cd6bcee4bf6e SHA256 2a2b0e59226e11de822edf2f69a74c9ae477873206237b010872d7fe4bb73e6d
 AUX gaia-0.1.2-remove_dep_checks_wwfetch.patch 386 RMD160 89d43472835f671cf81270e1e516519f5e992742 SHA1 937388bb2c5b03a07af79b63bdaa21b2ac7084e3 SHA256 bfe581646050a3fceded899e0e6065f21340d1323a6fda50636010ea5405e954
+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 1775 RMD160 c245b10d581f17995da84747fdac6ab521c75f08 SHA1 8ce6f56cb9bd18e4a83fdcda6a94671d8ad3ab16 SHA256 12a89bc4e3f1642f6b88c0e853aca4e4def268d1234e3385713013d47e35ddc4
-MISC ChangeLog 2082 RMD160 31716e4ba4b70220aac6a8eacc95b6bd09b61f5c SHA1 048045726ee10d43fc230d9ef0e47b1e206a41fb SHA256 e1f3c0003e575cd2124c554ab089947fb3d8c37437ba242f478db85cac9c5cba
+EBUILD gaia-0.1.2.ebuild 1830 RMD160 683aaaa1720558e79722d787a64a0e4a4bd127c0 SHA1 22d601ab6ba903f41ba3671d44a8834b65646bb5 SHA256 6dae5904b701e703e0d983bad9d99b489a596cf29fe9a64281c32760d64b5975
+MISC ChangeLog 2273 RMD160 8572edb3a005a064742abf600c3056654aa577e5 SHA1 ae69cc63771ae049736f26a91f633d370c348857 SHA256 9597c5683341f3ebc18dd9769b9d60d8f0e571a03f44126fc054072c56fad164
 MISC metadata.xml 266 RMD160 ec474d4b2edebeccd738705e8717ecdb4aaca347 SHA1 2eb26e89e18770b3cc373ab290938a2aea6bce97 SHA256 2d1e8e22e242d00cd34f662e4d04d2e7d488951bd1e84fe3132d2b1ebd1b71d2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgnQaUACgkQNQqtfCuFneOzzwCgiO/Dh7WMtBX1a19mReVHab8c
-Ii8Ani9pW1XNJsuLhFXvu72BlvRPL+2m
-=GZ/m
+iEYEARECAAYFAkg+nEUACgkQNQqtfCuFneOekwCeKizi0BBvCgky5xcokf06Ld8G
+Ql4AoIBNushJHMa3LqYZLlkeKINYOepR
+=20Ni
 -----END PGP SIGNATURE-----
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/"