Version bump (bug #498369) and use wxGTK-3.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 105 insertions, 10 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index a8a4eb4e8c8d..76b32f772031 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mkvtoolnix
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.194 2013/12/02 09:39:57 radhermit Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.195 2014/01/22 08:18:06 radhermit Exp $
+
+*mkvtoolnix-6.7.0 (22 Jan 2014)
+
+  22 Jan 2014; Tim Harder <radhermit@gentoo.org> +mkvtoolnix-6.7.0.ebuild:
+  Version bump (bug #498369) and use wxGTK-3.
 
 *mkvtoolnix-6.6.0 (02 Dec 2013)
 
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index dd1d1db6e07b..3923d7372ed9 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -10,6 +10,7 @@ DIST mkvtoolnix-6.3.0.tar.xz 5123624 SHA256 bc05f07d92190d018e901091a07ed5139f4e
 DIST mkvtoolnix-6.4.1.tar.xz 5119860 SHA256 76f24d792264a8c5aaa7ec7f3603bed458f03dff4ffe4f67bda8cc6dd908bea3 SHA512 c18bbfc7a244ef75d35946b2f984a264f0be3f642c6756d0b3db1e29079bc99e90bfa8b68b187cc9e489ab88346afaf73e41f1a8750b8a48012a3daad3f99424 WHIRLPOOL 4bf5560691bc7a3b41b6ab5b49ec85ecbfaf4b1619c9bdcee25a367a5a61e9cbdcfb4e7d682608df7c8dddf80189d7eaa97ed170530fc8158996a83019873850
 DIST mkvtoolnix-6.5.0.tar.xz 5167608 SHA256 a8ad5128cb87576857f239da0cbd4019d18ffdef489475b2587749bdd0417028 SHA512 f96bbdc4c53338dab3d7c62b2ea3e231d12a6f26146d203421c0a6d404f9727ff9541a98275f7cb68e82a4fa6f05493634900f4f0bb00e935d5b174c1cc5d60f WHIRLPOOL 0d19ba88e7ee2bf3faaa77ef3202a2eefd7b6ec70ec692bdea895f18b4ef9342dbe953d1a95b3d54f642caaf1190ca95a8370f00299efef05c2ddb6f9e517695
 DIST mkvtoolnix-6.6.0.tar.xz 5174424 SHA256 cb1f965617fe064cf78457d3fbd0685eb31ae5b7e205cf4c8e74b6f27f3399e3 SHA512 c86f10a0a919e6d28c2587b60663c38713cfa6ca0a5188524b81af2fd60e4ea626a01431d29c6ae5885eae05d71af93d857986c5008aec4963dacc3ead9dc26f WHIRLPOOL 55a15bb2fdb62af85e189c39b1a1391d33eb08b4ba116fc307965be6817a944b21d18c034b9a3da16a6e84e93544dbd59f3c7fe9406ab454e15cf8ee1eb815c3
+DIST mkvtoolnix-6.7.0.tar.xz 5119236 SHA256 82207c6ece01e76d51edcf6a330c9f0dc75e3bf4201fead3023c98bd7f323785 SHA512 e45621b2d68e8938731b89e2ac35d3811523896736d15c73acda283c61ae3414b459b881bcfe6764b3839a61e0d2f83ce23ea2ad94d329378d1904b0b97ac949 WHIRLPOOL 06ec4f2a4f2505b1a7c42224dd315031e3d0f43c1b11ca7e5fe3f6ab449582d75a7c95be7e4c31d29a703eb57d0bc08982213090089cf26f1168420925f51548
 EBUILD mkvtoolnix-5.0.1-r1.ebuild 1826 SHA256 82d52db276aa01eb04ba51dcf62bfb35b92d35e565568488601be74ceb63da9d SHA512 f173ff8c50635bf8731723e953ede5bfdd488775adb22012a8bb32a02b51d83692438afa82a383a42872d49623682468f4e1a4e3b0a6e9c2ee1dabbec7070b2a WHIRLPOOL 78fa80620ef232bb3829bdd7de7666edd37b80dececb032fd07eb4033e81344c0957c6c42f4c13b4f43662e3e17efec6d9b4a45db255e3e5c5774e08d7922aaf
 EBUILD mkvtoolnix-6.1.0-r1.ebuild 2244 SHA256 9c19f46672a6c8dd32500ea7e76f2503b9a433d94dc30eb7d0de9ca0cb7ce4d1 SHA512 55b411a9818822d90e098635aee7321c50c06664babe49d91c20aa99d58d7ff7c4edb8784c4dc9ac4e63d7f0b646ef08c00c6056fbb71ba65a2737efb2040ac5 WHIRLPOOL 8e19cdfb0d41150e986f2e7d482b3b65e09cc46acd0b5dcb087fdbbe18cf0a8ce71c8943c7f7f66db3a452cab692ce28124868f9685f195bf9067c782c48ea42
 EBUILD mkvtoolnix-6.2.0.ebuild 2131 SHA256 a2f20dafbf007b63aa715b2cd0dc1fdb3e6fbd5cb48f13917cc5ed275720c12a SHA512 b08bfe20b350ba7a928b0e335d88854fbc73b8c31a72bf27968ac79c205e7978ee035201f62758aa0a0dbdd5dc85c6995bfa68f2441a40d3e26b97f1ea005cc1 WHIRLPOOL 2ad6fa4e29b43093d7039a0e79682a83c142156d451ad2ab9bf6d1eb0256e52b2b391f439db739e25c7cef9fa47a2855b493027b80fbb91ed5b9f5c7db92b316
@@ -17,16 +18,17 @@ EBUILD mkvtoolnix-6.3.0.ebuild 2131 SHA256 7efe84227d2065f9306f11ebb3df1b7485d05
 EBUILD mkvtoolnix-6.4.1.ebuild 2133 SHA256 2783a0970ec94a7bf6ed2b5caf86c0b586489cb9b8979e27ba41c8aad49508a4 SHA512 825b00445ca52eb8304f84dc1dca9b268e29a3658040225842db9e3797e00b1b14823e8e2c9edce8f63df20195955efc879100a6a4af565a9acd00294fe8de59 WHIRLPOOL 46593f10d23acae4293f37919b78f6dff578c713e46ccb5e49b24455b212808614543327416a85d72af1d136e74af630a61c62e1f0e79e111f7880d47db5cb0e
 EBUILD mkvtoolnix-6.5.0.ebuild 2133 SHA256 3177ee3aec8af7927f2acfcbe1468c7d337cf101784a66cb10a55f25f2b22fc1 SHA512 0255895f8f850c379ad0fd83ca014104a4a6779d031191a59a9c8a4449c0a01b191ac4a85c333ab4735b35b65d22d921911c36ae2f84bf14de2b446f0442e851 WHIRLPOOL 7d3d2ba6101cc84a9cef984141c9785ea59b0da005d6bc573466b4b9f1961a0d55930b6fa65eb863cb5a7c301a5a879bdf246b3ef16873fa64f8c9d995d79283
 EBUILD mkvtoolnix-6.6.0.ebuild 2133 SHA256 ebe92c002ef4c567df958b23bc7c7144389f831dd527eb31d9eaf4d38af50c58 SHA512 6a3f8928b3520b5b75543058f62368818ae4052eff6684cbdc282bbc9da058096caf454c329030d3efa596386160098771b0af250268ebff2838674fc92def64 WHIRLPOOL 0b4d28191bd20cb97cfcad7e1f380dbd7741392ef38a137a8f412c7f6419e88f04c505d4cc62c4aad4f3ab2e38d377a63b4d863fbc04a87c0dabc3d7ae20a44d
-MISC ChangeLog 28577 SHA256 7f1e03ea652348150c7840a0b503a6a9da28741081b8259fb10d3a015e7b02d8 SHA512 8aab6398a32bfa5184061b9e95c6d2a5393e0b38fcae211c10e0fc64b6ab86d6755a0ef390b7a2ec183ebc87f69a82c72957fb5360ea3c28959f13276604c850 WHIRLPOOL 430b3bbf8cfa80f615f211f5339b3aed7e9155c8614a73e46554eb725c90c0a63afd6bf5377932a8586be8dc4f027da58875b6a1c8e01052f7ea5b6de75af0f8
+EBUILD mkvtoolnix-6.7.0.ebuild 2141 SHA256 a3966d9508e1819a34089331f5803f33881035036bf50dc93d2d9871870f425a SHA512 91e9b4165bbf311ec3fc58b91158ee4c9d15a896675d72da5e4d2b7b8a7e4d709f5a019fdf0f202c670cda759dbe8e444975be2edafc3695bf200987f7ea2dab WHIRLPOOL 40b0ca8bda26223e21b1aef36bf72b27c9c1cd786491246c0f41d1cb2c0eee1d1380623c322a4dafa593946a5e64bfae97da69892bfded8a56303ef702df80ab
+MISC ChangeLog 28732 SHA256 a0aefd3cd6b8f973f2decd7531f85053de6e615c38eae0d817034d83b5e60606 SHA512 3117edb11aa479ea5cf2107cdc0cbccedca88d45883a0eaca9bc89dc1e1658df2e24429f4904d93ebe47eea5a83d89510c306c1d4b7e96b257cad8712c9534f3 WHIRLPOOL 04797b8167e53750add12ef9bb031142e05849c02fa81074942faa006fd23e5074f69554af7255fb3acb3f492e1f09ef7da42e385dbabeda5225369b707502a6
 MISC metadata.xml 158 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4 SHA512 0bfb0265d3c42ba1958f8e589316112dba381e7701773668443cf0afe678a8d80675392efb2713e3d376b85b03a5b2bfb390c94411e0c6cf8a223b26aa9a04ca WHIRLPOOL 447b37b9f46058b1adc8d30a57460a8ab6b5ec149870c5ea385956cae9dd10a99b36e63526f2d13cabf13a4185f8b4e22a78156ab141a6e397bba298ab7efb2a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSnFVvAAoJEEqz6FtPBkyjFukH/RlIc3FU1VxP7+jdjDa4LfjK
-B996RCP+7YiyGMh9uiiFjlmnYf2Dax32VHLDG1SkR26ViRu82C7RLQoP0611VMgC
-7BkChel0vR4e24QOD5NO9r/21UfD95d8YxVToT+d2/Uab9X0ROB7B58XxFWWuCiF
-88sW6wtm+YwAk6EuHoK5eHIQg3ZWzQo4/9NcQ02Rg7l/ARkHrHXguJZXlSZ8pm+4
-n3QDYb89N1HAuKWxuIMZB4XnMmvVHAt+2xPfKer0Kdu4HmuXgcYrfV/kqf4IH3Q1
-+9uh0CgD4irkywsti0Yw4aug16FTr7RIoVHd+E5tiS3isOt6fWQWqmPOA3zpRT0=
-=d/ud
+iQEcBAEBCAAGBQJS336/AAoJEEqz6FtPBkyjXMUH/17Z23DFeGqfdAa9EFeJ7oEB
+jhbY72K2EAqRH/XccSQFou+Bu7fA0RxvEMT/Boo6QNI5yXpLnnPUh0U7KU1Hkjtb
+CyX3BHypMweGg9YtDTjsjiHNHZI/KJ3tf35H1pkLqdeQ/wsNfjdx1Q0eEwyVLqp7
+lc2BRiXSgkvLZgIq9n6wovp5zk7DG4x8On+M4v5mm0ZaEWenurcG1BVhLzDnGTpD
+fr5l/TV3RkNcDSuqJRgOppkGEb+3ZbpM5v/JJZKQnBONDfuyFLFz7jPUXDlxrhdt
+kYKp43db5S8CBxt4fBHHP7YQ5iPk5kMLwDL+klleSiAhMOlePbuAGBLwwkbHlIA=
+=hFZu
 -----END PGP SIGNATURE-----
diff --git a/media-video/mkvtoolnix/mkvtoolnix-6.7.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-6.7.0.ebuild
new file mode 100644
index 000000000000..8ecf799432da
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-6.7.0.ebuild
@@ -0,0 +1,88 @@
+# 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.7.0.ebuild,v 1.1 2014/01/22 08:18:06 radhermit Exp $
+
+EAPI=5
+WX_GTK_VER="3.0"
+inherit eutils multilib toolchain-funcs versionator wxwidgets multiprocessing autotools
+
+DESCRIPTION="Tools to create, alter, and inspect Matroska files"
+HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
+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"
+
+RDEPEND="
+	>=dev-libs/libebml-1.3.0:=
+	>=media-libs/libmatroska-1.4.1:=
+	>=dev-libs/boost-1.46.0:=
+	dev-libs/pugixml
+	media-libs/flac
+	media-libs/libogg
+	media-libs/libvorbis
+	sys-apps/file
+	>=sys-devel/gcc-4.6
+	sys-libs/zlib
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+"
+DEPEND="${RDEPEND}
+	dev-lang/ruby
+	virtual/pkgconfig
+"
+
+pkg_pretend() {
+	# http://bugs.gentoo.org/419257
+	local ver=4.6
+	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
+	if ! version_is_at_least ${ver} $(gcc-version); then
+		eerror ${msg}
+		die ${msg}
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.8.0-system-pugixml.patch \
+		"${FILESDIR}"/${PN}-5.8.0-boost-configure.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use wxwidgets ; then
+		need-wxwidgets unicode
+		myconf="--with-wx-config=${WX_CONFIG}"
+	fi
+
+	econf \
+		$(use_enable debug) \
+		$(use_enable qt4 qt) \
+		$(use_enable wxwidgets) \
+		$(usex pch "" --disable-precompiled-headers) \
+		${myconf} \
+		--disable-optimization \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-boost="${EPREFIX}"/usr \
+		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--without-curl
+}
+
+src_compile() {
+	./drake V=1 -j$(makeopts_jobs) || die
+}
+
+src_install() {
+	DESTDIR="${D}" ./drake -j$(makeopts_jobs) install || die
+
+	dodoc AUTHORS ChangeLog README TODO
+	doman doc/man/*.1
+
+	use wxwidgets && docompress -x /usr/share/doc/${PF}/guide
+}