gentoo resync : 18.08.2019

42 files changed, 452 insertions, 118 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 6b7dd13edf3d..89716eada2ea 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index 4eb060497d73..a18219627aca 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -6,6 +6,6 @@ AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-respect-compiler-flags.patch 2186 BL
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch 2446 BLAKE2B 5b1a5556829fbcd5d10ad869af5dcce4c6227dbc9d460094f237448a4aac9e07a9752039ab857a3556d062297cd0101e71ace0b4d3643f481e7479f16ccdf2e3 SHA512 f5171353ac14806166e26c4b335e6c7d9e111ba1eb68c3160fc9f802e1e3de659df48c4be180a0a25c67f7733007c8875c191436314ccfc9d7696a1f8a1fa719
 DIST aegisub-3.2.2_p20160518.tar.gz 7438734 BLAKE2B 3a57e5d6fafac2ca95d64d60e8d68b48177aaa0c5fd1438d0b0a133757ef95443c16324fb7effb41506f2b1eb70aab9d34845a91beef0ef81a3658444e24be07 SHA512 8d8775ba0a12735a9756b9abfd65c89519dae4e21afcaedbd18985d1c1021975b1ae909b3bef1121b707c626e1711d56f1823f3b4746eab49e8386536a5e84e6
 EBUILD aegisub-3.2.2_p20160518-r2.ebuild 3524 BLAKE2B 0cabead7524421c8eb0aef0aaa420257bde80b91f472caa10a1974eb62cf618e18929d6b834976f35e11961cf608138481172b8c4a1eb95b3fd4a0d22641ea51 SHA512 75d0d42d3cba04d06e866ce4717fa6cc4382f092edcd6d3e765038d6341785731fc23de961c2bf3b0688e1b768bbc4025f441b2f3c5fe4d92c1bf53e87ac2187
-EBUILD aegisub-3.2.2_p20160518-r3.ebuild 3576 BLAKE2B 25629564baf7a1302205b2a120aadef944498018407cfe13cfcf45347e8e6e080a9cd6e756eafd6568fa93a26149adc242bc5ac14ec5e9a8860d4c17bdc9ccc1 SHA512 e50eb0fcb9e92f2ad3d528507aab778481ce6e835dbc35e0a205fc75dd1a10cc42ebb52cd616e1fcfa81d6c30ef7341bb139e60ed3e3a7d5a7990ac70b56d249
-EBUILD aegisub-9999.ebuild 2952 BLAKE2B 8a590978889e76ce4fcb8718c878d9d9e6b497efbc33a83d5be2ed051b5078dc6860553825a04e7a549dec3449000b3792432949fe594192259731a030f38914 SHA512 16ec81f2eab15116da3e56ff9b2d30625eaccf1fc9dd21dc82c410cac85474aa78acf6e6444049236c1d1963dcb7485689d546cb6f1a4e1996a6c3749c10c214
+EBUILD aegisub-3.2.2_p20160518-r3.ebuild 3574 BLAKE2B cacf3998041b76dcdedebca8cba602e0c53b085c6846cb76f8552b8fd0538d6abe6576c3484e30525cbfac0244346be4ad1fa0fb50ad338820dba46e381ee003 SHA512 ede03a3ad19881f77c9b1d0d1797e78207d5c5c9d9fb2ade53f63b0c102f1fb12d43f1af964e71540524764c6ce50562c26336a4308ea447c6b2986ffd7548a5
+EBUILD aegisub-9999.ebuild 2945 BLAKE2B d326d141f8ad42c303b9522a14dcf3a4b698f9dec30028121654c80448db0ed273d5a95fb9e66b546814a425dd65c18c3bd6b9b9e5f857f1e3e2dd1189b9c4ea SHA512 931be2866081feb74286996ca058e5663f703ecf47b3a7f88a03d3f8c63e2a23273a1752b07d856915e754c597328a1f44ecb0f82559f474631d3223960945a6
 MISC metadata.xml 489 BLAKE2B b26abe2056ef0465a81ea8f9928c6d05053595b5650aff750251173ddce6f5248a30331104710c1b05cafe9641c072764c45f66935b25857785bc833af31174a SHA512 450c45be100ed72d7f0b69fe596862137ea2f421597e99129325bf2f58940600a62e1502ee4d6c7cbbab17b4cbd99da8c481ceb6fec2709452c17d8cb7aaae48
