Respect LDFLAGS, CFLAGS, and CC (Bug #332227)

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 75 insertions, 1 deletions

diff --git a/rox-base/rox-media/ChangeLog b/rox-base/rox-media/ChangeLog
index 3b53d3b5ede5..2af950d69ae4 100644
--- a/rox-base/rox-media/ChangeLog
+++ b/rox-base/rox-media/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for rox-base/rox-media
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-media/ChangeLog,v 1.1 2010/07/28 12:25:45 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-media/ChangeLog,v 1.2 2010/08/11 14:52:35 lack Exp $
+
+*rox-media-0.0.3-r1 (11 Aug 2010)
+
+  11 Aug 2010; Jim Ramsay <lack@gentoo.org> +rox-media-0.0.3-r1.ebuild,
+  +files/rox-media-0.0.3-Respect-env.patch:
+  Respect LDFLAGS, CFLAGS, and CC (Bug #332227)
 
 *rox-media-0.0.3 (27 Jul 2010)
 
diff --git a/rox-base/rox-media/files/rox-media-0.0.3-Respect-env.patch b/rox-base/rox-media/files/rox-media-0.0.3-Respect-env.patch
new file mode 100644
index 000000000000..291ad1a0d13f
--- /dev/null
+++ b/rox-base/rox-media/files/rox-media-0.0.3-Respect-env.patch
@@ -0,0 +1,24 @@
+diff --git a/src/SConscript b/src/SConscript
+index 6447851..85094b2 100644
+--- a/src/SConscript
++++ b/src/SConscript
+@@ -1,4 +1,5 @@
+ import os, sys
++import SCons.Util
+ 
+ media_env = Environment()
+ conf = Configure(media_env)
+@@ -19,6 +20,13 @@ for l in appinfo:
+         vstring = l.replace('<Version>', '').replace('</Version>', '')
+         break
+ 
++if os.environ.has_key('CC'):
++    media_env['CC'] = os.environ['CC']
++if os.environ.has_key('CFLAGS'):
++    media_env.Append(CFLAGS = SCons.Util.CLVar(os.environ['CFLAGS']))
++if os.environ.has_key('LDFLAGS'):
++    media_env.Append(LINKFLAGS = SCons.Util.CLVar(os.environ['LDFLAGS']))
++
+ media_env.ParseConfig('pkg-config --cflags --libs ' \
+         'gconf-2.0 gdu gtk+-2.0 gdk-pixbuf-2.0')
+ media_env.Append(CFLAGS = ['-DGDU_API_IS_SUBJECT_TO_CHANGE',
diff --git a/rox-base/rox-media/rox-media-0.0.3-r1.ebuild b/rox-base/rox-media/rox-media-0.0.3-r1.ebuild
new file mode 100644
index 000000000000..fdb93ed634ee
--- /dev/null
+++ b/rox-base/rox-media/rox-media-0.0.3-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-media/rox-media-0.0.3-r1.ebuild,v 1.1 2010/08/11 14:52:35 lack Exp $
+
+EAPI=3
+inherit rox eutils
+
+DESCRIPTION="Manage removable drives for ROX and other lightweight desktops"
+HOMEPAGE="http://rox.sourceforge.net"
+SRC_URI="mirror://gentoo/Media-0.0.3.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	gnome-base/gconf:2
+	sys-apps/gnome-disk-utility
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	dev-util/scons"
+
+APPNAME="Media"
+WRAPPERNAME="rox-media"
+APPCATEGORY="System"
+
+src_prepare() {
+	cd "${APPNAME}"
+	epatch "${FILESDIR}/${P}-Respect-env.patch"
+}
+
+# Override rox_src_compile for this non-standard build environment
+src_compile() {
+	cd "${APPNAME}"
+	scons
+
+	# Cleanup build products
+	rm -rf .sconf_temp .sconsign.dblite src/*.o config.log
+
+	# Cleanup sources
+	rm -rf Makefile SConstruct templates genclass geninterface \
+		test.c src/*.[ch] src/Makefile src/SConscript
+}