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

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     82c0b699b4e6b6fcbace9f1c219e5b186ce7f1ef
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 20 16:37:38 2022 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jan 20 16:40:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82c0b699

media-sound/mixxx: Avoid using plocale.eclass

It's not working with l10n_ USE flags in SRC_URI and still relies on
LINGUAS variable.

Revbump to fix dependency on libshout. mixxx-2.3.x releases currently
expect libshout-idjc which has not been packaged in Gentoo yet and the
release version the build system expects has not been published yet.

Closes: https://bugs.gentoo.org/831500
Bug: https://bugs.gentoo.org/775443
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../{mixxx-2.3.1-r3.ebuild => mixxx-2.3.1-r4.ebuild}   | 18 +++++++++++-------
 media-sound/mixxx/mixxx-2.3.9999.ebuild                | 18 +++++++++++-------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/media-sound/mixxx/mixxx-2.3.1-r3.ebuild b/media-sound/mixxx/mixxx-2.3.1-r4.ebuild
similarity index 88%
rename from media-sound/mixxx/mixxx-2.3.1-r3.ebuild
rename to media-sound/mixxx/mixxx-2.3.1-r4.ebuild
index b9b3057923d4..fff5c84c8171 100644
--- a/media-sound/mixxx/mixxx-2.3.1-r3.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.1-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake plocale xdg udev
+inherit cmake xdg udev
 
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
 HOMEPAGE="https://www.mixxx.org/"
@@ -71,9 +71,12 @@ RDEPEND="
 	mp4? ( media-libs/libmp4v2:= )
 	opus? (	media-libs/opusfile )
 	qtkeychain? ( dev-libs/qtkeychain )
-	shout? ( >=media-libs/libshout-2.4.5 )
 	wavpack? ( media-sound/wavpack )
 	"
+	# libshout-idjc-2.4.6 is required. Please check and re-add once it's
+	# available in ::gentoo
+	# Meanwhile we're using the bundled libshout-idjc. See bug #775443
+	#shout? ( >=media-libs/libshout-idjc-2.4.6 )
 
 DEPEND="${RDEPEND}
 	dev-qt/qtconcurrent:5
@@ -91,14 +94,13 @@ PATCHES=(
 PLOCALES="
 	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
 "
-PLOCALE_BACKUP="en"
 
 mixxx_set_globals() {
 	local lang
 	local MANUAL_URI_BASE="https://downloads.mixxx.org/manual/$(ver_cut 1-2)"
-	for lang in ${PLOCALES/ en} ; do
+	for lang in ${PLOCALES} ; do
 		SRC_URI+=" l10n_${lang}? ( ${MANUAL_URI_BASE}/${PN}-manual-$(ver_cut 1-2)-${lang/ja/ja-JP}.pdf )"
-		IUSE+=" l10n_${lang}"
+		IUSE+=" l10n_${lang/ en/ +en}"
 	done
 	SRC_URI+=" ${MANUAL_URI_BASE}/${PN}-manual-$(ver_cut 1-2)-en.pdf"
 }
@@ -147,7 +149,9 @@ src_install() {
 	udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules
 	dodoc README.md CHANGELOG.md
 	local locale
-	for locale in $(plocale_get_locales) ; do
-		dodoc ${DISTDIR}/${PN}-manual-$(ver_cut 1-2)-${locale/ja/ja-JP}.pdf
+	for locale in ${PLOCALES} ; do
+		if use l10n_${locale} ; then
+			dodoc ${DISTDIR}/${PN}-manual-$(ver_cut 1-2)-${locale/ja/ja-JP}.pdf
+		fi
 	done
 }

diff --git a/media-sound/mixxx/mixxx-2.3.9999.ebuild b/media-sound/mixxx/mixxx-2.3.9999.ebuild
index 3f04dcfafd4b..73bd3177b918 100644
--- a/media-sound/mixxx/mixxx-2.3.9999.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake plocale xdg udev
+inherit cmake xdg udev
 
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
 HOMEPAGE="https://www.mixxx.org/"
@@ -71,9 +71,12 @@ RDEPEND="
 	mp4? ( media-libs/libmp4v2:= )
 	opus? (	media-libs/opusfile )
 	qtkeychain? ( dev-libs/qtkeychain )
-	shout? ( >=media-libs/libshout-2.4.5 )
 	wavpack? ( media-sound/wavpack )
 	"
+	# libshout-idjc-2.4.6 is required. Please check and re-add once it's
+	# available in ::gentoo
+	# Meanwhile we're using the bundled libshout-idjc. See bug #775443
+	#shout? ( >=media-libs/libshout-idjc-2.4.6 )
 
 DEPEND="${RDEPEND}
 	dev-qt/qtconcurrent:5
@@ -89,14 +92,13 @@ PATCHES=(
 PLOCALES="
 	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
 "
-PLOCALE_BACKUP="en"
 
 mixxx_set_globals() {
 	local lang
 	local MANUAL_URI_BASE="https://downloads.mixxx.org/manual/$(ver_cut 1-2)"
-	for lang in ${PLOCALES/ en} ; do
+	for lang in ${PLOCALES} ; do
 		SRC_URI+=" l10n_${lang}? ( ${MANUAL_URI_BASE}/${PN}-manual-$(ver_cut 1-2)-${lang/ja/ja-JP}.pdf )"
-		IUSE+=" l10n_${lang}"
+		IUSE+=" l10n_${lang/ en/ +en}"
 	done
 	SRC_URI+=" ${MANUAL_URI_BASE}/${PN}-manual-$(ver_cut 1-2)-en.pdf"
 }
@@ -145,7 +147,9 @@ src_install() {
 	udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules
 	dodoc README.md CHANGELOG.md
 	local locale
-	for locale in $(plocale_get_locales) ; do
-		dodoc ${DISTDIR}/${PN}-manual-$(ver_cut 1-2)-${locale/ja/ja-JP}.pdf
+	for locale in ${PLOCALES} ; do
+		if use l10n_${locale} ; then
+			dodoc ${DISTDIR}/${PN}-manual-$(ver_cut 1-2)-${locale/ja/ja-JP}.pdf
+		fi
 	done
 }