diff --git a/media-video/aegisub/aegisub-3.2.2_p20160518-r3.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160518-r3.ebuild
index 69d4b3f6f5ed..563691cc85a6 100644
--- a/media-video/aegisub/aegisub-3.2.2_p20160518-r3.ebuild
+++ b/media-video/aegisub/aegisub-3.2.2_p20160518-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Aegisub/Aegisub/archive/${COMMIT_ID}.tar.gz -> ${P}.
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+alsa debug +fftw openal oss portaudio pulseaudio spell test +uchardet"
 
 # aegisub bundles luabins (https://github.com/agladysh/luabins).
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
index 7377cdca67a0..1e6debce1e82 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -54,7 +54,7 @@ REQUIRED_USE="|| ( alsa openal oss portaudio pulseaudio )"
 PATCHES=(
 	"${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-fix-system-luajit-build.patch"
 	"${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-respect-compiler-flags.patch"
-        "${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-fix-boost170-build.patch"
+	"${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-fix-boost170-build.patch"
 )
 
 src_prepare() {
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index f5f7ff3a5cd9..388c79387757 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,5 +1,8 @@
 AUX avidemux-2.7.0-glibc-2.27.patch 872 BLAKE2B 2edd751aa7de1d6b4ed6d6dc12bff1f02e54e4950b8402cd531776bba7be1481c205ee3b11249addfe759c2d730db0831280e6bdcafb470a683220242ee79937 SHA512 3bf0bc7b15cb50141b5ec771dcee97971d2889af8913c9d825a3d6cc929143eabf04af76d033257722cb6be90f966a34e3ba2c069470cfb6097bc959bb0feead
 AUX avidemux-2.7.0-qt-5.11.patch 1664 BLAKE2B 080497a678e869e143eb350ecdca2b77d5e5906a8a469e24f16fc58853665791dbbd94880418b492df6816b8f420d54ee7ecd06c805b0aab16e8d05ab43f545d SHA512 49186e7648db60e081f78e1257ea788313cac6e991c995249701189ab344744f0c410203b39b49e5530a8dd33de937582099eb8b615d19fe7d0e3731254d535c
+AUX avidemux-2.7.3-desktop.patch 678 BLAKE2B f903203996fddbe798f990b3092f4a0c578407933df153e05da19aa0a6bbfaa1bbd96f25b61787514c4272f94a0525e5fc5c0171744c2f87b04effc1a2907974 SHA512 68e6a0d3272ecf00aec63f513f50d39b7702eb59ecd85190483a93b03e7461964e9533656f2279bc00312c95418f415d159e15646790a1b0b9eb2ebd7f520b4f
+DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a
 DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015
 EBUILD avidemux-2.7.0.ebuild 4518 BLAKE2B 6eb480a6467eb5a734891ffeefbbb0a37abbb83469ca12a090c18502e3a3836701ef43439681e51ac5f3259af368f6b045c830207b05b5df7febbbf70a534b66 SHA512 5d7c46c56e237386d0c9e8c74ddfe5f25aa3e510a0e7683c91880a863fe40d51e3d5d4661cb670af25c6ff7a43264a303f74e9a7c9033bf0daa3d3d55968a8d0
+EBUILD avidemux-2.7.3.ebuild 3866 BLAKE2B 63c7cdc7d023d62356ae47198a6e22236b45199b1d1dfad06ce7d0343a76e51e379f69871ce4ed2018d74da92806639c975deeead8fe1900070bb4341de2e4c1 SHA512 2b579a10245f6fa062ee88b6d991ded8c77ef3fa5713387836ccb19dbe9270667875716baa48cd6fd10e4570f7d60151c45a6df17ca8b4879dc536c76d21a111
 MISC metadata.xml 489 BLAKE2B 51c28e4d932facf14fe99d0d18e736f16c754961e8fde468505f03c989e8ec3cb9afab9c916752468a5f9f0a07ad8d25da01e64cb987cfed1db835f657512b1e SHA512 7a1b885e05a9bb6684583dcaefc5853903330bbcfc6b1e07b76cde7405894d94e0f095fcfe18bc33bc24c1bbf260814c9ebb8219397e0e861a2fb5977361bc4d
diff --git a/media-video/avidemux/avidemux-2.7.3.ebuild b/media-video/avidemux/avidemux-2.7.3.ebuild
new file mode 100644
index 000000000000..40f4f5d8b223
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.7.3.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake-utils desktop qmake-utils xdg
+
+DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
+HOMEPAGE="http://fixounet.free.fr/avidemux"
+SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+# Multiple licenses because of all the bundled stuff.
+LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
+SLOT="2.7"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug nls nvenc opengl qt5 sdl vaapi vdpau xv"
+
+COMMON_DEPEND="
+	~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
+	nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
+	opengl? ( virtual/opengl:0 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)
+	vaapi? ( x11-libs/libva:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	nls? ( virtual/libintl:0 )
+	!<media-video/avidemux-${PV}
+"
+PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
+
+S="${WORKDIR}/avidemux2-${PV}"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-desktop.patch
+
+	processes="buildCli:avidemux/cli"
+	if use qt5 ; then
+		processes+=" buildQt4:avidemux/qt4"
+	fi
+
+	for process in ${processes} ; do
+		CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
+	done
+
+	# Fix icon name -> avidemux-2.7
+	sed -i -e "/^Icon/ s:${PN}\.png:${PN}-${SLOT}:" appImage/${PN}.desktop || \
+		die "Icon name fix failed."
+
+	# The desktop file is broken. It uses avidemux2 instead of avidemux3
+	# so it will actually launch avidemux-2.7 if it is installed.
+	sed -i -e "/^Exec/ s:${PN}2:${PN}3:" appImage/${PN}.desktop || \
+		die "Desktop file fix failed."
+	if use qt5; then
+		sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt5:' appImage/${PN}.desktop || \
+			die "Desktop file fix failed."
+	fi
+
+	# QA warnings: missing trailing ';' and 'Application' is deprecated.
+	sed -i -e 's/Application;AudioVideo/AudioVideo;/g' appImage/${PN}.desktop || \
+		die "Desktop file fix failed."
+
+	# Now rename the desktop file to not collide with 2.6.
+	mv appImage/${PN}.desktop ${PN}-${SLOT}.desktop || die "Collision rename failed."
+
+	# Remove "Build Option" dialog because it doesn't reflect
+	# what the GUI can or has been built with. (Bug #463628)
+	sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || \
+		die "Couldn't remove \"Build Option\" dialog."
+}
+
+src_configure() {
+	# See bug 432322.
+	use x86 && replace-flags -O0 -O1
+
+	# The build relies on an avidemux-core header that uses 'nullptr'
+	# which is from >=C++11. Let's use the GCC-6 default C++ dialect.
+	append-cxxflags -std=c++14
+
+	local mycmakeargs=(
+		-DGETTEXT="$(usex nls)"
+		-DSDL="$(usex sdl)"
+		-DLibVA="$(usex vaapi)"
+		-DVDPAU="$(usex vdpau)"
+		-DXVIDEO="$(usex xv)"
+	)
+
+	if use qt5 ; then
+		mycmakeargs+=(
+			-DENABLE_QT5="$(usex qt5)"
+			-DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
+		)
+	fi
+
+	if use debug ; then
+		mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
+	fi
+
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake-utils_src_configure
+	done
+}
+
+src_compile() {
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		BUILD_DIR="${build}" cmake-utils_src_compile
+	done
+}
+
+src_test() {
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		BUILD_DIR="${build}" cmake-utils_src_test
+	done
+}
+
+src_install() {
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		BUILD_DIR="${build}" cmake-utils_src_install
+	done
+
+	cd "${S}" || die "Can't enter source folder."
+	newicon ${PN}_icon.png ${PN}-${SLOT}.png
+
+	if use qt5 ; then
+		domenu ${PN}-${SLOT}.desktop
+	fi
+}
diff --git a/media-video/avidemux/files/avidemux-2.7.3-desktop.patch b/media-video/avidemux/files/avidemux-2.7.3-desktop.patch
new file mode 100644
index 000000000000..51416d27495b
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.7.3-desktop.patch
@@ -0,0 +1,20 @@
+From 4ea6b2e4199eddef7748de4fd58c1f4d8bfbedd2 Mon Sep 17 00:00:00 2001
+From: eumagga0x2a <eumagga0x2a@users.noreply.github.com>
+Date: Sun, 4 Aug 2019 15:34:19 +0800
+Subject: [PATCH] [appImage] Add missing Type entry to the .desktop file
+
+Upstream-Status: Accepted
+[https://github.com/mean00/avidemux2/commit/4ea6b2e4199eddef7748de4fd58c1f4d8bfbedd2]
+---
+ appImage/avidemux.desktop | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/appImage/avidemux.desktop b/appImage/avidemux.desktop
+index 3006e4335..d017ff309 100644
+--- a/appImage/avidemux.desktop
++++ b/appImage/avidemux.desktop
+@@ -2,3 +2,4 @@
+ Name=AVIDEMUX
+ Exec=avidemux3_portable
+ Icon=avidemux.png
++Type=Application
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index 0d093523ddab..6868405a5358 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -1,3 +1,3 @@
 DIST cheese-3.30.0.tar.xz 1546680 BLAKE2B 32cfc9553e1c9ebfe7d3eb5fdf19d74b49e9f69ea005f4c79097d69caa2125803c5c319e98ccd3e8f72157a5fd86c018f1be7af7045f6541ecd36d4162c5cdd1 SHA512 622910cedc8eadec4161f60e2bb3f02cbe11352b2431fdd9783f724b4119ffae6254b1566e1144c25491067f9c683a55eb85b265ef28992d852adce02fbdc8b4
-EBUILD cheese-3.30.0.ebuild 1945 BLAKE2B 23d2e6235267695c768c794a05c8eb65cc72973e32625fa503ae3fd9164c9593af8718da63916f0c850036c30f67cd0ba34207ec234a8437cdff6031d4dc9b30 SHA512 eb57dbc50a60508250a0d55368e13bb39a0bc918adf5538f03166e3330d7d531e0928dba906b928c157635544a8a10923842538f9a7fc557860e4898b32fb4dc
+EBUILD cheese-3.30.0.ebuild 1952 BLAKE2B c484fe4641a1396cb363f6fb6d14e3a21a29037b556453201ba204bff7a46d4c324eaa78f24289bee0e31f6f7b3d04ee2c1c60866f29adc282d720c562e89698 SHA512 495c39f4b8ec14e03de31d95915800943b11968102dd3fbc96dbf969ace3ffaa87b97ed882588c279457b03f4545d0584c6c084cdcccad35d2cb2f94d15d592d
 MISC metadata.xml 428 BLAKE2B 3a6b33697b144cba857668b55e04897b8b6c6c4323f09be85ce827843ef50c9c6d988a4e60ffde4ecf1e66a73d70f0e71f2f05371f33f3853429107684abbc9a SHA512 cbe065cc8fe75a86d8f16788dc2ddeafda2b1c27858427f6c9ec83841730e3d9c1c9f7815718c86e19626098b96782a1017b614bac5a0121c92af04b11a30a22
diff --git a/media-video/cheese/cheese-3.30.0.ebuild b/media-video/cheese/cheese-3.30.0.ebuild
index cdb01a015217..3456aaba1a7e 100644
--- a/media-video/cheese/cheese-3.30.0.ebuild
+++ b/media-video/cheese/cheese-3.30.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
 LICENSE="GPL-2+"
 SLOT="0/8" # subslot = libcheese soname version
 IUSE="+introspection"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.39.90:2
diff --git a/media-video/gaupol/Manifest b/media-video/gaupol/Manifest
index f26d19787715..77edc27db442 100644
--- a/media-video/gaupol/Manifest
+++ b/media-video/gaupol/Manifest
@@ -1,7 +1,8 @@
-DIST gaupol-1.4.tar.gz 524369 BLAKE2B 6f27ce3328339fc2f6248bb58d80965a5a26fed220ddf9c989a5029b4322ea790f768cb9e0472bb2c5eae4e4da3abd4b0f808e785273ff9fb787ff5b7df5d137 SHA512 da9256dd8dafeaff012226a8ff09807c7cb7609c293bde7d90b05b4f75c47751e65181f1bf47dff1c8e979f48186996253141ff18e849786bf2cff5ed5555148
+AUX gaupol-1.7-fix-tests.patch 5986 BLAKE2B f161262ad64c0a5fe02119522353b0348ecd96e66a52fcb5a3c1b9994098e1e1b647783ad47f7856f80e556ac4f8047693e0498bc8876f236730b56714883dbe SHA512 77dcd602e5e31886a5cbdb01fc58ed8aea216d16eaaf5a136e59a6b2fb0b0484cafb521ccefec5424edd7834cd36fa1e435477055a0c43bef7959aad7168eb26
 DIST gaupol-1.5.tar.gz 537279 BLAKE2B 1ba8644b49832ee80e61bf304b7978275064acbe2e5e733a991b280f947c4064f0d4f385055e580bd3aa2d9ee2291d64fd1ee4bd8a1ba4f8eaaaaf9a137085ff SHA512 48f3eda460c2fb3e4bdaf52c42645599f0d5ce8eae05f7a2a9c608192a27a8b86b83830584216dc73105968f544aeab30e171b2c176d9a3f5047e93510413b85
 DIST gaupol-1.6.tar.gz 540186 BLAKE2B 4e7a2e0c01be2ac88c0ae5948d3002005c72418ef21835195daf6b0c5b71d970006b0f76fa78a1ec7337d1f9366436c44eb336e0a56d8cbb7eac905e09d4c81a SHA512 e0f258b579a34644e54456978df9c5a6f72aa019b6de79918fe6892bb59d2316c3fc093f2f49c60d6eef74832fa2a9a9e102bb1d25f64f3143fd29d3cb4966e5
-EBUILD gaupol-1.4.ebuild 1419 BLAKE2B 12444dc45108e191261ad8d372d594178de4c4e04816eaab7dea8e56261b9a4e10ded197fa574e54e52f14e4a7467740ea579fa1ab6a42dc11e6180ab305e088 SHA512 b2e46895b60e336b7d5bcb07e3137080993a836ff97a4fa3f2457a5050148944bdf00fbdd8360aba3607bce6ad94f77b12e3363c70d2b00dd5a83bfb27a5e2e8
+DIST gaupol-1.7.tar.gz 524231 BLAKE2B 5f1c07a6d633fba53361ad4d9e1cdbc3236614a444bb387378c9e1ec6b358796eb7477168caace4b6101e0e6e0b83f10a2d3052acb5e0b0ab69e75f2b24db7fa SHA512 b0fa7f5216f47075aefddd58ab3aa1186265b5d70f8b4e7f7e252a1cc05bd1c4838c2af8efb4da39c0196f63dc3a64ff2269a458e2d95072606b59b4b8cada1b
 EBUILD gaupol-1.5.ebuild 1388 BLAKE2B 22b463f0a3c04e67962baf2f4b89e571d34ca566b9686db48bf2fedfc7ad3c70970dc43767bf538b638395e5f699cc78762db8a99fc5ec2253c1116bf49ee83e SHA512 1c449ea679eac67662f60462acc6658674c523952af58b3e2dddfda6fafa025d1fea62b4c41bb1a72fb1e705e940d484884dc6fe49b9a00191444cad978e5228
 EBUILD gaupol-1.6.ebuild 1391 BLAKE2B d9cbeef16f7cdb25c934276e839ece9c4c40794ad656956b6ad7071f4e4d3d27bbf64f01d436ab8596d1fb6bf9189310d032f867902258e5250efa768bdaff57 SHA512 76ebf50ff227cff32a6661ef0492c56bb14a1849ebf6ffb9664415dacf5e0b5f67205fcacfb210d0fc10920400f84fd78364ccc020211819e401d00116e9cc3a
+EBUILD gaupol-1.7.ebuild 1563 BLAKE2B d799e487dcd0041def428005511f62a71af15d9ef4d3268f2c4115eb9ed103cb5966b407345c081a186e38107d078cc7e1db59b05a8a70e0b323450cdbbd2cdb SHA512 d8f896d762dd863c28d8e40bd5d273b87216c6e1d471ba3c9eb98ea89689ff985183e5d0c1e9db7bcf0e7a8e5313eac2d7f6f8e2e866e2701e984eaf3e032c38
 MISC metadata.xml 508 BLAKE2B 979a43569103cfe36a47d56ed16c15b7775d0a36d031d488ac064152b8d59115dc656e28a5eced25da13d9a3925be24114a760862bf043b88a89c70b8dc053e8 SHA512 1af2a5a287075a0668850c229a5c9dcbef51bbe64467516e37b870459266021d528435dbd5274e0d5abf7cf0fe2d4b8fb08f6cc470418c3b64e4da6b93dcc147
diff --git a/media-video/gaupol/files/gaupol-1.7-fix-tests.patch b/media-video/gaupol/files/gaupol-1.7-fix-tests.patch
new file mode 100644
index 000000000000..d8a90669de9f
--- /dev/null
+++ b/media-video/gaupol/files/gaupol-1.7-fix-tests.patch
@@ -0,0 +1,132 @@
+commit 7778eda0e6e4280fb43aa78721561e43d3e866eb
+Author: Osmo Salomaa <otsaloma@iki.fi>
+Date:   Sun Aug 4 21:19:20 2019 +0300
+
+    Accept any en* language for spell-check tests
+
+diff --git a/aeidon/agents/test/test_text.py b/aeidon/agents/test/test_text.py
+index bf6c4ac1..a2261595 100644
+--- a/aeidon/agents/test/test_text.py
++++ b/aeidon/agents/test/test_text.py
+@@ -78,14 +78,16 @@ class TestTextAgent(aeidon.TestCase):
+         for subtitle in self.project.subtitles:
+             subtitle.main_text = subtitle.main_text.replace("a", " a")
+             subtitle.main_text = subtitle.main_text.replace("e", "e ")
++        language = self.get_spell_check_language("en")
+         self.project.spell_check_join_words(indices=None,
+                                             doc=aeidon.documents.MAIN,
+-                                            language="en")
++                                            language=language)
+ 
+     def test_spell_check_split_words(self):
+         for subtitle in self.project.subtitles:
+             subtitle.main_text = subtitle.main_text.replace("s ", "s")
+             subtitle.main_text = subtitle.main_text.replace("y ", "y")
++        language = self.get_spell_check_language("en")
+         self.project.spell_check_split_words(indices=None,
+                                              doc=aeidon.documents.MAIN,
+-                                             language="en")
++                                             language=language)
+diff --git a/aeidon/test/test_spell.py b/aeidon/test/test_spell.py
+index 66369e0e..ff94f150 100644
+--- a/aeidon/test/test_spell.py
++++ b/aeidon/test/test_spell.py
+@@ -21,7 +21,8 @@ import aeidon
+ class TestSpellChecker(aeidon.TestCase):
+ 
+     def setup_method(self, method):
+-        self.checker = aeidon.SpellChecker("en")
++        language = self.get_spell_check_language("en")
++        self.checker = aeidon.SpellChecker(language)
+ 
+     def test_add_replacement(self):
+         self.checker.add_replacement("abc", "xyz")
+@@ -50,7 +51,8 @@ class TestSpellChecker(aeidon.TestCase):
+ class TestSpellCheckNavigator(aeidon.TestCase):
+ 
+     def setup_method(self, method):
+-        self.navigator = aeidon.SpellCheckNavigator("en")
++        language = language = self.get_spell_check_language("en")
++        self.navigator = aeidon.SpellCheckNavigator(language)
+         self.navigator.text = "She knows the fighting\ntechniques of Panzer Kunst."
+ 
+     def test_ignore(self):
+diff --git a/aeidon/unittest.py b/aeidon/unittest.py
+index 8c384806..d80c5a22 100644
+--- a/aeidon/unittest.py
++++ b/aeidon/unittest.py
+@@ -50,6 +50,15 @@ class TestCase:
+         with open(path, "r", encoding="ascii") as f:
+             return f.read().strip()
+ 
++    def get_spell_check_language(self, language):
++        """Return spell-check language to use in unit tests."""
++        # Allow any close-enough variant as different systems will have
++        # different spell-check engines and dictionaries installed.
++        for candidate in aeidon.SpellChecker.list_languages():
++            if candidate.startswith(language):
++                return candidate
++        raise Exception("Spell-check dictionary {}* not found".format(language))
++
+     def new_microdvd_file(self):
+         """Return path to a new temporary MicroDVD file."""
+         return self.new_temp_file(aeidon.formats.MICRODVD)
+diff --git a/gaupol/agents/test/test_tools.py b/gaupol/agents/test/test_tools.py
+index a9fbdf8f..e1547476 100644
+--- a/gaupol/agents/test/test_tools.py
++++ b/gaupol/agents/test/test_tools.py
+@@ -36,7 +36,8 @@ class TestToolsAgent(gaupol.TestCase):
+ 
+     @patch("gaupol.util.flash_dialog", OK)
+     def test__on_check_spelling_activate(self):
+-        gaupol.conf.spell_check.language = "en"
++        language = self.get_spell_check_language("en")
++        gaupol.conf.spell_check.language = language
+         self.application.get_action("check-spelling").activate()
+ 
+     @patch("gaupol.util.flash_dialog", OK)
+diff --git a/gaupol/dialogs/test/test_spell_check.py b/gaupol/dialogs/test/test_spell_check.py
+index cbe7d61a..d74860fb 100644
+--- a/gaupol/dialogs/test/test_spell_check.py
++++ b/gaupol/dialogs/test/test_spell_check.py
+@@ -32,7 +32,8 @@ class TestSpellCheckDialog(gaupol.TestCase):
+         aeidon.SpellChecker.add_to_personal = aeidon.SpellChecker.add_to_session
+         aeidon.SpellChecker.read_replacements = lambda *args: None
+         aeidon.SpellChecker.write_replacements = lambda *args: None
+-        gaupol.conf.spell_check.language = "en"
++        language = self.get_spell_check_language("en")
++        gaupol.conf.spell_check.language = language
+         self.application = self.new_application()
+         for page in self.application.pages:
+             for subtitle in page.project.subtitles:
+diff --git a/gaupol/test/test_spell.py b/gaupol/test/test_spell.py
+index 72b74e33..5018abab 100644
+--- a/gaupol/test/test_spell.py
++++ b/gaupol/test/test_spell.py
+@@ -37,4 +37,5 @@ class TestSpellChecker(aeidon.TestCase):
+         Gtk.main()
+ 
+     def setup_method(self, method):
+-        self.checker = gaupol.SpellChecker("en")
++        language = self.get_spell_check_language("en")
++        self.checker = gaupol.SpellChecker(language)
+
+commit 340b3bf6bb7cfdf5be9e973f25f5a616ef504702
+Author: Osmo Salomaa <otsaloma@iki.fi>
+Date:   Mon Aug 5 02:31:32 2019 +0300
+
+    Set spell-check language for assistant test
+
+diff --git a/gaupol/test/test_assistants.py b/gaupol/test/test_assistants.py
+index 6969b273..4d6dfdcb 100644
+--- a/gaupol/test/test_assistants.py
++++ b/gaupol/test/test_assistants.py
+@@ -109,6 +109,8 @@ class TestJoinSplitWordsPage(_TestBuilderPage):
+ 
+     @patch("gaupol.util.flash_dialog", OK)
+     def test_correct_texts(self):
++        language = self.get_spell_check_language("en")
++        gaupol.conf.spell_check.language = language
+         self.page.correct_texts(self.project,
+                                 None,
+                                 aeidon.documents.MAIN)
diff --git a/media-video/gaupol/gaupol-1.4.ebuild b/media-video/gaupol/gaupol-1.7.ebuild
index 601dc5dd0018..22fc8a04293e 100644
--- a/media-video/gaupol/gaupol-1.4.ebuild
+++ b/media-video/gaupol/gaupol-1.7.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit distutils-r1 gnome2-utils virtualx xdg-utils
+inherit distutils-r1 virtualx xdg-utils
 
 DESCRIPTION="A subtitle editor for text-based subtitles"
 HOMEPAGE="https://otsaloma.io/gaupol/"
