gentoo resync : 29.10.2017

3 files changed, 11 insertions, 21 deletions

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 1c662da1532b..4ac9ee46e42b 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -2,7 +2,7 @@ AUX makemkv-path.patch 2153 SHA256 daf69f09e936929e78c82ef8efdd6014a3b1bfdf77675
 AUX makemkv-wget.patch 1013 SHA256 8153281145a2299c190e5b3453fa3f76c9451e1eb16006fde459e6665a7bad80 SHA512 09ece751d6765a93ff18e0eb8edbb7c413e1074676bc5c6fbc57bb1b8c2314f66198737c5077ecef18d286d724088d2db6731977885713bc095531281f104e0f WHIRLPOOL 453a619c70b8ef28e0d8ccfb80141109fe129879f7a4e31355d52d059d95a2abfebe74b16b05d14b033b0c63fa28a0f1567d4382c370937c63990d66d22a1b67
 DIST makemkv-bin-1.10.7.tar.gz 8724225 SHA256 2b9a9e6fb779bc876371b2f88b23fddad3e92d6449fe5d1541dcd9ad04e01eac SHA512 7c3c1713df6b4009de2337a28f4c5b1f38d37be3a30f08ceafc6dc276c960960f6443fd5b29f5f96f10597093ff170fb5ab69d6244db5165da30abe1d3732aab WHIRLPOOL 7cdbd0aef4d1d5e9d7eb0b5ba1e7be5d478a84dfa4fe2c6528c91db29c2ebe86db4ee2cd5059b84b934bb720f293979e0afec9bcce2a3c8460825d9c5a6ce104
 DIST makemkv-oss-1.10.7.tar.gz 4570003 SHA256 be61fcee31dc52944ec7ef440ff8fffbc140d24877e6afb19149c541564eb654 SHA512 f329449ed1bb4240a8256c3171c3c6cc0843c8d07a79526608fa3ea83e012634e6c6d9dd17160853b973d012e3483bcdaa17d9d1e6f7beb90c048b6063c12aa8 WHIRLPOOL 2e74e6d025bf26c12b036c971648975a4e7d9b753a2015e9282f5a4ded0885e83df4f54ca30200c8f50ba5f748283c582fba3b65b4e26211a7d87e4d431ec137
-EBUILD makemkv-1.10.7.ebuild 3113 SHA256 bd8dfb616f0219994f7ea82ca2526ad1030ecb1d4ed765ad2968049fef631d88 SHA512 4733ad340dd9ab8fe247e6f37005620ea5ed5e364c21911d81bb54e7a31e02b5c652699422a14d0fdd3113c2870529e20dba8b3166b424ab3472971c7a960202 WHIRLPOOL 078a37c1892a4fa9700848db25b34f1c232f7428f328303822819d0e86afd35eee61e350f862c68b3af96f681b984f4c53b782e1ecb1fb60b9cbc34be516853e
+EBUILD makemkv-1.10.7-r1.ebuild 2910 SHA256 7a3bf0095f0b62f3e80f215c0720b7a40afd61b340427f4191b66cd8c0c3943d SHA512 9f72258fcce7878938b086613fd31d0197f4b1380d4a02ce5e3ef67356d0f2ade43e8e2066875bed76f8051539c646ccd401b9f292b73a70f7bb69cc0f437a46 WHIRLPOOL e093f3cee709d82f45e10938868552bc05aa51186f80e5ba43180496cd0e96d3ab82be65008753d129b532d92bfe32c0fc97d213dda246a9d317db091dde3316
 MISC ChangeLog 7615 SHA256 377311aefb24e51892ac094ee9733edecad630891cdea77e76c745b3059fc0b1 SHA512 99510e41787abe9edefd918edaff201c5a43f3c8e05c0bf49f9499a9b31e685c6dc8f1d5763f9feb251a352e76a9a9b7d5a13488c33ea8d18ddc32cb6370d1e5 WHIRLPOOL b30a6ec149a2c90ec532b38c4ed8c10b33a7285ee9174c792fdb44123e454704906ebebd92f497c0a5302392884559cabf35af71c7a1e0621f3a7f1534b43cc5
 MISC ChangeLog-2015 12085 SHA256 fbf29eb91bf5bf4b516857b2e3e778bc4ed54b6fe382d80f84ffd688dc0afb02 SHA512 63a0713ae6a6cee55f3077d850a86cc6079a574145683b61b643b8324dcf9ed55dc207e54e70709d1b818489a9fb016c12d553076b5f7aa9a298c599990a565f WHIRLPOOL 3a54bb835dea1cd815cfc2daab46338b46b65e785bc0684a7787ee74ff69b8fd19f8741d821fb5a4de968a3029742e8f7666589e03d64d34b518289a9294c2e6
