summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Faulhammer <opfer@gentoo.org>2006-11-24 11:05:07 +0000
committerChristian Faulhammer <opfer@gentoo.org>2006-11-24 11:05:07 +0000
commit579e72e6eded0f0bd921ae73a05059666dda7979 (patch)
treea8ab21c4096c0d1c47af26f768f6e03bbb41c524 /x11-misc
parentBump. (diff)
downloadgentoo-2-579e72e6eded0f0bd921ae73a05059666dda7979.tar.gz
gentoo-2-579e72e6eded0f0bd921ae73a05059666dda7979.tar.bz2
gentoo-2-579e72e6eded0f0bd921ae73a05059666dda7979.zip
added a patch that respects the USE flags of the environment. Thanks to Michael Hanselmann <hansmi@gentoo.org> for the help on Python mangling
(Portage version: 2.1.1-r2)
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/gaia/ChangeLog7
-rw-r--r--x11-misc/gaia/files/gaia-respect_CFLAGS.patch20
-rw-r--r--x11-misc/gaia/gaia-0.1.0.ebuild5
3 files changed, 30 insertions, 2 deletions
diff --git a/x11-misc/gaia/ChangeLog b/x11-misc/gaia/ChangeLog
index ddf2765fe526..594b1c1c9c75 100644
--- 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/files/gaia-respect_CFLAGS.patch b/x11-misc/gaia/files/gaia-respect_CFLAGS.patch
new file mode 100644
index 000000000000..197de21866e8
--- /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 09331dda3d9b..f8e1e2285dba 100644
--- 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() {