added a patch that respects the USE flags of the environment. Thanks to Michael...

Package-Manager: portage-2.1.1-r2

diff --git a/x11-misc/gaia/ChangeLog b/x11-misc/gaia/ChangeLog
index ddf2765fe5260219890c36739d3caa416f543c85..594b1c1c9c75ffb01314460a330e4326e052eb96 100644 (file)
--- a/x11-misc/gaia/ChangeLog
+++ b/x11-misc/gaia/ChangeLog
@@ -1,6 +1,11 @@
 # 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.4 2006/11/24 09:18:14 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gaia/ChangeLog,v 1.5 2006/11/24 11:05:07 opfer Exp $
+
+  24 Nov 2006; Christian Faulhammer <opfer@gentoo.org>
+  +files/gaia-respect_CFLAGS.patch, gaia-0.1.0.ebuild:
+  added a patch that respects the USE flags of the environment. Thanks to
+  Michael Hanselmann <hansmi@gentoo.org> for the help on Python mangling
 
   24 Nov 2006; Christian Faulhammer <opfer@gentoo.org> gaia-0.1.0.ebuild:
   kick out libtool.eclass, not needed

diff --git a/x11-misc/gaia/Manifest b/x11-misc/gaia/Manifest
index 4f03bb90a005513c07e03382e64f1b61d68d913d..7ab345971f2328fbc2879dfc951265fed132cece 100644 (file)
--- a/x11-misc/gaia/Manifest
+++ b/x11-misc/gaia/Manifest
@@ -1,15 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gaia-respect_CFLAGS.patch 687 RMD160 7811549b32d5e29d89c5c9ee666df9b236c919aa SHA1 2c88cf062e3b8e5df0f1ba2648593865f8d78d6c SHA256 46f539121803b70b57e23162f4e7a1505b395304092d8f663da37f2e2934e7ef
+MD5 a4921d84aa67b1f660170cef2e3fd38d files/gaia-respect_CFLAGS.patch 687
+RMD160 7811549b32d5e29d89c5c9ee666df9b236c919aa files/gaia-respect_CFLAGS.patch 687
+SHA256 46f539121803b70b57e23162f4e7a1505b395304092d8f663da37f2e2934e7ef files/gaia-respect_CFLAGS.patch 687
 DIST gaia-0.1.0.tar.bz2 64892 RMD160 da0fd41fe6452ac3d20390e7d5a24a4e722c8963 SHA1 cbac9aec0d670f84588ed5a953c8d76db6cd4740 SHA256 83931c8e5316d3b156a4b71c1e92ec693133daa24f803c35ef983580fe42e48b
-EBUILD gaia-0.1.0.ebuild 1686 RMD160 14f9b51b75a93e241dc70107e39847fdb7c321f0 SHA1 583f33b647a891c6e579815f63e3bc3a6d329786 SHA256 943213e81bf0ed4ad98b897794982f91d48e0acb7aaa3bcb4e01d93f33f22d61
-MD5 8ca11319e27ad3bfb9d7f056abae1bf5 gaia-0.1.0.ebuild 1686
-RMD160 14f9b51b75a93e241dc70107e39847fdb7c321f0 gaia-0.1.0.ebuild 1686
-SHA256 943213e81bf0ed4ad98b897794982f91d48e0acb7aaa3bcb4e01d93f33f22d61 gaia-0.1.0.ebuild 1686
-MISC ChangeLog 796 RMD160 56b93e952a04aa7c40903e6a417378ae1c6827ff SHA1 013136972901064a0704a31658c700c5d881711c SHA256 5726223db5153f335e6b361c27a62941bdaf6d1f3aed727f1a1f2dc22ffde5ff
-MD5 3390532ece2ae4b08b2e2df43130f222 ChangeLog 796
-RMD160 56b93e952a04aa7c40903e6a417378ae1c6827ff ChangeLog 796
-SHA256 5726223db5153f335e6b361c27a62941bdaf6d1f3aed727f1a1f2dc22ffde5ff ChangeLog 796
+EBUILD gaia-0.1.0.ebuild 1751 RMD160 7887621c4ffa2aadcf91fdd3aa31a2a6dda1d3af SHA1 8338b97521284785b6fcd7c80657333eb545539c SHA256 973d190ab5fc986d149a8c4211de6858549f37971e735291cc9d342fa2ae8fbf
+MD5 4f07490c6d3b4e196f6dee87878c9fcd gaia-0.1.0.ebuild 1751
+RMD160 7887621c4ffa2aadcf91fdd3aa31a2a6dda1d3af gaia-0.1.0.ebuild 1751
+SHA256 973d190ab5fc986d149a8c4211de6858549f37971e735291cc9d342fa2ae8fbf gaia-0.1.0.ebuild 1751
+MISC ChangeLog 1054 RMD160 c433c605246270fe8d1392b33ce4c69bad225b52 SHA1 325c8afd335ee43bea00ddbf6ef1457029dcdadf SHA256 44dfb5db7e4934ecac93437a4652b486b061d009dc9acbfc8db63cc575e4bde0
+MD5 3f852a9fcca962e7a886b9a4537afc8a ChangeLog 1054
+RMD160 c433c605246270fe8d1392b33ce4c69bad225b52 ChangeLog 1054
+SHA256 44dfb5db7e4934ecac93437a4652b486b061d009dc9acbfc8db63cc575e4bde0 ChangeLog 1054
 MISC metadata.xml 266 RMD160 ec474d4b2edebeccd738705e8717ecdb4aaca347 SHA1 2eb26e89e18770b3cc373ab290938a2aea6bce97 SHA256 2d1e8e22e242d00cd34f662e4d04d2e7d488951bd1e84fe3132d2b1ebd1b71d2
 MD5 f2e99271e391d686f969c3d65ac24562 metadata.xml 266
 RMD160 ec474d4b2edebeccd738705e8717ecdb4aaca347 metadata.xml 266
