Respect {C,CXX,LD}FLAGS. Bug #317519

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 106 insertions, 2 deletions

diff --git a/media-sound/mixxx/ChangeLog b/media-sound/mixxx/ChangeLog
index aa8b52f5b7a2..6114abe4fe3b 100644
--- a/media-sound/mixxx/ChangeLog
+++ b/media-sound/mixxx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mixxx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/ChangeLog,v 1.52 2010/04/29 08:45:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/ChangeLog,v 1.53 2010/08/06 23:10:58 hwoarang Exp $
+
+*mixxx-1.7.2-r2 (06 Aug 2010)
+
+  06 Aug 2010; Markos Chandras <hwoarang@gentoo.org> +mixxx-1.7.2-r2.ebuild,
+  +files/mixxx-1.7.2-flags.patch:
+  Respect {C,CXX,LD}FLAGS. Bug #317519
 
   29 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> mixxx-1.7.2-r1.ebuild:
   Raise libsoundtouch depend to 1.5.0 wrt #317729 by John.
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 4c617f034ab0..68c8a8e39628 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,5 +1,7 @@
 AUX mixxx-1.7.2-external_libsoundtouch.patch 1815 RMD160 c4a9fbb3b46f8c2aefe0f5580adc4289f773b766 SHA1 6db8978bbebfdd9ff0161023330d2068b4025a5c SHA256 cc7c7fd4a93a178807f5cdea20df423f7e7817237695b4df8e66d73a839d8572
+AUX mixxx-1.7.2-flags.patch 1028 RMD160 0fec9961b71d56359d5bacc08768cfe5f7acdef8 SHA1 4e2dcccc31987c93edca88578c60797c4e072b74 SHA256 5659540e8a1d6444b5ff85ef1d314add5749333c0da8e7f986672acace20f395
 DIST mixxx-1.7.2-src.tar.gz 8758842 RMD160 a1aa7faf5392aa2da7365ea755e745ecb4eeb324 SHA1 594b5940a562b8b720bf555961cb8cf4c9c1b96d SHA256 d263e0c0f1ebbb264522cd5cbcbba4a6b262d6f8a0b373222452c307a4acc5f4
 EBUILD mixxx-1.7.2-r1.ebuild 1963 RMD160 3e9444fa4e631c904ff6539db740c10457f12ce9 SHA1 2e160ead09a6abb393b00cfda104fde49bba5baa SHA256 73bce60dedf072ecf615bdaf86440d65f3ad1119fe07fa45fe834cd71537f7cf
-MISC ChangeLog 7506 RMD160 26079dba79129013bff192f2588d668264408cf1 SHA1 6777f3f666532d5ed8a9634aeab06aa68d53c034 SHA256 8c0108064e6c4f185b237aa7fc3a8797a62c3dbf4720eee28b0d5eed5b21aec4
+EBUILD mixxx-1.7.2-r2.ebuild 2041 RMD160 e73fe3865f4c3c80d459b26f94816c4e103a11f7 SHA1 908c77cbb1929c776d229a8de56922265b037ca0 SHA256 ced1b77451082c703d242291ab9ff1d8639f97af3a8c1766149217da28acc878
+MISC ChangeLog 7687 RMD160 d8f41335a199646f2f790b975febf2604cef3f38 SHA1 3f9236afdbdec18e52283f62f9a2647a2ef3fcca SHA256 8af732233a3ed9065b7609a6462482728e93f47338afac4cc26d439c96169def
 MISC metadata.xml 482 RMD160 b927bd984dbab0e233b6421eb78b9d7d89b17889 SHA1 1e04d64735382b7513ba8b4aff4657fa6379a98e SHA256 fb99e21b641c0577f7f866928be8bc973008299c8e2dc03ba7dda79135da6cbf
