gentoo resync : 05.04.2019

4 files changed, 139 insertions, 7 deletions

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index bae591258aed..6eca2875afe3 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,8 +1,10 @@
 DIST mkvtoolnix-29.0.0.tar.xz 7051380 BLAKE2B 8f5694abdbeb95c13e3a97740e3e81c02f1408116f1bdf96e8199bba0408e03278cac0bee0506b4b0aedc0a0417d61e13f31af716942faa9dbe61d16eb1d0761 SHA512 bfb5e31fdd43dbb1c3a54a9b82af414abd43f8edad1cc87e5118f8c1781185470152163fda828303c58db97df27c8037b7fa64e2077c69e3204d5080f0248dae
 DIST mkvtoolnix-30.1.0.tar.xz 7274296 BLAKE2B 0b0c7a9954269d0c6f071bd808ddf18eaf2d004dc2d8cf209f7021624458a9a29a7f705ad08446bd769b3a4e73732a3b2a269385868041fd887eff1d92c07558 SHA512 0c29a7a246b7e7ddccbb7ec51d7dd45d06530e01d7f1c8fa901b1a94dc6c7d9db0890009f200c3bebee572e24c826f7c05a53c16e8d11cfac2c68a3d13b96a53
 DIST mkvtoolnix-31.0.0.tar.xz 7282492 BLAKE2B 1c0d4a6de81ddb1953e3f7997ef62ffeeb9562cacaf5df33320cd8f2263d6303986c3a1a129e9b6ac986efd4a290046aba41e38ae1ed83e7eec00dab099a19fc SHA512 085bc7d5a2b2e692d584bef5f31aab8dc25883cc93d9f2b2c35ea6356d64536763b6e9f7cef2dbaf1b789e73c05cb5f9e76ce76c54f034aa9d46c30983d1a5b7
+DIST mkvtoolnix-32.0.0.tar.xz 7282928 BLAKE2B cf051474c3e4735f5c3fdda44bd9065539ea6333ad4683f61b1a7d8ecc6fab2e45bd0ae37f82acdbc11c01704c319356d2baa9fdfe1e8e48ffcf65b05f484836 SHA512 a209360fcad3164ebf127b7a54542b2b791318cef1ac8acbb24e64458bd9fe693ea6fa2b44b6e85504decab9668296637d9d4ce706effcf6a9f0d7bdea64793a
 EBUILD mkvtoolnix-29.0.0.ebuild 2917 BLAKE2B 0a6f43f3976acee9843c486ecfc2901a585b56cdc5c1f3edfff86322e356c58cefb7ac41e42df32e2cb9cafb14d8bc5d3868f30363538a6464bab073d08225d3 SHA512 4604578ff5449024a7333a6d1613d1fa558d24009e4c1f73a05ece43413f76e62613f8436536815e0062778a73d5921646a3bf37429ac43fdb0167d6fabc243c
 EBUILD mkvtoolnix-30.1.0.ebuild 2884 BLAKE2B b5e5337a678e01457f2fc967f077c757e3b73bffdbcfbad49cc4479c71e25e536232d2ad47ad68ca5e15c0cdd311a2ee9400eefdbe7320aa4a5906dcfc3e44a8 SHA512 751ea92e2107310d27ddad995305878da9a465318a6bbf8b3acb4940f008a54a1643661430a20c65b430963481c7097f3e6a5e6b7641222cae0ba19ffe9d30f4
-EBUILD mkvtoolnix-31.0.0.ebuild 2884 BLAKE2B b5e5337a678e01457f2fc967f077c757e3b73bffdbcfbad49cc4479c71e25e536232d2ad47ad68ca5e15c0cdd311a2ee9400eefdbe7320aa4a5906dcfc3e44a8 SHA512 751ea92e2107310d27ddad995305878da9a465318a6bbf8b3acb4940f008a54a1643661430a20c65b430963481c7097f3e6a5e6b7641222cae0ba19ffe9d30f4
-EBUILD mkvtoolnix-9999.ebuild 2918 BLAKE2B 75f39a5be50cfad1ef9c21cd11691aecc53071e2b9167f3f5f8b5b9eba6431ce876a56048abe7bd3818df8f8a25be5035f7c4dac55a7ec6536e43cbd2728d018 SHA512 3d2048d6b89efe936fafa3860e349c5faa0656837715cc0f6ac25d7404d0830445d79dc93ca824b54b6db8bc52cd0ee90f9f3262fe49cbebe5d2302d8f10be35
+EBUILD mkvtoolnix-31.0.0.ebuild 2887 BLAKE2B a5c9ef6509c2f9ddfd3c5ae4626a7354bfcc856df0873d5a4f651c15a00cfb636d996ce294ba114a10ed4b73a25f280bf7038024d91bf64ffbe99630060fdf58 SHA512 8ecd511e9d8754ba0972f6e9a910c842c905583958818e916bd3c2550837847e377013d6cf5732dfb9ccb6b29aff6ad7948d719e656a495bdebdc7ec785fcde9
+EBUILD mkvtoolnix-32.0.0.ebuild 2887 BLAKE2B 9b5de5cda6e7f841f9181db1b49f0a225813de08d3423a292093c32ff8932ab1dfc768560225b41b895acc31c47c743c1d712f9c6f0a83a562c9b296eb4d6376 SHA512 55c5d2ead89d902a1d7fe6e7dcd49448af5ba0dc3616c56ba6cb9fad8f6448d6bdc650edff8737f59ec6581fad38e9731292b8b767349c5c0d8da94a8ca39d3d
+EBUILD mkvtoolnix-9999.ebuild 2921 BLAKE2B 94cde7706e5e71c1d6da9a6ac26df789884b0707f90c6963ae98ea0e49fcd58f222ac46be1427104208e9a96530ee846ab183cb089b3735ecf71076cf34c91eb SHA512 a83e0f2ed548f9b021368c98306ee50dfd16174e081b87aa15988a18168522cc731d01e73b9181de3141fcdcae23a0b15d458af2608886cd4778cd8c0f150947
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/mkvtoolnix-31.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-31.0.0.ebuild
index 01b2b95c89bb..59cbce24aca9 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-31.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-31.0.0.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 		dev-qt/qtwidgets:5
 		dev-qt/qtconcurrent:5
 		dev-qt/qtmultimedia:5
