| 1 |
commit: 4fc9a2ac4be43af35159bfcbcc5a671dae7ee008 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 22 16:33:41 2017 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 22 16:35:18 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fc9a2ac |
| 7 |
|
| 8 |
media-video/makemkv: Drop Qt4 support and introduce gui USE flag |
| 9 |
|
| 10 |
Qt4 will be dropped from the tree soon. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.12, Repoman-2.3.2 |
| 13 |
|
| 14 |
...emkv-1.10.7.ebuild => makemkv-1.10.7-r1.ebuild} | 23 +++++----------------- |
| 15 |
media-video/makemkv/metadata.xml | 5 ++++- |
| 16 |
2 files changed, 9 insertions(+), 19 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-video/makemkv/makemkv-1.10.7.ebuild b/media-video/makemkv/makemkv-1.10.7-r1.ebuild |
| 19 |
similarity index 90% |
| 20 |
rename from media-video/makemkv/makemkv-1.10.7.ebuild |
| 21 |
rename to media-video/makemkv/makemkv-1.10.7-r1.ebuild |
| 22 |
index f01bbdb662f..8ae13a9e98f 100644 |
| 23 |
--- a/media-video/makemkv/makemkv-1.10.7.ebuild |
| 24 |
+++ b/media-video/makemkv/makemkv-1.10.7-r1.ebuild |
| 25 |
@@ -16,7 +16,7 @@ SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz |
| 26 |
LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl" |
| 27 |
SLOT="0" |
| 28 |
KEYWORDS="-* ~amd64 ~x86" |
| 29 |
-IUSE="libav multilib qt4 qt5" |
| 30 |
+IUSE="+gui libav multilib" |
| 31 |
|
| 32 |
QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec" |
| 33 |
|
| 34 |
@@ -25,17 +25,12 @@ DEPEND=" |
| 35 |
dev-libs/expat |
| 36 |
dev-libs/openssl:0[-bindist(-)] |
| 37 |
sys-libs/zlib |
| 38 |
- qt5? ( |
| 39 |
+ gui? ( |
| 40 |
dev-qt/qtcore:5 |
| 41 |
dev-qt/qtdbus:5 |
| 42 |
dev-qt/qtgui:5 |
| 43 |
dev-qt/qtwidgets:5 |
| 44 |
) |
| 45 |
- !qt5? ( qt4? ( |
| 46 |
- dev-qt/qtcore:4 |
| 47 |
- dev-qt/qtdbus:4 |
| 48 |
- dev-qt/qtgui:4 |
| 49 |
- ) ) |
| 50 |
!libav? ( >=media-video/ffmpeg-1.0.0:0= ) |
| 51 |
libav? ( >=media-video/libav-0.8.9:0= ) |
| 52 |
" |
| 53 |
@@ -49,20 +44,12 @@ src_configure() { |
| 54 |
# See bug #439380. |
| 55 |
replace-flags -O* -Os |
| 56 |
|
| 57 |
- local econf_args=() |
| 58 |
- |
| 59 |
- if use qt5 || use qt4; then |
| 60 |
- econf_args+=( --enable-gui ) |
| 61 |
- else |
| 62 |
- econf_args+=( --disable-gui ) |
| 63 |
- fi |
| 64 |
- |
| 65 |
econf \ |
| 66 |
--enable-debug \ |
| 67 |
--disable-noec \ |
| 68 |
- $(use_enable qt5) \ |
| 69 |
- $(use_enable qt4) \ |
| 70 |
- "${econf_args[@]}" |
| 71 |
+ --disable-qt4 \ |
| 72 |
+ $(use_enable gui) \ |
| 73 |
+ $(use_enable gui qt5) |
| 74 |
} |
| 75 |
|
| 76 |
src_install() { |
| 77 |
|
| 78 |
diff --git a/media-video/makemkv/metadata.xml b/media-video/makemkv/metadata.xml |
| 79 |
index b650d107cd5..9de3ac702c5 100644 |
| 80 |
--- a/media-video/makemkv/metadata.xml |
| 81 |
+++ b/media-video/makemkv/metadata.xml |
| 82 |
@@ -21,5 +21,8 @@ |
| 83 |
without intermediate conversion to wide range of players, so you |
| 84 |
may watch Blu-ray and DVD discs with your favorite player on |
| 85 |
your favorite OS or on your favorite device. |
| 86 |
-</longdescription> |
| 87 |
+ </longdescription> |
| 88 |
+ <use> |
| 89 |
+ <flag name="gui">Build the Qt5 GUI</flag> |
| 90 |
+ </use> |
| 91 |
</pkgmetadata> |
Archives