gentoo Easter resync : 12.04.2020

2 files changed, 8 insertions, 12 deletions

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 7afb9c5cec2f..fce59bbc2ada 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,5 +1,5 @@
 AUX makemkv-path.patch 2153 BLAKE2B bab155f5aea1c7f5e3d1923b580b3f36115d32bf0d384a347379dd9ea80b650ea9755c641be0253c9d5b269f9aa4d2774ace89ea598b5206391794263530a84a SHA512 c7744f92ed7a5f09f0301c454afa32e4fce7251f276129917d2ce602b35f5961e629fa0328213f6e5a8d260b5964db099c44b1e870b209f7bb78712cf52b6e95
-DIST makemkv-bin-1.14.7.tar.gz 9487718 BLAKE2B ecba22794035ed022863a2f736572a0da207346d6a3e44e3ca8c319fa672228be23835201ac3b023250d1a6457b8dd37e680573c7a83c53bb8fee1e016d00096 SHA512 cdd2eae8a80b2e564b786dfef0273ef36211327e5f4932b0f580a59c1ac288d5a99a2a1fe6fa0059e0f3fec6bcbc07278e7f7580507f36ca6d01f92d47092626
-DIST makemkv-oss-1.14.7.tar.gz 4384451 BLAKE2B f2a2cff901a4c6d03286a5a4cdd54ac0f61e3c0f04d3adb4089f03fc767dda099b0d4b4e8f76a3ad0ba57fb1af85cd2ab8fb6d966f4fbed490e25250f0be283c SHA512 2e8ab96ae1c1e855ff840fffaedd7ba998021630b61e66337d1027c53b8315ef8c303016a85ae8fddbfc52ae006fadab44fd63e0f2cca3602bfd17086a52aa06
-EBUILD makemkv-1.14.7.ebuild 2982 BLAKE2B c6be006dead8d1e25329fe3a5a0d2deb2fd21d9f28e6b807c9c65b2b7717a6cb968ad0bfdddde30e771834011b3a8daca88d7c54de1331c99015dffe3329654f SHA512 0888197206f82289a7ee24e7ba8db09967a18f066e8a1349ef3d6d0c148fd43a8f0d4ae0569060592d488da44113eea34621b6fb0d5856a4d853e434ff5b6787
+DIST makemkv-bin-1.15.0.tar.gz 9516617 BLAKE2B 9df4277a0ef2835bbb946afc32670153181a68924ede88778d613ec91da70a3bd95cf52feb1219e8f6032a8b80f63b6084afb07b10c14a3f9faba0aed8310b64 SHA512 c6436870554c29c8e646dccaac3a73e23c0a861f0689e10a1ddafe3c6388dd708860c9944b035b9fbbd4e50ee6e67848c25d65fc0808789bdd24fb54a4668994
+DIST makemkv-oss-1.15.0.tar.gz 6383576 BLAKE2B fa1c09545b48d01654c444f2d0a5551035f9af43113bd8dc175c7ba806c7f23fd437cf8e68544632895833feaec915c9440cc4120f90cd9deb6158956d5b1f46 SHA512 457c06736ed4ce05eb9a8038fedd28b8741e32b1cd0d77b2fbbec9723419e26e01fb34c9302c0612a3f68c73602f7ba436d93598edd966dda9abec738de1a004
+EBUILD makemkv-1.15.0.ebuild 2938 BLAKE2B 1bd9597c1fdc238cd63c910f707ae38231cef81a8f34216a6a8b5cb56f29c331d93b55747ce6762d463a431eefa3763aaf1ea27bedffb9105ece7a4359f04ef0 SHA512 df34f7ac1edb082ad1ba096d4549efacbeaba6b663ca6502b55fcd18dbdc68aeadc916bb6c4b7336d9fe6c0c98baad3518701009692c33509bdc927f65fb6281
 MISC metadata.xml 1166 BLAKE2B f2e594a7e322225101561a998472a832c3d2559dbfd79817f2fd1eaf9b0e7145fb467b9b0421d13b3df90ece45ff969d97e9e44d9147d4b0a57e4d8fd9104345 SHA512 d8e8d898cf3ee9428fc1b08e292608da7a4f753ad22053a521c475e9445dafa9ac7c2c5139ed4ab9009b0d59e95737f77773d15f8590b8a4cf0f39961d714fb7
diff --git a/media-video/makemkv/makemkv-1.14.7.ebuild b/media-video/makemkv/makemkv-1.15.0.ebuild
index 1d97177013e9..ff30a137bbc1 100644
--- a/media-video/makemkv/makemkv-1.14.7.ebuild
+++ b/media-video/makemkv/makemkv-1.15.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic linux-info xdg-utils
+inherit flag-o-matic linux-info xdg
 
 MY_P=makemkv-oss-${PV}
 MY_PB=makemkv-bin-${PV}
@@ -17,6 +17,7 @@ LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+gui libav libressl"
+RESTRICT="bindist mirror"
 
 QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
 
@@ -56,7 +57,6 @@ src_configure() {
 	econf \
 		--enable-debug \
 		--disable-noec \
-		--disable-qt4 \
 		$(use_enable gui) \
 		$(use_enable gui qt5)
 }
@@ -86,13 +86,13 @@ src_install() {
 }
 
 pkg_postinst() {
-	xdg_icon_cache_update
+	xdg_pkg_postinst
 
 	elog "While MakeMKV is in beta mode, upstream has provided a license"
 	elog "to use if you do not want to purchase one."
 	elog ""
 	elog "See this forum thread for more information, including the key:"
-	elog "http://www.makemkv.com/forum2/viewtopic.php?f=5&t=1053"
+	elog "https://www.makemkv.com/forum/viewtopic.php?f=5&t=1053"
 	elog ""
 	elog "Note that beta license may have an expiration date and you will"
 	elog "need to check for newer licenses/releases. "
@@ -107,7 +107,3 @@ pkg_postinst() {
 	elog "the following variables when launching the player:"
 	elog "LIBAACS_PATH=libmmbd LIBBDPLUS_PATH=libmmbd"
 }
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}