| 1 |
commit: 07944728f3aa7f23c2129588734952e8dec0b5cf |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 2 12:20:12 2020 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 2 12:20:29 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07944728 |
| 7 |
|
| 8 |
media-sound/mixxx: added scons py3 compatibility |
| 9 |
|
| 10 |
thanks for the patch to jospezial <jospezial <AT> gmx.de> |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/704856 |
| 13 |
Package-Manager: Portage-3.0.5, Repoman-3.0.1 |
| 14 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
| 15 |
|
| 16 |
media-sound/mixxx/mixxx-2.2.4.ebuild | 15 +++++++++------ |
| 17 |
media-sound/mixxx/mixxx-9999.ebuild | 15 +++++++++------ |
| 18 |
2 files changed, 18 insertions(+), 12 deletions(-) |
| 19 |
|
| 20 |
diff --git a/media-sound/mixxx/mixxx-2.2.4.ebuild b/media-sound/mixxx/mixxx-2.2.4.ebuild |
| 21 |
index da8269b4fbe..931b5e47cce 100644 |
| 22 |
--- a/media-sound/mixxx/mixxx-2.2.4.ebuild |
| 23 |
+++ b/media-sound/mixxx/mixxx-2.2.4.ebuild |
| 24 |
@@ -1,9 +1,11 @@ |
| 25 |
# Copyright 1999-2020 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
-EAPI=6 |
| 29 |
+EAPI=7 |
| 30 |
|
| 31 |
-inherit flag-o-matic scons-utils toolchain-funcs |
| 32 |
+PYTHON_COMPAT=( python2_7 python3_{6,7,8}) |
| 33 |
+ |
| 34 |
+inherit flag-o-matic python-any-r1 scons-utils toolchain-funcs |
| 35 |
|
| 36 |
DESCRIPTION="Advanced Digital DJ tool based on Qt" |
| 37 |
HOMEPAGE="https://www.mixxx.org/" |
| 38 |
@@ -75,6 +77,7 @@ DEPEND="${RDEPEND} |
| 39 |
virtual/pkgconfig |
| 40 |
dev-qt/qttest:5 |
| 41 |
dev-qt/qtxmlpatterns:5 |
| 42 |
+ ${PYTHON_DEPS} |
| 43 |
" |
| 44 |
|
| 45 |
PATCHES=( |
| 46 |
@@ -102,7 +105,7 @@ src_configure() { |
| 47 |
fi |
| 48 |
done |
| 49 |
|
| 50 |
- myesconsargs=( |
| 51 |
+ MYSCONS=( |
| 52 |
prefix="${EPREFIX}/usr" |
| 53 |
qtdir="${EPREFIX}/usr/$(get_libdir)/qt5" |
| 54 |
faad="$(usex aac 1 0)" |
| 55 |
@@ -123,13 +126,13 @@ src_configure() { |
| 56 |
|
| 57 |
src_compile() { |
| 58 |
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \ |
| 59 |
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} |
| 60 |
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${MYSCONS[@]} |
| 61 |
} |
| 62 |
|
| 63 |
src_install() { |
| 64 |
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \ |
| 65 |
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \ |
| 66 |
- install_root="${ED%/}"/usr install |
| 67 |
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${MYSCONS[@]} \ |
| 68 |
+ install_root="${ED}"/usr install |
| 69 |
|
| 70 |
dodoc README Mixxx-Manual.pdf |
| 71 |
} |
| 72 |
|
| 73 |
diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild |
| 74 |
index a0693776834..7656de621ce 100644 |
| 75 |
--- a/media-sound/mixxx/mixxx-9999.ebuild |
| 76 |
+++ b/media-sound/mixxx/mixxx-9999.ebuild |
| 77 |
@@ -1,9 +1,11 @@ |
| 78 |
# Copyright 1999-2020 Gentoo Authors |
| 79 |
# Distributed under the terms of the GNU General Public License v2 |
| 80 |
|
| 81 |
-EAPI=6 |
| 82 |
+EAPI=7 |
| 83 |
|
| 84 |
-inherit flag-o-matic scons-utils toolchain-funcs |
| 85 |
+PYTHON_COMPAT=( python2_7 python3_{6,7,8}) |
| 86 |
+ |
| 87 |
+inherit flag-o-matic python-any-r1 scons-utils toolchain-funcs |
| 88 |
|
| 89 |
DESCRIPTION="Advanced Digital DJ tool based on Qt" |
| 90 |
HOMEPAGE="https://www.mixxx.org/" |
| 91 |
@@ -75,6 +77,7 @@ DEPEND="${RDEPEND} |
| 92 |
virtual/pkgconfig |
| 93 |
dev-qt/qttest:5 |
| 94 |
dev-qt/qtxmlpatterns:5 |
| 95 |
+ ${PYTHON_DEPS} |
| 96 |
" |
| 97 |
|
| 98 |
src_prepare() { |
| 99 |
@@ -96,7 +99,7 @@ src_configure() { |
| 100 |
fi |
| 101 |
done |
| 102 |
|
| 103 |
- myesconsargs=( |
| 104 |
+ MYSCONS=( |
| 105 |
prefix="${EPREFIX}/usr" |
| 106 |
qtdir="${EPREFIX}/usr/$(get_libdir)/qt5" |
| 107 |
faad="$(usex aac 1 0)" |
| 108 |
@@ -117,13 +120,13 @@ src_configure() { |
| 109 |
|
| 110 |
src_compile() { |
| 111 |
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \ |
| 112 |
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} |
| 113 |
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${MYSCONS[@]} |
| 114 |
} |
| 115 |
|
| 116 |
src_install() { |
| 117 |
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \ |
| 118 |
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \ |
| 119 |
- install_root="${ED%/}"/usr install |
| 120 |
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${MYSCONS[@]} \ |
| 121 |
+ install_root="${ED}"/usr install |
| 122 |
|
| 123 |
dodoc README Mixxx-Manual.pdf |
| 124 |
} |
Archives