gentoo resync : 02.08.2019

3 files changed, 2 insertions, 133 deletions

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 72e0e5fb6c5e..d85c84aceb67 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,6 +1,4 @@
-DIST mkvtoolnix-29.0.0.tar.xz 7051380 BLAKE2B 8f5694abdbeb95c13e3a97740e3e81c02f1408116f1bdf96e8199bba0408e03278cac0bee0506b4b0aedc0a0417d61e13f31af716942faa9dbe61d16eb1d0761 SHA512 bfb5e31fdd43dbb1c3a54a9b82af414abd43f8edad1cc87e5118f8c1781185470152163fda828303c58db97df27c8037b7fa64e2077c69e3204d5080f0248dae
 DIST mkvtoolnix-35.0.0.tar.xz 7297244 BLAKE2B 9a7cd015b00fe46f165903b8b6f9317489548aa9a352c85727296ee0638506336028231b115a9270388a4ede1a088a4bdba16156600341c51bd5a2ae557b181f SHA512 aa109be9da3f0bd119d9315b9ea136d3c1532d0f351c5a052dcc7ad67a4dcec9d8fec69a0c9358790abfcb6eeaee47fad4af2a0506bef39cfd5c8466f90bdf98
-EBUILD mkvtoolnix-29.0.0.ebuild 2907 BLAKE2B 2591fc5379f969c62ddcc7ce029397697e6a92439e1e02185b3bf1173d75ca7c2d6d78c8c6f71be1c92279af432ed47cc766299f4a56712915858c2b37c83b53 SHA512 bfa8b9d83d3eb7c215808edabf43b442140d2ab972aa890003aa663d1c14332647c47fb1c3470f505a61114e4ef902868165c22dc0f1ff989dd7f1ded382bcf4
-EBUILD mkvtoolnix-35.0.0.ebuild 2675 BLAKE2B ba3e4bc1b96e62e979a054c53fb0b7c12b5da0d2f7bfc45a0312ad8ce0135af33034e4544e2a5e89306e9aebbe750b1481dc48a61f31da8cdd83f50735cf2c6a SHA512 5cf589522efefbc12108494a711707f84e67b3c3a8d7f1c788c4318e9c5f17e2d4ada8879d0a88b622664ce0018bd724857120c81d2973b41acb91e9d891f7e0
+EBUILD mkvtoolnix-35.0.0.ebuild 2673 BLAKE2B 2e0f0339434a91911d6b09541c1e1ea0a33deb365e82c13cd97a976c0ffff08a340d2402bd5a6949d24a9565e2406c5403a684f582068eb505494938fda9a89e SHA512 55744b23a1f061e14601d157309615bed32a282a0d6c3b84aa2dd1212cdcaf264d6e6b28f345bfbef16759c01e3f88e20457ccb0de40ee2d9f86569dadbb5f06
 EBUILD mkvtoolnix-9999.ebuild 2700 BLAKE2B 5022fb5fe50f1ad679460b31422358a7e225221faaf0c5a7a222b92cdb78f6e2f875b84b7ac538d7304e30c2d59c29f9d2c854d7532f8dad62cc1a5dc8a5bd3a SHA512 7ea4aa4ad28297f92910e7997faa97923c02e704d8f066fdb3fc8f5bbb47e91bbd94fa504fca0df6d1de57b06406910e2b1dfc5e9a6762122fc21884d795fb7d
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/mkvtoolnix-29.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-29.0.0.ebuild
deleted file mode 100644
index e8f9a9bf09ef..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-29.0.0.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# 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 ~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 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/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/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-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-35.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
index 7cb3dce6c6e3..3fabd7e2dccb 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"