@@ -13,49 +13,52 @@ SRC_URI="https://github.com/otsaloma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="spell test"
 
-RDEPEND="app-text/iso-codes
+RDEPEND="
+	app-text/iso-codes
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	x11-libs/gtk+:3[introspection]
-	spell? (
-		app-text/gtkspell:3
-		>=dev-python/pyenchant-1.4[${PYTHON_USEDEP}]
-	)"
+	spell? ( app-text/gspell[introspection] )
+"
 DEPEND="
 	sys-devel/gettext
 	test? (
 		${RDEPEND}
-		dev-python/pyenchant[${PYTHON_USEDEP}]
+		app-dicts/myspell-en
+		app-text/enchant[hunspell]
+		app-text/gspell[introspection]
 		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
 	)
 "
 
 DOCS=( AUTHORS.md NEWS.md TODO.md README.md README.aeidon.md )
 
+PATCHES=( "${FILESDIR}/${P}-fix-tests.patch" )
+
 python_test() {
-	virtx py.test
+	virtx pytest -vv
 }
 
 pkg_postinst() {
 	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "Previewing support needs MPV, MPlayer or VLC."
-
+		elog "Previewing support requires MPV, MPlayer or VLC."
 		if use spell; then
-			elog "Additionally, spell-checking requires a dictionary, any of"
-			elog "Aspell/Pspell, Ispell, MySpell, Uspell, Hspell or AppleSpell."
+			elog ""
+			elog "Spell-checking requires a dictionary, any of app-dicts/myspell-*"
+			elog "or app-text/aspell with the appropriate L10N variable."
+			elog ""
+			elog "Additionally, make sure that app-text/enchant has the correct flags enabled:"
+			elog "USE=hunspell for myspell dictionaries and USE=aspell for aspell dictionaries."
 		fi
 	fi
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/media-video/griffith/Manifest b/media-video/griffith/Manifest
index 7cf38fb7fd44..91facbaad729 100644
--- a/media-video/griffith/Manifest
+++ b/media-video/griffith/Manifest
@@ -2,5 +2,5 @@ AUX 0.10-fix_lib_path.patch 666 BLAKE2B 03dcaf2732c753885bd34254c988a5d6b5be12df
 AUX griffith-0.13-validators.patch 549 BLAKE2B fb8b53aeea53d331ff01b74a7bfbad05615b7de8f7e2d09057674a582191381a4a4a9348573a22ba9d42814946598f2e5592288799dba39b682509b814cb81f4 SHA512 0ce26c62d26d397fb4b212ada76895af826dfc11ea289f928d1761809bcd67d3e9c0de4a2c3ac402f4cb550ed9b50dc067689d4cc0c8e05f5117317c968e7c9b
 DIST griffith-0.13.tar.gz 1565903 BLAKE2B d3d806ef2a7cef76ce548e3ad785e96938447cb6425ac95fdbb4b5ae233adb2aeb4a274aa24c9e502607bc1287ea30ce8806cb1608fc194531757943e499b0e7 SHA512 dc8117b1a89253a87eb303c5229e6cdffde26b52de9ac4a3409dcc3f6dca64105f13a98cace225a932aefb2d620e828eea66bae57f40328b7ee3c06a944f0bed
 DIST griffith-extra-artwork-0.9.4.tar.gz 124008 BLAKE2B 992f8e4995d0465e891eacfe601eead2323754c60ad0c0a96ea9568dbecf5790039f58212e8a115f382532e1787e4db267b1259ac91de40728f7911f6b2178ae SHA512 09e912b4511c5c4a7b501d9a8f98223d20e58574e667cdb759e66f743cce14b45cce8bf0f9502ff2aacfc09e7a7b37966a887205a74a6e028b832703a65a2734
-EBUILD griffith-0.13-r2.ebuild 2122 BLAKE2B 52390854850805261f5c6da3020329fe7ab2e4df9dfce62104c8e70036ae0e3519dfb7b4656524fb1d3bfbbc8aaff1d85164db8233594da29123452349b7afbf SHA512 ef0fec8a4962bbbdb1cded7a7f9212ce5e765c074a35bab593bd266a40bc2f234a90935aa10bfa887388dbd828611db6b69f64462db3261957ebb23c1407ca46
+EBUILD griffith-0.13-r2.ebuild 2123 BLAKE2B 3b2b0f93ae340858f005d12aa5e497fce45b61a4491f68b6ed013d331c5115afca678bf94a25a45e99b0cd158a1d637e4b8a90a4963730e9090c5871a201f9fd SHA512 e0d9b21831f03bf2c1f2049c7f9e8af4365d24a7fece28314524821bfde42644cac8cbd12541d5a077b1d7fac2e05f53315b0bce0ae04318116013a57c577f31
 MISC metadata.xml 345 BLAKE2B 2c1e03aeaaa718018760dc5853f6ed18c915c5c436f7fa64e101ebf8cde36b442d41641a0a6bb3b05ecc3cffd138a749bfff1721430a78300c7ce9a312a4b9c2 SHA512 c259fe792b25d60fa4112e229076beeecb198cdb5e7b3b737f8546954039995ad321253d9004d939fb7232b67fb44d4ea0d6cae5e5240baa0c0ad0b9265f5592
diff --git a/media-video/griffith/griffith-0.13-r2.ebuild b/media-video/griffith/griffith-0.13-r2.ebuild
index a4a8911d4db9..74c6fc2d2ffa 100644
--- a/media-video/griffith/griffith-0.13-r2.ebuild
+++ b/media-video/griffith/griffith-0.13-r2.ebuild
@@ -71,7 +71,7 @@ src_install() {
 	cd "${WORKDIR}/${PN}-extra-artwork-${ARTWORK_PV}/" || die
 	emake DESTDIR="${D}" install
 	# This carries over from -0.13 but appears to have no effect.
-	python_optimize "${ED}"usr/share/${PN}
+	python_optimize "${ED}"/usr/share/${PN}
 }
 
 pkg_postinst() {
diff --git a/media-video/kamerka/Manifest b/media-video/kamerka/Manifest
index cc90336a11d5..03576ed5d1ec 100644
--- a/media-video/kamerka/Manifest
+++ b/media-video/kamerka/Manifest
@@ -1,5 +1,3 @@
-DIST kamerka-0.12_p20161002.tar.gz 139348 BLAKE2B b19594855be7937375168ae999e0a51995e2825af9124bc942716185ffd790a3c3cbd47fc3b0918b0be0faf28ce089f80d495f9a99d4728d9164e1d3b1a89fb9 SHA512 e0bdf3ff5ea8b928f1865f6de25e36b57b83d4f135eb605cb02bf2647d50230f20c9db94998332afff478aa2363639ec1a8d6dc44351ed3fc33732a24ff61f9b
 DIST kamerka-0.20.tar.gz 139764 BLAKE2B edfeb002d7b0c83600f494a065b15a84dcd058aad35633cd6c762fb8ae58d4a69bbc54e0867833ca6f95cd0a133355fc330617a6a129d6aeae8afc50f3cc65bf SHA512 3dc65c66ddbc11807e0f0f3a7ff03751b908ba99e4581f8543c10ccf23a821e96298240b8286be01f021b480757cc5a4460b4b34485c133a1192240453d97555
-EBUILD kamerka-0.12_p20161002-r1.ebuild 1083 BLAKE2B 7f5c4f61b4fe5ef4aa48a90c15cc22fafcaccab529bef52b01fe9aa438ef9774e4fb8a3941aa2d717539720b8659a6fda9e5465ed9d0382330b1eb78c485e0b6 SHA512 606a860f385ca8ea88fe0709bc894106b9ee601aa513b90d0d490588c286f97a68fd9b9b8bb8a3a688cefc87e0c0f4b157afc90da0efeb4c9e39141dfabfd068
-EBUILD kamerka-0.20.ebuild 1052 BLAKE2B 9d540c27632f3e320c52b8fbf8350a90ae72c4fecdd3f337cefa63934053db056f2a8d5360ec5c81b01e3ce66333df5ff814314aafa4ee7b9695bc31153abb1b SHA512 169c104f4a2aa1b863a464d9bb0b45020e0f7d2ce7955d64401b66f27dfacc830a047a77615b702edd9e6217af01067df2999c28726ebcac410a69dcafab6ad6
+EBUILD kamerka-0.20.ebuild 1050 BLAKE2B 672f782a6864cf50e861246ac88ff56ed171f9c3c76077b35f0c046a1e9268fb02997de47578b12fd05ef7a5781c25fc7beabe126fed78fa6d0181898df4fdb4 SHA512 95ad824cd47527a52104c800054344558548ab5c17bf4dfafb3e8ed6d0ac20efe01a72147cd5bb63106e915bc3e539eb7fdccb79dc9f48810763ddffb9f82984
 MISC metadata.xml 326 BLAKE2B 9806468052b469106e76290073e6d9489ca675e12ac621c46f6b7c23abea115009d50ac5658de107ab75b9eda4ef4c7cd02fd68f1bfb0c55f7513ec06fcbde63 SHA512 4fa92e1c40db08a5c84bfd85718bbd42623919947142989822885d1c86b4327807b72a874ab70f24cc7d0a5bc774fa99db7778606e377c89dda5d83c07fe10eb
diff --git a/media-video/kamerka/kamerka-0.12_p20161002-r1.ebuild b/media-video/kamerka/kamerka-0.12_p20161002-r1.ebuild
deleted file mode 100644
index c31df0915797..000000000000
--- a/media-video/kamerka/kamerka-0.12_p20161002-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT="a201df47a0849a09a20617fedfee26a407dc847c"
-inherit kde5 vcs-snapshot
-
-DESCRIPTION="Simple photo taking application with fancy animated interface"
-HOMEPAGE="https://dos1.github.io/kamerka/ https://github.com/dos1/kamerka"
-SRC_URI="https://github.com/dos1/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtwidgets)
-	media-libs/libv4l
-	media-libs/phonon[qt5(+)]
-	>=media-libs/qimageblitz-0.0.6_p20131029[qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/media-video/kamerka/kamerka-0.20.ebuild b/media-video/kamerka/kamerka-0.20.ebuild
index 29ef7e1ebef1..f138e973a958 100644
--- a/media-video/kamerka/kamerka-0.20.ebuild
+++ b/media-video/kamerka/kamerka-0.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dos1/kamerka/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest
index 5046cf21e102..1f1fb0436b55 100644
--- a/media-video/kmplayer/Manifest
+++ b/media-video/kmplayer/Manifest
@@ -6,5 +6,5 @@ AUX kmplayer-0.12.0b-qt-5.11b3.patch 943 BLAKE2B db0b5bbf4e36859693645cde5aa67b9
 AUX kmplayer-0.12.0b-qt-5.9.patch 1097 BLAKE2B 093961b12c4482303c43b603ad30c5fb49a97550da77641c4cb306eded8849df76eac0dcc441c2febf5523eb07abd1a494eee2335e02bd9d1bceacc87ccdf826 SHA512 137733705a879e87c59d26b1cb609aa9246d4543f758a0987fb1dee013d47ea469cdf7a19fa8aebe01a4643c5d7ed8b5e5f9057e9f80eaa3d3f5504fccaa48e9
 AUX kmplayer-0.12.0b-schedulerepaint.patch 2085 BLAKE2B a8c51d503de212b375cf77c41cf1c581c80decfdfe30cdd98ac0ff3f4b8a7bc335e921762808994c298db47e6327bb768838c00b41e8d20e6bb211a2c62ef6ff SHA512 e3c874ca5886d3a16eab0f10169009317214c8c196d9ce70b797f97f1ed2ed9143fb31e7f99d711a2c9ede26cb957f767fabbeb3c6670d430b1d4061a02982f1
 DIST kmplayer-0.12.0b.tar.bz2 599496 BLAKE2B c27b54cf05c52ffbb78c8f623b7cab066901f647c14364da1de2fcedd96329439521ad329fc15be58491b570de17fd151c95f266738e049501a5a22ba8dd9c93 SHA512 d34c496d0c24c6d5c1bb675b83fac60da5c9672e4076aed72bac2e9b333e88d031076e7e386ec7b61ae8ece88870f6187c61f483f425aa78edd1e443c7f2e882
-EBUILD kmplayer-0.12.0b-r1.ebuild 2447 BLAKE2B 8919ccdc4a38f0d288f641e305c3bf32b3d1b60d433786024dfa5f4aec5b70dcbef057dfeedc74482738eac66720a1c8b626ebadfac7ee521b6a53cce2e25655 SHA512 2e4ac7e2089bc09762f140033c2ac38562f94e56cf4c07e08d14a3aea2a265fc587099cf01e444e19d21a2114132a42c08556f7351daf86e50796c52de1f074e
+EBUILD kmplayer-0.12.0b-r2.ebuild 2408 BLAKE2B 9101fb98b727227884a223f8e7386b8f166c531a589e2535b7663a4f62280c73114caea7b8a28cbb70e4d909bdf5582804b18afbe1613be0d3000ecb30edff91 SHA512 0c13ed1b2417d115d5360276f54a776599fb3d2585ff2429b3ac09e12a673b71ab11be9917d2cb93e9631090577df6a9abb5f90dde424931647a544a65473bfe
 MISC metadata.xml 475 BLAKE2B 3c086dc3f1ddb849cf673de7aa73a3d68bc7f24537af193dca8e4f65fe28147f85b05bb8c88d591df95fb1f001ae2fe8b5f414eaf10cc314363c91185b4eb0da SHA512 0f45fbd4596c4e885093addcf323d7c53a5d550f91bd9bf0bcf5bc18cd9a808caac52dee949ad5437a1e6827b1b6bbd42a81a563eb648ebad64a6a7a6c34e37f
diff --git a/media-video/kmplayer/kmplayer-0.12.0b-r1.ebuild b/media-video/kmplayer/kmplayer-0.12.0b-r2.ebuild
index bb6d4b92d3e4..ddd10e09aab3 100644
--- a/media-video/kmplayer/kmplayer-0.12.0b-r1.ebuild
+++ b/media-video/kmplayer/kmplayer-0.12.0b-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="true"
 inherit kde5
@@ -14,7 +14,10 @@ LICENSE="GPL-2 FDL-1.2 LGPL-2.1"
 KEYWORDS="amd64 x86"
 IUSE="cairo npp"
 
-CDEPEND="
+BDEPEND="
+	sys-devel/gettext
+"
+DEPEND="
 	$(add_frameworks_dep kbookmarks)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -46,12 +49,8 @@ CDEPEND="
 		>=x11-libs/gtk+-2.10.14:2
 	)
 "
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	media-video/mplayer
-	!media-video/kmplayer:4
 "
 
 PATCHES=(
diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest
index 6ecacd0d1095..f2f3891079eb 100644
--- a/media-video/libva-utils/Manifest
+++ b/media-video/libva-utils/Manifest
@@ -7,6 +7,6 @@ EBUILD libva-utils-2.0.0-r1.ebuild 1352 BLAKE2B 24cd83a890efeb1edc3794e581405906
 EBUILD libva-utils-2.1.0.ebuild 1352 BLAKE2B a53ee0ce8a047e995eb7ea3f1f79efc5f44eb33965f1a13db7302a3cf89bcfd38bb6966ad14ba57acbf2d50f703c3b795e0368c11be9bb43e00b2af810a47e82 SHA512 9020017ce01eb0d3abe946e1de006287c03cc110338c4fd9b18aa64fc6ddd996f3c7758bf88e02fbb556e5a65717caaff193b47d79f9afa28c343b5b47462d1e
 EBUILD libva-utils-2.2.0.ebuild 1352 BLAKE2B 700a90494c689b3260d0d0d09be5671aaec976b03bdd57b2b01de0469a4b3f678f2d3f5c9ec9dd311df059f612fa3ab1d7395bb2bbed51bfe5163cccec6d0062 SHA512 b64978b6b8b880d134d92edfb03cc0b2dc13389e76c4ce594549377ec688141756ff16f6d0a9bdb5439e1e5dd038cd20658b18c70dace5826b211916605bdf96
 EBUILD libva-utils-2.3.0.ebuild 1295 BLAKE2B 593c4fd0478068527e1e4d1b4e353d4bc7814d68b897bbf13491087ef91414e3c627fc1082c720025c533206d77e0b9159648c01c1f18f9b1e9b9d7c1d28017b SHA512 caf1cd6c81bf5dbdee999bee5aeeba4ec6cabf67144376a43ac0e9397903b6c1bed4de3f7bbde3057b2cca7d631e5dfeaa797f1d1ccf499bb89d2f2119a29f6d
-EBUILD libva-utils-2.4.0.ebuild 1243 BLAKE2B 61e8d03195a05298aab400f82ad970e2da8324638f0eab1de330518be906ca847b46727493f1c82555ccd5e31548e8ad05c61d194ede83ad53895147d8ac5c49 SHA512 7375fcf7be6c59d86bde4cff1b9578dc66a859043f4e09508e05465fa095910b6f87e142cf21f400984e3d152af4ce4d06be1b79af6732d79e4f5f7e2a018a90
+EBUILD libva-utils-2.4.0.ebuild 1240 BLAKE2B a970d0c1e48ef7fc91b535f1cef599458f07fdd5f15353a4091035db0b4face8a57400936c20baa84b861582c6743b310b8de799fc7afcd875cb959be7be610e SHA512 bd4ea74f9e5d47467cded5da5c206ec3371747d9c7fd87d1e79fb62aa848653ceab9c362051fec284473ffd3d804a3dff00f9d47014d14de7059ea97f1a930b5
 EBUILD libva-utils-9999.ebuild 1243 BLAKE2B 61e8d03195a05298aab400f82ad970e2da8324638f0eab1de330518be906ca847b46727493f1c82555ccd5e31548e8ad05c61d194ede83ad53895147d8ac5c49 SHA512 7375fcf7be6c59d86bde4cff1b9578dc66a859043f4e09508e05465fa095910b6f87e142cf21f400984e3d152af4ce4d06be1b79af6732d79e4f5f7e2a018a90
 MISC metadata.xml 414 BLAKE2B 38e8ac043ae6960cdc20190dd2f7f802b006c4d1f71920d1b699a8750a53c65ceeaa32f4d82f0699a5989f2f252daa1fbe5e2dfa330b9eb745a12cce8da045f8 SHA512 a515f432546c6063a66694fb5fbd310d498d2970cac15dea1c9497d086cb517557c15da0837f068bf28bd2e000345f95c68f4aa6170d65b960ba7e6d44e8ad57
diff --git a/media-video/libva-utils/libva-utils-2.4.0.ebuild b/media-video/libva-utils/libva-utils-2.4.0.ebuild
index 928d6f126f65..8482dda2887c 100644
--- a/media-video/libva-utils/libva-utils-2.4.0.ebuild
+++ b/media-video/libva-utils/libva-utils-2.4.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Collection of utilities and tests for VA-API"
 HOMEPAGE="https://01.org/linuxmedia/vaapi"
 if [[ ${PV} != *9999* ]] ; then
 	SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/media-video/movit/Manifest b/media-video/movit/Manifest
index 788e12c597a0..3334a833e5a7 100644
--- a/media-video/movit/Manifest
+++ b/media-video/movit/Manifest
@@ -2,7 +2,7 @@ DIST gtest-1.7.0.zip 1164254 BLAKE2B ba8cf5dc336e3a6889b58922b62497cdac94d9f77bc
 DIST movit-1.2.0.tar.gz 534145 BLAKE2B 6409bd2d1e85e21dbce00c36152275553594f0c9d809802b5f96e8b7e56c03ccda9588631c156e34da1d54962bbdbbd03d9e78c60062bc01a04896b7fd88410f SHA512 7c75ae60e2b5248e2691074d67005728555d6b7fea320ac9d7bcd401c1640467f18f78e446e57894d9b3b3b6a597ee0603ccdd963f21a408e96c7f0d0f5ac154
 DIST movit-1.6.1.tar.gz 870278 BLAKE2B 736b34cf4d5a9d9b59e56dc994d467ffc33e86c8bd04a8062362e76f4d7a4c973252a65258d6b29753942c0f320e778a4a1ae4484795b3129de779a51770f936 SHA512 36e425cc1bcfce9afd9124c696d95f2f6c74279161c178195d9f4d22a34acb1919aac5f51c29aa13b95d0a7343beacb41b1686fb4ad92acd136c6a25ccb4044d
 DIST movit-1.6.2.tar.gz 878822 BLAKE2B 02b1a5d9b05c944d0b39f93e6c4ea0ced26128e9067db91b93f47fdda154cb7650217a821b077742ae555e6464579f95ad7a5976bcfea319e3dd2d515add83c4 SHA512 005e75712fcb83b0e9c0301925afe2c87a6d99856e7c6fe6468c93de5cbdd633507179c79a7536bb7acb1246c71302d98a92289a0a618b07d920b4620fd6abc7
-EBUILD movit-1.2.0.ebuild 744 BLAKE2B cc237476131aef48945452e279eb8a3a42571d6b82ae54572e97f544ef6a263d8dc2255f188951a6ac14f275bb5350fb4df6ec122d532d3356f934ad7f7dcb46 SHA512 b1c6018478eca0bfab87e299f072ca6a02d3cdbc1e50959d3fb9b6245ba493b527311c32e47f09c2c3e207cea76a1e24d0f341c112708ac32e152f2e5f06420b
-EBUILD movit-1.6.1.ebuild 763 BLAKE2B 3560fd54bdf4188fc6184d824c432473270a2aa11f0fb9c9915e9d059f991ebe805f70dfef781bce65f3b7e96f1a48b1c71c0aa4ebb02f987d79637eb16f039f SHA512 ea9d0fe5635ad82b8cd57cee2ab7580f9d572e80ffd8b86b16a3b6ce2aaf7c00dbe054147ec2b886767d76910f8fc259579b2115c9d37631ae528340904e0680
-EBUILD movit-1.6.2.ebuild 767 BLAKE2B ffa8f9f5f20cb0e4ed8798141f58a9830779f2cdea2a24a72d7f16010f68c7bad24e2532f5151dbc336a0ecf3b60fa0863c71ebeafc2079c2982febba7cbdb4e SHA512 90b8629db856209d7b25e608504cb13c77bf5eea48abe7def2da7957be395f39b25152c5552a97ec402adb074431826327f18905d8aeb8017a9edd0fc3c30a20
+EBUILD movit-1.2.0.ebuild 750 BLAKE2B 73e786af169f9ef8cf00ff84e0de2a0ec9447eac79c99e609bbcd6b9636f54b6438bbef0d8e022f42c6e7765a824c64d45b21fcfd9c5a1d3536c566d469e8ba0 SHA512 9afdcef285b790f47358946e81a731e07f2e7d78dfc0824d162789fef4b8bb8f056b24cb16da3195f31a7e9a2a75a015238d9fcd0eeac05d9b5a871349ba062d
+EBUILD movit-1.6.1.ebuild 769 BLAKE2B 24408b89d61c5f1906b6984ab96c670247f5671b8825fc20609b1cd5779ed0575d5963b03c90ef896e38305e7f9c14daeb84ca52618681ecac457f1e9048e11b SHA512 373b280233db085556e2ee56a9c2ea1777023b61aaabb302b059487fbda491b602571b55369a3a0d28b100912595ce832681c4fd6885871b79ceb6c7a5ec1963
+EBUILD movit-1.6.2.ebuild 773 BLAKE2B 6ac9bb630d4df7cc963d8ae2be9c43d0fa393dead1c57bfcf688d80a862732a363421d8ee84f1cc6659b58a0bdfb24f780946244e2bbebc03654cc88ec140771 SHA512 4dfcd8a148ae8566570a8d858c228c1d5714af4f38b6cfced69da635310eae60a481ce337cd73376532002296d2d606500f33b2257a901b9473916501910d729
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/media-video/movit/movit-1.2.0.ebuild b/media-video/movit/movit-1.2.0.ebuild
index 8ee6a7f71a47..0408883d3b5b 100644
--- a/media-video/movit/movit-1.2.0.ebuild
+++ b/media-video/movit/movit-1.2.0.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
-RDEPEND="media-libs/mesa
+RDEPEND="media-libs/mesa[X(+)]
 	>=dev-cpp/eigen-3.2.0:3
 	media-libs/libepoxy
 	sci-libs/fftw
diff --git a/media-video/movit/movit-1.6.1.ebuild b/media-video/movit/movit-1.6.1.ebuild
index 173963dd3bf3..4da6285ade13 100644
--- a/media-video/movit/movit-1.6.1.ebuild
+++ b/media-video/movit/movit-1.6.1.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
-RDEPEND="media-libs/mesa
+RDEPEND="media-libs/mesa[X(+)]
 	>=dev-cpp/eigen-3.2.0:3
 	media-libs/libepoxy
 	>=sci-libs/fftw-3
diff --git a/media-video/movit/movit-1.6.2.ebuild b/media-video/movit/movit-1.6.2.ebuild
index c6ffe6046ef6..d5ae1e840cb6 100644
--- a/media-video/movit/movit-1.6.2.ebuild
+++ b/media-video/movit/movit-1.6.2.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
-RDEPEND="media-libs/mesa
+RDEPEND="media-libs/mesa[X(+)]
 	>=dev-cpp/eigen-3.2.0:3
 	media-libs/libepoxy
 	>=sci-libs/fftw-3
diff --git a/media-video/mpglen/Manifest b/media-video/mpglen/Manifest
index 540de8b9cffb..9313fc610933 100644
--- a/media-video/mpglen/Manifest
+++ b/media-video/mpglen/Manifest
@@ -1,3 +1,3 @@
-DIST mpglen.tar.gz 10149 BLAKE2B 479fbaad9c635fc47dce9dd8191b8c2df4c9da115a2a7c30d59e6c5e65751bc7a757c311f98f222dbaf633f25a0c7bfde0f8600e27ac8aefae5e45ae01abcac4 SHA512 10c3550e14fb0d76360f8b99e8e82f7ca951cffc14921a6ffce5a949bf10d0c1d7d2dcafaf61c85123fecf5432139332a10f0f54e9c04ef99584578294d812a2
-EBUILD mpglen-0.1.ebuild 648 BLAKE2B b6b06cdee5a3e7dfd51d246da834543d6de6dcd23f0e61dae4e35f73fe82ff9fc47910871ba4c84cff1266e58d7ba1eba2dcf2d017550f2f15b3a9323df2792c SHA512 3c759e398edc72c222478ece689c3cb8125348d26ea74d3625407a50a41b041150666b941d86458511a1c058037e4f9414f5fb584eb497a9597d52c8a7711b4f
+DIST mpglen-0.1.tar.gz 10149 BLAKE2B 479fbaad9c635fc47dce9dd8191b8c2df4c9da115a2a7c30d59e6c5e65751bc7a757c311f98f222dbaf633f25a0c7bfde0f8600e27ac8aefae5e45ae01abcac4 SHA512 10c3550e14fb0d76360f8b99e8e82f7ca951cffc14921a6ffce5a949bf10d0c1d7d2dcafaf61c85123fecf5432139332a10f0f54e9c04ef99584578294d812a2
+EBUILD mpglen-0.1.ebuild 662 BLAKE2B 62447f089f591f667646f4efb414cd1f13171f96552aae8f10fa90eae0c65c5735ec057058c1b27e968f1ee0d1666009426265d955e4756e30b5142f8333e065 SHA512 4d52124c02410d73314690b9dda0df0494b9f93bfc556de2579eea90204692aea13441aa0cf0536a111087cb2ab92677c15ee592a2c462640651f4f1ce797dd5
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-video/mpglen/mpglen-0.1.ebuild b/media-video/mpglen/mpglen-0.1.ebuild
index 0da5b94f898a..d366cc724bfa 100644
--- a/media-video/mpglen/mpglen-0.1.ebuild
+++ b/media-video/mpglen/mpglen-0.1.ebuild
@@ -1,34 +1,37 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="A program to scan through a MPEG file and count the number of GOPs and frames"
 HOMEPAGE="http://www.iamnota.net/mpglen/"
-SRC_URI="http://www.iamnota.net/mpglen/${PN}.tar.gz"
+SRC_URI="mirror://gentoo/${PN}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	echo 'all: mpglen' > Makefile
+src_prepare() {
+	default
+
+	# awful Makefile, just rely on implicit rules
+	rm Makefile || die
+}
+
+src_configure() {
 	append-lfs-flags
+	tc-export CC
 }
 
 src_compile() {
-	tc-export CC
-	emake || die "emake failed"
+	emake mpglen
 }
 
 src_install () {
-	dobin ${PN} || die
+	dobin ${PN}
 	dodoc AUTHORS Changelog README
 }
diff --git a/media-video/openshot/Manifest b/media-video/openshot/Manifest
index e05195b566b7..93b090696909 100644
--- a/media-video/openshot/Manifest
+++ b/media-video/openshot/Manifest
@@ -2,4 +2,4 @@ DIST openshot-2.4.4.tar.gz 63065376 BLAKE2B 2ee00f24d699d5935a182c394821f215a27b
 DIST openshot-qt-2.4.0.tar.gz 60710408 BLAKE2B 33c8abe7ba3122ae720163d6ab91d367ee282b94d3d8986fdccf4f9efae832f54af7f946472c781a17f7e54083028762952d02d7139e6815cd0d44e80515c728 SHA512 95778effa5b02a467c44741384b0f43bf90343d4f450d5fcc2319ff1c3bee212338435dd8c781e0ff111a704aacdce3dbfb6bdcf62afa1f59bbb0668b58074ca
 EBUILD openshot-2.4.0-r1.ebuild 1275 BLAKE2B 04d16ebe05301d91fd4692410662618f4d7d1304e719f4ef3c3b3dabb85285c3dc64044fe80920dfae5d52c2f9789c60a7ce535e25d5fce196fe3888f0d89776 SHA512 40495955fe86cb522f12fc78a73e216093a21f08a899667197bc4943e929c858bfd9d807261df0179b4d1079fea9551db3e76c81bc3e1cefb83828432a712751
 EBUILD openshot-2.4.4.ebuild 1210 BLAKE2B 7d6ee91f9bf739c785b57387f9f0ca61f0b372c64210f1f6d86f660ff06b655dce2638494574798fecc789c7732e02e6cec3552061aabe9870d7ef7528f8dfdc SHA512 f1b006b2d1a99c19af6b6c5d26af31205ddbed121010002ebc164ef66cb4bbd5531a80cebb8717dfebb2d494a6f3518d37731bfa00c50233949688f12343d487
-MISC metadata.xml 516 BLAKE2B 00f73a7bde29bf2e437dabe263b6a1b4a18a46133516788a3072b9f306b4db8a2f413f2f273128dbb1f9761a5d1e0157ba4be1e111d733214c2eb73077fd481d SHA512 7511087d836af5594f5e9261974ee0e3b7df77b066d05a4b032993bcfffa2d703dcee869c96c710196b5acbb580ea39be3f9d14bbd05b86fe929269edce6bf6f
+MISC metadata.xml 636 BLAKE2B 08e8c695bf15de910bb90ebe5fef7b6883ce1fac03eb6c7de660d280cb402c5a70befd6e99dc281aa76098322439e2c4bff48e63ade946fa390dfe5f1ccbe156 SHA512 1b736005e9564431798291c83f1ccba5de2b03ba18b41a0fe400e2b2b58020fb0863e6aad2c348191f5903f288ed4fef1cef1e7615bbc3e97f2deb35633b5bd4
diff --git a/media-video/openshot/metadata.xml b/media-video/openshot/metadata.xml
index 2229623f13c1..6e1e6c99fcf9 100644
--- a/media-video/openshot/metadata.xml
+++ b/media-video/openshot/metadata.xml
@@ -5,6 +5,10 @@
 		<email>steils@gentoo.org</email>
 		<name>Stefan Strogin</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<longdescription>Free, open-source, non-linear video editor to create and edit videos and movies</longdescription>
 	<upstream>
 		<remote-id type="github">OpenShot/openshot-qt</remote-id>
diff --git a/media-video/parole/Manifest b/media-video/parole/Manifest
index 66691fac9c47..49ee00c6997f 100644
--- a/media-video/parole/Manifest
+++ b/media-video/parole/Manifest
@@ -1,5 +1,7 @@
 DIST parole-1.0.2.tar.bz2 915511 BLAKE2B e6fa116cae5c015a90b4a1d04df70f006ad59dfdb5d849b8ae8c3fdc0665e48790739c82bdb7c35c70f34548b9bee3dcac62f29e28562663d46b10a3a080f13d SHA512 d7e989af7f9dab14080e62bd656a2858d8536a056ba82b5d5ac7d26a7d898f478b74c1ba4371779624691b7f42b695580ad53cfb15da0a4dc209d7570c12a66d
 DIST parole-1.0.3.tar.bz2 963822 BLAKE2B 8f7131ea8e46541edab093514f7955ebe551549f1e6057186b87d2e5074a9760eb571b36c65cb7d33ff398432c2397fca3ffc764fb924967b50343eb4d7e93a9 SHA512 6163cd9d37b50093a44694af79aa421e9cd33ba92b2cf3e15640894fe9c51809ed7e93a31eccd274cfd9934fb34a63e6a21a161f5a0a96aeb20faac85ff65d16
+DIST parole-1.0.4.tar.bz2 921020 BLAKE2B c81b5d8773a933e7f3b2d3816401e5e833db58964623b1c40747b47632f594e9aaabde87d89de3c6e87b01b43ef9aef01194ab5a40ce2e36fe8909acceac5c3e SHA512 5f67830e36b6ac41c85dbbb7d6b4e2dfbd037c9e8fe4f5ab5ef8c52ebe4c69b5a9bfdee298b174a85334a4ae9414ed3492994853896f745c489116359cc14969
 EBUILD parole-1.0.2.ebuild 1442 BLAKE2B db6d0f6f8ad020030448874f38d2e2d270fb2f7b5446e24f85792d1de574c368f0c6ce352bef0a0834d331089ac42052b8f5662599ed874d836e2b273dc68634 SHA512 985e7c0dcd1f792ee707e47fd34dd52dc4698fa474103a0565905212e55ef7c576bc99cf315664782dec3a4693ee928eb33c58efcaba10a47827c93c8175dde0
 EBUILD parole-1.0.3.ebuild 1444 BLAKE2B 928756a4fb9ad566657266178425bd2d92f983addea0ff360eba32d307514bba50410bf5471d3e3fa0b9fa6b5c33d9beb1a35638185f6955f9c888cd864992d1 SHA512 db929065e2c46e0a060c4e2647cf7b21674ffd42711f147fcc97db42f9edd0b41abf3737be08dc9fcb330c126241a9ccefa8488717129a3e4c4e7023dba49d4a
+EBUILD parole-1.0.4.ebuild 1420 BLAKE2B 3ed5b8491d39c1fb0655de2cfffcfaf71ab79f8d74082a9e81073a7f5ca66fd1e3a5a582367d9a31402e80267bca24b83bab4608fa8c46cade95ea837a382276 SHA512 804a9913d3572d2dc58fc12b03ff32ad180d797092caee752c2be991c77ac0cbd826c3d13f7e59b497fccc81b8d5bf2d7ccb1d802de216fd5703cedfbed9b800
 MISC metadata.xml 241 BLAKE2B 19a1f7371ba9451232b7795e806499d1de2aba44dc9864bf1c8c72f6074af18387f6091c891f84c402c70e52f8502bc7a9a937828d63991402d2f0d17b247782 SHA512 97a8057b496da7d18b75e0cec2f5de16f7f16187776c3d7134ade6b0be2539c5f0e8de7ce43c2a4fc342ca9c3dd83a74c194a506ad28221c260dfa8a4eadb1e8
diff --git a/media-video/parole/parole-1.0.4.ebuild b/media-video/parole/parole-1.0.4.ebuild
new file mode 100644
index 000000000000..23581583e261
--- /dev/null
+++ b/media-video/parole/parole-1.0.4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="A simple Xfce4 media player using GStreamer"
+HOMEPAGE="https://docs.xfce.org/apps/parole/start"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="libnotify taglib"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
+	>=dev-libs/glib-2.32:2
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	sys-apps/dbus
+	>=x11-libs/gtk+-3.20:3
+	x11-libs/libX11
+	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.11:=
+	>=xfce-base/xfconf-4.10:=
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+	taglib? ( >=media-libs/taglib-1.6:0= )"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0"
+DEPEND="${COMMON_DEPEND}
+	dev-util/glib-utils
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto"
+
+DOCS=( AUTHORS ChangeLog README THANKS TODO )
+
+src_configure() {
+	local myconf=(
+		# clutter backend does not work with new GTK+3 versions
+		--disable-clutter
+		$(use_enable taglib)
+		$(use_enable libnotify notify-plugin)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index a9f613d3ec2d..3f359ea417d5 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -3,5 +3,5 @@ AUX pipewire-0.2.6-fix-probing-without-starting.patch 2119 BLAKE2B f7180ad95f0f2
 AUX pipewire-0.2.6-reuse-fd-in-pipewiresrc.patch 5684 BLAKE2B 9ce85e2f15b18ef458d21a44b10c875b0cb456972a61dd1ff127ad62510604d35ea6dd70daa0191181a34d2fea613ac254ffd6fa4f0fa3bb6114191e3a62996e SHA512 ba194a678b1130a29b17f1831c1a94c24db6cb05ae1d2a0e825fd1099aa2a300200d7cbfd5e5b592c54aea33893c68e554edd4bdfd1ca6cc84739b12e33058f6
 AUX pipewire-0.2.6-revert-combine-all-perms.patch 1039 BLAKE2B 5fd1d82c92680b6097ac70367eb5f7fc8190d0589d4bb228dc93c6f673763a65a7c18a5fd3b242686ba86773d90078cc50a5d7c2277dc90edcdb341d5ecb9f23 SHA512 c9bab5e79b4a88f240d34702dfe5de2df4ab7c5158d5b95228647018cb5bb69ec124fb47405074aef91480d25d388df7cdbb7fa94396d228b6f573697b2f8333
 DIST pipewire-0.2.6.tar.gz 421137 BLAKE2B 155667d14fe5380e21f0b70accea72dc4478085916a9126185136f6d33bd7729d91b790c171dcf7b6aea2c52894462d16516f8821229ca0bf9f6cde15df524d9 SHA512 3d1db41f5beb42a0ee15ae7bc8afb89b54a37c3a6a414e88b5e33ceaf98ec6dda0d9a2d03ac47a8dfce48e9637e647291919e6670bb70589b0d1951fbcbd3ff8
-EBUILD pipewire-0.2.6.ebuild 1831 BLAKE2B 53426ccce169bb1d4ac89251afa82deefb9ed416fc764fc12bc0a7193295ac6a771d0e16ccf90b6fc489302b47b04af36d7bae8bc4c9d1a70061332e2d72d31d SHA512 88d98a80a6f04d16b6ea1ce8a9e7758a42e406314e7174abf96bfd0d90e36e101a1ec81625e98efa4902e627252cef7545f1b94314ddff146a8fae51cc52a4e3
+EBUILD pipewire-0.2.6.ebuild 1836 BLAKE2B c076453215c8ffb67e4e61518dac5e0eb924be63a802be4f883b701ad05d6f51fd6e090bdc4c21ff9a799e532a759a9f454c9f84219dc816c73c22411d91f8e2 SHA512 132038875b9dc8ce1e19edf36c14529d7c3e974575b6becea66abf43eaba1ec4523862a10feaace9847bfa57b141d70fce84d281540fbd455d89cae7943eec54
 MISC metadata.xml 449 BLAKE2B c580fa69fbecd1046123d51f0a556bf54e7dd76a7ced768ae31289969a3fcb0c03f301a214da222201bad2cd0bcf68674807e28efcdee27edd9fa6d913cdc146 SHA512 73c4b73b417e92d1bdf802ce38939afdff2ba42bc638e0c6ba42593894755ce6f197678e8676f763bd66bb0b2bb9175c1369c173be3ab64e7323795d3b00bf0c
diff --git a/media-video/pipewire/pipewire-0.2.6.ebuild b/media-video/pipewire/pipewire-0.2.6.ebuild
index 53944bcd82fd..75c4a6074d2b 100644
--- a/media-video/pipewire/pipewire-0.2.6.ebuild
+++ b/media-video/pipewire/pipewire-0.2.6.ebuild
@@ -16,8 +16,8 @@ fi
 DESCRIPTION="Multimedia processing graphs"
 HOMEPAGE="https://pipewire.org/"
 
-LICENSE="LGPL-2.1"
-SLOT="0"
+LICENSE="LGPL-2.1+"
+SLOT="0/0.2"
 IUSE="bluetooth doc ffmpeg libav gstreamer sdl systemd vaapi X"
 
 BDEPEND="
diff --git a/media-video/plasma-mediacenter/Manifest b/media-video/plasma-mediacenter/Manifest
index aa3ae8e17760..a1c259108926 100644
--- a/media-video/plasma-mediacenter/Manifest
+++ b/media-video/plasma-mediacenter/Manifest
@@ -1,3 +1,3 @@
 DIST plasma-mediacenter-5.7.5.tar.xz 162076 BLAKE2B 6001c11ee96e989e9b9366e74637816e3f7d778a225d89c6414ae7b9cc0f3649b460d0e39ed3eb3f9daa6b3cee4d96e42fb71102d500cf2546e4c4af757d8990 SHA512 47a5b015364a1ffd1fd1b1dd3720e5ae8ebc38e4aee03e55d042c6b9aeea2579e1b7a31f1b0fcef74c4c19c470c7a380694d9c93624a75337eb58080f5b8d09b
-EBUILD plasma-mediacenter-5.7.5.ebuild 1138 BLAKE2B a3e708baf9909d92d3f75b0b004265ceb1184e2ec6079272a1e57b98413a2d767e1e98e26a20b33bb3190a743b2a8a9b1d67d80759dbbc753631f72d5b1d3d94 SHA512 35be93f8d78ba3d92a6029b7c2f86c6c27054c02725faa23c2cbc22ea5fe4552c70839b9316a29ad38fa14d5080b1038d27cd5ff632f8d2091c772d05c56395e
+EBUILD plasma-mediacenter-5.7.5.ebuild 1135 BLAKE2B 7d614f343c0381fd8e136c06dbae6f862ce20f0cab700fd83c13a339a004cf2d79d2d9549db3f1faf40edc5a5563634fa74d6590b2e23a351ae692e40b29a7c2 SHA512 a9e786f23bdaeff0e624b211609c934a066f86c716468865722b32b12e95f5995d380756f6b7deb575beaf66ced5ecb02fe9ccef09f0973d041d6a254f80df3a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-video/plasma-mediacenter/plasma-mediacenter-5.7.5.ebuild b/media-video/plasma-mediacenter/plasma-mediacenter-5.7.5.ebuild
index 57312a69e418..ad1eb0048ef8 100644
--- a/media-video/plasma-mediacenter/plasma-mediacenter-5.7.5.ebuild
+++ b/media-video/plasma-mediacenter/plasma-mediacenter-5.7.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_TEST="forceoptional"
 inherit kde5
diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest
index 164186aa6191..f0b80bab9a0b 100644
--- a/media-video/simplescreenrecorder/Manifest
+++ b/media-video/simplescreenrecorder/Manifest
@@ -1,4 +1,4 @@
 DIST simplescreenrecorder-0.3.11.tar.gz 1823944 BLAKE2B b7692ad158b4784f0222dd47227b85d33aae7eb416ed87d2eda1040027c910ec8d0ebe6a7e164e77cb9c3f6f2756e15fe97a7f05f45c92465473d2ae90e86b34 SHA512 5919774a00cd7015cd7db40561efaea43809b9465508b7770db9eb0fc87f338746e5cd4a79a0ab6c09e516257fa80184c3dcb5ab400c0ef2c0a8cf50ea2a073f
-EBUILD simplescreenrecorder-0.3.11-r2.ebuild 3079 BLAKE2B b7a1704ca440040b31136057a0a7d0684a5bab4417a45f845abc96e633dd323e8a4c858f9a72bd486d3380003554f14878dd35178e3ee488dbfa186ef55c4b78 SHA512 048cdd940936d8a133f617d3b807638b7ddedb7bd01008423d1e40bba159c0a4341c1c5f4f5e5a54bcc3a2a8a65e4fdbb9f6a507ca2587b65939778a0ca0bd3a
-EBUILD simplescreenrecorder-9999.ebuild 3079 BLAKE2B b7a1704ca440040b31136057a0a7d0684a5bab4417a45f845abc96e633dd323e8a4c858f9a72bd486d3380003554f14878dd35178e3ee488dbfa186ef55c4b78 SHA512 048cdd940936d8a133f617d3b807638b7ddedb7bd01008423d1e40bba159c0a4341c1c5f4f5e5a54bcc3a2a8a65e4fdbb9f6a507ca2587b65939778a0ca0bd3a
+EBUILD simplescreenrecorder-0.3.11-r2.ebuild 3084 BLAKE2B 32382d742514ba7a5865ae9549010ae04189d01656b52c88a7ddd7956c497c3d67673735c962fafcd190ddcb8d44d3fca0a0193da0b932c69bace3c8119024de SHA512 8dbb6a0b4b200a6d840221b67b474e5b2f84093ea105ca655bafb0aac2988dbb211ccb17e07df907ccee1483f690b0cf9f5f46e86b70530600d25f238631fc16
+EBUILD simplescreenrecorder-9999.ebuild 3084 BLAKE2B 32382d742514ba7a5865ae9549010ae04189d01656b52c88a7ddd7956c497c3d67673735c962fafcd190ddcb8d44d3fca0a0193da0b932c69bace3c8119024de SHA512 8dbb6a0b4b200a6d840221b67b474e5b2f84093ea105ca655bafb0aac2988dbb211ccb17e07df907ccee1483f690b0cf9f5f46e86b70530600d25f238631fc16
 MISC metadata.xml 508 BLAKE2B c43c69903c35e9e1f87c94cb26b06a8d6c4dd1a51c8a3409027ab8c867e54851aa8e4bfcaf4a0a37298795ded69743e82d2b0a4e0bb84cb3d88d6a6c5c4a1c0f SHA512 d4879cb7f57f23d273e45b429ab5548d30a0a6eefe63e28c2c60e7cef9a44b295d8455bfedaf9d9294ff4cf16b4f841f0ddb34541c62c25cbf190f7b6c7538ce
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r2.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r2.ebuild
index 852caf0a6bac..ebea68fc269a 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r2.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r2.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	media-libs/alsa-lib:0=
-	media-libs/mesa[${MULTILIB_USEDEP}]
+	media-libs/mesa[${MULTILIB_USEDEP},X(+)]
 	|| (
 		media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
 		media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?]
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
index 852caf0a6bac..ebea68fc269a 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	media-libs/alsa-lib:0=
-	media-libs/mesa[${MULTILIB_USEDEP}]
+	media-libs/mesa[${MULTILIB_USEDEP},X(+)]
 	|| (
 		media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
 		media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?]
diff --git a/media-video/tsmuxer/Manifest b/media-video/tsmuxer/Manifest
index 4b0ee516c843..2f496763738c 100644
--- a/media-video/tsmuxer/Manifest
+++ b/media-video/tsmuxer/Manifest
@@ -1,3 +1,3 @@
 DIST tsmuxer-2.6.11.tar.gz 538798 BLAKE2B 18f5f9002e356664ae84343afbadcddd447743404bcdcca709ba039ebb2ab05e5fba7eda0f30c86c29e18040d646004d1aec7dec34ed008ddbdb15228c63f09d SHA512 25b552153b76231ac1b88858d2178564d22edd18c6b08dc872765ac214ca6fd1ff6df5c5fff0f24647ea35f3f990e364bfb8adff5dd79c69cc12875fafb4f137
-EBUILD tsmuxer-2.6.11-r1.ebuild 794 BLAKE2B 600bcb9ff330fefb35a5b3dd26f91525416384420716d6433ab5c2681369754d1fa97b21068d1e787b3d9972466d02c37058472fefdb2f07ce352bf6dfe61052 SHA512 eebbbb239bac63e99cd797a6bc89f2c470021a271fcb2b44089c71d40dea17fe64e992f722b5493e0a0b171039c1f3db61fcd92fc940edd744491f27c2de846a
+EBUILD tsmuxer-2.6.11-r1.ebuild 790 BLAKE2B e12590324f4798c862045b53e0a9eb4f043d31ab719b77a4d43fc42d3f45445b6a9506ffa028b47e5c0ec86b3c6e5671294497838d70b94de75ce69173384847 SHA512 bb8e02444ceec2b8411633e22df14fd729a3ce4f30d8714fc7623d25c14f652bb2f864bdc2cc977417d0c64f71fc217ca6a0b0e7aa8391959e83f380f99c0016
 MISC metadata.xml 572 BLAKE2B 244e20f96b8fc9ae813458ea873fb6dc9fb2f35208bda79a560bf9d014de331643f38c7734b507a7b41b6e59c5f73a0919f6467f03545e25f151de06435fbdce SHA512 8527c0daedfcbf7798518d8731fb6c2995b551b83f17d476a949d3b34e8df8a96cf5f85d78d01c6f5b621d8e5f243ceadde6af763b50f84aa24ec406b41a2714
diff --git a/media-video/tsmuxer/tsmuxer-2.6.11-r1.ebuild b/media-video/tsmuxer/tsmuxer-2.6.11-r1.ebuild
index 8f2338996d71..f9c3f8f54b78 100644
--- a/media-video/tsmuxer/tsmuxer-2.6.11-r1.ebuild
+++ b/media-video/tsmuxer/tsmuxer-2.6.11-r1.ebuild
@@ -15,7 +15,7 @@ IUSE=""
 QA_FLAGS_IGNORED="opt/${PN}/bin/tsMuxeR opt/${PN}/bin/tsMuxerGUI"
 
 DEPEND="|| (
-	>=app-arch/upx-ucl-3.01[lzma]
+	>=app-arch/upx-3.01[lzma]
 	>=app-arch/upx-bin-3.01
 )"
 RDEPEND="
diff --git a/media-video/vcsi/Manifest b/media-video/vcsi/Manifest
index a9375758d1ab..3a99760de3f4 100644
--- a/media-video/vcsi/Manifest
+++ b/media-video/vcsi/Manifest
@@ -1,3 +1,3 @@
 DIST vcsi-7.tar.gz 18350 BLAKE2B 840f17db49a0b538a53bc0c3cd426e117d6a29d4b6f7b1ab7bf2f3a1697ea903a908f19b798c5898abf3cb0d308b34aeffc863517c682b8b9a114f5f9dcefb42 SHA512 5b5a3b9db76003c364aef0574a1b43c1177f5b7dae1339be981d6358c38102f0e7f275c9ec074e7cdd6b042ae30b982cfbbffa35c67eb8e2fc887c00073f2e48
-EBUILD vcsi-7.ebuild 838 BLAKE2B e69d6df7d2cef9aa4e90f1a155fb0b94fe4881ba2774a16a398832c39f93395731b83c59264ea13d5a65c3b75db4d8cdec6ec748eec413fcd58f82ddf3d4620f SHA512 56a8a184e13fd049a02dd58d32e935bd5ec7702fc95c66f4d2545a4c54f715b125711221234c963d32226a9deecc7f8ffd31a887ee91259b40abcd0edf71b66a
+EBUILD vcsi-7.ebuild 863 BLAKE2B ea59d61c032ca1ef77423f8afb3a9174b858d433901ca5fb488f302b3ce520c138913bc07dad21d66dbbf2a860ff68a027bb484115d6029211d94e1f8ce5b847 SHA512 42c0591691ed77bd6da94576f46d9ef0aea8bb0afa508c4b5e384614f948d6b291c6467a8d4494c06d2be4f87dcdd6ce5249e798a6cb8cfb06ba5d0b2b894c18
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/media-video/vcsi/vcsi-7.ebuild b/media-video/vcsi/vcsi-7.ebuild
index 01930585d6c2..3ef53f47136d 100644
--- a/media-video/vcsi/vcsi-7.ebuild
+++ b/media-video/vcsi/vcsi-7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
+RESTRICT="!test? ( test )"
+
 DEPEND="
 	>=dev-python/jinja-2[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]