diff --git a/media-sound/mixxx/files/mixxx-1.7.2-flags.patch b/media-sound/mixxx/files/mixxx-1.7.2-flags.patch
new file mode 100644
index 000000000000..3c6c192e2def
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-1.7.2-flags.patch
@@ -0,0 +1,22 @@
+Index: mixxx-1.7.2/src/SConscript
+===================================================================
+--- mixxx-1.7.2.orig/src/SConscript
++++ mixxx-1.7.2/src/SConscript
+@@ -238,6 +238,17 @@ for getenv in ['CXXFLAGS', 'CCFLAGS', 'L
+ 	if os.environ.has_key(getenv):
+ 		kwargs[getenv] = SCons.Util.CLVar( os.environ[getenv] )
+ 		env.Append(**kwargs)
++# Using suggestions for http://dev.gentoo.org/~vapier/scons-blows.txt
++if os.environ.has_key('CC'):
++	env['CC'] = os.environ['CC']
++if os.environ.has_key('CFLAGS'):
++	env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
++if os.environ.has_key('CXX'):
++	env['CXX'] = os.environ['CXX']
++if os.environ.has_key('CXXFLAGS'):
++	env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
++if os.environ.has_key('LDFLAGS'):
++	env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
+ 
+ #env.Append(CPPDEFINES=[('BUILD_REV', '"%s"' % getBZRRevision())]) #doing this forces a rebuild of everything whenever a commit happens -- not much fun
+ ## instead, embed BZR version into build
diff --git a/media-sound/mixxx/mixxx-1.7.2-r2.ebuild b/media-sound/mixxx/mixxx-1.7.2-r2.ebuild
new file mode 100644
index 000000000000..fcfeb8271871
--- /dev/null
+++ b/media-sound/mixxx/mixxx-1.7.2-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.7.2-r2.ebuild,v 1.1 2010/08/06 23:10:58 hwoarang Exp $
+
+EAPI=2
+inherit eutils multilib
+
+DESCRIPTION="a QT based Digital DJ tool"
+HOMEPAGE="http://mixxx.sourceforge.net"
+SRC_URI="http://downloads.mixxx.org/${P}/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="debug +hifieq ipod ladspa pulseaudio shout tonal +vinylcontrol"
+
+RDEPEND="media-libs/libmad
+	media-libs/libid3tag
+	media-libs/libvorbis
+	media-libs/libsndfile
+	>=media-libs/portaudio-19_pre
+	virtual/opengl
+	virtual/glu
+	x11-libs/qt-gui:4
+	x11-libs/qt-svg:4
+	x11-libs/qt-opengl:4
+	>=media-libs/libsoundtouch-1.5.0
+	ladspa? ( media-libs/ladspa-sdk )
+	pulseaudio? ( media-sound/pulseaudio )
+	shout? ( media-libs/libshout )"
+DEPEND="${RDEPEND}
+	dev-util/scons
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	mysconsargs="prefix=/usr
+		qtdir=/usr/$(get_libdir)/qt4
+		djconsole=0
+		djconsole_legacy=0
+		optimize=0
+		install_root=${D}/usr"
+
+	use hifieq && mysconsargs+=" hifieq=1" || mysconsargs+=" hifieq=0"
+	use ipod && mysconsargs+=" ipod=1" || mysconsargs+=" ipod=0"
+	use ladspa && mysconsargs+=" ladspa=1" || mysconsargs+=" ladspa=0"
+	use vinylcontrol && mysconsargs+=" vinylcontrol=1" || mysconsargs+=" vinylcontrol=0"
+	use shout && mysconsargs+=" shoutcast=1" || mysconsargs+=" shoutcast=0"
+	use debug && mysconsargs+=" cmetrics=1" || mysconsargs+=" cmetrics=0"
+	use tonal && mysconsargs+=" tonal=1" || mysconsargs+=" tonal=0"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-external_libsoundtouch.patch
+	sed -i \
+		-e 's:-O3::g' \
+		lib/cmetrics/SConscript || die
+
+	use pulseaudio || sed -i -e 's:pasuspender ::' src/mixxx.desktop
+	# Respect {C,CXX,LD}FLAGS. Bug #317519
+	epatch "${FILESDIR}"/${P}-flags.patch
+}
+
+src_compile() {
+	scons ${mysconsargs} || die
+}
+
+src_install() {
+	scons ${mysconsargs} install || die
+
+	dodoc README*
+
+	insinto /usr/share/doc/${PF}/pdf
+	doins Mixxx-Manual.pdf
+}