gentoo resync : 31.12.2018

4 files changed, 135 insertions, 3 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 1523adda4ca1..73b1475d0fd1 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 11b8d32d5a94..e65460c48831 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -7,6 +7,7 @@ EBUILD mkvtoolnix-19.0.0.ebuild 2549 BLAKE2B f205d940a9fe250d842cfeaffefd389be86
 EBUILD mkvtoolnix-21.0.0-r1.ebuild 2776 BLAKE2B 86398031edf9b7f0a3a4e6f4847e72d2ee9025af58a7ddd524dfad296a15e0b6f79f629f0ddb7ed1ed1cdc629d43d3d74ab4413fcc593e60fb08ddb1ef3b2a2b SHA512 28b5a3406f1f89c2839ed2f859d790c3171740cbff1a871111aeb31a7bedb9df0680cb96c64eb36363af680eb409d1069f5fd9bc33d1840d89ac0b5f6c9f4613
 EBUILD mkvtoolnix-22.0.0.ebuild 2776 BLAKE2B 86398031edf9b7f0a3a4e6f4847e72d2ee9025af58a7ddd524dfad296a15e0b6f79f629f0ddb7ed1ed1cdc629d43d3d74ab4413fcc593e60fb08ddb1ef3b2a2b SHA512 28b5a3406f1f89c2839ed2f859d790c3171740cbff1a871111aeb31a7bedb9df0680cb96c64eb36363af680eb409d1069f5fd9bc33d1840d89ac0b5f6c9f4613
 EBUILD mkvtoolnix-23.0.0.ebuild 2776 BLAKE2B 86398031edf9b7f0a3a4e6f4847e72d2ee9025af58a7ddd524dfad296a15e0b6f79f629f0ddb7ed1ed1cdc629d43d3d74ab4413fcc593e60fb08ddb1ef3b2a2b SHA512 28b5a3406f1f89c2839ed2f859d790c3171740cbff1a871111aeb31a7bedb9df0680cb96c64eb36363af680eb409d1069f5fd9bc33d1840d89ac0b5f6c9f4613
+EBUILD mkvtoolnix-29.0.0-r1.ebuild 2872 BLAKE2B 38443c0a03010bda7a3088d46694ec11ecb04ade74b5dc4bc3392792281b0c677f2a2ef4f130f4cf21e72530984ae5d592cf0249bee48e9b252bcc5f5b453f87 SHA512 cd2797b2821e140eccf81d8cdeec5977100f077c1c429dfdc3f5ab9aafcbb604373ddd52c2ebc46e272eeb501a2a835ff6eab834b600fb943ba32b4b9d53a7c3
 EBUILD mkvtoolnix-29.0.0.ebuild 2920 BLAKE2B 57f7ebdaa2d39f180bc123ccef3f976a28e58aac54b1ec851c0b1f5d7d8a53b5915082718e380d851fddd7173fb53ab90d86ba89fe40f5c89aeb3e914dbb6b60 SHA512 fce50ac64933c2a20d6606395810bb21887756d0e447da65dae01a006db8964d04e303b8b61c7f471209de8c5b553ab189aafb4e96db3f03193181e84dc9df0d
-EBUILD mkvtoolnix-9999.ebuild 2920 BLAKE2B 57f7ebdaa2d39f180bc123ccef3f976a28e58aac54b1ec851c0b1f5d7d8a53b5915082718e380d851fddd7173fb53ab90d86ba89fe40f5c89aeb3e914dbb6b60 SHA512 fce50ac64933c2a20d6606395810bb21887756d0e447da65dae01a006db8964d04e303b8b61c7f471209de8c5b553ab189aafb4e96db3f03193181e84dc9df0d
+EBUILD mkvtoolnix-9999.ebuild 2918 BLAKE2B 75f39a5be50cfad1ef9c21cd11691aecc53071e2b9167f3f5f8b5b9eba6431ce876a56048abe7bd3818df8f8a25be5035f7c4dac55a7ec6536e43cbd2728d018 SHA512 3d2048d6b89efe936fafa3860e349c5faa0656837715cc0f6ac25d7404d0830445d79dc93ca824b54b6db8bc52cd0ee90f9f3262fe49cbebe5d2302d8f10be35
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/mkvtoolnix-29.0.0-r1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-29.0.0-r1.ebuild
new file mode 100644
index 000000000000..b47988527a70
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-29.0.0-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2018 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 ~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.5:=
+	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/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
+	)
+"
+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 865f816c46ce..3036925897dc 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
@@ -21,11 +21,10 @@ 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
-# TODO: package fmt (http://fmtlib.net/)
 RDEPEND="
+	dev-libs/libfmt:=
 	>=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:=
@@ -45,6 +44,8 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
+	dev-cpp/nlohmann_json
+	dev-libs/utfcpp
 	dev-ruby/rake
 	virtual/pkgconfig
 	dev-libs/libxslt