[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     5bdb3b2fa3861ca76c7481192e33e4fce7c2ddde
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 13 23:15:27 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 23:19:28 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bdb3b2f

media-sound/mixxx: Add missing dependency

Closes: https://bugs.gentoo.org/704616
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-sound/mixxx/{mixxx-9999.ebuild => mixxx-2.2.3-r2.ebuild} | 10 ++++++----
 media-sound/mixxx/mixxx-9999.ebuild                            |  6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-2.2.3-r2.ebuild
similarity index 93%
copy from media-sound/mixxx/mixxx-9999.ebuild
copy to media-sound/mixxx/mixxx-2.2.3-r2.ebuild
index c3949aa84c2..e6c04ed417b 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,6 +53,7 @@ RDEPEND="
 	media-libs/vamp-plugin-sdk
 	sci-libs/fftw:3.0=
 	sys-power/upower
+	virtual/glu
 	virtual/libusb:1
 	virtual/opengl
 	x11-libs/libX11
@@ -70,20 +71,21 @@ RDEPEND="
 	ffmpeg? ( media-video/ffmpeg:0= )
 "
 # media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	dev-qt/qttest:5
 	dev-qt/qtxmlpatterns:5
 "
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.0-docs.patch
 	"${FILESDIR}"/${PN}-2.2.0-lilv_include_fix.patch
+	"${FILESDIR}"/${P}-qt-5.14.patch
 )
 
 src_prepare() {
 	# use multilib compatible directory for plugins
-	sed -i -e "/env.Alias('install', docs)/d;"'/unix_lib_path =/!b;n;'"s/'lib'/'$(get_libdir)'/" SConscript || die
+	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
 
 	default
 }

diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
index c3949aa84c2..3c4c7d006b0 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,6 +53,7 @@ RDEPEND="
 	media-libs/vamp-plugin-sdk
 	sci-libs/fftw:3.0=
 	sys-power/upower
+	virtual/glu
 	virtual/libusb:1
 	virtual/opengl
 	x11-libs/libX11
@@ -70,8 +71,7 @@ RDEPEND="
 	ffmpeg? ( media-video/ffmpeg:0= )
 "
 # media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	dev-qt/qttest:5
 	dev-qt/qtxmlpatterns:5