From 85f19302d80465c470c8fbbba2e25c9abb88433f Mon Sep 17 00:00:00 2001
From: Ettore Di Giacinto <mudler@gentoo.org>
Date: Fri, 21 Oct 2016 13:04:49 +0200
Subject: [PATCH] media-sound/mixxx: revbump to 2.0.0-r2 wrt #591968

* enable detected optimizations with -march and -mcpu

Package-Manager: portage-2.3.1
---
 ...xx-2.0.0-r1.ebuild => mixxx-2.0.0-r2.ebuild} | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)
 rename media-sound/mixxx/{mixxx-2.0.0-r1.ebuild => mixxx-2.0.0-r2.ebuild} (91%)

diff --git a/media-sound/mixxx/mixxx-2.0.0-r1.ebuild b/media-sound/mixxx/mixxx-2.0.0-r2.ebuild
similarity index 91%
rename from media-sound/mixxx/mixxx-2.0.0-r1.ebuild
rename to media-sound/mixxx/mixxx-2.0.0-r2.ebuild
index f60d07b6621f..9baebd114d66 100644
--- a/media-sound/mixxx/mixxx-2.0.0-r1.ebuild
+++ b/media-sound/mixxx/mixxx-2.0.0-r2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-inherit eutils flag-o-matic multilib scons-utils toolchain-funcs
+inherit flag-o-matic scons-utils toolchain-funcs
 
 DESCRIPTION="A advanced Digital DJ tool based on Qt"
 HOMEPAGE="http://www.mixxx.org/"
@@ -23,7 +23,7 @@ REQUIRED_USE="^^ ( qt4 qt5 )"
 # fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
 # got fixed
 RDEPEND="dev-db/sqlite
-	dev-libs/libusb:1
+	virtual/libusb:1
 	dev-libs/protobuf
 	media-libs/chromaprint
 	media-libs/flac
@@ -93,6 +93,8 @@ src_prepare() {
 
 src_configure() {
 	local myqtdir=qt5
+	local myoptimize=0
+
 	if use qt4 ; then
 		myqtdir="qt4"
 	fi
@@ -102,6 +104,15 @@ src_configure() {
 		append-cxxflags -std=c++11
 	fi
 
+	# Try to get cpu type based on CFLAGS.
+	# Bug #591968
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		if [[ ${i} = native ]] ; then
+			myoptimize="native"
+			break
+		fi
+	done
+
 	myesconsargs=(
 		prefix="${EPREFIX}/usr"
 		qtdir="${EPREFIX}/usr/$(get_libdir)/${myqtdir}"
@@ -111,7 +122,7 @@ src_configure() {
 		hifieq=1
 		m4a="$(usex mp4 1 0)"
 		mad="$(usex mp3 1 0)"
-		optimize=native
+		optimize="${myoptimize}"
 		qdebug="$(usex debug 1 0)"
 		qt5="$(usex qt5 1 0)"
 		shoutcast="$(usex shout 1 0)"
-- 
2.26.2