Version bump.

(Portage version: 2.1.5.5)

3 files changed, 100 insertions, 1 deletions

diff --git a/media-sound/mixxx/ChangeLog b/media-sound/mixxx/ChangeLog
index 391b3f0cccea..a4d4bc9c7ef7 100644
--- a/media-sound/mixxx/ChangeLog
+++ b/media-sound/mixxx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/mixxx
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/ChangeLog,v 1.37 2008/05/21 13:44:52 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/ChangeLog,v 1.38 2008/06/16 17:13:46 drac Exp $
+
+*mixxx-1.6.0_beta3 (16 Jun 2008)
+
+  16 Jun 2008; Samuli Suominen <drac@gentoo.org>
+  +files/mixxx-1.6.0_beta3-debug.patch, +mixxx-1.6.0_beta3.ebuild:
+  Version bump wrt #203335, thanks to Alex Barker. Attached patch is a
+  compile time fix from upstream.
 
   21 May 2008; Ferris McCormick <fmccor@gentoo.org>
   mixxx-1.6.0_beta2.ebuild:
diff --git a/media-sound/mixxx/files/mixxx-1.6.0_beta3-debug.patch b/media-sound/mixxx/files/mixxx-1.6.0_beta3-debug.patch
new file mode 100644
index 000000000000..e9488c21e5ab
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-1.6.0_beta3-debug.patch
@@ -0,0 +1,10 @@
+--- src/enginefilterblock.cpp.orig	2008-05-22 09:27:10.000000000 -0700
++++ src/enginefilterblock.cpp	2008-05-22 09:27:16.000000000 -0700
+@@ -21,6 +21,7 @@
+ #include "enginefilteriir.h"
+ #include "enginefilter.h"
+ #include "enginefilterbutterworth8.h"
++#include <QtDebug>
+ 
+ EngineFilterBlock::EngineFilterBlock(const char * group)
+ {
diff --git a/media-sound/mixxx/mixxx-1.6.0_beta3.ebuild b/media-sound/mixxx/mixxx-1.6.0_beta3.ebuild
new file mode 100644
index 000000000000..85cde879bdc8
--- /dev/null
+++ b/media-sound/mixxx/mixxx-1.6.0_beta3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.6.0_beta3.ebuild,v 1.1 2008/06/16 17:13:46 drac Exp $
+
+EAPI=1
+
+inherit eutils
+
+MY_P=${P/_/-}
+
+DESCRIPTION="a QT based Digital DJ tool"
+HOMEPAGE="http://mixxx.sourceforge.net"
+SRC_URI="http://downloads.mixxx.org/${MY_P}/${MY_P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="debug djconsole hifieq ladspa recording shout +vinylcontrol"
+
+# TODO. It bundles libs, like samplerate, why?
+RDEPEND="media-libs/mesa
+	media-libs/libmad
+	media-libs/libid3tag
+	media-libs/libvorbis
+	media-libs/libsndfile
+	>=media-libs/portaudio-19_pre
+	djconsole? ( media-libs/libdjconsole )
+	shout? ( media-libs/libshout )
+	ladspa? ( media-libs/ladspa-sdk )
+	virtual/glu
+	|| ( ( x11-libs/qt-core
+		x11-libs/qt-gui
+		x11-libs/qt-opengl )
+		>=x11-libs/qt-4.3:4 )"
+DEPEND="${RDEPEND}
+	dev-util/scons
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${P/_/\~}
+
+pkg_setup() {
+	if ! has_version x11-libs/qt-opengl && ! built_with_use -a =x11-libs/qt-4* opengl qt3support; then
+		die "Re-emerge x11-libs/qt with USE flags opengl and qt3support."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e 's:-O3::g' lib/cmetrics/SConscript || die "sed failed."
+	epatch "${FILESDIR}"/${P}-debug.patch
+}
+
+src_compile() {
+	local myconf="optimize=0 ffmpeg=0 script=0 prefix=/usr"
+
+	use djconsole && myconf+=" djconsole=1" || myconf+=" djconsole=0"
+	use hifieq && myconf+=" hifieq=1" || myconf+=" hifieq=0"
+	use debug && myconf+=" cmetrics=1" || myconf+=" cmetrics=0"
+	use shout && myconf+=" shoutcast=1" || myconf+=" shoutcast=0"
+	use ladspa && myconf+=" ladspa=1" || myconf+=" ladspa=0"
+	use recording && myconf+=" experimentalrecord=1" || myconf+=" experimentalrecord=0"
+	use vinylcontrol && myconf+=" vinylcontrol=1" || myconf+=" vinylcontrol=0"
+
+	$(type -P scons) ${myconf} -c . || die "scons -c . failed."
+	$(type -P scons) ${myconf} || die "scons failed."
+}
+
+src_install() {
+	dobin mixxx || die "dobin failed."
+
+	insinto /usr/share/mixxx
+	doins -r src/{skins,midi,keyboard} || die "doins failed."
+
+	doicon src/mixxx-icon.png
+	domenu src/mixxx.desktop
+
+	dodoc HERCULES.txt README*
+
+	insinto /usr/share/doc/${PF}
+	doins Mixxx-Manual.pdf
+}