-MISC metadata.xml 1221 SHA256 19e142b9a9c08384f526c0bf2175aa9443a31c8082f8fe6804dc5011421db4c8 SHA512 697327658b9d1dff99431417d48d9184377c56eacdaf61d98f22a1f7df1e596ee34971f6f75f13cd3842ccb49a21bd2f70592acee8269ae9c130261f72d6a92b WHIRLPOOL 9231c2da5d1d02def5eff7b9609f470720710ea9fb6d2c807226a7488b84f9baa000215761ae71acb88306d59c9429a5bd6ec761bfe1c0918baadd6dc5886083
+MISC metadata.xml 1281 SHA256 fbbb6558c79e5a4df39afcd552f583f662ac08bdd10ccacec693661c256cfb99 SHA512 5060b07ae001cff4403f34cb7a5d09aaa9338147b3a649ec1ab98a355029b770e8c127ba08f771b24c27182c24cb2c72287af77022482844b2188a4a2c6b22d1 WHIRLPOOL dab82e73c8bcbe382c3bd849f5915dca4fe2dd2c6cea65498224adb24eaa66ffefde76aba79b95747af469bfeb1518eb5beb2687123401f1274380e430b4a973
diff --git a/media-video/makemkv/makemkv-1.10.7.ebuild b/media-video/makemkv/makemkv-1.10.7-r1.ebuild
index f01bbdb662fc..8ae13a9e98f9 100644
--- a/media-video/makemkv/makemkv-1.10.7.ebuild
+++ b/media-video/makemkv/makemkv-1.10.7-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
 LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="libav multilib qt4 qt5"
+IUSE="+gui libav multilib"
 
 QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
 
@@ -25,17 +25,12 @@ DEPEND="
 	dev-libs/expat
 	dev-libs/openssl:0[-bindist(-)]
 	sys-libs/zlib
-	qt5? (
+	gui? (
 		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= )
 "
@@ -49,20 +44,12 @@ src_configure() {
 	# See bug #439380.
 	replace-flags -O* -Os
 
-	local econf_args=()
-
-	if use qt5 || use qt4; then
-		econf_args+=( --enable-gui )
-	else
-		econf_args+=( --disable-gui )
-	fi
-
 	econf \
 		--enable-debug \
 		--disable-noec \
-		$(use_enable qt5) \
-		$(use_enable qt4) \
-		"${econf_args[@]}"
+		--disable-qt4 \
+		$(use_enable gui) \
+		$(use_enable gui qt5)
 }
 
 src_install() {
diff --git a/media-video/makemkv/metadata.xml b/media-video/makemkv/metadata.xml
index b650d107cd5b..9de3ac702c5f 100644
--- a/media-video/makemkv/metadata.xml
+++ b/media-video/makemkv/metadata.xml
@@ -21,5 +21,8 @@
       without intermediate conversion to wide range of players, so you
       may watch Blu-ray and DVD discs with your favorite player on
       your favorite OS or on your favorite device.
-</longdescription>
+	</longdescription>
+	<use>
+		<flag name="gui">Build the Qt5 GUI</flag>
+	</use>
 </pkgmetadata>