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

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 103 insertions, 1 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/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
+}