summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2014-04-19 08:44:23 +0000
committerLars Wendler <polynomial-c@gentoo.org>2014-04-19 08:44:23 +0000
commitc025efbaaf80711532385fef38799d9ab5f6798e (patch)
tree5229a4c027a054913310fc2f4f4497acd69a67ff /media-video/mkvtoolnix
parentVersion bump. Add ruby21. (diff)
downloadgentoo-2-c025efbaaf80711532385fef38799d9ab5f6798e.tar.gz
gentoo-2-c025efbaaf80711532385fef38799d9ab5f6798e.tar.bz2
gentoo-2-c025efbaaf80711532385fef38799d9ab5f6798e.zip
>=mkvtoolnix-6.8.0 has no qt4 support. Moved to qt5 USE flag
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'media-video/mkvtoolnix')
-rw-r--r--media-video/mkvtoolnix/ChangeLog5
-rw-r--r--media-video/mkvtoolnix/mkvtoolnix-6.9.0.ebuild12
2 files changed, 10 insertions, 7 deletions
diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index 97c979dd290a..90273e312ae4 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/mkvtoolnix
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.199 2014/04/18 21:06:54 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.200 2014/04/19 08:44:23 polynomial-c Exp $
+
+ 19 Apr 2014; Lars Wendler <polynomial-c@gentoo.org> mkvtoolnix-6.9.0.ebuild:
+ >=mkvtoolnix-6.8.0 has no qt4 support. Moved to qt5 USE flag.
18 Apr 2014; Tim Harder <radhermit@gentoo.org> -mkvtoolnix-6.1.0-r1.ebuild,
-mkvtoolnix-6.2.0.ebuild, -mkvtoolnix-6.3.0.ebuild, -mkvtoolnix-6.4.1.ebuild,
diff --git a/media-video/mkvtoolnix/mkvtoolnix-6.9.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-6.9.0.ebuild
index a3eca8f6a1af..b716758d0e7b 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-6.9.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-6.9.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-6.9.0.ebuild,v 1.1 2014/04/18 21:04:39 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-6.9.0.ebuild,v 1.2 2014/04/19 08:44:23 polynomial-c Exp $
EAPI=5
WX_GTK_VER="3.0"
@@ -16,7 +16,7 @@ SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug pch qt4 wxwidgets"
+IUSE="debug pch qt5 wxwidgets"
RDEPEND="
>=dev-libs/libebml-1.3.0:=
@@ -29,9 +29,9 @@ RDEPEND="
sys-apps/file
>=sys-devel/gcc-4.6
sys-libs/zlib
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
)
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
"
@@ -78,7 +78,7 @@ src_configure() {
econf \
$(use_enable debug) \
- $(use_enable qt4 qt) \
+ $(use_enable qt5 qt) \
$(use_enable wxwidgets) \
$(usex pch "" --disable-precompiled-headers) \
${myconf} \