gentoo resync : 30.06.2019

23 files changed, 202 insertions, 684 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index ce2793ab8af2..c29d93dc1cd7 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/blinkentools/Manifest b/media-video/blinkentools/Manifest
index 27637beeef46..32427c2e25c8 100644
--- a/media-video/blinkentools/Manifest
+++ b/media-video/blinkentools/Manifest
@@ -1,4 +1,3 @@
 DIST blinkentools-2.9.tar.gz 560904 BLAKE2B 86068a9ea2321bb0688ca44a7fed406a38b73d01813d0d39c5ca6e84f690539eb864cafaf1a8e554e298c674d67cbc4f4b892d9393187a0452e381b517043a08 SHA512 ba6fed446bfa757979469ed2894cb7b6a7fa4c1296a3074d75b6ac6c9f17e69d4ae172d1d54bb62d7f05cc20e9e7ca1a6eca5a83f2cfb7e86f7f9070bc2da2dc
 EBUILD blinkentools-2.9-r1.ebuild 443 BLAKE2B e3af680f4337d258707540fd74de39298e1bb4bb7dd3ffdeb4ecf339da8fe33c2ae071c447d67eacd20be0b77be4ba24301cbad5f81b00f4faa26761555f9d95 SHA512 de0a0620ad14bd501d266ede7a6c907dc7a35ac0e0b93c953593d610ec2e6bf2fe68bf78af77b01670182ccbce34ac5c028eed0ece08f96df1b650364a188a25
-EBUILD blinkentools-2.9.ebuild 569 BLAKE2B 37b65f99fe848fe037d8b067a89dcbb696aaa0c7f1f9fa60c602aca1b6778816d0e0ee04c3d916fdf28082c05c05cb3415f3fb3d7f73b527cb6b0d6586447c89 SHA512 f99eefcd415668d4864c9244ae3b0bb3446e48475b18ccb1ae796bcc46739fbd7f300002b8fd99648dd04ad4108fbaa92854fb11059cadd8f856c46fd77e0c43
 MISC metadata.xml 510 BLAKE2B a70382b0ab3630981bb062a9abc97216dc1abd65614af6ca0f4be42360a66bfca9289f242f9e2b693ecb28aaffe20a65ab2c1350905aa1d90dde554398c47acf SHA512 39f50dda7c89cfbab1b4d29ed81c9e832ff41222d4bd219ad574b59d65a11b882e60feffef9a890769f7e234f992d507daac00b394c09c3e3311a2644f91ad8f
diff --git a/media-video/blinkentools/blinkentools-2.9.ebuild b/media-video/blinkentools/blinkentools-2.9.ebuild
deleted file mode 100644
index 81f422d42d60..000000000000
--- a/media-video/blinkentools/blinkentools-2.9.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="blinkentools is a set of commandline utilities related to Blinkenlights"
-HOMEPAGE="http://blinkenlights.net/project/developer-tools"
-SRC_URI="http://blinkenlights.de/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND="media-libs/blib
-	media-libs/libmng
-	virtual/pkgconfig"
-RDEPEND=""
-
-src_compile() {
-	econf
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-}
diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index ee61535f4d2d..cc042daaf1cd 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -1,5 +1,3 @@
-DIST mediainfo_18.12.tar.xz 1397888 BLAKE2B 11ee571136c2f4e82af210c0a345284c1188ef501c3ea8bd0ebad3808334d388f83abbe0e36118bc3752465ffbe989396be3c3578d124736a4579cb1fb64a031 SHA512 f5e70b075516ffa21f41d049b64f00275387366e5bad4bb331211db9e7449035bea2acbe37bf7074499ed56a01d45b8e94b078ca52334591f4dd9b985d3cc3a0
 DIST mediainfo_19.04.tar.xz 1732860 BLAKE2B d4bded273b8dce2be2c578d263f2d442ad5b4a37f5d8b292d34dd80ed7fe83fbacce69a4ce740f9527f2fdb9a304b6dd91c96bfe747c023ce0dddac2244eb7f4 SHA512 cb6cb3c4bc3a037267684bd850babe3ca5998954f93e86d5b25aad7c4641918546a012cf7c6df4ef8d6017c85ab159dc5ae0b18f166385f8c5cc940a6fb0b3ce
-EBUILD mediainfo-18.12.ebuild 1600 BLAKE2B dc74bb63e27c2c36fe52668e86998af8e867b467cb58ba42ffc54da66dd34cc9300b180f6e04153974b6964ff384abf72dfbcb783a073a06a390b3e729942422 SHA512 05bdb15bd3e85e7f594556c49596bfe81b56f59630127e04203ef7b9a77c835760a4c83ced5ee733558e06e6ba2042932bc2cd8505aebc688932c4e05a156dfe
-EBUILD mediainfo-19.04.ebuild 1602 BLAKE2B ba4076c82d812b436c9c707c36043e1f2a5c493fa23c78ab2b545dc1e207f1d42e49cc3795fd5675820ef4e614f37c94128e9e4c5e3a82ccb79e416338950ae7 SHA512 30306ad04a63f72802532bcc3bfbf9bac6cba5306af8d6f693052a17b24f033ab089a7dc1f928cb6fe5c569c5f73d71206fb8d6d0d1f9b4d135cabf8bc109637
+EBUILD mediainfo-19.04.ebuild 1600 BLAKE2B 73ddba373cd77ac61a13705931958022ea238e16482a6d8d859b43b26e70ccd9c587b7b08c9db574e013b6e577524d76220c1301983458d65e9ef8a2712a647e SHA512 3ccaf944aadde48141b9971e8e6ee547ba1fe5d32f8303a672178a86edb2b5dc8a360c457cc10ff178d0d92a67e9c15dbc4162973bcb21ff68aa39b3760a0e22
 MISC metadata.xml 343 BLAKE2B 53fbddabb217e6584379432d0ee85ef7e8a5a9ba13bf0e9fe71a22c2a1f0495d692e51cf17ea17427f22d65c94fc97bb7c5d0a3407e9c810c91616aa92d3e71e SHA512 3647e319de82c1521bd1e6a28dc7a64435b052130102d7a4b6f1478d92cfc94a164b7d9435855b4929d584be2f886f6bc51c84f6cb63b8431ac028583d57f0a3
