| 1 |
commit: 82c0b699b4e6b6fcbace9f1c219e5b186ce7f1ef |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 20 16:37:38 2022 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 20 16:40:58 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82c0b699 |
| 7 |
|
| 8 |
media-sound/mixxx: Avoid using plocale.eclass |
| 9 |
|
| 10 |
It's not working with l10n_ USE flags in SRC_URI and still relies on |
| 11 |
LINGUAS variable. |
| 12 |
|
| 13 |
Revbump to fix dependency on libshout. mixxx-2.3.x releases currently |
| 14 |
expect libshout-idjc which has not been packaged in Gentoo yet and the |
| 15 |
release version the build system expects has not been published yet. |
| 16 |
|
| 17 |
Closes: https://bugs.gentoo.org/831500 |
| 18 |
Bug: https://bugs.gentoo.org/775443 |
| 19 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 20 |
|
| 21 |
.../{mixxx-2.3.1-r3.ebuild => mixxx-2.3.1-r4.ebuild} | 18 +++++++++++------- |
| 22 |
media-sound/mixxx/mixxx-2.3.9999.ebuild | 18 +++++++++++------- |
| 23 |
2 files changed, 22 insertions(+), 14 deletions(-) |
| 24 |
|
| 25 |
diff --git a/media-sound/mixxx/mixxx-2.3.1-r3.ebuild b/media-sound/mixxx/mixxx-2.3.1-r4.ebuild |
| 26 |
similarity index 88% |
| 27 |
rename from media-sound/mixxx/mixxx-2.3.1-r3.ebuild |
| 28 |
rename to media-sound/mixxx/mixxx-2.3.1-r4.ebuild |
| 29 |
index b9b3057923d4..fff5c84c8171 100644 |
| 30 |
--- a/media-sound/mixxx/mixxx-2.3.1-r3.ebuild |
| 31 |
+++ b/media-sound/mixxx/mixxx-2.3.1-r4.ebuild |
| 32 |
@@ -3,7 +3,7 @@ |
| 33 |
|
| 34 |
EAPI=7 |
| 35 |
|
| 36 |
-inherit cmake plocale xdg udev |
| 37 |
+inherit cmake xdg udev |
| 38 |
|
| 39 |
DESCRIPTION="Advanced Digital DJ tool based on Qt" |
| 40 |
HOMEPAGE="https://www.mixxx.org/" |
| 41 |
@@ -71,9 +71,12 @@ RDEPEND=" |
| 42 |
mp4? ( media-libs/libmp4v2:= ) |
| 43 |
opus? ( media-libs/opusfile ) |
| 44 |
qtkeychain? ( dev-libs/qtkeychain ) |
| 45 |
- shout? ( >=media-libs/libshout-2.4.5 ) |
| 46 |
wavpack? ( media-sound/wavpack ) |
| 47 |
" |
| 48 |
+ # libshout-idjc-2.4.6 is required. Please check and re-add once it's |
| 49 |
+ # available in ::gentoo |
| 50 |
+ # Meanwhile we're using the bundled libshout-idjc. See bug #775443 |
| 51 |
+ #shout? ( >=media-libs/libshout-idjc-2.4.6 ) |
| 52 |
|
| 53 |
DEPEND="${RDEPEND} |
| 54 |
dev-qt/qtconcurrent:5 |
| 55 |
@@ -91,14 +94,13 @@ PATCHES=( |
| 56 |
PLOCALES=" |
| 57 |
ca cs de en es fi fr gl id it ja kn nl pl pt ro ru sl sq sr tr zh-CN zh-TW |
| 58 |
" |
| 59 |
-PLOCALE_BACKUP="en" |
| 60 |
|
| 61 |
mixxx_set_globals() { |
| 62 |
local lang |
| 63 |
local MANUAL_URI_BASE="https://downloads.mixxx.org/manual/$(ver_cut 1-2)" |
| 64 |
- for lang in ${PLOCALES/ en} ; do |
| 65 |
+ for lang in ${PLOCALES} ; do |
| 66 |
SRC_URI+=" l10n_${lang}? ( ${MANUAL_URI_BASE}/${PN}-manual-$(ver_cut 1-2)-${lang/ja/ja-JP}.pdf )" |
| 67 |
- IUSE+=" l10n_${lang}" |
| 68 |
+ IUSE+=" l10n_${lang/ en/ +en}" |
| 69 |
done |
| 70 |
SRC_URI+=" ${MANUAL_URI_BASE}/${PN}-manual-$(ver_cut 1-2)-en.pdf" |
| 71 |
} |
| 72 |
@@ -147,7 +149,9 @@ src_install() { |
| 73 |
udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules |
| 74 |
dodoc README.md CHANGELOG.md |
| 75 |
local locale |
| 76 |
- for locale in $(plocale_get_locales) ; do |
| 77 |
- dodoc ${DISTDIR}/${PN}-manual-$(ver_cut 1-2)-${locale/ja/ja-JP}.pdf |
| 78 |
+ for locale in ${PLOCALES} ; do |
| 79 |
+ if use l10n_${locale} ; then |
| 80 |
+ dodoc ${DISTDIR}/${PN}-manual-$(ver_cut 1-2)-${locale/ja/ja-JP}.pdf |
| 81 |
+ fi |
| 82 |
done |
| 83 |
} |
| 84 |
|
| 85 |
diff --git a/media-sound/mixxx/mixxx-2.3.9999.ebuild b/media-sound/mixxx/mixxx-2.3.9999.ebuild |
| 86 |
index 3f04dcfafd4b..73bd3177b918 100644 |
| 87 |
--- a/media-sound/mixxx/mixxx-2.3.9999.ebuild |
| 88 |
+++ b/media-sound/mixxx/mixxx-2.3.9999.ebuild |
| 89 |
@@ -3,7 +3,7 @@ |
| 90 |
|
| 91 |
EAPI=7 |
| 92 |
|
| 93 |
-inherit cmake plocale xdg udev |
| 94 |
+inherit cmake xdg udev |
| 95 |
|
| 96 |
DESCRIPTION="Advanced Digital DJ tool based on Qt" |
| 97 |
HOMEPAGE="https://www.mixxx.org/" |
| 98 |
@@ -71,9 +71,12 @@ RDEPEND=" |
| 99 |
mp4? ( media-libs/libmp4v2:= ) |
| 100 |
opus? ( media-libs/opusfile ) |
| 101 |
qtkeychain? ( dev-libs/qtkeychain ) |
| 102 |
- shout? ( >=media-libs/libshout-2.4.5 ) |
| 103 |
wavpack? ( media-sound/wavpack ) |
| 104 |
" |
| 105 |
+ # libshout-idjc-2.4.6 is required. Please check and re-add once it's |
| 106 |
+ # available in ::gentoo |
| 107 |
+ # Meanwhile we're using the bundled libshout-idjc. See bug #775443 |
| 108 |
+ #shout? ( >=media-libs/libshout-idjc-2.4.6 ) |
| 109 |
|
| 110 |
DEPEND="${RDEPEND} |
| 111 |
dev-qt/qtconcurrent:5 |
| 112 |
@@ -89,14 +92,13 @@ PATCHES=( |
| 113 |
PLOCALES=" |
| 114 |
ca cs de en es fi fr gl id it ja kn nl pl pt ro ru sl sq sr tr zh-CN zh-TW |
| 115 |
" |
| 116 |
-PLOCALE_BACKUP="en" |
| 117 |
|
| 118 |
mixxx_set_globals() { |
| 119 |
local lang |
| 120 |
local MANUAL_URI_BASE="https://downloads.mixxx.org/manual/$(ver_cut 1-2)" |
| 121 |
- for lang in ${PLOCALES/ en} ; do |
| 122 |
+ for lang in ${PLOCALES} ; do |
| 123 |
SRC_URI+=" l10n_${lang}? ( ${MANUAL_URI_BASE}/${PN}-manual-$(ver_cut 1-2)-${lang/ja/ja-JP}.pdf )" |
| 124 |
- IUSE+=" l10n_${lang}" |
| 125 |
+ IUSE+=" l10n_${lang/ en/ +en}" |
| 126 |
done |
| 127 |
SRC_URI+=" ${MANUAL_URI_BASE}/${PN}-manual-$(ver_cut 1-2)-en.pdf" |
| 128 |
} |
| 129 |
@@ -145,7 +147,9 @@ src_install() { |
| 130 |
udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules |
| 131 |
dodoc README.md CHANGELOG.md |
| 132 |
local locale |
| 133 |
- for locale in $(plocale_get_locales) ; do |
| 134 |
- dodoc ${DISTDIR}/${PN}-manual-$(ver_cut 1-2)-${locale/ja/ja-JP}.pdf |
| 135 |
+ for locale in ${PLOCALES} ; do |
| 136 |
+ if use l10n_${locale} ; then |
| 137 |
+ dodoc ${DISTDIR}/${PN}-manual-$(ver_cut 1-2)-${locale/ja/ja-JP}.pdf |
| 138 |
+ fi |
| 139 |
done |
| 140 |
} |
Archives