Version bump wrt #252895 by Alex Barker.

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

4 files changed, 90 insertions, 8 deletions

diff --git a/media-sound/mixxx/ChangeLog b/media-sound/mixxx/ChangeLog
index dcc895875582..ff1c33531b37 100644
--- a/media-sound/mixxx/ChangeLog
+++ b/media-sound/mixxx/ChangeLog
@@ -1,6 +1,12 @@
 # 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.46 2008/12/04 22:32:52 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/ChangeLog,v 1.47 2009/07/23 09:08:59 ssuominen Exp $
+
+*mixxx-1.7.0_beta2 (23 Jul 2009)
+
+  23 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +mixxx-1.7.0_beta2.ebuild:
+  Version bump wrt #252895 by Alex Barker.
 
   04 Dec 2008; Markus Meier <maekke@gentoo.org> mixxx-1.6.0.ebuild:
   x86 stable, bug #249420
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index df5f55f11d3c..884fb8232ed0 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,5 +1,7 @@
 DIST mixxx-1.6.0-src.tar.gz 7285308 RMD160 d0046d8e98b1530f15821eb2d11ee4af82f87e44 SHA1 268d5ed18f4a21185a5496abe0acac12d06242ae SHA256 b57d999f82ab508291692c28ced5190f0391bcab3f85f98a8211a643c82335cb
-EBUILD mixxx-1.6.0-r1.ebuild 2051 RMD160 fca75b428ca341d1f910946055acb1526683a9bc SHA1 a2a4588ae62adf0dd82f5b24a5890ff8d0ab20e0 SHA256 049b04d707b6cfcadf50094c88cb34220c7b6f1f7ef081df0a772e290e3be83a
+DIST mixxx-1.7.0-beta2-src.tar.gz 8279780 RMD160 13e4c9023efde3470270c657341a3bb6eeb9460a SHA1 623577ac284f2ca396d26a1f36a09dfa58d5f905 SHA256 4c3ab0831547835a13944278cc8f9df9bdf92f15cad4f2cc84e83aeb820c5d86
+EBUILD mixxx-1.6.0-r1.ebuild 2028 RMD160 3fb5b63c6b4338e29b788d3e12c040130582fc81 SHA1 2bebf190fa5bb7b0fafa3d1af842a9c4e850f74d SHA256 6a25709a96ec0551611da525805613faf9917c7552c4ca212a6937138be6d7ca
 EBUILD mixxx-1.6.0.ebuild 2199 RMD160 6dad109253b8ee21d76513c4e9330099127590dd SHA1 7eaf38df2298327fe9cba53cd85a09117bebfe94 SHA256 4e9f66a3eef58d0d314d3fe8f01be6e3633c78a6e5b371775fdbf7f45c1966ca
-MISC ChangeLog 6527 RMD160 817fc16a514e3b41413645664a7173d2e69f98d2 SHA1 02b3e626c9ba49175210dfaad54fae99d0137828 SHA256 eba76c09839a5d2c5900f33c27e97a23cbe18082e0ab7fb38466edaaffaab43f
+EBUILD mixxx-1.7.0_beta2.ebuild 2124 RMD160 ac2b47b52ce55ce0a4f62b40d70a97fcedf4d5a1 SHA1 6e0009bc9e4a4f0bbd0a85c448c27b9e323557a2 SHA256 4c7c3634950ffc051c51c37821e9fe1bdcba5389356a464da875493e0a7dff40
+MISC ChangeLog 6691 RMD160 a8efb969bd149bf09348d03f330e42977bcfd30d SHA1 62043b69e56b2a779099e40648e1863f96ca9e73 SHA256 c169172dde892928e6d66ce76825c9ff7127b703b2e183f80ca97391dca2068e
 MISC metadata.xml 556 RMD160 31002be47033f8390e02338def17124473f586b8 SHA1 9d056c326c53f6492db0af18ace55761af62dd91 SHA256 fcd00b5c328445c09809b938e0faff9bb9862242ef12edb90a291294b19fbd95
diff --git a/media-sound/mixxx/mixxx-1.6.0-r1.ebuild b/media-sound/mixxx/mixxx-1.6.0-r1.ebuild
index ebbe3efbb90e..7dbf7051c882 100644
--- a/media-sound/mixxx/mixxx-1.6.0-r1.ebuild
+++ b/media-sound/mixxx/mixxx-1.6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.2 2008/12/02 06:17:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.6.0-r1.ebuild,v 1.3 2009/07/23 09:08:59 ssuominen Exp $
 
 EAPI=2
 
@@ -37,9 +37,7 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${P/_/\~}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	sed -i -e 's:-O3::g' lib/cmetrics/SConscript || die "sed failed."
 }
 
diff --git a/media-sound/mixxx/mixxx-1.7.0_beta2.ebuild b/media-sound/mixxx/mixxx-1.7.0_beta2.ebuild
new file mode 100644
index 000000000000..924a77195aa1
--- /dev/null
+++ b/media-sound/mixxx/mixxx-1.7.0_beta2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.7.0_beta2.ebuild,v 1.1 2009/07/23 09:08:59 ssuominen Exp $
+
+EAPI=2
+MY_P=${P/_/-}
+inherit eutils multilib
+
+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 ~ppc ~sparc ~x86"
+IUSE="debug +djconsole hifieq ipod shout +vinylcontrol ladspa"
+
+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:4
+	x11-libs/qt-gui:4
+	x11-libs/qt-svg:4
+	x11-libs/qt-opengl:4"
+DEPEND="${RDEPEND}
+	dev-util/scons
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${P/_/\~}
+
+src_prepare() {
+	sed -i -e 's:-O3::g' lib/cmetrics/SConscript || die "sed failed"
+}
+
+src_configure() {
+	myconf="optimize=0 ladspa=0 ffmpeg=0 script=0 prefix=/usr
+		qtdir=/usr/$(get_libdir)/qt4"
+
+	use djconsole && myconf+=" djconsole=1 djconsole_legacy=1" || myconf+=" djconsole=0 djconsole_legacy=0"
+	use hifieq && myconf+=" hifieq=1" || myconf+=" hifieq=0"
+	use debug && myconf+=" cmetrics=1" || myconf+=" cmetrics=0"
+	use ipod && myconf+=" ipod=1" || myconf+=" ipod=0"
+	use shout && myconf+=" shoutcast=1" || myconf+=" shoutcast=0"
+	use ladspa && myconf+=" ladspa=1" || myconf+=" ladspa=0"
+	use vinylcontrol && myconf+=" vinylcontrol=1" || myconf+=" vinylcontrol=0"
+	#use ffmpg && myconf+=" ffmpg=1" || myconf+=" ffmpg=0"
+
+	$(type -P scons) ${myconf} -c . || die "scons config failed"
+}
+
+src_compile() {
+	$(type -P scons) ${myconf} || die "scons compile failed"
+}
+
+src_install() {
+	dobin mixxx || die "dobin failed."
+
+	insinto /usr/share/mixxx
+	doins -r res/{skins,midi,keyboard}
+	use ladspa && doins res/ladspa_presets
+
+	doicon res/images/mixxx-icon.png
+	domenu src/mixxx.desktop
+
+	dodoc README*
+
+	insinto /usr/share/doc/${PF}
+	doins Mixxx-Manual.pdf
+}