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

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 78 insertions, 2 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/Manifest b/rox-base/rox-media/Manifest
index 87ed7a533fef..93251abff3f5 100644
--- a/rox-base/rox-media/Manifest
+++ b/rox-base/rox-media/Manifest
@@ -1,4 +1,6 @@
+AUX rox-media-0.0.3-Respect-env.patch 806 RMD160 113a6d339860e8050d09b5108cc6b475ea6504f6 SHA1 1697030908402fccdcae6cd5642c4e6315c1e8bd SHA256 5972fbc5b609c544008996d08b0409a1a468b08fd27b7078f583bf0debe5ecfa
 DIST Media-0.0.3.tar.bz2 26051 RMD160 2c768f76d270ad9010d5ff2c76e6846f65df486c SHA1 a08ab7fea7bf1b6419ef763f1db743d39becb11d SHA256 e52339ca78960c6ac5b4ede1ad5792f108b8af37cd6fbe4cbde72e7b8d86d826
+EBUILD rox-media-0.0.3-r1.ebuild 1065 RMD160 2b60b93c2538febf31d7bcf6a173af7d78637e59 SHA1 bdedc6e24991f77ef8f7bf5dcd10c4943b4ef1b8 SHA256 2ed2f00061ea78a804c896db116a304c6ed9c235cd01dffb6eac116e26c7eaaf
 EBUILD rox-media-0.0.3.ebuild 979 RMD160 1daf653658099196d2eca27d1fa7344675d7d4d8 SHA1 6ead7a6237c3eda938c637ec1480ece08344cdac SHA256 d2a63b88f514a6cce5cf1e84e693480a61c6cb74c9933800b92055c7ba71b1d0
-MISC ChangeLog 416 RMD160 8f18ac955c55413195fcce28ac421a436556fea2 SHA1 2fdceb618a7165a9871a31ee7672d40c110fc66b SHA256 c63d175ac7e4696e030c91fdd2bd76d444c08d7b2f96916a170039498e0b5439
+MISC ChangeLog 616 RMD160 dd9d58e743893935c085b70944682f60f4806639 SHA1 c2225de44093eba1a9370383cf9e4cff1b6fd479 SHA256 d0a3d158558230aba601dc6187cb826f909af1d7c53b1eb1078ef5fa67a06083
 MISC metadata.xml 157 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f SHA1 54ccd31d923f052c9111f04c1a7d8b8f04f0a7b2 SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c
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
+}