media-video/makemkv: Version bump to 1.10.0, undo locales, amend Qt

The locale flags were a nice idea but Gentoo is moving away from
LINGUAS-based USE flags. These will be replaced by L10N-based flags
but not for this particular use case. The new INSTALL_MASK mechanism
won't support the non-standard locations used by this package. We may
as well just install them all as they only take up 150KB.

Also prefer qt5 over qt4 without REQUIRED_USE in accordance with
Gentoo's Qt policy.

Package-Manager: portage-2.3.0

2 files changed, 14 insertions, 47 deletions

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 289b40b9c4da..610c9f5cbd56 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.9.10.tar.gz 5619754 SHA256 d94468b1cb1ec815b5ab899baab7ab9a03fcdb35c93bc0f6cbc646ffcac4b6c4 SHA512 fb42fad4404aab5196eb506ce82cfb0b094193e38cd5f42992c7007b4fb1870658cfca518e7258b8c29baf50c2b2c9be75857b7464d7a555aaadfedcf710c1f0 WHIRLPOOL 668ed528b8ca3695e039fe35028690c38e785d91c159ff4646a647b1e37fbfde1ea807e0c4d74eddc6168c8b69f1c26d92a5c8cfbbaa708afcbcbec185122c38
-DIST makemkv-oss-1.9.10.tar.gz 4419555 SHA256 b395bebd64d4c95b1558573d316e88221b4ce03798dace65bd339cae2314ecfa SHA512 b9ac8679dbb62f7174cf085726301fefbd6384dcf9beeb2a2e73c157120bd03b3313700711fda69543764b0dd27c7b4b262515315eb3cd055d42c162a26bff82 WHIRLPOOL ce31538bc888c15266d5bed10fade07a42a976cb6c0dc32d710f88270085daedb1aac45acca449e00805f3abe8912335fe6e2eb0ebd4b5af8da5195b3dd1663b
+DIST makemkv-bin-1.10.0.tar.gz 7789479 SHA256 910d717444676b60b57b5a2be9211a683f80734c4cac3cc8a90cd568b4756b9a SHA512 77394409c4180ba8f46e5e86fec1ba295ae1a846bb368f05ee01821000a2d5008fc5f18b4d227a1c4d176d591ae8fa0c22a1ca125a873fa64d993762ee997ba0 WHIRLPOOL e8522155c643b04e2b8fad8007083dda1497a69a50ff193ae4b01aeb995cfcf27a4d90890def24ec093293bb657dd278bd0cf30bdd99233dbaae4fa6cb58fe72
+DIST makemkv-oss-1.10.0.tar.gz 4419794 SHA256 3be02125ee753b3620f95ce1dff5e13c3d19f664cb6eff7a524b29938ef8f9ff SHA512 6c819aee37a0298680f70c1726a2f4f6a5d22ee91384bf8dfeb9dc594ef811c1749b26583fed450099526e8fb62a67560034c742f110e7c689badc3566622942 WHIRLPOOL 0d8fec11c5bc6494e69b4a07811a8571ff397ecd13853ce6ab241fd16836c33511c0dd1989dca29b397d4cd35ae687da7185719c24b6a606287d1c9ce74a6899
diff --git a/media-video/makemkv/makemkv-1.9.10.ebuild b/media-video/makemkv/makemkv-1.10.0.ebuild
index cb90134e4974..d2a5e6ee72d0 100644
--- a/media-video/makemkv/makemkv-1.9.10.ebuild
+++ b/media-video/makemkv/makemkv-1.10.0.ebuild
@@ -18,7 +18,6 @@ LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="libav multilib qt4 qt5"
-REQUIRED_USE="?? ( qt4 qt5 )"
 
 QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
 
@@ -27,45 +26,23 @@ DEPEND="
 	dev-libs/expat
 	dev-libs/openssl:0
 	sys-libs/zlib
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-	)
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtdbus:5
 		dev-qt/qtgui:5
 		dev-qt/qtwidgets:5
 	)
+	!qt5? ( qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+	) )
 	!libav? ( >=media-video/ffmpeg-1.0.0:0= )
 	libav? ( >=media-video/libav-0.8.9:0= )
 "
 RDEPEND="${DEPEND}
 	net-misc/wget"
 
-# Upstream uses non-standard locale names so map them with this
-# associative array and perform some tricks below.
-declare -A MY_LOCALES
-MY_LOCALES=(
-	[zh]=chi
-	[da]=dan
-	[de]=deu
-	[nl]=dut
-	[fr]=fra
-	[it]=ita
-	[ja]=jpn
-	[no]=nor
-	[fa]=per
-	[pl]=pol
-	[pt_BR]=ptb
-	[es]=spa
-	[sv]=swe
-)
-
-PLOCALES="${!MY_LOCALES[@]}"
-inherit l10n
-
 S="${WORKDIR}/makemkv-oss-${PV}"
 
 src_prepare() {
@@ -74,15 +51,12 @@ src_prepare() {
 	# Qt5 always trumps Qt4 if it is available. There are no configure
 	# options or variables to control this and there is no publicly
 	# available configure.ac either.
-	if use qt4; then
-		PATCHES+=( "${FILESDIR}"/${PN}-qt4.patch )
-	elif use qt5; then
+	if use qt5; then
 		PATCHES+=( "${FILESDIR}"/${PN}-qt5.patch )
+	elif use qt4; then
+		PATCHES+=( "${FILESDIR}"/${PN}-qt4.patch )
 	fi
 
-	# Check for locale changes against the non-standard names.
-	PLOCALES="${MY_LOCALES[@]}" l10n_find_plocales_changes "${WORKDIR}"/${MY_PB}/src/share makemkv_ .mo.gz
-
 	default
 }
 
@@ -92,7 +66,7 @@ src_configure() {
 
 	local econf_args=()
 
-	if use qt4 || use qt5; then
+	if use qt5 || use qt4; then
 		econf_args+=( '--enable-gui' )
 	else
 		econf_args+=( '--disable-gui' )
@@ -117,7 +91,7 @@ src_install() {
 	dosym libmmbd.so.0    /usr/$(get_libdir)/libmmbd.so
 	dosym libmmbd.so.0    /usr/$(get_libdir)/libmmbd.so.0.${PV}
 
-	if use qt4 || use qt5; then
+	if use qt5 || use qt4; then
 		dobin out/makemkv
 
 		local res
@@ -138,16 +112,9 @@ src_install() {
 		use multilib && dobin bin/i386/mmdtsdec
 	fi
 
+	# install profiles and locales
 	insinto /usr/share/MakeMKV
-
-	# install profiles
-	doins src/share/*.xml
-
-	# install locales
-	local locale
-	for locale in $(l10n_get_locales); do
-		doins src/share/makemkv_${MY_LOCALES[${locale}]}.mo.gz
-	done
+	doins src/share/*.{mo.gz,xml}
 }
 
 pkg_preinst() { gnome2_icon_savelist; }