From 4f948e12f868525cd6c2625bc8c2bf88d3ee042b Mon Sep 17 00:00:00 2001
From: David Guglielmi <david.guglielmi@gmail.com>
Date: Tue, 12 Jan 2016 11:00:49 +0000
Subject: [PATCH] - media-sound/mixxx: remove pulseaudio flag, add new.

---
 media-sound/mixxx/Manifest           |  2 +-
 media-sound/mixxx/mixxx-2.0.0.ebuild | 20 +++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 56fe73a..c260f42 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -4,4 +4,4 @@ AUX mixxx-2.0.0-docs.patch 445 SHA256 9250ab6b2368ad03b8c54d767fda1d23cd82634018
 AUX mixxx-2.0.0-system-libs.patch 5879 SHA256 daca3a3662ecf4fedffdc610199d36f5ca24ba22cd1f7d82dd264b9762081a5b SHA512 44e71b5e02a32fa2f533dc07d4d320d18fe112e7e1342db594e49080ec987ae389b696f5f7ed17cb3b101789916936367b88a6aa0fd755b8d0e7028741c46bc2 WHIRLPOOL f810b7254de4421eebc28c12e7255d3b05f95e93758d51c8bd992fd9d4152537448eebaeaf7703f15d032e139276503ccae360a49c8766395988b67729b345d1
 DIST mixxx-2.0.0.tar.gz 25075794 SHA256 688d87d907f3ad3721602f44295a4d0caa41502df8504ca9264ca0c87d8818f1 SHA512 c0ae850408a63c1b916bde6adaadd5860277f1d8fefbed8bf385c4cc7f5b898bcf220d82eba6942493b8551031907160ecf2cb53a1201a8e82726303e6c23149 WHIRLPOOL 6044379535f0d966485f37bb0da9d476230a902dae034b305742e616ac730780e62e29022ec8e40125d229c1b81d9b7cfc030f5f3f7ebc23cbcf301983cd6a70
 EBUILD mixxx-1.12.9999.ebuild 2679 SHA256 cbc078e3536fb0a3b1ce02fa478b99aaafb2ffd666c8cbe38ff99333fdd4f7fc SHA512 485cfde679e9501a2f7a1467bf76ed9c1ba408fdc40e6ec8f55517f41ae7d970255a25954b5a992c7eb3b5fab8b1a69d195cead73726190b104618d8cc7d6202 WHIRLPOOL 4ea86a7690d5cb0ec9334f51d05cea0bf317e0f7e1589fc2ea348d2ba8b49682820024328db3031372d075cc5eb15de0b2f4e7b6835cbba876ed78a30a6a2e44
-EBUILD mixxx-2.0.0.ebuild 3398 SHA256 d1ff5fc66a456cb87c2a1aebef18591b32d9f40de60c3c58f7252873fa42ac81 SHA512 645de19b68fad72a979335dad66683480c99349bb1ce2e4e6898f8f0b80fff1559491c370cee0227e6acc91de7819fa0dea7941b92f806bbd42009868fefd179 WHIRLPOOL 5ff0dd6cb91340e6e823be673a188d28c483ec17cc6e50757d769d80e0789fd958e9f959c87737ef1d4db21152b755cb1e45d2772c1eb499784f925651217e17
+EBUILD mixxx-2.0.0.ebuild 3478 SHA256 a3c5c5b016cdaa9ff9ceb5f5a81d376fccc89aed0d06e51fe91ec9622aa9cc5c SHA512 b7737eb9f89839a07b13e376bb8e99f9f3bd44735ec2e6dcf50062afa4897997706aea6955654cde9d212a092bf7b6fce2315133c211d1cad539b1b55268c366 WHIRLPOOL 4453812f187e56a2d048d5fc281130498d8536db39624b1080092dab7581be29782f63ac5e292d069e15fb1dd60bb4a04923d5b11470927dc1fade4eb44dbcd3
diff --git a/media-sound/mixxx/mixxx-2.0.0.ebuild b/media-sound/mixxx/mixxx-2.0.0.ebuild
index e935c5b..3d71914 100644
--- a/media-sound/mixxx/mixxx-2.0.0.ebuild
+++ b/media-sound/mixxx/mixxx-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV/_/-}.tar.gz -> ${
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="aac debug doc ffmpeg hid mp3 mp4 pulseaudio +qt4 qt5 shout wavpack"
+IUSE="aac +bulk debug doc ffmpeg hid mp3 opus perftools +qt4 qt5 shout +vinylcontrol wavpack"
 REQUIRED_USE="^^ ( qt4 qt5 )"
 
 RDEPEND="dev-libs/protobuf
@@ -57,13 +57,15 @@ RDEPEND="dev-libs/protobuf
 	)
 	aac? (
 		media-libs/faad2
-		media-libs/libmp4v2:0
+		media-libs/libmp4v2:=
 	)
 	hid? ( dev-libs/hidapi )
 	mp3? ( media-libs/libmad )
-	mp4? ( media-libs/libmp4v2:= )
 	ffmpeg? ( virtual/ffmpeg )
-	pulseaudio? ( media-sound/pulseaudio )
+	opus? ( 
+	       media-libs/opus
+	       media-libs/opusfile )
+	perftools? ( dev-util/google-perftools )
 	shout? ( media-libs/libshout )
 	wavpack? ( media-sound/wavpack )"
 DEPEND="${RDEPEND}
@@ -107,16 +109,16 @@ src_configure() {
 		prefix="${EPREFIX}/usr"
 		qtdir="${QTDIR}"
 		hifieq=1
-		vinylcontrol=1
 		optimize=0
-		$(use_scons qt5)
 		$(use_scons aac faad)
+		$(use_scons bulk bulk)
 		$(use_scons debug qdebug)
+		$(use_scons ffmpeg)
 		$(use_scons hid hid)
 		$(use_scons mp3 mad)
-		$(use_scons mp4 m4a)
-		$(use_scons ffmpeg)
+		$(use_scons qt5)
 		$(use_scons shout shoutcast)
+		$(use_scons vinylcontrol vinylcontrol)
 		$(use_scons wavpack wv)
 	)
 }