diff --git a/media-video/mediainfo/mediainfo-18.12.ebuild b/media-video/mediainfo/mediainfo-18.12.ebuild
deleted file mode 100644
index 8b740ab64728..000000000000
--- a/media-video/mediainfo/mediainfo-18.12.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit gnome2-utils xdg-utils autotools wxwidgets
-
-DESCRIPTION="MediaInfo supplies technical and tag information about media files"
-HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo"
-SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="curl mms wxwidgets"
-
-RDEPEND="sys-libs/zlib
-	>=media-libs/libzen-0.4.37
-	~media-libs/lib${P}[curl=,mms=]
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/MediaInfo
-
-pkg_setup() {
-	TARGETS="CLI"
-	if use wxwidgets; then
-		TARGETS+=" GUI"
-		setup-wxwidgets
-	fi
-}
-
-src_prepare() {
-	default
-
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target} || die
-		sed -i -e "s:-O2::" configure.ac || die
-		eautoreconf
-	done
-}
-
-src_configure() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target} || die
-		local args=""
-		[[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
-		econf ${args}
-	done
-}
-
-src_compile() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target} || die
-		default
-	done
-}
-src_install() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target} || die
-		default
-		dodoc "${S}"/History_${target}.txt
-	done
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/mediainfo/mediainfo-19.04.ebuild b/media-video/mediainfo/mediainfo-19.04.ebuild
index 255a3010c595..37cd73d53baf 100644
--- a/media-video/mediainfo/mediainfo-19.04.ebuild
+++ b/media-video/mediainfo/mediainfo-19.04.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="curl mms wxwidgets"
 
 RDEPEND="sys-libs/zlib
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index bde76bc783d6..2ae343adcf95 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,12 +1,6 @@
 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
-DIST mkvtoolnix-33.1.0.tar.xz 7286068 BLAKE2B 2ff55bf8fa1e1356144931e1586783ccbc937ce8f7048e85a8ca0a29c69f419a4a1f43eecdc606674d3314c642e58a06c98900e4fc5e7069a30806c61401f646 SHA512 40023a1d2c1c27fd5f490ec017852304442bee2c2ae2d62cf042c3fba56652ed7489a2b0ad9d5dd0fa57eb0af99a49a936666d85836f57cb9417868356874a83
+DIST mkvtoolnix-35.0.0.tar.xz 7297244 BLAKE2B 9a7cd015b00fe46f165903b8b6f9317489548aa9a352c85727296ee0638506336028231b115a9270388a4ede1a088a4bdba16156600341c51bd5a2ae557b181f SHA512 aa109be9da3f0bd119d9315b9ea136d3c1532d0f351c5a052dcc7ad67a4dcec9d8fec69a0c9358790abfcb6eeaee47fad4af2a0506bef39cfd5c8466f90bdf98
 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 2887 BLAKE2B a5c9ef6509c2f9ddfd3c5ae4626a7354bfcc856df0873d5a4f651c15a00cfb636d996ce294ba114a10ed4b73a25f280bf7038024d91bf64ffbe99630060fdf58 SHA512 8ecd511e9d8754ba0972f6e9a910c842c905583958818e916bd3c2550837847e377013d6cf5732dfb9ccb6b29aff6ad7948d719e656a495bdebdc7ec785fcde9
