From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CB5981396D9 for ; Sun, 22 Oct 2017 16:35:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0B63DE0C01; Sun, 22 Oct 2017 16:35:28 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CEA62E0BFA for ; Sun, 22 Oct 2017 16:35:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 58A5433BF51 for ; Sun, 22 Oct 2017 16:35:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EEAC182A for ; Sun, 22 Oct 2017 16:35:24 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1508690118.4fc9a2ac4be43af35159bfcbcc5a671dae7ee008.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/makemkv/makemkv-1.10.7-r1.ebuild media-video/makemkv/makemkv-1.10.7.ebuild media-video/makemkv/metadata.xml X-VCS-Directories: media-video/makemkv/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 4fc9a2ac4be43af35159bfcbcc5a671dae7ee008 X-VCS-Branch: master Date: Sun, 22 Oct 2017 16:35:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1ca89f70-7433-4405-a7ee-06cca1407937 X-Archives-Hash: b33edc9e19332910c01ab48c2479c604 commit: 4fc9a2ac4be43af35159bfcbcc5a671dae7ee008 Author: James Le Cuirot gentoo org> AuthorDate: Sun Oct 22 16:33:41 2017 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Sun Oct 22 16:35:18 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fc9a2ac 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 ...emkv-1.10.7.ebuild => makemkv-1.10.7-r1.ebuild} | 23 +++++----------------- media-video/makemkv/metadata.xml | 5 ++++- 2 files changed, 9 insertions(+), 19 deletions(-) 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 f01bbdb662f..8ae13a9e98f 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 b650d107cd5..9de3ac702c5 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. - + + + Build the Qt5 GUI +