@@ -20,7 +24,7 @@ SHA256 083477a60a7f839377a832cabeaba8dd89c055d45341362662a444b1a6180b1c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFZrjgNQqtfCuFneMRAvhqAJ4zSHSDmCQ/tElD2FaoBH9O/ikN4QCcCBn0
-+6KghIWHuYU30ZUEy7xcpTw=
-=CDZO
+iD8DBQFFZtH9NQqtfCuFneMRAk3mAKCY0DuLnzhTQnRy+yg99wGLNvX8kQCeMtRL
+F8fJOiytdvcFq5uvA/Ljlsc=
+=kgJP
 -----END PGP SIGNATURE-----

diff --git a/x11-misc/gaia/files/gaia-respect_CFLAGS.patch b/x11-misc/gaia/files/gaia-respect_CFLAGS.patch
new file mode 100644 (file)
index 0000000..197de21
--- /dev/null
+++ b/x11-misc/gaia/files/gaia-respect_CFLAGS.patch
@@ -0,0 +1,20 @@
+--- SConstruct 2006-11-24 11:53:51.000000000 +0100
++++ /tmp/SConstruct    2006-11-24 11:55:07.000000000 +0100
+@@ -1,4 +1,5 @@
+ import os
++import re
+ 
+ #######################################
+ # OPTIONS
+@@ -11,8 +12,9 @@
+ #######################################
+ # ENVIRONMENT
+ #######################################
+-env = Environment( CCFLAGS = [ '-Wall', '-g' ],
+-                 CXXFLAGS = [ '-Wall', '-g' ],
++
++env = Environment( CCFLAGS = re.split('\s+', os.environ.get('CFLAGS', '')),
++                 CXXFLAGS = re.split('\s+', os.environ.get('CXXFLAGS', '')),
+                  CPPPATH = [ '/usr/local/include', '/usr/X11R6/include' ],
+                  LIBPATH = [ '/usr/X11R6/lib', '/usr/local/lib' ],
+                  options = opts )

diff --git a/x11-misc/gaia/gaia-0.1.0.ebuild b/x11-misc/gaia/gaia-0.1.0.ebuild
index 09331dda3d9b73e27872ee359bddec92ef7f7de7..f8e1e2285dbaa83f80715bcc0c30d45cd5242f9a 100644 (file)
--- a/x11-misc/gaia/gaia-0.1.0.ebuild
+++ b/x11-misc/gaia/gaia-0.1.0.ebuild
@@ -1,6 +1,8 @@
 # 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.0.ebuild,v 1.5 2006/11/24 09:18:14 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gaia/gaia-0.1.0.ebuild,v 1.6 2006/11/24 11:05:07 opfer Exp $
+
+inherit eutils
 
 DESCRIPTION="opensource 3D interface to the planet, based on Google Earth data"
 HOMEPAGE="http://gaia.serezhkin.com/"
@@ -29,6 +31,7 @@ src_unpack() {
        cd ${S}
        sed -i "s/\.\/data/\/usr\/share\/gaia/" src/config.h
        sed -i "/libgefetch_examples/a\SConsignFile()" SConstruct
+       epatch "${FILESDIR}"/${PN}-respect_CFLAGS.patch
 }
 
 src_compile() {