-EBUILD mkvtoolnix-32.0.0.ebuild 2887 BLAKE2B 9b5de5cda6e7f841f9181db1b49f0a225813de08d3423a292093c32ff8932ab1dfc768560225b41b895acc31c47c743c1d712f9c6f0a83a562c9b296eb4d6376 SHA512 55c5d2ead89d902a1d7fe6e7dcd49448af5ba0dc3616c56ba6cb9fad8f6448d6bdc650edff8737f59ec6581fad38e9731292b8b767349c5c0d8da94a8ca39d3d
-EBUILD mkvtoolnix-33.1.0.ebuild 2887 BLAKE2B 9b5de5cda6e7f841f9181db1b49f0a225813de08d3423a292093c32ff8932ab1dfc768560225b41b895acc31c47c743c1d712f9c6f0a83a562c9b296eb4d6376 SHA512 55c5d2ead89d902a1d7fe6e7dcd49448af5ba0dc3616c56ba6cb9fad8f6448d6bdc650edff8737f59ec6581fad38e9731292b8b767349c5c0d8da94a8ca39d3d
-EBUILD mkvtoolnix-9999.ebuild 2921 BLAKE2B 94cde7706e5e71c1d6da9a6ac26df789884b0707f90c6963ae98ea0e49fcd58f222ac46be1427104208e9a96530ee846ab183cb089b3735ecf71076cf34c91eb SHA512 a83e0f2ed548f9b021368c98306ee50dfd16174e081b87aa15988a18168522cc731d01e73b9181de3141fcdcae23a0b15d458af2608886cd4778cd8c0f150947
+EBUILD mkvtoolnix-35.0.0.ebuild 2676 BLAKE2B 07b73b67f35cfd78b25849f6c859b5f1ca19e0fa4df4df78d3a3b7957323861891cdf9f7259e99aee6aaeefd7e7caf38c985aff1f969f12a0b5114bb42c1d43e SHA512 671912514e22004491cb38f62edfc693704fa95555ae969cb23d23ba0b9810328ff4d93667e37265d87cfb2b9ea6cd97e7b8afee14e569d9f5af7ffb220fd2e7
+EBUILD mkvtoolnix-9999.ebuild 2710 BLAKE2B 2ee4d65bf0c84e68b4a050d6cc8f0d0ab69081b4f1f3775dba26b4d685cdbad898d05c3ad08c792ee08dadee23389e9b4d833857dd18f1b03c713ee255ead330 SHA512 792637c46b0a663eb34cb59e69b8bcf101088468627afcd120d28762160689163c7ed34c76d186393afb101bbb120e0ac702f1808401647455a8635aaab4395d
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/mkvtoolnix-30.1.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-30.1.0.ebuild
deleted file mode 100644
index 01b2b95c89bb..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-30.1.0.ebuild
+++ /dev/null
@@ -1,130 +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"
-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-31.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-31.0.0.ebuild
deleted file mode 100644
index 59cbce24aca9..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-31.0.0.ebuild
+++ /dev/null
@@ -1,130 +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"
-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: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-33.1.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-33.1.0.ebuild
deleted file mode 100644
index 8837542e21d4..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-33.1.0.ebuild
+++ /dev/null
@@ -1,130 +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"
-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-32.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
index 8837542e21d4..67e541fbc01a 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-32.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit toolchain-funcs versionator multiprocessing xdg-utils qmake-utils gnome2-utils
+inherit toolchain-funcs versionator multiprocessing qmake-utils xdg
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
@@ -22,7 +22,7 @@ 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/libfmt-5.3.0:=
 	>=dev-libs/boost-1.49.0:=
 	>=dev-libs/libebml-1.3.7:=
 	dev-libs/pugixml
@@ -70,7 +70,7 @@ pkg_pretend() {
 }
 
 src_prepare() {
-	default
+	xdg_src_prepare
 	[[ ${PV} == "9999" ]] && { ./autogen.sh || die; }
 }
 
