From: James Le Cuirot <chewi@gentoo.org>
Date: Sun, 22 Oct 2017 16:33:41 +0000 (+0100)
Subject: media-video/makemkv: Drop Qt4 support and introduce gui USE flag
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4fc9a2ac4be43af35159bfcbcc5a671dae7ee008;p=gentoo.git

media-video/makemkv: Drop Qt4 support and introduce gui USE flag

Qt4 will be dropped from the tree soon.

Package-Manager: Portage-2.3.12, Repoman-2.3.2
---

diff --git a/media-video/makemkv/makemkv-1.10.7.ebuild b/media-video/makemkv/makemkv-1.10.7-r1.ebuild
similarity index 90%
rename from media-video/makemkv/makemkv-1.10.7.ebuild
rename to 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>