gentoo resync : 20.12.2017

3 files changed, 115 insertions, 3 deletions

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 81653074523c..b1d3d4c02258 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -2,11 +2,13 @@ DIST mkvtoolnix-15.0.0.tar.xz 4552588 BLAKE2B 2be4813a4a0714d47cb6036c4051704832
 DIST mkvtoolnix-16.0.0.tar.xz 4607360 BLAKE2B 4387411724dbc7bb36ead16fbed9c82fa9e66ff0e1551ef98dc7132a5906f307e27f70976fbb74debf36feee1e7d71498e9afe6591f5f7236cd5f1a64dd46f1f SHA512 5255c5a1d995bbf24d414dcdde8de987295581d4a8054164f15dca6019c79d96c9c074dc1892a86cd0084da34079529357efbeb3381addd9dc087b433be493fa
 DIST mkvtoolnix-17.0.0.tar.xz 4606064 BLAKE2B b4f8265eedaed1a5669c91833b970b2ffd0267d64dbce0ec4fa0e8dd90cd0d2620300ca286b83a9f6787f37d74202022a5070e44f7f6287d32c757545d9f9334 SHA512 9d092949a78bcf063483219245b610c73b73dd6c3bb740e4c30016c49dd35612629679df10265235ad1e7f77422afa913ae9473765611b049eef6d8f2f174fe5
 DIST mkvtoolnix-18.0.0.tar.xz 4613492 BLAKE2B d972ee1b31966d66e0b3665c340f87fa517cc7dcb4ed24dc0907758ad7fb939bb795f56bbfdc36f37aa065851afef95a9179985bf7cbb854b197947b35134faa SHA512 3094bc4859a29bc35a9051989a327a50bcfc2a033386f9ece0dba23a5221037ae6aa318345ecae024ef7884fc3622b56bf3cbafbee9e2b116b74bb28c5d779f9
+DIST mkvtoolnix-19.0.0.tar.xz 4616780 BLAKE2B 72eb3b1a34bbed0d492098c02c1f60c7ce7f0ea6a8fbff6b88bd9d7af5891dda8c8adb9a0f856c65106fb430b481183ce74b9369590cd4dcfe881d7db84eb06d SHA512 dd18eeffc8a5210ca3c8a287321ad106f63cff8fbe5ad3891460aab7e60f2d5261a3f335f3991524a95724861288593cfb3bd9df6829a2f7751f6a1fdaba0ca6
 DIST mkvtoolnix-9.6.0.tar.xz 3810216 BLAKE2B 0213f7643b517436610fd2abd5862026cad81ae48018bbdde6fd83b226eaba6d36589925fd49b7244a47569f7fd15480eac9af559df1da7c131a05aea4865606 SHA512 5f469215a10dc865e51f77c43961705d70b1b0e38d70b930e5065d8d89b8379734d9826a63e2cb7ae9cb6723ed8a1d16793df35bad6244cedaa19bc4df49b436
 EBUILD mkvtoolnix-15.0.0-r1.ebuild 2552 BLAKE2B 1d69b89514777d1516870bfbf0adcfd34394a0d9da99ce93c17b80e5f600c6211b486bbc7467ccbb9656fca05976f0e129f0ddc36f9fdb0907d412772a439c36 SHA512 29dad1e71c085a2bb54379ec1a7daa4516ef072fdd1048905b43f6adb6ee4eb988b74e7626a99908a1b149095ff4f8a42b3844b5c3a4b3bffce5f9f953d4a817
 EBUILD mkvtoolnix-16.0.0.ebuild 2552 BLAKE2B a7e2fe43a191072e8fe4099429d90ca4fbbb00f1f7f25aff4a9926df076684910e6daa08de38bc6c4018162d1ef3e72977ad03abb3b92beb893f527d2a095097 SHA512 2f326f9d3300ddbe52aef7d0fceb0b393a335eb0cd8d716ba5627cde93db95d246821d959d2bff16c30cbd1aa936742c137f190b6021e2a3f78bc35679170ca2
 EBUILD mkvtoolnix-17.0.0.ebuild 2552 BLAKE2B a7e2fe43a191072e8fe4099429d90ca4fbbb00f1f7f25aff4a9926df076684910e6daa08de38bc6c4018162d1ef3e72977ad03abb3b92beb893f527d2a095097 SHA512 2f326f9d3300ddbe52aef7d0fceb0b393a335eb0cd8d716ba5627cde93db95d246821d959d2bff16c30cbd1aa936742c137f190b6021e2a3f78bc35679170ca2
 EBUILD mkvtoolnix-18.0.0.ebuild 2552 BLAKE2B a7e2fe43a191072e8fe4099429d90ca4fbbb00f1f7f25aff4a9926df076684910e6daa08de38bc6c4018162d1ef3e72977ad03abb3b92beb893f527d2a095097 SHA512 2f326f9d3300ddbe52aef7d0fceb0b393a335eb0cd8d716ba5627cde93db95d246821d959d2bff16c30cbd1aa936742c137f190b6021e2a3f78bc35679170ca2