@@ -116,15 +116,3 @@ src_install() {
 	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 2bc8fa7624cf..8f7b2cf67639 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit toolchain-funcs versionator multiprocessing xdg-utils qmake-utils gnome2-utils
+inherit toolchain-funcs versionator multiprocessing qmake-utils xdg
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
@@ -22,7 +22,7 @@ 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/libfmt-5.3.0:=
 	>=dev-libs/boost-1.49.0:=
 	>=dev-libs/libebml-1.3.7:=
 	dev-libs/pugixml
@@ -70,7 +70,7 @@ pkg_pretend() {
 }
 
 src_prepare() {
-	default
+	xdg_src_prepare
 	[[ ${PV} == "9999" ]] && { ./autogen.sh || die; }
 }
 
@@ -116,15 +116,3 @@ src_install() {
 	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/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 5d9198069b77..ce0e961af931 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,6 +1,5 @@
-DIST obs-studio-23.0.1.tar.gz 6223214 BLAKE2B c3b65ad9134aefc36a3fa33b8d185a1ee76f76c10edd30d5ad8a7af86605c4e7b3b8d83c5570203d926655131f7c20f4ef11dcbf55c7af745efc2b68d4933c54 SHA512 6877d4bf635a9769d634683a85075a5fe3a5de1fcc83882647dfbc379a897eee05b69c2159e290ff73f53aa7c03027ea4ea15e1169de57c2c50f4e504eff410f
-DIST obs-studio-23.1.0.tar.gz 6192139 BLAKE2B 8c85d21f68b0dc799a8fdfce3ff94d837d0e02bfa55606eec9985d2c2d1c3d9ae78664ba8b17f393abb197f1595fa0f78f314fe474883a81166d9c6a0967682c SHA512 ab4f71430ae314774afbba8b8e39c4eb35ab147d49d6d33b188e7a820b1198ccbb6005fad111502834652b5261b88d07c075094a8303ea7294da3171e8e015bb
-EBUILD obs-studio-23.0.1.ebuild 2999 BLAKE2B 967cca610af94878444107a34cad25854e8f1b6d15bf68e7d4390ac069a47beb2a21564a56cd3896f76f1d3314fefb50922915ec79fa074fa5850931e4bc74c3 SHA512 f119490d232ab884b2f7098522bd6c25a367f24c124f0ebca4ad24984dafe3b66d4c6df66f64e002f5f27516388a3d9d5dbaf1511607dbf5cae105fe3aaa30a8
-EBUILD obs-studio-23.1.0-r1.ebuild 3015 BLAKE2B e6eeeede23cea3713a2bbc98fd548cda2616906a67daf9ab38e1a364177219136c5362f9d2054506f7d3fffb5be270d72567a62b3cefaf81a09c3411a34da197 SHA512 f39b3e9ba7f67202294e29253f6a9817ddeed39b0ee2e270274fc8887129e7d948c756d220f4d16ca09528e74a01c21bacbe947d763a86466e3b1d672201ad50
+AUX obs-studio-23.2.1-use-correct-libdir.patch 1776 BLAKE2B 4b3bcc6a0b1c128b3b2e90ce65d8515847413fb7b879943cd42789b8597dd7cb7036916cc5c796fb860237235cfba464c2a51c7aa43fb607f21dd9b823e9b2ce SHA512 33396fdb59d0588b8cae14539742f65d4f257ad1b9fb85fefae68c636de31099d8878e4b5ffde2ca16575c4ebe642164a2a8a4b8e87ca7101cf5bb3474bcd367
+DIST obs-studio-23.2.1.tar.gz 6204515 BLAKE2B bd025a1ec2809e8a0b47fba79c6a3d40feb255a03a461725501a9c7cdbc40c04b75ff714fa4b3787f876a3f524f3371119a3ea9666c3aeb003184f1eb2a63123 SHA512 aabc23d825c2ca3f40274a8e2c4935939dab4955d929c44b28cebde114e808543c1c0dc05791bb6d9f2611effb0f2cb3e20c9a653154c30a9851ea94e74c8169
+EBUILD obs-studio-23.2.1.ebuild 3076 BLAKE2B 537845e1bb605bef3fb624912c2433dd52c350119a4ae6bb6a620b3bfa0de6a5170074b3b5c99521e7d54d255e27b32f4e8c117e545e06c9302e2560ab1d9fa6 SHA512 02fb36afdee9f05b98df9b21ae9c6fb449e8acb8be03aaf6b7e8533c3546fc3a72376fac4a2279a9eb96c73203c6cceb9658904e8226df1bd274acbb80c97c12
 EBUILD obs-studio-9999.ebuild 2984 BLAKE2B c2421879062c3593fd6644086b51d6a8bd1f9077d252b406ce6505d5eb052bbc2dff3ac0acd73fd6fab7d627f9b95c9588b59c7084be802f52d3d2e832daa3c3 SHA512 7a95552fcd24e0404b5a6e724c8d0e9ddbfedae67867d9a0119c1a32c2bb1f99f7d779b3a12da8a252e24db9a6e6b80f80f5c6879d30ba9b8f708c2fe24e8805
 MISC metadata.xml 1122 BLAKE2B 608bff24775bd69702b19d9b1db4260ed1e5bf7d932f917d3a27d284a791374211c7fec019bd3a742552cf11142df3d2a4877d81645244bc81a6df5e60ae9f71 SHA512 29291de223d1d70f78b419c05fec1cca18e8dcd52ed5619dff51a130f9e064369378e9e803f3dd5e7c86c9f505ae506917ec04e2c9adadfcc1a23c9aeb27192f
diff --git a/media-video/obs-studio/files/obs-studio-23.2.1-use-correct-libdir.patch b/media-video/obs-studio/files/obs-studio-23.2.1-use-correct-libdir.patch
new file mode 100644
index 000000000000..619c414d6b8a
--- /dev/null
+++ b/media-video/obs-studio/files/obs-studio-23.2.1-use-correct-libdir.patch
@@ -0,0 +1,50 @@
+From ab67b39257be83eaab87c4a938c4c58b5cccad7e Mon Sep 17 00:00:00 2001
+From: Jimi Huotari <chiitoo@gentoo.org>
+Date: Fri, 21 Jun 2019 17:48:32 +0300
+Subject: [PATCH] cmake: Install 'libobs.pc' under the correct 'libdir'
+
+In 'libobs/CMakeLists.txt', use '${CMAKE_INSTALL_LIBDIR}' instead of
+'${CMAKE_INSTALL_PREFIX}/lib', as the latter results into 'libobs.pc'
+being installed under '/lib' when '/lib64' would be more appropriate.
+
+In 'libobs/libobs.pc.in', use '@CMAKE_INSTALL_FULL_LIBDIR@' for
+'libdir', '@CMAKE_INSTALL_FULL_INCLUDEDIR@' for 'includedir',
+and '@CMAKE_INSTALL_PREFIX@' for 'prefix'.
+
+Gentoo-Bug: https://bugs.gentoo.org/644538
+---
+ libobs/CMakeLists.txt | 2 +-
+ libobs/libobs.pc.in   | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
+index fed3e694..86811481 100644
+--- a/libobs/CMakeLists.txt
++++ b/libobs/CMakeLists.txt
+@@ -454,7 +454,7 @@ if(UNIX AND NOT APPLE)
+ 		set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}")
+ 	endforeach()
+ 	CONFIGURE_FILE("libobs.pc.in" "libobs.pc" @ONLY)
+-	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libobs.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
++	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libobs.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ endif()
+ 
+ set_target_properties(libobs PROPERTIES
+diff --git a/libobs/libobs.pc.in b/libobs/libobs.pc.in
+index 03fe4cdd..f6c471ba 100644
+--- a/libobs/libobs.pc.in
++++ b/libobs/libobs.pc.in
+@@ -1,7 +1,7 @@
+-prefix=@DEST_DIR@
++prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${prefix}/@OBS_LIBRARY_DESTINATION@
+-includedir=${prefix}/include
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+ 
+ Name: libobs
+ Description: OBS Studio Library
+-- 
+2.22.0
+
diff --git a/media-video/obs-studio/obs-studio-23.0.1.ebuild b/media-video/obs-studio/obs-studio-23.0.1.ebuild
deleted file mode 100644
index 6ee58e5d0a11..000000000000
--- a/media-video/obs-studio/obs-studio-23.0.1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
-
-inherit cmake-utils python-single-r1 xdg-utils
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
-	EGIT_SUBMODULES=()
-else
-	SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Software for Recording and Streaming Live Video Content"
-HOMEPAGE="https://obsproject.com"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex truetype v4l"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
-	luajit? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-"
-DEPEND="
-	>=dev-libs/jansson-2.5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtsql:5
-	dev-qt/qttest:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-video/ffmpeg:=[x264]
-	net-misc/curl
-	x11-libs/libXcomposite
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	alsa? ( media-libs/alsa-lib )
-	fdk? ( media-libs/fdk-aac:= )
-	imagemagick? ( media-gfx/imagemagick:= )
-	jack? ( virtual/jack )
-	luajit? ( dev-lang/luajit:2 )
-	nvenc? (
-		|| (
-			<media-video/ffmpeg-4[nvenc]
-			>=media-video/ffmpeg-4[video_cards_nvidia]
-		)
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( ${PYTHON_DEPS} )
-	speex? ( media-libs/speexdsp )
-	truetype? (
-		media-libs/fontconfig
-		media-libs/freetype
-	)
-	v4l? ( media-libs/libv4l )
-"
-RDEPEND="${DEPEND}"
-
-CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DDISABLE_ALSA=$(usex !alsa)
-		-DDISABLE_FREETYPE=$(usex !truetype)
-		-DDISABLE_JACK=$(usex !jack)
-		-DDISABLE_LIBFDK=$(usex !fdk)
-		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
-		-DDISABLE_SPEEXDSP=$(usex !speex)
-		-DDISABLE_V4L2=$(usex !v4l)
-		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
-		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
-		-DOBS_VERSION_OVERRIDE=${PV}
-		-DUNIX_STRUCTURE=1
-	)
-
-	if use luajit || use python; then
-		mycmakeargs+=(
-			-DDISABLE_LUA=$(usex !luajit)
-			-DDISABLE_PYTHON=$(usex !python)
-			-DENABLE_SCRIPTING=yes
-		)
-	else
-		mycmakeargs+=( -DENABLE_SCRIPTING=no )
-	fi
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-
-	if ! use alsa && ! use pulseaudio; then
-		elog
-		elog "For the audio capture features to be available,"
-		elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
-		elog "be enabled."
-		elog
-	fi
-
-	if ! has_version "sys-apps/dbus"; then
-		elog
-		elog "The 'sys-apps/dbus' package is not installed, but"
-		elog "could be used for disabling hibernating, screensaving,"
-		elog "and sleeping.  Where it is not installed,"
-		elog "'xdg-screensaver reset' is used instead"
-		elog "(if 'x11-misc/xdg-utils' is installed)."
-		elog
-	fi
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-video/obs-studio/obs-studio-23.1.0-r1.ebuild b/media-video/obs-studio/obs-studio-23.2.1.ebuild
index cc23ee0bb08a..2b14f6e82721 100644
--- a/media-video/obs-studio/obs-studio-23.1.0-r1.ebuild
+++ b/media-video/obs-studio/obs-studio-23.2.1.ebuild
@@ -68,6 +68,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES="${FILESDIR}/${PN}-23.2.1-use-correct-libdir.patch"
+
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
 
 pkg_setup() {
diff --git a/media-video/shotcut/Manifest b/media-video/shotcut/Manifest
index 8d1212bc583e..5ee4d42047dc 100644
--- a/media-video/shotcut/Manifest
+++ b/media-video/shotcut/Manifest
@@ -1,3 +1,5 @@
 DIST shotcut-19.01.24.tar.gz 4864498 BLAKE2B e76f38e2545bff176730f1287fbba35de9d82e11d5ea4b396e69e71f90dd09325aceae8ffefe6914e66e37c983415a28c4fcdeba14314e370b3220cc8399a6be SHA512 1026e0701dd7a0a5dc3bc5f9babe0f58c6d3a0871af7b09cfca8d71b4c3e370708103d6f78de1061505cd162ade3de0189c9dc085d51546e85bb472f38b0363d
+DIST shotcut-19.06.15.tar.gz 5066141 BLAKE2B ca140045b181287089486f8e7c857ddee29b41727cc9808f37b39118875927a46b0d80558403870b478d2e6b53aadb9acc6456b09560ec94d63c91a5b36bffba SHA512 bf1dbd1233f587ba33dff9c551cdaa22c0ca8bb389c79e817d3eb7af60834b47da2be29872c50125a93e152442a7f7afe8f76f353464334de399dda793d15591
 EBUILD shotcut-19.01.24.ebuild 1225 BLAKE2B 21c4442cf654b4a423dcf5d906bd8932f8ff86ef70d1dc9558400454fc30996e6c115ca0a870a23d5337695e800881ae5f6a99038fd0e500de5f4a95c00b19c5 SHA512 a1b2b473cb58041135d05af1aeee46855f40b72628542d4d8d3f0384bf3b8203e5c39cca2e09af845194c7dca8b01d8ce65bc73f90164bcb250ccc4a18181e73
+EBUILD shotcut-19.06.15.ebuild 1168 BLAKE2B 4cc8943a78ca62013b316ddca70b5d3f0d3afda15ed4151064669605d50d338120ca165916e13b04fa10098dde6eb1d556498cb584644ff04d9e1497645b49eb SHA512 bd29b2c85b1eade3560639fa15250713b2c8d97e15106a4f80583fcc5f124ea716e2ecde3f4c12969b6f7ca3b28569d110968628d58346c1d8374e54ede0e65f
 MISC metadata.xml 451 BLAKE2B 7438699cd72f469998316ff1f3efd8bda67aab68f0fdbd405bb24b286e75f998a82b88c01c7d74d63fadeec47f58c381c51652854ac3dc8bd6a3a687fb8cb42f SHA512 58f1a6ddd5eef3a6cfd81936d61e34ea29aa7a26e5e841e96218642fa9fafc5529c3c6e0283f8c1e948a11eb819163e03056335d989933f390854f22aeb61ed0
diff --git a/media-video/shotcut/shotcut-19.06.15.ebuild b/media-video/shotcut/shotcut-19.06.15.ebuild
new file mode 100644
index 000000000000..dc79f1d5c977
--- /dev/null
+++ b/media-video/shotcut/shotcut-19.06.15.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils xdg
+
+DESCRIPTION="A free, open source, cross-platform video editor"
+HOMEPAGE="https://www.shotcut.org/"
+SRC_URI="https://github.com/mltframework/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgraphicaleffects:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtquickcontrols:5[widgets]
+	dev-qt/qtsql:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwebsockets:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/ladspa-sdk
+	media-libs/libsdl:0
+	media-libs/libvpx
+	>=media-libs/mlt-6.16.0-r1[ffmpeg,frei0r,qt5,sdl,xml]
+	media-libs/x264
+	media-plugins/frei0r-plugins
+	media-sound/lame
+	media-video/ffmpeg
+	virtual/jack
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+	dev-qt/qtx11extras:5
+"
+
+src_configure() {
+	eqmake5 \
+		PREFIX="${EPREFIX}/usr" \
+		SHOTCUT_VERSION="${PV}"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
diff --git a/media-video/smtube/Manifest b/media-video/smtube/Manifest
index bbb19561af84..81a984f0a3be 100644
--- a/media-video/smtube/Manifest
+++ b/media-video/smtube/Manifest
@@ -1,3 +1,5 @@
 DIST smtube-17.5.0.tar.bz2 748559 BLAKE2B 41c5be3933b74b079136788c99cf3e073eab5903596f2e39f9451493e17338d39454a8956841452f37e56c0e6051720a02a9765f3165f4e7e4aa1d93caa1a59f SHA512 bda1d166fe03eb85e5a9971b0d5422ea3e72ea91293c4dd14cdb447788635971a1d9977fd2dda60bfcda68183511b5c6ca6b39a229960fbd4c7c5f125882140b
+DIST smtube-19.6.0.tar.bz2 748844 BLAKE2B 55e662fc85ec44f067cba037c28b26fbfe08439bafea294dfcd1c4187e8df9f1f066780dd80c765dc4e584ba5b3917d8982a46253039b6327a30ff9d842b9e0b SHA512 f61e432b8f99e34ddbd9415064eecf30c9a3a6731d646073253d63690cf531321a7a5038117db981d036d1abfdbd3150df21bc22c9ae75e32c63ade3a859ecef
 EBUILD smtube-17.5.0-r2.ebuild 1447 BLAKE2B 06f6b15ca00add442247f618b96c82560b7ecb65668ddea9547df95e818d28ad87069227b2d1be728c32bdaec99488e64962974c13ea323675c0580c62c70260 SHA512 679bceda52dc589a039d4520160b861dc03599d6dcf16bd5fef6c1e6e73753f1a36255525b4ce2c16bec356ee7ed0b08e2bbf26ef9855190bd1116b82052dfdf
+EBUILD smtube-19.6.0.ebuild 1308 BLAKE2B cd64ffb10782dada1d0ab433eaa6acf6c0eb0728cc7c928a9e9274e36936393d7c895cfd15edab742aeff15244150ee3a33cdcabeed5d5c281282606c3db4678 SHA512 e0af27f8dd95d6ec4791beacb2c8cfef130330b80db220db794cb8e205cea01422312631a009b19211a645f2b14ca2148f30defd63069100222b1dc938447eda
 MISC metadata.xml 553 BLAKE2B 5818030e41958376eb0a4566f79a245d8bd1142dbcbf56aaeb21434e4194d2e8c7208bfd7b7e15b11f688f0e8ef47be2e1748740883a09cce1cda04836a70e24 SHA512 0e833e9f3075e066d059871c97bc951acb2d68152719388b9c1eb92776f50822585c88f662e8c5544ef15861f11bd76e469a34c593c98f3bc76ccf898eb202a6
diff --git a/media-video/smtube/smtube-19.6.0.ebuild b/media-video/smtube/smtube-19.6.0.ebuild
new file mode 100644
index 000000000000..dcf67fb03df9
--- /dev/null
+++ b/media-video/smtube/smtube-19.6.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="bg cs da de en_GB en es eu fr gl he_IL hr hu it ja ko ms nn_NO pl pt_BR pt ru sq sr tr uk zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+inherit desktop l10n qmake-utils
+
+DESCRIPTION="YouTube Browser for SMPlayer"
+HOMEPAGE="http://smplayer.sourceforge.net/smtube"
+SRC_URI="mirror://sourceforge/smtube/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtscript:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	|| (
+		media-video/smplayer
+		media-video/mpv
+		media-video/mplayer
+		media-video/vlc
+		media-video/totem
+	)
+"
+
+gen_translation() {
+	"$(qt5_get_bindir)"/lrelease ${PN}_${1}.ts
+	eend $? || die "failed to generate $1 translation"
+}
+
+src_compile() {
+	eqmake5 src/${PN}.pro
+	emake
+
+	cd src/translations || die
+	l10n_for_each_locale_do gen_translation
+}
+
+install_locale() {
+	insinto /usr/share/${PN}/translations
+	doins src/translations/${PN}_${1}.qm
+	eend $? || die "failed to install $1 translation"
+}
+
+src_install() {
+	dobin ${PN}
+	domenu ${PN}.desktop
+	newicon icons/${PN}_64.png ${PN}.png
+	dodoc Changelog
+
+	l10n_for_each_locale_do install_locale
+}
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 835217564bbf..4d0f113cbc3d 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -7,9 +7,9 @@ AUX vlc-3.0.6-libvpx-1.8.0.patch 1147 BLAKE2B b12fa40a02dcc5d6ba319b773cb4bcfa52
 AUX vlc-3.0.6-sftp.patch 979 BLAKE2B b6fd797112363e5fb0f0721eeeb92ee7b5c9a9e1a9450e51a99346dd824f75089775ae09c0dbc48dce7adaa889f3b03570d2d995b2aade6e73ffcd8e8765cf51 SHA512 3f510d9b007ce353211db878b671c43b17abffafd22a03c883e509808ce8b46bf64fa48e64d077c1e8f6ba2cd1f3e08a24e5db48fcda9cba02bdf266ca1a4378
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 DIST vlc-3.0.6.tar.xz 25699704 BLAKE2B 91c43fa3ceb6f55a3808c64a661ca453f0872f01eecc801921eb1b9f9cc462478b1fcd6f7cc36f33b7e1085320710b27a42a3b7b49dd74338fe63a3a46f36b0f SHA512 7c72e98f30ce5c5a94d74e097fa9960442f89240079b042a729f8a33dd7fedee2538c86c99738ccef2eb27f29055f0221d4c70316e3312c5ebba9565eaa15c52
-DIST vlc-3.0.7.tar.xz 26059760 BLAKE2B 552ba7dce17219a632a011203e45405085ea39ec5b4bf062f9e94501fc4c24ea5a8c73f96690fd2b6d8e15be3fedcb9c5d01e5fced3a8725bf21e1e63655393f SHA512 0ee2407b44c6ed33e4c4089a9e00702dd65eb9a50173ca4028411ddd6de51fdee1f437de48941b2a9e449e647d14e16907be35daeb273b3ddfec92e0cd330bec
+DIST vlc-3.0.7.1.tar.xz 26052372 BLAKE2B 349e967ff00db2fd5ea1a62deb12009ff0d85c56a82774aa4fedf7bffecd21b0c8c745f41eb4b9b4d36aaddcce95e79146901f318d18eab99f08e347841a8008 SHA512 6b99ae0564630a7a7ca9187c3bb954c601e384522ce93460b73f2dbf31787ce5828daca9f31c781b97db77872d76b6a3e871ff3401d70f1b5829fee7c4e847fd
 EBUILD vlc-3.0.6-r1.ebuild 13308 BLAKE2B 69eb584b41942885678439a16b0b99ccba1e00f6c369233a23d190b739d9ce2906e5c7fe2d4a2bff38edd5f03bb047f016a40839c9ea788c60b5824068e64db9 SHA512 fa81f931ed9216997be00835584542224eec9c74086b2df48c6c00ad8d3b15b88e51769402997103ed303fc77e81a35ed087b46a59c2306a1f510260454c5075
-EBUILD vlc-3.0.7.ebuild 13095 BLAKE2B be7332c48b815e83afb4e138ee6d64f43feeead4a03b37acebea1668f3df7c0a7023311ecbe3d2a881b573dab63dd3e53d7aae2943545b702a8e5e0a241a9d2b SHA512 c78a9aa66f3cfe5fd7723cacab40c606ad6a29eae98b459d6d964bc1cef656dd78687197f2f7d9d4d04eae51f84db9dbace94448f3f572e377c9501b6396a6e7
-EBUILD vlc-3.0.9999.ebuild 13105 BLAKE2B cb8098cb3cac5c90c57b170bd7e8947ac17a0f12721c0783af940acbbdd41b05362e9160aa3e2d4ee45453f5e105f07fc84ad7dccc91231bc9e4f1e155b74ca8 SHA512 61a250dcc2e246269eab095e3ecc13173471c2f8ef79e20158b3d495f64b7367585d06cb7aea4c0235c928321858b9d303d21953a7ef93449114d51dbb09ad89
+EBUILD vlc-3.0.7.1.ebuild 13051 BLAKE2B 2e824fb9cdff5b9622e4321a40173a87487aee437539d87a3811a676e3523dfc5e9f494ec9e7e2de6f8062e50d5298eb77ebe520b7c6bb19b18ce25be979a038 SHA512 cb0b69d3902b78ab6b767d4ad23a240d048f1839b89a41760dbde5df01cf9837f2e2e823e9e599e10b068728000d5b700b89e1689dacd15c8070f77bb03f7196
+EBUILD vlc-3.0.9999.ebuild 13051 BLAKE2B 2e824fb9cdff5b9622e4321a40173a87487aee437539d87a3811a676e3523dfc5e9f494ec9e7e2de6f8062e50d5298eb77ebe520b7c6bb19b18ce25be979a038 SHA512 cb0b69d3902b78ab6b767d4ad23a240d048f1839b89a41760dbde5df01cf9837f2e2e823e9e599e10b068728000d5b700b89e1689dacd15c8070f77bb03f7196
 EBUILD vlc-9999.ebuild 12990 BLAKE2B a55dc13a60632cbdb925007c8dd52ebc964125e8d4412557ff281cc206143c35ef9d41ba813b68d1976e5dd1224bc0c030b0bf0819ec7921b2d196da4e0b8820 SHA512 86e8e1e2d58d59d6c3ae5999fa27b025e4b1304c000a10c9935f013bb9c77379a2397b0a13d5447c7f04167a1de9938ded9ea60baf9e071d411ff8a117ffddb4
 MISC metadata.xml 5087 BLAKE2B 57254aa856882b33eb97358623d2600cb07e30d1554316de645d808f1bb6a7442cfb3b3fe6422f5de72dcadab06fbae28aa2c7b1d88d8fa588472de76d20fa23 SHA512 eb14beac4431445a8920190edac1a2a0b818565dc352b5df1e05dcddd4ff15a817e2624bce66a6aea431fa17b2203732bb9165396528e9a13c5dafacfce39274
diff --git a/media-video/vlc/vlc-3.0.7.ebuild b/media-video/vlc/vlc-3.0.7.1.ebuild
index 9220dbf11a1a..329fb3dedb9b 100644
--- a/media-video/vlc/vlc-3.0.7.ebuild
+++ b/media-video/vlc/vlc-3.0.7.1.ebuild
@@ -19,7 +19,7 @@ else
 	else
 		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 	fi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
 fi
 inherit autotools flag-o-matic toolchain-funcs virtualx xdg
 
@@ -32,7 +32,7 @@ SLOT="0/5-9" # vlc - vlccore
 IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast
 	dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
 	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
-	libass libav libcaca libnotify libplacebo +libsamplerate libtar libtiger linsys lirc
+	libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc
 	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
 	neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio
 	+qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl
@@ -130,7 +130,6 @@ RDEPEND="
 		x11-libs/gtk+:3
 		x11-libs/libnotify
 	)
-	libplacebo? ( media-libs/libplacebo )
 	libsamplerate? ( media-libs/libsamplerate )
 	libtar? ( dev-libs/libtar )
 	libtiger? ( media-libs/libtiger )
@@ -330,7 +329,6 @@ src_configure() {
 		$(use_enable libass)
 		$(use_enable libcaca caca)
 		$(use_enable libnotify notify)
-		$(use_enable libplacebo)
 		$(use_enable libsamplerate samplerate)
 		$(use_enable libtar)
 		$(use_enable libtiger tiger)
@@ -406,6 +404,7 @@ src_configure() {
 		--disable-goom
 		--disable-kai
 		--disable-kva
+		--disable-libplacebo
 		--disable-macosx-qtkit
 		--disable-maintainer-mode
 		--disable-merge-ffmpeg
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 5b5892f8acc2..329fb3dedb9b 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -32,7 +32,7 @@ SLOT="0/5-9" # vlc - vlccore
 IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast
 	dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
 	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
-	libass libav libcaca libnotify libplacebo +libsamplerate libtar libtiger linsys lirc
+	libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc
 	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
 	neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio
 	+qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl
@@ -130,7 +130,6 @@ RDEPEND="
 		x11-libs/gtk+:3
 		x11-libs/libnotify
 	)
-	libplacebo? ( media-libs/libplacebo )
 	libsamplerate? ( media-libs/libsamplerate )
 	libtar? ( dev-libs/libtar )
 	libtiger? ( media-libs/libtiger )
@@ -330,7 +329,6 @@ src_configure() {
 		$(use_enable libass)
 		$(use_enable libcaca caca)
 		$(use_enable libnotify notify)
-		$(use_enable libplacebo)
 		$(use_enable libsamplerate samplerate)
 		$(use_enable libtar)
 		$(use_enable libtiger tiger)
@@ -406,6 +404,7 @@ src_configure() {
 		--disable-goom
 		--disable-kai
 		--disable-kva
+		--disable-libplacebo
 		--disable-macosx-qtkit
 		--disable-maintainer-mode
 		--disable-merge-ffmpeg