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

["Miroslav Šulc" <fordfrog@gentoo.org>]

commit:     07944728f3aa7f23c2129588734952e8dec0b5cf
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  2 12:20:12 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Sep  2 12:20:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07944728

media-sound/mixxx: added scons py3 compatibility

thanks for the patch to jospezial <jospezial <AT> gmx.de>

Closes: https://bugs.gentoo.org/704856
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/mixxx/mixxx-2.2.4.ebuild | 15 +++++++++------
 media-sound/mixxx/mixxx-9999.ebuild  | 15 +++++++++------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/media-sound/mixxx/mixxx-2.2.4.ebuild b/media-sound/mixxx/mixxx-2.2.4.ebuild
index da8269b4fbe..931b5e47cce 100644
--- a/media-sound/mixxx/mixxx-2.2.4.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.4.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit flag-o-matic scons-utils toolchain-funcs
+PYTHON_COMPAT=( python2_7 python3_{6,7,8})
+
+inherit flag-o-matic python-any-r1 scons-utils toolchain-funcs
 
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
 HOMEPAGE="https://www.mixxx.org/"
@@ -75,6 +77,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	dev-qt/qttest:5
 	dev-qt/qtxmlpatterns:5
+	${PYTHON_DEPS}
 "
 
 PATCHES=(
@@ -102,7 +105,7 @@ src_configure() {
 		fi
 	done
 
-	myesconsargs=(
+	MYSCONS=(
 		prefix="${EPREFIX}/usr"
 		qtdir="${EPREFIX}/usr/$(get_libdir)/qt5"
 		faad="$(usex aac 1 0)"
@@ -123,13 +126,13 @@ src_configure() {
 
 src_compile() {
 	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]}
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${MYSCONS[@]}
 }
 
 src_install() {
 	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \
-		install_root="${ED%/}"/usr install
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${MYSCONS[@]} \
+		install_root="${ED}"/usr install
 
 	dodoc README Mixxx-Manual.pdf
 }

diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
index a0693776834..7656de621ce 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit flag-o-matic scons-utils toolchain-funcs
+PYTHON_COMPAT=( python2_7 python3_{6,7,8})
+
+inherit flag-o-matic python-any-r1 scons-utils toolchain-funcs
 
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
 HOMEPAGE="https://www.mixxx.org/"
@@ -75,6 +77,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	dev-qt/qttest:5
 	dev-qt/qtxmlpatterns:5
+	${PYTHON_DEPS}
 "
 
 src_prepare() {
@@ -96,7 +99,7 @@ src_configure() {
 		fi
 	done
 
-	myesconsargs=(
+	MYSCONS=(
 		prefix="${EPREFIX}/usr"
 		qtdir="${EPREFIX}/usr/$(get_libdir)/qt5"
 		faad="$(usex aac 1 0)"
@@ -117,13 +120,13 @@ src_configure() {
 
 src_compile() {
 	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]}
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${MYSCONS[@]}
 }
 
 src_install() {
 	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \
-		install_root="${ED%/}"/usr install
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${MYSCONS[@]} \
+		install_root="${ED}"/usr install
 
 	dodoc README Mixxx-Manual.pdf
 }