+EBUILD mkvtoolnix-19.0.0.ebuild 2552 BLAKE2B 83fd2697455d3f25a23ce9c050a1e5435f4f52bca5e289c47814f9c9a5e7ebee7435beb3f7e495ecd7fc704dfa64dbf0ccf3df6232634358a1faf277a9fac2c8 SHA512 c3cb925382cb19947251ffd175c1cd67b30010829a38ad4a8bab489a17a769fcf5f2ba5edcba8def33181dbf94da369fdbf4c4c0936ef443bff951417bff1cc5
 EBUILD mkvtoolnix-9.6.0.ebuild 2804 BLAKE2B 449263c96ba91f576ec4aff230dc281119e4809913b537530d7cc6f413994baf28a83471f23322151eb35721b0e1374dff630b60aa5724be9eb7c989ac075db8 SHA512 6197ff1dec6dfca50711c7165d46f8a08d0844666686142eef5124485f448428bf9c0445a9976c52dbc28cede017921d2bccc5ca7089021c35f71d394a174d51
-EBUILD mkvtoolnix-9999.ebuild 2552 BLAKE2B a7e2fe43a191072e8fe4099429d90ca4fbbb00f1f7f25aff4a9926df076684910e6daa08de38bc6c4018162d1ef3e72977ad03abb3b92beb893f527d2a095097 SHA512 2f326f9d3300ddbe52aef7d0fceb0b393a335eb0cd8d716ba5627cde93db95d246821d959d2bff16c30cbd1aa936742c137f190b6021e2a3f78bc35679170ca2
+EBUILD mkvtoolnix-9999.ebuild 2552 BLAKE2B 83fd2697455d3f25a23ce9c050a1e5435f4f52bca5e289c47814f9c9a5e7ebee7435beb3f7e495ecd7fc704dfa64dbf0ccf3df6232634358a1faf277a9fac2c8 SHA512 c3cb925382cb19947251ffd175c1cd67b30010829a38ad4a8bab489a17a769fcf5f2ba5edcba8def33181dbf94da369fdbf4c4c0936ef443bff951417bff1cc5
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/mkvtoolnix-19.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-19.0.0.ebuild
new file mode 100644
index 000000000000..f0e294854bdb
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-19.0.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs versionator multiprocessing
+
+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
+	)
+"
+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=/usr/$(get_libdir)/qt5/bin/moc
+			--with-uic=/usr/$(get_libdir)/qt5/bin/uic
+			--with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
+			--with-qmake=/usr/$(get_libdir)/qt5/bin/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
+}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
index 93682af702f5..f0e294854bdb 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit toolchain-funcs versionator multiprocessing
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/mbunkus/mkvtoolnix.git"
+	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
 	inherit git-r3
 else
 	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
@@ -13,7 +13,7 @@ else
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="https://mkvtoolnix.download/ https://github.com/mbunkus/mkvtoolnix"
+HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
 
 LICENSE="GPL-2"
 SLOT="0"