-		app-text/cmark
+		app-text/cmark:0=
 	)
 "
 DEPEND="${RDEPEND}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-32.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-32.0.0.ebuild
new file mode 100644
index 000000000000..8837542e21d4
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-32.0.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs versionator multiprocessing xdg-utils qmake-utils gnome2-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
+	inherit git-r3
+else
+	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Tools to create, alter, and inspect Matroska files"
+HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug nls pch test qt5"
+
+# check NEWS.md for build system changes entries for boost/libebml/libmatroska
+# version requirement updates and other packaging info
+RDEPEND="
+	dev-libs/libfmt:=
+	>=dev-libs/boost-1.49.0:=
+	>=dev-libs/libebml-1.3.7:=
+	dev-libs/pugixml
+	media-libs/flac
+	>=media-libs/libmatroska-1.5.0:=
+	media-libs/libogg
+	media-libs/libvorbis
+	sys-apps/file
+	sys-libs/zlib
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtconcurrent:5
+		dev-qt/qtmultimedia:5
+		app-text/cmark:0=
+	)
+"
+DEPEND="${RDEPEND}
+	dev-cpp/nlohmann_json
+	dev-libs/utfcpp
+	dev-ruby/rake
+	virtual/pkgconfig
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	nls? (
+		sys-devel/gettext
+		app-text/po4a
+	)
+	test? ( dev-cpp/gtest )
+"
+
+DOCS="AUTHORS NEWS.md README.md"
+
+pkg_pretend() {
+	# https://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() {
+	default
+	[[ ${PV} == "9999" ]] && { ./autogen.sh || die; }
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(usex pch "" --disable-precompiled-headers)
+		$(use_enable qt5 qt)
+		$(use_with nls gettext)
+		$(usex nls "" --with-po4a-translate=false)
+		--disable-update-check
+		--disable-optimization
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		--with-boost="${EPREFIX}"/usr
+		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
+	)
+
+	if use qt5 ; then
+		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
+		myeconfargs+=(
+			--with-moc=$(qt5_get_bindir)/moc
+			--with-uic=$(qt5_get_bindir)/uic
+			--with-rcc=$(qt5_get_bindir)/rcc
+			--with-qmake=$(qt5_get_bindir)/qmake
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	rake V=1 -j$(makeopts_jobs) || die
+}
+
+src_test() {
+	rake V=1 -j$(makeopts_jobs) tests:unit || die
+	rake V=1 -j$(makeopts_jobs) tests:run_unit || die
+}
+
+src_install() {
+	DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
+
+	einstalldocs
+	doman doc/man/*.1
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
index 3036925897dc..2bc8fa7624cf 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,10 +24,10 @@ IUSE="debug nls pch test qt5"
 RDEPEND="
 	dev-libs/libfmt:=
 	>=dev-libs/boost-1.49.0:=
-	>=dev-libs/libebml-1.3.5:=
+	>=dev-libs/libebml-1.3.7:=
 	dev-libs/pugixml
 	media-libs/flac
-	>=media-libs/libmatroska-1.4.8:=
+	>=media-libs/libmatroska-1.5.0:=
 	media-libs/libogg
 	media-libs/libvorbis
 	sys-apps/file
@@ -40,7 +40,7 @@ RDEPEND="
 		dev-qt/qtwidgets:5
 		dev-qt/qtconcurrent:5
 		dev-qt/qtmultimedia:5
-		app-text/cmark
+		app-text/cmark:0=
 	)
 "
 DEPEND="${RDEPEND}