gentoo resync : 18.03.2018

2 files changed, 123 insertions, 0 deletions

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index bcea6853ad32..d5bda64265aa 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,8 +1,10 @@
 DIST mkvtoolnix-19.0.0.tar.xz 4616780 BLAKE2B 72eb3b1a34bbed0d492098c02c1f60c7ce7f0ea6a8fbff6b88bd9d7af5891dda8c8adb9a0f856c65106fb430b481183ce74b9369590cd4dcfe881d7db84eb06d SHA512 dd18eeffc8a5210ca3c8a287321ad106f63cff8fbe5ad3891460aab7e60f2d5261a3f335f3991524a95724861288593cfb3bd9df6829a2f7751f6a1fdaba0ca6
 DIST mkvtoolnix-20.0.0.tar.xz 4670268 BLAKE2B fd10e5bd739338252d4d1c8878382652660e59b9669c85a3f9bfab1349da6cbcd4a79b23a1db9f59adb5ccb12aa1ae046978f722e887ab0668c91270cf50b705 SHA512 1ba7b2d02fcaa2252409702e82e04075237a33b8f2cfe8b85e4ea416d7ad55d0454659c821eb851fa666b15acceec40a5be00691ddaa4ea098cd3a4d2db0d313
+DIST mkvtoolnix-21.0.0.tar.xz 4682788 BLAKE2B 52d9920fc5b735f7d8af1f6e60828f143a914ce7cd7c635daacb6d2da584b0158f80e0f4d39824130b0c8fcc83b7c3a1215b2e965cb8b47b2b297df2d78414d5 SHA512 881e0c38eee2d36ab9dea5ccaa8ad74e0076cdc13606f873ab58bfeeec09c05e947529d3bad665b1d4df6a816faca30e8a685bc19115f90c18dac3c1ae27c252
 DIST mkvtoolnix-9.6.0.tar.xz 3810216 BLAKE2B 0213f7643b517436610fd2abd5862026cad81ae48018bbdde6fd83b226eaba6d36589925fd49b7244a47569f7fd15480eac9af559df1da7c131a05aea4865606 SHA512 5f469215a10dc865e51f77c43961705d70b1b0e38d70b930e5065d8d89b8379734d9826a63e2cb7ae9cb6723ed8a1d16793df35bad6244cedaa19bc4df49b436
 EBUILD mkvtoolnix-19.0.0.ebuild 2549 BLAKE2B f205d940a9fe250d842cfeaffefd389be863556cfbb6d1d2960551c5b16ece35269c9c64f2c110655e38f2cda894c5940bf686fb04602ad997cca05f61ecb0b9 SHA512 e8291ce11ad3871b538ccce78d81e258ff4112098a14587f12a03969a40cec24ddb884a2c9e3c16503ac1272a586e6e61fef8d414c28e9ee526949c97e52124c
 EBUILD mkvtoolnix-20.0.0.ebuild 2711 BLAKE2B 05bc79c266139415bfa53d7c739bfd4b1738b606d2d7660d41eb1fa68a4738970371ab915e0413b30ff8a482452ed8b4568f076c32a8383955f5c2a7f237bff8 SHA512 db31f33ad3f2f302fb978a5a5ce59c265141844142b1d557a1febc42b2c3a0ac1a13a9b5cd04d8903a7c1dab01f3fea9701aa634edd165c40d04e6d64ff9f5df
+EBUILD mkvtoolnix-21.0.0.ebuild 2711 BLAKE2B 05bc79c266139415bfa53d7c739bfd4b1738b606d2d7660d41eb1fa68a4738970371ab915e0413b30ff8a482452ed8b4568f076c32a8383955f5c2a7f237bff8 SHA512 db31f33ad3f2f302fb978a5a5ce59c265141844142b1d557a1febc42b2c3a0ac1a13a9b5cd04d8903a7c1dab01f3fea9701aa634edd165c40d04e6d64ff9f5df
 EBUILD mkvtoolnix-9.6.0.ebuild 2797 BLAKE2B 63dcef388c97df90fa9d47572d2af82839fb1687409060aedeb824400e5e2d450674689c69e630bc02f00ff92f784ab29d3b445b39a4317884a30513e30151b2 SHA512 bd376bb7787b79719e4e3bba4361e55be0d8c39d55b6c37c905c84bf8b583f718b66d7ce9941f87213514ce38c33f2d2a506f2fd8e1edcd6d0fb4e11e45d4052
 EBUILD mkvtoolnix-9999.ebuild 2711 BLAKE2B 05bc79c266139415bfa53d7c739bfd4b1738b606d2d7660d41eb1fa68a4738970371ab915e0413b30ff8a482452ed8b4568f076c32a8383955f5c2a7f237bff8 SHA512 db31f33ad3f2f302fb978a5a5ce59c265141844142b1d557a1febc42b2c3a0ac1a13a9b5cd04d8903a7c1dab01f3fea9701aa634edd165c40d04e6d64ff9f5df
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/mkvtoolnix-21.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-21.0.0.ebuild
new file mode 100644
index 000000000000..9cc2c6abecac
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-21.0.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs versionator multiprocessing xdg-utils qmake-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 ~x86-fbsd ~amd64-linux ~x86-linux"
+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 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/boost-1.49.0:=
+	>=dev-libs/libebml-1.3.5:=
+	dev-libs/jsoncpp:=
+	dev-libs/pugixml
+	media-libs/flac
+	>=media-libs/libmatroska-1.4.8:=
+	media-libs/libogg
+	media-libs/libvorbis
+	sys-apps/file
+	sys-libs/zlib
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtconcurrent:5
+		dev-qt/qtmultimedia:5
+		app-text/cmark
+	)
+"
+DEPEND="${RDEPEND}
+	dev-ruby/rake
+	sys-devel/gettext
+	virtual/pkgconfig
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	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 myconf
+
+	if use qt5 ; then
+		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
+		myconf+=(
+			--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 \
+		$(use_enable debug) \
+		$(use_enable qt5 qt) \
+		$(usex pch "" --disable-precompiled-headers) \
+		"${myconf[@]}" \
+		--disable-update-check \
+		--disable-optimization \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-boost="${EPREFIX}"/usr \
+		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
+}
+
+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
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}