gentoo resync : 14.12.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
commit: 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree: 25413d1cb3a0cbfe36029db32398c0f333609215 /media-video
parent: 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)
56 files changed, 887 insertions, 1098 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 758a601275e5..070655dd6ded 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index d2cc1976b96d..b96ae3f79644 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -5,10 +5,12 @@ AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-makefile-for-make4.3.patch 729 B
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-system-luajit-build.patch 4029 BLAKE2B 635bfd2317a05b1393c26b648f0081920be30e9ca29eeac0a5d25b75a141a3eb40cded94d27934eddb4d2ad1f28a1d8752faf97f264cc4a2a4ef0ffaedeed7b4 SHA512 247dba6e593212294f3157226c03e2fb5d3a5a8eaf9a16e0a65ea1fee006b8f21fadbdd80fb0b748be3a9b043779a0da6bb6007fac07b7908fb46f27a055704e
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-respect-compiler-flags.patch 2186 BLAKE2B 67558c0d8a1227e03d6ab97e4f417ec0ef557609be908b403ea5d4c4b12b58dd33822611b98e42afdbc3e65741094ef52d19812fd4eea5611f12a7e109b0986f SHA512 8584f8b6822642f5afdbe1fb9a1e77b32fa4eefebb473d6a501147d328ca38ecb2f88f4247a7ad06a8dfe3d9cc6695f60652dbc122237a17d097bae2f29a6a7e
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch 2446 BLAKE2B 5b1a5556829fbcd5d10ad869af5dcce4c6227dbc9d460094f237448a4aac9e07a9752039ab857a3556d062297cd0101e71ace0b4d3643f481e7479f16ccdf2e3 SHA512 f5171353ac14806166e26c4b335e6c7d9e111ba1eb68c3160fc9f802e1e3de659df48c4be180a0a25c67f7733007c8875c191436314ccfc9d7696a1f8a1fa719
+AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-tests_luarocks_lua_version.patch 505 BLAKE2B d92ab5c7604b9c04296ea82d3c5b093a900bb9345289539262e5d057bf21d003ce1fdfce7e6f57b8dad3cb62c3e604ada6e9bd596a3673afbbced338230ba638 SHA512 71bc5511bc0fcb9d55e893300066f7e755da5bad04f74e0ba103e622cac6ebf99d1fa7b1ca9f08d2b5169d305a4bee6a7782cb14304352ca108d126931851a5b
 AUX aegisub-9999-git.patch 2337 BLAKE2B 472a8312ac6d79acc494f3b77e55c09219158815dd608c35f1ecc5f0e7dfe2de729c5ade20b04ffa02d767492a0d981f3d9de729b61354cd2df0426cdaf8cd1e SHA512 df873bd18c9329541bc327a93e1a76af9c27d8a19d868375246b136d011330764f18c5b19d1fc0846060037ecf4613030a8e9549a1fbe2206f5fac3af9fce8c9
 DIST aegisub-3.2.2_p20160518.tar.gz 7438734 BLAKE2B 3a57e5d6fafac2ca95d64d60e8d68b48177aaa0c5fd1438d0b0a133757ef95443c16324fb7effb41506f2b1eb70aab9d34845a91beef0ef81a3658444e24be07 SHA512 8d8775ba0a12735a9756b9abfd65c89519dae4e21afcaedbd18985d1c1021975b1ae909b3bef1121b707c626e1711d56f1823f3b4746eab49e8386536a5e84e6
+EBUILD aegisub-3.2.2_p20160518-r100.ebuild 4049 BLAKE2B 9d99d0d3663a875457e23fe5341d5390fa3fcacc010aa122b98f715165edcf14e8e05a0797edf29e5fbb5bbf29eaf39871d6f9854a81414928609ccfd011f350 SHA512 a453c22c73369d5dd818dd5954293505dd11972bc8f2f2db5370fa14e99e5c7abcd1c6d5454969e24aec53509b409611a7fc39c1a1cd1ea1d6f95561475c0530
 EBUILD aegisub-3.2.2_p20160518-r2.ebuild 3551 BLAKE2B cff2e09de3983eb5f9bdc8f6ef68e1a4ba9b714707d1048dfd87d88b869bf2a50d671fdb779fc5ac23e46e4216609fcf6f294c95da22659483ad51f69fcdcaaa SHA512 f8455fe7205c84ebd039173ccfe7119068917f424839da5c0232922d8e02e17cde06fdf4ca06504e9a0e92c824dd888641a7643f8e777de01240ec8e79caac49
 EBUILD aegisub-3.2.2_p20160518-r3.ebuild 3601 BLAKE2B 53f7443999f2a1f07bd3d24c39315cca83df4dfbcba3ea42bf4ac6ef71dda782086f7ab86f0ae059f73500d991995606d58798e885ad1d736d879dfadbd39d8e SHA512 4eb7caa739fb28df49d8bc366452d0e465802a03e1d1341011d066ef3891d1150f2ed0257020b4bad2c2bfab9976cb3dc71bb5be3b199c690af996a0e1605993
 EBUILD aegisub-3.2.2_p20160518-r4.ebuild 3660 BLAKE2B 0e24a41fa570fe561564d9b59692975b0b8bbd586504316459361f9589477451e6584f57d7543e59f234e393286f9526ad3266217f2efb9afe2b8f4abbfb155d SHA512 242a6543a631309a0d2791f171a43897dbf46ec8ad0ccdfef9be4e71bac3db21fe8471ea0ef06812d229b8061d9b6dbdf31cc05fb894dad90fd341b0e682895b
-EBUILD aegisub-9999.ebuild 2825 BLAKE2B 667a98ee5b7c68e1a0dc189dd097f7b10dc8c0b7df2094196c97de470db6005dde5c30fb1768541d7859f82c1a1b4b376d870b8cde8b21eb963e7678742a9bfb SHA512 a36170ee5b54edb32f22e7dbd9717805b90e8e97b2998b2f7ae45259d51b9c9124e0ff54de3bc7478a13f96d3b45efc47985c9e06ca159171f7e62054c56202d
+EBUILD aegisub-9999.ebuild 2873 BLAKE2B 8967ace19b9aa1536682aaaf310f8d9a22286f5227777dd77575af6d65b52571b21218f14f4b9f851bdbc84a63233206aa96d34d15f547be928afe1d0fe42333 SHA512 c528ca6e2f1dbfa4915e51045618ff62347f6abc7695b90918d3d93966b9cccf75ab92be62a0ff97f7846dd2d8d2520286bf039982bda3b638c89d568a968902
 MISC metadata.xml 489 BLAKE2B b26abe2056ef0465a81ea8f9928c6d05053595b5650aff750251173ddce6f5248a30331104710c1b05cafe9641c072764c45f66935b25857785bc833af31174a SHA512 450c45be100ed72d7f0b69fe596862137ea2f421597e99129325bf2f58940600a62e1502ee4d6c7cbbab17b4cbd99da8c481ceb6fec2709452c17d8cb7aaae48
diff --git a/media-video/aegisub/aegisub-3.2.2_p20160518-r100.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160518-r100.ebuild
new file mode 100644
index 000000000000..fa12808a3cd6
--- /dev/null
+++ b/media-video/aegisub/aegisub-3.2.2_p20160518-r100.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( luajit )
+LUA_REQ_USE="lua52compat"
+
+WX_GTK_VER=3.0
+PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS sr_RS@latin uk_UA vi zh_CN zh_TW"
+COMMIT_ID="b118fe7e7a5c37540e2f0aa75af105e272bad234"
+
+inherit autotools flag-o-matic l10n lua-single wxwidgets xdg-utils vcs-snapshot
+
+DESCRIPTION="Advanced subtitle editor"
+HOMEPAGE="http://www.aegisub.org/ https://github.com/Aegisub/Aegisub"
+SRC_URI="https://github.com/Aegisub/Aegisub/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa debug +fftw openal oss portaudio pulseaudio spell test +uchardet"
+RESTRICT="!test? ( test )"
+
+# aegisub bundles luabins (https://github.com/agladysh/luabins).
+# Unfortunately, luabins upstream is practically dead since 2010.
+# Thus unbundling luabins isn't worth the effort.
+RDEPEND="${LUA_DEPS}
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,debug?]
+	dev-libs/boost:=[icu,nls,threads]
+	dev-libs/icu:=
+	media-libs/ffmpegsource:=
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libass:=[fontconfig]
+	sys-libs/zlib
+	virtual/libiconv
+	virtual/opengl
+	alsa? ( media-libs/alsa-lib )
+	fftw? ( >=sci-libs/fftw-3.3:= )
+	openal? ( media-libs/openal )
+	portaudio? ( =media-libs/portaudio-19* )
+	pulseaudio? ( media-sound/pulseaudio )
+	spell? ( app-text/hunspell:= )
+	uchardet? ( app-i18n/uchardet )
+"
+DEPEND="${RDEPEND}"
+# luarocks is only used as a command-line tool so there is no need to enforce
+# LUA_SINGLE_USEDEP on it. On the other hand, this means we must use version
+# bounds in order to make sure we use a version migrated to Lua eclasses.
+BDEPEND="dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		${RDEPEND}
+		>=dev-cpp/gtest-1.8.1
+		>=dev-lua/luarocks-3.4.0-r100
+		$(lua_gen_cond_dep '
+			dev-lua/busted[${LUA_USEDEP}]
+		')
+	)
+"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	|| ( alsa openal oss portaudio pulseaudio )"
+
+PATCHES=(
+	"${FILESDIR}/${PV}/${P}-fix-system-luajit-build.patch"
+	"${FILESDIR}/${PV}/${P}-respect-compiler-flags.patch"
+	"${FILESDIR}/${PV}/${P}-support-system-gtest.patch"
+	"${FILESDIR}/${PV}/${P}-fix-icu59-build.patch"
+	"${FILESDIR}/${PV}/${P}-fix-icu62-build.patch"
+	"${FILESDIR}/${PV}/${P}-fix-boost170-build.patch"
+	"${FILESDIR}/${PV}/${P}-fix-makefile-for-make4.3.patch"
+	"${FILESDIR}/${PV}/${P}-tests_luarocks_lua_version.patch"
+)
+
+aegisub_check_compiler() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
+		die "Your compiler lacks C++11 support. Use GCC>=4.7.0 or Clang>=3.3."
+	fi
+}
+
+pkg_pretend() {
+	aegisub_check_compiler
+}
+
+pkg_setup() {
+	aegisub_check_compiler
+	lua-single_pkg_setup
+}
+
+src_prepare() {
+	default_src_prepare
+
+	# Remove tests that require unavailable uuid Lua module.
+	rm automation/tests/modules/lfs.moon || die
+
+	remove_locale() {
+		rm "po/${1}.po" || die
+	}
+
+	l10n_find_plocales_changes 'po' '' '.po'
+	l10n_for_each_disabled_locale_do remove_locale
+
+	# See http://devel.aegisub.org/ticket/1914
+	config_rpath_update "${S}"/config.rpath
+
+	eautoreconf
+
+	cat <<- EOF > build/git_version.h || die
+		#define BUILD_GIT_VERSION_NUMBER 8897
+		#define BUILD_GIT_VERSION_STRING "${PV}"
+		#define TAGGED_RELEASE 0
+	EOF
+}
+
+src_configure() {
+	# Prevent access violations from OpenAL detection. See Gentoo bug 508184.
+	use openal && export agi_cv_with_openal="yes"
+
+	setup-wxwidgets
+	local myeconfargs=(
+		--disable-update-checker
+		--with-ffms2
+		--with-system-luajit
+		$(use_enable debug)
+		$(use_with alsa)
+		$(use_with fftw fftw3)
+		$(use_with openal)
+		$(use_with oss)
+		$(use_with portaudio)
+		$(use_with pulseaudio libpulse)
+		$(use_with spell hunspell)
+		$(use_with uchardet)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake WITH_SYSTEM_GTEST=$(usex test)
+}
+
+src_test() {
+	emake test-automation
+	emake test-libaegisub
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
index dedf8a1e8582..bcc8a14c9a32 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -1,12 +1,15 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+LUA_COMPAT=( luajit )
+LUA_REQ_USE="lua52compat"
 
 WX_GTK_VER=3.0-gtk3
 PLOCALES="ar be bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS sr_RS@latin uk_UA vi zh_CN zh_TW"
 
-inherit autotools gnome2-utils l10n wxwidgets xdg-utils git-r3
+inherit autotools l10n lua-single wxwidgets xdg-utils git-r3
 
 DESCRIPTION="Advanced subtitle editor"
 HOMEPAGE="http://www.aegisub.org/ https://github.com/Aegisub/Aegisub"
@@ -23,9 +26,8 @@ RESTRICT="test"
 # aegisub bundles luabins (https://github.com/agladysh/luabins).
 # Unfortunately, luabins upstream is practically dead since 2010.
 # Thus unbundling luabins isn't worth the effort.
-RDEPEND="
+RDEPEND="${LUA_DEPS}
 	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,debug?]
-	dev-lang/luajit:2[lua52compat]
 	dev-libs/boost:=[icu,nls,threads]
 	dev-libs/icu:=
 	media-libs/ffmpegsource:=
@@ -43,18 +45,23 @@ RDEPEND="
 	spell? ( app-text/hunspell:= )
 	uchardet? ( app-i18n/uchardet )
 "
-DEPEND="${RDEPEND}
-	dev-util/intltool
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig
 "
 
-REQUIRED_USE="|| ( alsa openal oss portaudio pulseaudio )"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	|| ( alsa openal oss portaudio pulseaudio )"
 
 PATCHES=(
 	"${FILESDIR}/${P}-git.patch"
 )
 
+pkg_setup() {
+	lua-single_pkg_setup
+}
+
 src_prepare() {
 	default_src_prepare
 
@@ -107,16 +114,12 @@ src_test() {
 	emake test-libaegisub
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-tests_luarocks_lua_version.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-tests_luarocks_lua_version.patch
new file mode 100644
index 000000000000..c441b8fe083b
--- /dev/null
+++ b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-tests_luarocks_lua_version.patch
@@ -0,0 +1,14 @@
+Make sure 'luarocks path' outputs the paths for the Lua ABI version
+required by aegisub, not the one used internally by luarocks.
+
+--- a/automation/Makefile
++++ b/automation/Makefile
+@@ -19,7 +19,7 @@
+ PROGRAM += $(d)aegisub-lua
+ 
+ test-automation: $(PROGRAM)
+-	eval `luarocks path`; cd $(TOP)automation; ./aegisub-lua tests/busted.lua -p 'moon' tests/modules
++	eval `luarocks --lua-version 5.1 path`; cd $(TOP)automation; ./aegisub-lua tests/busted.lua -p 'moon' tests/modules
+ 
+ test: test-automation
+ 
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 5fe6dcf6fe11..336ef7cb59a7 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -6,6 +6,6 @@ DIST ffmpeg-4.2.2-ppc64-gcc.patch.gz 750 BLAKE2B 3a9cc7f0135e077c77179a7ca3da917
 DIST ffmpeg-4.2.4.tar.bz2 10959430 BLAKE2B 932bc0046edab5587063bbc04d6ef0149876bd1001ad185384fcabb3d0ae196c9ba591e680823b3c7b6e0ef9a0a9e9575a8b08439fdd89ef0e4dabb9d4a7f4e6 SHA512 5c74e3fe77ddf8ffede0e4692d574858dd0626e542380a819ab79c0f669c6c1329ffbccb872502f60306e561f10aa8bc1e61d09b2bea829870fe4a48b76460c6
 DIST ffmpeg-4.3.1.tar.bz2 11301038 BLAKE2B 3b0eb332459921435b60e72f5c572034abf65d4ab79ef4cfae94fe594048eaa37eec47724d119863102a7211c2178f5a2382a6d4016b792818079b8241bde084 SHA512 831a187d8b8f2715a9f11c93c8d3ec126ff579d470797da452d3395178877de113af7ae90ed27fca0b223791ad257972570481e6dbb8361d2b7f3b010924bee8
 EBUILD ffmpeg-4.2.4.ebuild 18169 BLAKE2B b771bf50bfce5c754963f431f085c29b962bed73e55e805e112986281abf025cf7723e8cdc5f15829d06424aadbc6899c644f5e4ca56a2a113920a13c5c8b13b SHA512 b26527dc7e5c46dbe8b958efd4d5ebd51d91e258c2a6b23d1d9c9fcc4ddbbe72f1ad9751b8dd9273ebd0840003db83db16babc15ca844e33df2a06ac16add793
-EBUILD ffmpeg-4.3.1.ebuild 18218 BLAKE2B d22f2388930330bbfa0605a2c3f309b75b13a74ee9bfde34b023cb545b388cdc720445c3b2e98bd0440f029aa343fcc1bbe0840eef479ec1bfd861ef022ca5dd SHA512 506b47849f8efbba6a4ffe3e3913303be7a06da20531ae3e63fdf87d34f6c3c81bcd26dcf220878c090b77e56aebc15225327a54391ee1ef475c776a778a5c26
+EBUILD ffmpeg-4.3.1.ebuild 18225 BLAKE2B 243639ef4e19df4a57cdf3084687dd4bd6e37a3d59b17b8bdc5ee4b5b03113cce262929f0ecb546912145a47d3554fc3fdd34cb51774648f55e509ea5f359431 SHA512 9b08a306c5b2dda66b4721eb714ff1c61a32ebc221ace8b7e9b38223c7ce0f7b40fb64d42c10453b9e4dae2f7a19afa1516d9332df1aea91a27f13d46d91fd7f
 EBUILD ffmpeg-9999.ebuild 18049 BLAKE2B 3d1ebb9b9ce4abc8e5db6da31e600a9db93580a4fa876dde23e0ae4623a3aceba9351b40637d8a6ecc60f0f15c62c438fd8445633e325eaff25c69b64438927a SHA512 dce9ed532ac8a084c03e4d27898de3d5b9fc9afa577d1312e1c157657a3f372faaa594aa83006ec6397ef9cc35b684ce37865a2a0c59624ee88481026be00d1f
 MISC metadata.xml 5868 BLAKE2B afe06c266a6dce5dc2b13a1dcaae85c4288a4f45ef493d9b865bf476a624fb188ebab686708049149f1eac94e434b926b185d1bf0467f26f62f641a0f832dd22 SHA512 8b85ed0ba2d98135b3b2f7f4e13b7fcff52cd4238fa429e355c4e2033e51d945d8363ecf2bf73c0569e5a071a793bb01cd716113e4672603867a01d258d4aa77
diff --git a/media-video/ffmpeg/ffmpeg-4.3.1.ebuild b/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
index 7c722389ec2b..2fd3ea1ba4c1 100644
--- a/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
@@ -59,7 +59,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest
index 4f5dc6b05fa7..0b7eebc01fa4 100644
--- a/media-video/gxine/Manifest
+++ b/media-video/gxine/Manifest
@@ -1,10 +1,3 @@
-AUX gxine-0.5.905-desktop.patch 377 BLAKE2B 580e7b160d861597250f35c02e6e24471b485d7bf7e9b930463b7bade58145f6cb8b1eddf546239e26d9113c33b5b284bb1dd60d2f013d5d0b18b101e46bb3c7 SHA512 dcc34836594c4616e2962c08ffb20608fd6978f2914231202afb6bae406fdd23b0a0f82cedcd87c9201d004bd0a42c8616ab4b2277ef487d93306a17c50f120e
-AUX gxine-0.5.905-fix-nspr-useage.patch 433 BLAKE2B 3605204a1fc0f4d3c52c0833bf70cb180bc587d2fe91ba93cb432e722447904822ee41d4c08f09070eb5e1187093e9fc2792dadc626a9ff0d0f588380f8e6fe0 SHA512 b528e7c7cb8f3dce8c8ef81ca8f9bf5078e499e7c5f1afe88e85f1e17297ee3de26e2d53ff8dd13bf912a18337eff6b8260fbdcd6012174bb8b017421fdff7de
-AUX gxine-0.5.906-endif.patch 349 BLAKE2B 55f916dda7abea59e4eb54c327ce299c9fb7b50c617a822fdfa23cc7c3062ec8e41433b681858b9adfaeaacd60776e7f4d560bc5df34025766ff2e8e4573ba03 SHA512 7bdea80e1ddc98621d76540cb4fc02e037ef85f2d9bd8d882701d5a2f408f038d23722ac5d57d309f46510358518a4b0ab812b4a67f8630d5c645b2b070f0d39
-AUX gxine-0.5.907-glib-2.31.patch 636 BLAKE2B 08e3839aa025bb88c398b78e65bdc5e0a9a11b106bd7a34ade7f6e95f8efc4c4522aea07891124b89f83db21ba2d657debb69cebcbdc776e5078f79e5496d04a SHA512 0b017254f4a7412ea243e7b8977c37170d18a005a98f9c8b8fea0113c7dc294e6c7c20719fc1a171093b0be7d672bcf0ccc18ea00699829ece327aca86cdc8a9
-AUX gxine-0.5.907-underlinking.patch 781 BLAKE2B 14a02ab58d17507486e43bb803f60b395ee0f617bdfea6924701774b8fd33cbd26217f34c1a6011d9b66e94d45d609952513dbf4eda1bf84fb76d0c74e5e8f44 SHA512 47775e2c06116505644eaeb13c91fa58ca289d133380857eade90e2e7b7520b1d7801626772d537621358676132202ac83d31ac4e0871ad07e1ce68d2b7b7610
-DIST gxine-0.5.907.tar.xz 910528 BLAKE2B 6c45e1b1d9819bdf9f51fbb3c8be5265144ae62f4e419eb4ab002b14c9705b48f943b28a67ff826a90e945679d487f16c9188ed45f26aa8fda0b0b45ddfe7657 SHA512 dd35c8a8810c233e81a28e9f10504645662d60dc9609451e7c49c5d516bb041b61a3b9c8f330021af1e527064cf3f62f37bde98402df7426f501d0c78c571045
 DIST gxine-0.5.909.tar.xz 928544 BLAKE2B 4b649aca2602eafb5931f5f869d00d9e50f8e23c416bba0a661d895630f70840591cd3286626fc024deb45fe1484d8f640c2fb1412f536b665e6ff6b8091ce40 SHA512 87e65bb87fa416535f76253e4394447c6cd7dfaaa209b76c07b9aa81aeca0ca09399991bb2be8e6928fa3883ff61b155e173610c6c28aab10f5b1487e0699215
-EBUILD gxine-0.5.907-r1.ebuild 2502 BLAKE2B 6cb7d5d4155e82094ca59db704105a9fb9e1367f21091f6f420c630bc395fa305e26f87ed81a51bf81b6ff6cb333e65d832112ba74def6bbf2982e498b3bfd93 SHA512 7796247639f723f8b15fb1001ecd8d80a131b93b165dca96aa5b4b7fbd0a1d8cf69d81a31556d5c2d54b3af4127bd8fd957ed88c123a599b65748c4498a25801
 EBUILD gxine-0.5.909.ebuild 2040 BLAKE2B 68a161a5a1639615b8d976df2e78ba22a969140377e3bce3d4f900617b5074875e87243f8e1c76efd0eb9741dc193e0ff52e0fd7733b4de13a8624109dbe057e SHA512 4705f92285382af777273ae36d77ea72fae400f3cdc82ec5b1b6c9e21bc13848da73e1b968aa444b1f791c9ebb1422739155241fa6a55999ea968e8784e30e4b
 MISC metadata.xml 305 BLAKE2B 0704c2d6ae4a0e249d693a63f719b4ec470a08e1cf1b64342571dad7514fd2a14616bf0812aa8f6a0732049c702ee3e00ab005c5b650723577526413c8337ad5 SHA512 396865e52e9dc380cbf6d3dbf33deb69877495356dc6c6a09ba35ab3062608a93e7ab3d5d22564192070ddc186f3a5ff9ceea639911cc554ca6db5084a413587
diff --git a/media-video/gxine/files/gxine-0.5.905-desktop.patch b/media-video/gxine/files/gxine-0.5.905-desktop.patch
deleted file mode 100644
index c5777a157506..000000000000
--- a/media-video/gxine/files/gxine-0.5.905-desktop.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gxine.desktop.in
-+++ gxine.desktop.in
-@@ -14,5 +14,5 @@
- Terminal=false
- Type=Application
- StartupNotify=true
--Categories=AudioVideo;GTK;Player;TV;
--MimeType=x-content/video-dvd;x-content/audio-cdda;x-content/video-vcd;x-content/video-svcd;
-\ No newline at end of file
-+Categories=AudioVideo;Video;GTK;Player;TV;
-+MimeType=x-content/audio-cdda;
-\ No newline at end of file
diff --git a/media-video/gxine/files/gxine-0.5.905-fix-nspr-useage.patch b/media-video/gxine/files/gxine-0.5.905-fix-nspr-useage.patch
deleted file mode 100644
index 9d0e5f87da5c..000000000000
--- a/media-video/gxine/files/gxine-0.5.905-fix-nspr-useage.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.am	2011-01-02 11:33:09.675000001 -0600
-+++ b/src/Makefile.am	2011-01-02 11:34:05.205000001 -0600
-@@ -4,7 +4,7 @@
- 	   -I$(top_builddir)/pixmaps $(LIRC_INCLUDE)
- 
- AM_CFLAGS = $(GNU99) $(XINE_CFLAGS) $(X_CFLAGS) \
--	    $(GTK2_CFLAGS) $(GTHREAD2_CFLAGS) \
-+	    $(GTK2_CFLAGS) $(GTHREAD2_CFLAGS) $(NSPR_CFLAGS) \
- 	    $(HAL_CFLAGS) $(UDEV_CFLAGS) $(DBUS_CFLAGS) $(JS_CFLAGS) \
- 	    -DLOCALEDIR=\"$(localedir)\"
- 
diff --git a/media-video/gxine/files/gxine-0.5.906-endif.patch b/media-video/gxine/files/gxine-0.5.906-endif.patch
deleted file mode 100644
index 40c4a8a39458..000000000000
--- a/media-video/gxine/files/gxine-0.5.906-endif.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-lirc.c:227:3: error: ‘gxine_lirc_thread’ undeclared (first use in this function)
-
---- src/lirc.c
-+++ src/lirc.c
-@@ -223,8 +223,8 @@
-   if (gxine_lirc_thread_created)
-     pthread_join (gxine_lirc_thread, NULL);
-   gxine_lirc_start ();
--#endif
-   JS_SET_RVAL (cx, vp, gxine_lirc_thread ? JSVAL_TRUE : JSVAL_FALSE);
-+#endif
-   return JS_TRUE;
- }
-
diff --git a/media-video/gxine/files/gxine-0.5.907-glib-2.31.patch b/media-video/gxine/files/gxine-0.5.907-glib-2.31.patch
deleted file mode 100644
index 9edea6c84af6..000000000000
--- a/media-video/gxine/files/gxine-0.5.907-glib-2.31.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-http://bugs.gentoo.org/412323
-
---- src/console_output.h
-+++ src/console_output.h
-@@ -21,7 +21,7 @@
- #ifndef GXINE_CONSOLE_OUTPUT_H
- #define GXINE_CONSOLE_OUTPUT_H
- 
--#include <glib/gmessages.h>
-+#include <glib.h>
- 
- void console_output_init (void);
- 
---- src/engine.c
-+++ src/engine.c
-@@ -30,7 +30,7 @@
- #include <errno.h>
- #include <unistd.h>
- 
--#include <glib/gthread.h>
-+#include <glib.h>
- 
- #include "engine.h"
- #include "ui.h"
---- src/main.c
-+++ src/main.c
-@@ -46,7 +46,6 @@
- #include <gdk/gdk.h>
- #include <gdk/gdkkeysyms.h>
- #include <glib.h>
--#include <glib/gmessages.h>
- 
- #include "desktop_integration.h"
- #include "engine.h"
diff --git a/media-video/gxine/files/gxine-0.5.907-underlinking.patch b/media-video/gxine/files/gxine-0.5.907-underlinking.patch
deleted file mode 100644
index 21f8a697766f..000000000000
--- a/media-video/gxine/files/gxine-0.5.907-underlinking.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -333,6 +333,20 @@
- AC_SUBST(THREAD_LIBS)
- 
- dnl ---------------------------------------------
-+dnl Check for libdl/libdld for dlopen()
-+dnl ---------------------------------------------
-+AC_SEARCH_LIBS([dlopen], [dl dld], [], [
-+	AC_MSG_ERROR([unable to find the dlopen() function])
-+])
-+
-+dnl ---------------------------------------------
-+dnl Check for libm for log10()
-+dnl ---------------------------------------------
-+AC_SEARCH_LIBS([log10], [m], [], [
-+	AC_MSG_ERROR([unable to find the log10() function])
-+])
-+
-+dnl ---------------------------------------------
- dnl Check for xine-lib
- dnl ---------------------------------------------
- AM_PATH_XINE([$XINE_LIB_MIN_VER],, AC_MSG_ERROR([*** Please install xine-lib (devel) first ***]))
diff --git a/media-video/gxine/gxine-0.5.907-r1.ebuild b/media-video/gxine/gxine-0.5.907-r1.ebuild
deleted file mode 100644
index 105163c36e4e..000000000000
--- a/media-video/gxine/gxine-0.5.907-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils gnome2-utils multilib nsplugins xdg-utils
-
-DESCRIPTION="GTK+ Front-End for libxine"
-HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="l10n_cs l10n_de lirc nls nsplugin udev +xcb xinerama"
-
-COMMON_DEPEND=">=media-libs/xine-lib-1.1.20
-	x11-libs/gtk+:2
-	>=dev-libs/glib-2
-	>=dev-lang/spidermonkey-1.8.2.15:0
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	lirc? ( app-misc/lirc )
-	nls? ( virtual/libintl )
-	nsplugin? ( dev-libs/nspr
-		x11-libs/libXaw
-		x11-libs/libXt )
-	udev? ( dev-libs/libgudev:= )
-	xcb? ( x11-libs/libxcb )
-	xinerama? ( x11-libs/libXinerama )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	# ld: cannot find -ljs
-	sed -i -e '/JS_LIBS="`spidermonkey_locate_lib/s:js:mozjs:' m4/_js.m4 || die
-
-	if has_version '>=dev-lang/spidermonkey-1.8.7:0'; then
-		sed -i -e 's:mozjs185:mozjs187:' m4/_js.m4 || die #422983
-	fi
-
-	epatch \
-		"${FILESDIR}"/${PN}-0.5.905-desktop.patch \
-		"${FILESDIR}"/${PN}-0.5.905-fix-nspr-useage.patch \
-		"${FILESDIR}"/${PN}-0.5.906-endif.patch \
-		"${FILESDIR}"/${PN}-0.5.907-glib-2.31.patch \
-		"${FILESDIR}"/${PN}-0.5.907-underlinking.patch
-
-	# need to disable calling of xine-list when running without
-	# userpriv, otherwise we get sandbox violations (bug #233847)
-	if [[ ${EUID} == "0" ]]; then
-		sed -i -e 's:^XINE_LIST=.*$:XINE_LIST=:' configure.ac || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable lirc) \
-		--enable-watchdog \
-		$(use_with xcb) \
-		$(has_version '<dev-lang/spidermonkey-1.8.5' && echo --with-spidermonkey=/usr/include/js) \
-		$(use_with nsplugin browser-plugin) \
-		$(use_with udev gudev) \
-		--without-hal \
-		--without-dbus \
-		$(use_with xinerama)
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		docdir=/usr/share/doc/${PF} \
-		docsdir=/usr/share/doc/${PF} \
-		install
-
-	dodoc AUTHORS BUGS ChangeLog README{,_l10n} TODO
-
-	use l10n_cs && dodoc README.cs
-	use l10n_de && dodoc README.de
-
-	use nsplugin && inst_plugin /usr/$(get_libdir)/gxine/gxineplugin.so
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-video/harvid/Manifest b/media-video/harvid/Manifest
index b066279f8a88..b2c42f954895 100644
--- a/media-video/harvid/Manifest
+++ b/media-video/harvid/Manifest
@@ -1,11 +1,4 @@
-AUX ffmpeg29.patch 11613 BLAKE2B 3ec6dcdf43cfefc26ce9e0fb94f66bb33251430ac5636289726364cd6d7abb1e240d34b2d87fb1ffcd39110ef2bb01eb863d91ff71b1236f519310ca17c6fa5f SHA512 40ddf43ea18912ff8bcf73925ac846a4c96a2b4269f4bb1ca6cdc7a314070bea338c8a4a181018781a6036090c67a1622c1b7968ebad0be290e3a60ce01cba53
 AUX jpeg.patch 921 BLAKE2B 321213241c8160a5f06438f5740c795e69797858f33eab0a9a294cba7b006028f0f5d961d84f114b85089c3419c1c5dbcd137a7b213569a926af1f7a1dca0a91 SHA512 c9bc0f20f118955ed31feedbf24f10a3f988e658d2b248db9fdfdc23cabef1e68139ba6d532e0515fc7bb1830bc1c31d15799568a9871800f31fe27191794951
-DIST harvid-0.8.0.tar.gz 116079 BLAKE2B 17e92f9100d4874604d524b31d3bfd50f2b4f1bbd4d53ab82b05e65f4ff7d43176bad2cf57e197d54d4fb1281dc863d6afae50f8b312933014b92def51538dea SHA512 8e999e91e36708df7264fc351e5b6cac6c47fa5e0e612d0917bbfa02e98d13f9758f43312e6febebe56e7b8f2f72b80b6c47598de7100d3b5479b80720b91568
-DIST harvid-0.8.1.tar.gz 116277 BLAKE2B 1382625d241e63f3733817e57be4ad6cc57411aca6fbb7ba472e1b2959362fd384b1e2d1a35594656c30778fae4f54a1c89d1bb6565d006ad801e29c6d657d7d SHA512 b425eca844bb9eec3ec8caa324f783132a3e83938b258a5f8e92ce6dc47108ae491a009223b7e3c8051d965a1ff1b5e5509a804d1462641128a8524cde5ae60a
-DIST harvid-0.8.2.tar.gz 116541 BLAKE2B e3f82ad0b30fa0c1eefe84b85ba658c1897890d2b35aef355dfc029c26140ee5809a42d4e82a2ea515a277f4cc8cd24fdc032f6a42875bcddcb5bd4a77b6282a SHA512 fde352124008cd3d6230950c79a3a2b8d581803f952c7313c941226b00e80f8078053d941f2c5ead04672639a8db696f0c33482f69dab78187801d7ebce23fce
 DIST harvid-0.8.3.tar.gz 116446 BLAKE2B b245166ab2244a7afdddabb463296974c0d995d70ad8af6e93f549f045245597cb4ca3abf47c608eea15089ac5e6f82972b789d9a3f268b8be98f3080fd6e5e7 SHA512 748475602c7279f10790523cbd5cbf34c9cd283ca9e959ac0535fbb5b4ee6d2fcab976c5ddba3fa40862552b49d73df7145f36d26c9fe708063505812537a8ac
-EBUILD harvid-0.8.0.ebuild 961 BLAKE2B e4357dc555a4dbc0a071cdb1aacae0236f6fbf4bc95c9a7f036b0dc02a707aa6c10b68fdfd1f4c6ab32f17f89870b5b1899a7919308404ea3faee37b5efaf6c5 SHA512 77429081faeccf5bf2f36ee9e28ca972256eb2b85762bef355a478c11885885b9145ab4f34ea681186abdb6872554b61f15820361d8ebbfb40809ecd489ac43f
-EBUILD harvid-0.8.1.ebuild 905 BLAKE2B 025184861535e8073613e1be3a4daf26a534ee1ce84885c25ade482607bc3c511990755f5d81807dccc4f4bbabf9ab3cf7e32949fd76034ae105ff2431b79ed0 SHA512 a00c58f253a040b927198d96591229c660832b9406cd373e3cc45831a4ce691a19e2662468d8efc2caca2f30f4654a4ef4cd6a085936b5e12f88b7ddfb68e70f
-EBUILD harvid-0.8.2.ebuild 905 BLAKE2B 025184861535e8073613e1be3a4daf26a534ee1ce84885c25ade482607bc3c511990755f5d81807dccc4f4bbabf9ab3cf7e32949fd76034ae105ff2431b79ed0 SHA512 a00c58f253a040b927198d96591229c660832b9406cd373e3cc45831a4ce691a19e2662468d8efc2caca2f30f4654a4ef4cd6a085936b5e12f88b7ddfb68e70f
 EBUILD harvid-0.8.3-r1.ebuild 968 BLAKE2B b5ea60fdb804cca1dffd2cefd5becab6ed2bf18dcb8a46087fd6d23bbaa7d20cbcbe7c3ce4e8f672553ef25b7a3e592e16f11a6a5b5ad5346205ba86a1fc8e3d SHA512 5979b29c1632798d9efe1e6dbf9c2678ecc9dcec38d9b02891218814d542fcc424dc15013ebf1487360947d1a0c2f6049ce5295cf24a2dff87bf87a67df6017a
 MISC metadata.xml 306 BLAKE2B 5c1fba580f975a8cbd2247e002f0565de5a1f406f4361e312865e9e7b6fdd406a3e128fee109fddcf37b5978e865850a7de3abbe656f50d3c1642650d8f371f2 SHA512 4fa6b478e09481b73a9c1743c79b108e115a9452c31f3a37134d9ef939f4118c27690e9e7f33fcd0fa7a558d73840b84b944e14344d1ebffc10febc16cbf2315
diff --git a/media-video/harvid/files/ffmpeg29.patch b/media-video/harvid/files/ffmpeg29.patch
deleted file mode 100644
index 09fe15abca27..000000000000
--- a/media-video/harvid/files/ffmpeg29.patch
+++ /dev/null
@@ -1,301 +0,0 @@
-Index: harvid-0.8.0/libharvid/decoder_ctrl.c
-===================================================================
---- harvid-0.8.0.orig/libharvid/decoder_ctrl.c
-+++ harvid-0.8.0/libharvid/decoder_ctrl.c
-@@ -29,7 +29,7 @@
- #include "ffcompat.h"
- #include "dlog.h"
- 
--#define DEFAULT_PIX_FMT (PIX_FMT_RGB24) // TODO global default
-+#define DEFAULT_PIX_FMT (AV_PIX_FMT_RGB24) // TODO global default
- 
- //#define HASH_EMIT_KEYS 3
- #define HASH_FUNCTION HASH_SAX
-@@ -104,15 +104,15 @@ static inline int my_open_movie(void **v
-   }
-   ff_create(vd);
-   assert (
--         render_fmt == PIX_FMT_YUV420P
--      || render_fmt == PIX_FMT_YUV440P
--      || render_fmt == PIX_FMT_YUYV422
--      || render_fmt == PIX_FMT_UYVY422
--      || render_fmt == PIX_FMT_RGB24
--      || render_fmt == PIX_FMT_BGR24
--      || render_fmt == PIX_FMT_RGBA
--      || render_fmt == PIX_FMT_ARGB
--      || render_fmt == PIX_FMT_BGRA
-+         render_fmt == AV_PIX_FMT_YUV420P
-+      || render_fmt == AV_PIX_FMT_YUV440P
-+      || render_fmt == AV_PIX_FMT_YUYV422
-+      || render_fmt == AV_PIX_FMT_UYVY422
-+      || render_fmt == AV_PIX_FMT_RGB24
-+      || render_fmt == AV_PIX_FMT_BGR24
-+      || render_fmt == AV_PIX_FMT_RGBA
-+      || render_fmt == AV_PIX_FMT_ARGB
-+      || render_fmt == AV_PIX_FMT_BGRA
-       );
- 
-   if (!ff_open_movie (*vd, fn, render_fmt)) {
-@@ -144,7 +144,7 @@ static inline void my_get_info_canonical
- static JVOBJECT *newjvo (JVOBJECT *jvo, pthread_mutex_t *appendlock) {
-   debugmsg(DEBUG_DCTL, "DCTL: newjvo() allocated new decoder object\n");
-   JVOBJECT *n = calloc(1, sizeof(JVOBJECT));
--  n->fmt = PIX_FMT_NONE;
-+  n->fmt = AV_PIX_FMT_NONE;
-   n->frame = -1;
-   pthread_mutex_init(&n->lock, NULL);
-   JVOBJECT *cptr = jvo;
-@@ -175,8 +175,8 @@ static JVOBJECT *testjvd(JVOBJECT *jvo,
-     if (!(cptr->flags&VOF_VALID) || cptr->id != id) {
-       continue;
-     }
--    if (fmt != PIX_FMT_NONE && cptr->fmt != fmt
--        && cptr->fmt != PIX_FMT_NONE
-+    if (fmt != AV_PIX_FMT_NONE && cptr->fmt != fmt
-+        && cptr->fmt != AV_PIX_FMT_NONE
-         ) {
-       continue;
-     }
-@@ -324,7 +324,7 @@ static int clearjvo(JVD *jvd, int f, int
-       my_destroy(&cptr->decoder);
-       cptr->decoder = NULL;
-       cptr->flags &= ~VOF_OPEN;
--      cptr->fmt = PIX_FMT_NONE;
-+      cptr->fmt = AV_PIX_FMT_NONE;
-     }
- 
-     hashref_delete_jvo(jvd, cptr);
-@@ -410,7 +410,7 @@ static JVOBJECT *getjvo(JVD *jvd) {
-         if (cptr->flags&(VOF_OPEN)) {
-           my_destroy(&cptr->decoder); // close it.
-           cptr->decoder = NULL; // not really need..
--          cptr->fmt = PIX_FMT_NONE;
-+          cptr->fmt = AV_PIX_FMT_NONE;
-         }
- 
-         hashref_delete_jvo(jvd, cptr);
-@@ -563,7 +563,7 @@ static JVOBJECT *new_video_object(JVD *j
- 
- 
-   jvo->id = id;
--  jvo->fmt = fmt == PIX_FMT_NONE ? DEFAULT_PIX_FMT : fmt;
-+  jvo->fmt = fmt == AV_PIX_FMT_NONE ? DEFAULT_PIX_FMT : fmt;
-   jvo->frame = -1;
-   jvo->flags |= VOF_VALID;
- 
-@@ -619,7 +619,7 @@ static void * dctrl_get_decoder(void *p,
-    * use it IFF frame == -1  (ie. non-blocking info lookups) */
-   if (frame < 0) {
-     pthread_rwlock_rdlock(&jvd->lock_jdh);
--    if (fmt == PIX_FMT_NONE) {
-+    if (fmt == AV_PIX_FMT_NONE) {
-       HASH_FIND(hhi, jvd->jvi, &id, sizeof(unsigned short), jvo);
-     } else {
-       const JVOBJECT jvt = {id, fmt, 0};
-@@ -670,7 +670,7 @@ static void * dctrl_get_decoder(void *p,
-       jvo->lru = time(NULL);
-       pthread_mutex_unlock(&jvo->lock);
- 
--      if (fmt == PIX_FMT_NONE) fmt = DEFAULT_PIX_FMT;
-+      if (fmt == AV_PIX_FMT_NONE) fmt = DEFAULT_PIX_FMT;
- 
-       if (!my_open_movie(&jvo->decoder, get_fn(jvd, jvo->id), fmt)) {
-         pthread_mutex_lock(&jvo->lock);
-@@ -798,7 +798,7 @@ int dctrl_decode(void *p, unsigned short
- 
- int dctrl_get_info(void *p, unsigned short id, VInfo *i) {
-   int err = 0;
--  JVOBJECT *jvo = (JVOBJECT*) dctrl_get_decoder(p, id, PIX_FMT_NONE, -1, &err);
-+  JVOBJECT *jvo = (JVOBJECT*) dctrl_get_decoder(p, id, AV_PIX_FMT_NONE, -1, &err);
-   if (!jvo) return err;
-   my_get_info(jvo->decoder, i);
-   jvo->hitcount_info++;
-Index: harvid-0.8.0/libharvid/ffdecoder.c
-===================================================================
---- harvid-0.8.0.orig/libharvid/ffdecoder.c
-+++ harvid-0.8.0/libharvid/ffdecoder.c
-@@ -102,7 +102,7 @@ static int ff_getbuffersize(void *ptr, s
- 
- static void render_empty_frame(ffst *ff, uint8_t* buf, int w, int h, int xoff, int ys) {
-   switch (ff->render_fmt) {
--    case PIX_FMT_UYVY422:
-+    case AV_PIX_FMT_UYVY422:
-       {
- 	int i;
- 	for (i = 0; i < w*h*2; i += 2) {
-@@ -110,7 +110,7 @@ static void render_empty_frame(ffst *ff,
- 	}
-       }
-       break;
--    case PIX_FMT_YUYV422:
-+    case AV_PIX_FMT_YUYV422:
-       {
- 	int i;
- 	for (i = 0; i < w*h*2; i += 2) {
-@@ -118,25 +118,25 @@ static void render_empty_frame(ffst *ff,
- 	}
-       }
-       break;
--    case PIX_FMT_YUV420P:
-+    case AV_PIX_FMT_YUV420P:
-       {
- 	size_t Ylen = w * h;
- 	memset(buf, 0, Ylen);
- 	memset(buf+Ylen, 0x80, Ylen/2);
-       }
-       break;
--    case PIX_FMT_YUV440P:
-+    case AV_PIX_FMT_YUV440P:
-       {
- 	size_t Ylen = w * h;
- 	memset(buf, 0, Ylen);
- 	memset(buf+Ylen, 0x80, Ylen);
-       }
-       break;
--    case PIX_FMT_BGR24:
--    case PIX_FMT_RGB24:
--    case PIX_FMT_RGBA:
--    case PIX_FMT_BGRA:
--    case PIX_FMT_ARGB:
-+    case AV_PIX_FMT_BGR24:
-+    case AV_PIX_FMT_RGB24:
-+    case AV_PIX_FMT_RGBA:
-+    case AV_PIX_FMT_BGRA:
-+    case AV_PIX_FMT_ARGB:
-       memset(buf, 0, ff_getbuffersize(ff, NULL));
-       break;
-     default:
-@@ -147,8 +147,8 @@ static void render_empty_frame(ffst *ff,
- #if 1 // draw cross
-   int x,y;
-   switch (ff->render_fmt) {
--    case PIX_FMT_YUV420P:
--    case PIX_FMT_YUV440P:
-+    case AV_PIX_FMT_YUV420P:
-+    case AV_PIX_FMT_YUV440P:
-       for (x = 0, y = 0; x < w-1; x++, y = h * x / w) {
- 	int off = (x + w * y);
- 	buf[off]=127; buf[off+1]=127;
-@@ -156,8 +156,8 @@ static void render_empty_frame(ffst *ff,
- 	buf[off]=127; buf[off+1]=127;
-       }
-       break;
--    case PIX_FMT_YUYV422:
--    case PIX_FMT_UYVY422:
-+    case AV_PIX_FMT_YUYV422:
-+    case AV_PIX_FMT_UYVY422:
-       for (x = 0, y = 0; x < w-1; x++, y = h * x / w) {
- 	int off = (x + w * y) * 2;
- 	buf[off] = 127; buf[off+1] = 127;
-@@ -165,8 +165,8 @@ static void render_empty_frame(ffst *ff,
- 	buf[off] = 127; buf[off+1] = 127;
-       }
-       break;
--    case PIX_FMT_RGB24:
--    case PIX_FMT_BGR24:
-+    case AV_PIX_FMT_RGB24:
-+    case AV_PIX_FMT_BGR24:
-       for (x = 0, y = 0; x < w-1; x++, y = h * x / w) {
- 	int off = 3 * (x + w * y);
- 	buf[off]=255; buf[off+1]=255; buf[off+2]=255;
-@@ -174,11 +174,11 @@ static void render_empty_frame(ffst *ff,
- 	buf[off]=255; buf[off+1]=255; buf[off+2]=255;
-       }
-       break;
--    case PIX_FMT_RGBA:
--    case PIX_FMT_BGRA:
--    case PIX_FMT_ARGB:
-+    case AV_PIX_FMT_RGBA:
-+    case AV_PIX_FMT_BGRA:
-+    case AV_PIX_FMT_ARGB:
-       {
--      const int O = (ff->render_fmt == PIX_FMT_ARGB) ? 1 : 0;
-+      const int O = (ff->render_fmt == AV_PIX_FMT_ARGB) ? 1 : 0;
-       for (x = 0, y = 0; x < w-1; x++, y = h * x / w) {
- 	int off = 4 * (x + w * y) + O;
- 	buf[off]=255; buf[off+1]=255; buf[off+2]=255;
-@@ -749,7 +749,7 @@ void ff_get_info_canonical(void *ptr, VI
- 
- void ff_create(void **ff) {
-   (*((ffst**)ff)) = (ffst*) calloc(1, sizeof(ffst));
--  (*((ffst**)ff))->render_fmt = PIX_FMT_RGB24;
-+  (*((ffst**)ff))->render_fmt = AV_PIX_FMT_RGB24;
-   (*((ffst**)ff))->want_ignstart = 0;
-   (*((ffst**)ff))->want_genpts = 0;
-   (*((ffst**)ff))->packet.data = NULL;
-@@ -792,25 +792,25 @@ void ff_resize(void *ptr, int w, int h,
- 
- const char * ff_fmt_to_text(int fmt) {
-   switch (fmt) {
--    case PIX_FMT_NONE:
-+    case AV_PIX_FMT_NONE:
-       return "-";
--    case PIX_FMT_BGR24:
-+    case AV_PIX_FMT_BGR24:
-       return "BGR24";
--    case PIX_FMT_RGB24:
-+    case AV_PIX_FMT_RGB24:
-       return "RGB24";
--    case PIX_FMT_RGBA:
-+    case AV_PIX_FMT_RGBA:
-       return "RGBA";
--    case PIX_FMT_BGRA:
-+    case AV_PIX_FMT_BGRA:
-       return "BGRA";
--    case PIX_FMT_ARGB:
-+    case AV_PIX_FMT_ARGB:
-       return "ARGB";
--    case PIX_FMT_YUV420P:
-+    case AV_PIX_FMT_YUV420P:
-       return "YUV420P";
--    case PIX_FMT_YUYV422:
-+    case AV_PIX_FMT_YUYV422:
-       return "YUYV422";
--    case PIX_FMT_UYVY422:
-+    case AV_PIX_FMT_UYVY422:
-       return "UYVY422";
--    case PIX_FMT_YUV440P:
-+    case AV_PIX_FMT_YUV440P:
-       return "YUV440P";
-     default:
-       return "?";
-Index: harvid-0.8.0/src/ics_handler.c
-===================================================================
---- harvid-0.8.0.orig/src/ics_handler.c
-+++ harvid-0.8.0/src/ics_handler.c
-@@ -109,16 +109,16 @@ void parse_param(struct queryparserstate
-     else if (!strncmp(val, "jpeg",4)) {qps->a->render_fmt = FMT_JPG; qps->a->misc_int = atoi(&val[4]);}
-     else if (!strcmp(val, "png"))      qps->a->render_fmt = FMT_PNG;
-     else if (!strcmp(val, "ppm"))      qps->a->render_fmt = FMT_PPM;
--    else if (!strcmp(val, "yuv"))     {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_YUV420P;}
--    else if (!strcmp(val, "yuv420"))  {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_YUV420P;}
--    else if (!strcmp(val, "yuv440"))  {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_YUV440P;}
--    else if (!strcmp(val, "yuv422"))  {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_YUYV422;}
--    else if (!strcmp(val, "uyv422"))  {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_UYVY422;}
--    else if (!strcmp(val, "rgb"))     {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_RGB24;}
--    else if (!strcmp(val, "bgr"))     {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_BGR24;}
--    else if (!strcmp(val, "rgba"))    {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_RGBA;}
--    else if (!strcmp(val, "argb"))    {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_ARGB;}
--    else if (!strcmp(val, "bgra"))    {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_BGRA;}
-+    else if (!strcmp(val, "yuv"))     {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_YUV420P;}
-+    else if (!strcmp(val, "yuv420"))  {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_YUV420P;}
-+    else if (!strcmp(val, "yuv440"))  {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_YUV440P;}
-+    else if (!strcmp(val, "yuv422"))  {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_YUYV422;}
-+    else if (!strcmp(val, "uyv422"))  {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_UYVY422;}
-+    else if (!strcmp(val, "rgb"))     {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_RGB24;}
-+    else if (!strcmp(val, "bgr"))     {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_BGR24;}
-+    else if (!strcmp(val, "rgba"))    {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_RGBA;}
-+    else if (!strcmp(val, "argb"))    {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_ARGB;}
-+    else if (!strcmp(val, "bgra"))    {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_BGRA;}
-     /* info, version, rc,... format */
-     else if (!strcmp(val, "html"))    qps->a->render_fmt = OUT_HTML;
-     else if (!strcmp(val, "xhtml"))   qps->a->render_fmt = OUT_HTML;
-@@ -141,7 +141,7 @@ static void parse_http_query_params(stru
- static int parse_http_query(CONN *c, char *query, httpheader *h, ics_request_args *a) {
-   struct queryparserstate qps = {a, NULL, 0};
- 
--  a->decode_fmt = PIX_FMT_RGB24;
-+  a->decode_fmt = AV_PIX_FMT_RGB24;
-   a->render_fmt = FMT_PNG;
-   a->frame = 0;
-   a->misc_int = 0;
diff --git a/media-video/harvid/harvid-0.8.0.ebuild b/media-video/harvid/harvid-0.8.0.ebuild
deleted file mode 100644
index 45de47a567e3..000000000000
--- a/media-video/harvid/harvid-0.8.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs multilib eutils
-
-DESCRIPTION="HTTP Ardour Video Daemon"
-HOMEPAGE="http://x42.github.io/harvid/"
-SRC_URI="https://github.com/x42/harvid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=media-video/ffmpeg-2.6:0=
-	media-libs/libpng:0=
-	virtual/jpeg:0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/ffmpeg29.patch"
-}
-
-hv_make() {
-	emake \
-		CC="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		STRIP="true" \
-		NM="$(tc-getNM) -B" \
-		LD="$(tc-getLD)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX:-/}usr" \
-		libdir="${EPREFIX:-/}usr/$(get_libdir)" \
-		hdocdir="${EPREFIX:-/}usr/share/doc/${PF}" \
-		"${@}"
-}
-
-src_compile() {
-	hv_make -C libharvid
-	hv_make -C src
-	hv_make
-}
-
-src_install() {
-	hv_make DESTDIR="${D}" install
-	dodoc ChangeLog README.md
-}
diff --git a/media-video/harvid/harvid-0.8.1.ebuild b/media-video/harvid/harvid-0.8.1.ebuild
deleted file mode 100644
index d7829ef1ef59..000000000000
--- a/media-video/harvid/harvid-0.8.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs multilib eutils
-
-DESCRIPTION="HTTP Ardour Video Daemon"
-HOMEPAGE="http://x42.github.io/harvid/"
-SRC_URI="https://github.com/x42/harvid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=media-video/ffmpeg-2.6:0=
-	media-libs/libpng:0=
-	virtual/jpeg:0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-hv_make() {
-	emake \
-		CC="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		STRIP="true" \
-		NM="$(tc-getNM) -B" \
-		LD="$(tc-getLD)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX:-/}usr" \
-		libdir="${EPREFIX:-/}usr/$(get_libdir)" \
-		hdocdir="${EPREFIX:-/}usr/share/doc/${PF}" \
-		"${@}"
-}
-
-src_compile() {
-	hv_make -C libharvid
-	hv_make -C src
-	hv_make
-}
-
-src_install() {
-	hv_make DESTDIR="${D}" install
-	dodoc ChangeLog README.md
-}
diff --git a/media-video/harvid/harvid-0.8.2.ebuild b/media-video/harvid/harvid-0.8.2.ebuild
deleted file mode 100644
index d7829ef1ef59..000000000000
--- a/media-video/harvid/harvid-0.8.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs multilib eutils
-
-DESCRIPTION="HTTP Ardour Video Daemon"
-HOMEPAGE="http://x42.github.io/harvid/"
-SRC_URI="https://github.com/x42/harvid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=media-video/ffmpeg-2.6:0=
-	media-libs/libpng:0=
-	virtual/jpeg:0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-hv_make() {
-	emake \
-		CC="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		STRIP="true" \
-		NM="$(tc-getNM) -B" \
-		LD="$(tc-getLD)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX:-/}usr" \
-		libdir="${EPREFIX:-/}usr/$(get_libdir)" \
-		hdocdir="${EPREFIX:-/}usr/share/doc/${PF}" \
-		"${@}"
-}
-
-src_compile() {
-	hv_make -C libharvid
-	hv_make -C src
-	hv_make
-}
-
-src_install() {
-	hv_make DESTDIR="${D}" install
-	dodoc ChangeLog README.md
-}
diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest
index fdd2d0786a2f..02af79235c77 100644
--- a/media-video/libva-utils/Manifest
+++ b/media-video/libva-utils/Manifest
@@ -3,6 +3,6 @@ DIST libva-utils-2.8.0.tar.bz2 1037112 BLAKE2B 9168d7d489e1574d970e9e3a270946de5
 DIST libva-utils-2.9.1.tar.gz 1198337 BLAKE2B 58f5a6a537c68eed74aec5dc8f1c4b5a0431062d1d9803d8ccb1e5c3b534edf4f91288009d5940a0ddab49beeadae92bf361bec0bee8a3214f04f3c6767b0992 SHA512 39d79d4eed1fc0890fbf89d5689d4f01f704d3c71b4986e0eaf4c4a2f836cc36338d0a01630092a31b740588426398d0381eae1dc0302b0df94859d9161d8378
 EBUILD libva-utils-2.4.0.ebuild 1274 BLAKE2B 0f68cfea6a566fd35bf63ff6d655ef8ddcc2e28d8cb6379ae0cf72a69abe3d2efb4df404da98bf454c24bda07e6b78c80ad0a856142d60d459e0fe48f5f226a4 SHA512 97fd99aee8f53392d1df26460ada81f940cad393672adcc3cfff42cceb58effdf841392696f564f27e23014f0799e8430675a9e9d48b7b8b238a8a4953ade38e
 EBUILD libva-utils-2.8.0.ebuild 1277 BLAKE2B fe2f300acb0fcc91b4aa3fbffd7a587b7a06190df5e7f88b2a277cc0001f72d0c8741106db1fe7c46cb2bf16be196bb31b39f215da23a1d3a1765566c4765a6a SHA512 8b649c415532ef439847cc6639a22b2b1ca2cf02bf72b58a4aca8f518b9349801f451122fc0d0f8cba7398b1d772e30ddf26c1ea399f90386d7a3570fd82ea76
-EBUILD libva-utils-2.9.1.ebuild 1276 BLAKE2B 830f4728dcb1e436ae7755097fc55ff341ef8c14c7fa1daa56587aaeb83a94f675c0e89e5d4aff57b54f08785aa96fb2511564159d12a8b046373865751ad089 SHA512 be383fe04d33543acddddae27c843c0773fe875102984e23776582b601b7cc109f3024856aa596770a277b852cd6096a0bae24018a39179529c075aff8ec40b2
+EBUILD libva-utils-2.9.1.ebuild 1283 BLAKE2B f4fe7461cd06c506e6e6291368dd1866aab6fecc2ec4fecd5f20e1778cf8198a46565089f553495e85f6c8b0daa64e4852ffc7153e6ded66f4e8683acf77e1a0 SHA512 a69d691c8b0f7921844e4b8297aaccb7b2488840d35b88fc89202f78a7ef06b9f4f7043be25785b96b4df4937047998bcfa55111e10fe641d48f955a49accecf
 EBUILD libva-utils-9999.ebuild 1276 BLAKE2B 830f4728dcb1e436ae7755097fc55ff341ef8c14c7fa1daa56587aaeb83a94f675c0e89e5d4aff57b54f08785aa96fb2511564159d12a8b046373865751ad089 SHA512 be383fe04d33543acddddae27c843c0773fe875102984e23776582b601b7cc109f3024856aa596770a277b852cd6096a0bae24018a39179529c075aff8ec40b2
 MISC metadata.xml 414 BLAKE2B 38e8ac043ae6960cdc20190dd2f7f802b006c4d1f71920d1b699a8750a53c65ceeaa32f4d82f0699a5989f2f252daa1fbe5e2dfa330b9eb745a12cce8da045f8 SHA512 a515f432546c6063a66694fb5fbd310d498d2970cac15dea1c9497d086cb517557c15da0837f068bf28bd2e000345f95c68f4aa6170d65b960ba7e6d44e8ad57
diff --git a/media-video/libva-utils/libva-utils-2.9.1.ebuild b/media-video/libva-utils/libva-utils-2.9.1.ebuild
index 61b1748bbee5..c560f3968fb9 100644
--- a/media-video/libva-utils/libva-utils-2.9.1.ebuild
+++ b/media-video/libva-utils/libva-utils-2.9.1.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/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index a86096aa844d..d920de70cd0c 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -3,5 +3,5 @@ DIST mediainfo_20.08.tar.xz 1994480 BLAKE2B bab189f1cd667977c744744bb272f8010c4a
 DIST mediainfo_20.09.tar.xz 1984148 BLAKE2B 6926d9ce787b9f9e5c07fe0ddf98e186139ea25c7ab6b3573dc1732850a7f98aeefdeca2157fdcad83d652332705028df12a1cf1e6377f9c1e23b7865578cfd8 SHA512 b6c8bf661585fa6b8e82c7f4bafacae8505078c5c57bc1c703ed16ac237dad0829569dd33fdaaadccd394bdd93088d9b71e5ad2c2294f75aa641004ec91feca9
 EBUILD mediainfo-20.03.ebuild 1581 BLAKE2B 627f4f7c702c4c64c66004fc47b010ea331029ac28183d389b81d8d6682f4dd6b915f135f3d0f9cfaa3eff3066013e83cef477103ba5a784867e63fdcd98368b SHA512 1bad9e19544f7bf7a290f9927c83d4fe56189e8265afbfea1644eb39634b03c97488283d1250bdbcaee4c3696aeb62e59529cf02276b85b76170263f71e5a289
 EBUILD mediainfo-20.08.ebuild 1581 BLAKE2B 627f4f7c702c4c64c66004fc47b010ea331029ac28183d389b81d8d6682f4dd6b915f135f3d0f9cfaa3eff3066013e83cef477103ba5a784867e63fdcd98368b SHA512 1bad9e19544f7bf7a290f9927c83d4fe56189e8265afbfea1644eb39634b03c97488283d1250bdbcaee4c3696aeb62e59529cf02276b85b76170263f71e5a289
-EBUILD mediainfo-20.09.ebuild 1583 BLAKE2B baac9d8a581b1d936650d122a72fcc309004744accf1f2d4b3a7080bfd3b462a0dabb6c67d7110fa65ddaafe12935f88e64edbe78a539a321165752cc2b4d91e SHA512 88714894cbffe34641c90b55b172a7c8d5710219e997df5595e3437ef5e836590f10e140376b0d51ae0481ce97092f7b3e6298f715acb96bd827018c00e67170
+EBUILD mediainfo-20.09.ebuild 1581 BLAKE2B 627f4f7c702c4c64c66004fc47b010ea331029ac28183d389b81d8d6682f4dd6b915f135f3d0f9cfaa3eff3066013e83cef477103ba5a784867e63fdcd98368b SHA512 1bad9e19544f7bf7a290f9927c83d4fe56189e8265afbfea1644eb39634b03c97488283d1250bdbcaee4c3696aeb62e59529cf02276b85b76170263f71e5a289
 MISC metadata.xml 343 BLAKE2B 53fbddabb217e6584379432d0ee85ef7e8a5a9ba13bf0e9fe71a22c2a1f0495d692e51cf17ea17427f22d65c94fc97bb7c5d0a3407e9c810c91616aa92d3e71e SHA512 3647e319de82c1521bd1e6a28dc7a64435b052130102d7a4b6f1478d92cfc94a164b7d9435855b4929d584be2f886f6bc51c84f6cb63b8431ac028583d57f0a3
diff --git a/media-video/mediainfo/mediainfo-20.09.ebuild b/media-video/mediainfo/mediainfo-20.09.ebuild
index dec60a2ece9e..a79f1f182702 100644
--- a/media-video/mediainfo/mediainfo-20.09.ebuild
+++ b/media-video/mediainfo/mediainfo-20.09.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/motion/Manifest b/media-video/motion/Manifest
index 859e098cea62..f6eac22d5078 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -1,10 +1,5 @@
-AUX 4.1.1/Fix-build-errors-with-FFmpeg-4.0.patch 1768 BLAKE2B d2ec71166a4c3779007aabd975e3bd003b17713ff1bcd3c94e57183936c5f6fc24abd6ed5231dca94d1d37f66db7a13358c5dc52795200d190d848f0360ec1e6 SHA512 bee1af2f32215b2abc006b9f12c77e138dbe9bb2de41ae9f1022b6c10340cb8e2eb2831459b241c44e3a0789a9df81b7227dfc07beb3e7e3af6f718fb4a4c56d
-AUX motion.conf 37 BLAKE2B 0a30bc830b519022f8c3bfdedb274329ecb506f3b3e42fb3de1f61513b9ef86c7884a9298c17b19b4afbb83b33ceb4f35f85fd377775e2485bbbfa2feb76833e SHA512 06e2dd29b946f35c78e7cf0ddeca727ca7f3f84e57e38b6688b2a493d487061ea6c959c5b365305a7813e0d3315f719003c681c26265566f46faa6ff88606853
-AUX motion.confd-r1 272 BLAKE2B bb395beafecf0498158ff0358b489ab251d79e005148715ef89ea882dec945f82faec60c2650e703d4db82e0bef3ccc8abd9768adf23dc8df5161f7fd8f24714 SHA512 8a67b5b0360924e58ba3136a737ce73bb43201a49b2b6e2c632426561b830f6ab55cbbeaa89be7f1683aa8fd322b4f31b9f560e67a93eaceb964c9f56ceef363
 AUX motion.confd-r4 773 BLAKE2B 1a7f0128ec385751d75152c4a36cc2afe57a36b55cd5efe5035af3e78df775edf11568f8bae3acbf7c986b967087cb8b633724bb08bbbf24a0102a082dc5a55f SHA512 4aff16be6fd77909751b034ada9611522acb3c8de0fd160fe67c415eb54cb63a8adad055972ffc3ea7428588a6f5673bb9b311be4660c180796d6067eb3c45e5
-AUX motion.initd-r3 1163 BLAKE2B 1926b3468c1b49651377c2704fe8f5cb65c9eed5a4bd11efe365aa01b9acd5300d7dae2f22c93748c2e1c1c49be9d707ad7d1c14d49dc092f18e6ddfe0e06ac5 SHA512 7c7201768fd868f851bb35b8df5e22d43688f1729178fd94d10f21436db6d5c178811bcef8b51c5b79b426bb92d542892edd65ee0414acaa799639a3a226934e
 AUX motion.initd-r4 975 BLAKE2B a9f001318783f793474ef295d5724ff207d646051783d9927b2949c5c3adf65fef11ca63071f1401cab017ba1cf676f39bb2298b848e9f57185a1875c7e4c316 SHA512 ee0b471da01f7a7bb6a19fb974ec775e5d830b4970b5a690b2ba8043bddfe79245c72546d4a41b5d3bb50adbe03b79373ecc643161b50bd88386e66ee318b9ef
-AUX motion.service 358 BLAKE2B 8f118322ec347472d1aec2d89e37335ecce594b1c0f194b3adfad3ce3d68cb5d6f4db6f2f932769e4adbc3b3c2094e1426f1d7c64d3985267a4558f549d6f4ed SHA512 b87bb9edd8d3b53e14eb0292358d05ea6c81f25c9d2b5b2208b5208ba57054dec64e1057f3bfbf5b2b490f643bd2ee497da038aad56e1274b9bf513f1366c8ca
 AUX motion.service-r4 462 BLAKE2B 3aeac7440cb545bbf7c41a59eb81260202e7783f701ed20ad33e8f69356bcc78ff7a23b3f518df7dc0ab0eb664d05b75e449afa7abbf1f993ad3c77b0eb83fb7 SHA512 2fbcdb381888d63d0becfc04473f915d75f97e267e4fb2bcf2554e53cbc302fd45b544b7c267a99a05540fb79ce4fcf3e3bc7e973fe08d0db5481e7728c02a1f
 DIST motion-release-4.3.1.tar.gz 849633 BLAKE2B 33039d9b8b6db0698767892997be958d84a881cc56e8cdc31d8c27242c972e629d328197c92f91c1b71a957d85807877dc602f474d430384b1e27c9213ddc697 SHA512 17033dab055c4f1d9e2912a27d0a5b419d325b0781def98428a6117e38c62201b87199210071ba93d6c4dae514733b749e39cbc1befe6242f157d4583e07dcc6
 EBUILD motion-4.3.1.ebuild 2855 BLAKE2B 595ffa0920ab840308ca9562657532b61cf72d528a2bc976b384332d97ed255512710c142267479be2b04b7c255004d32ff230c5324871d7f85ba65281157667 SHA512 36bf969a4608a3156d1a798ae39f0df5d174d0557ff752dfdc060aa7e05e6146ff432827d0537b07231bdc922c8f886ef51c34a6f8f9097820ac177f239038fd
diff --git a/media-video/motion/files/4.1.1/Fix-build-errors-with-FFmpeg-4.0.patch b/media-video/motion/files/4.1.1/Fix-build-errors-with-FFmpeg-4.0.patch
deleted file mode 100644
index 641d68a8d0c5..000000000000
--- a/media-video/motion/files/4.1.1/Fix-build-errors-with-FFmpeg-4.0.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 9a9e918ec819277c6c5c2f21b52dd63570e426a7 Mon Sep 17 00:00:00 2001
-From: James Cowgill <jcowgill@users.noreply.github.com>
-Date: Sun, 25 Feb 2018 20:13:57 +0000
-Subject: [PATCH] Fix build errors with FFmpeg 4.0
-
----
- ffmpeg.c | 17 +++++++++++++++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/ffmpeg.c b/ffmpeg.c
-index b2780bb..23644db 100644
---- a/ffmpeg.c
-+++ b/ffmpeg.c
-@@ -67,6 +67,19 @@
- 
- #endif
- 
-+/*********************************************/
-+#if (LIBAVCODEC_VERSION_MAJOR >= 57)
-+
-+#define MY_CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER
-+#define MY_CODEC_FLAG_QSCALE        AV_CODEC_FLAG_QSCALE
-+
-+#else
-+
-+#define MY_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER
-+#define MY_CODEC_FLAG_QSCALE        CODEC_FLAG_QSCALE
-+
-+#endif
-+
- /*********************************************/
- AVFrame *my_frame_alloc(void){
-     AVFrame *pic;
-@@ -538,7 +551,7 @@ static int ffmpeg_set_quality(struct ffmpeg *ffmpeg){
-         /* The selection of 8000 in the else is a subjective number based upon viewing output files */
-         if (ffmpeg->vbr > 0){
-             ffmpeg->vbr =(int)(((100-ffmpeg->vbr)*(100-ffmpeg->vbr)*(100-ffmpeg->vbr) * 8000) / 1000000) + 1;
--            ffmpeg->ctx_codec->flags |= CODEC_FLAG_QSCALE;
-+            ffmpeg->ctx_codec->flags |= MY_CODEC_FLAG_QSCALE;
-             ffmpeg->ctx_codec->global_quality=ffmpeg->vbr;
-         }
-     }
-@@ -663,7 +676,7 @@ static int ffmpeg_set_codec(struct ffmpeg *ffmpeg){
-       ffmpeg->ctx_codec->strict_std_compliance = -2;
-       ffmpeg->ctx_codec->level = 3;
-     }
--    ffmpeg->ctx_codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+    ffmpeg->ctx_codec->flags |= MY_CODEC_FLAG_GLOBAL_HEADER;
- 
-     retcd = ffmpeg_set_quality(ffmpeg);
-     if (retcd < 0){
--- 
-2.16.2
-
diff --git a/media-video/motion/files/motion.conf b/media-video/motion/files/motion.conf
deleted file mode 100644
index f032d874f0ca..000000000000
--- a/media-video/motion/files/motion.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /var/lib/motion/ 0750 motion video
diff --git a/media-video/motion/files/motion.confd-r1 b/media-video/motion/files/motion.confd-r1
deleted file mode 100644
index dfff31beb45d..000000000000
--- a/media-video/motion/files/motion.confd-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-# Set the user and group under which motion will be run
-MOTION_USER="motion"
-MOTION_GROUP="video"
-
-# Set the the directory for storing the pidfile
-MOTION_RUN_DIR="/var/run/motion"
-
-# Set the the working directory for storing images/videos
-MOTION_LIB_DIR="/var/lib/motion"
diff --git a/media-video/motion/files/motion.initd-r3 b/media-video/motion/files/motion.initd-r3
deleted file mode 100644
index 2b474fc56f9a..000000000000
--- a/media-video/motion/files/motion.initd-r3
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-
-depend() {
-	need modules
-	after mysql
-}
-
-checkconfig() {
-	export MOTION_RUN_DIR="${MOTION_RUN_DIR:-/var/run/motion}"
-	checkpath -d -m 750 -o "${MOTION_USER:-motion}:${MOTION_GROUP:-video}" "${MOTION_RUN_DIR}"
-	export MOTION_LIB_DIR="${MOTION_LIB_DIR:-/var/lib/motion}"
-	checkpath -d -m 750 -o "${MOTION_USER:-motion}:${MOTION_GROUP:-video}" "${MOTION_LIB_DIR}"
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting motion detection"
-	start-stop-daemon --start -u "${MOTION_USER}" -g "${MOTION_GROUP}" -d "${MOTION_LIB_DIR}" --quiet --exec /usr/bin/motion -- -b -p "${MOTION_RUN_DIR}/motion.pid"
-	eend $?
-}
-
-stop() {
-	checkconfig || return 1
-
-	ebegin "Stopping motion detection"
-	start-stop-daemon --stop --quiet --exec /usr/bin/motion --pidfile "${MOTION_RUN_DIR}/motion.pid"
-	eend $?
-}
-
-reload() {
-	checkconfig || return 1
-
-	ebegin "Reloading motion detection configuration"
-	start-stop-daemon --stop --signal HUP --exec /usr/bin/motion --pidfile "${MOTION_RUN_DIR}/motion.pid"
-	eend $?
-}
diff --git a/media-video/motion/files/motion.service b/media-video/motion/files/motion.service
deleted file mode 100644
index d4755bdb48ea..000000000000
--- a/media-video/motion/files/motion.service
+++ /dev/null
@@ -1,20 +0,0 @@
-[Unit]
-Description=Motion detection daemon
-After=local-fs.target network.target
-Documentation=man:motion(1)
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/motion -n -c /etc/motion/motion.conf
-StandardError=null
-
-#User=motion
-Group=video
-
-#RuntimeDirectory=motion
-#RuntimeDirectoryMode=0750
-
-#WorkingDirectory=/var/lib/motion
-
-[Install]
-WantedBy=multi-user.target
diff --git a/media-video/movit/Manifest b/media-video/movit/Manifest
index 229cb1a82e74..8cebffd77a1c 100644
--- a/media-video/movit/Manifest
+++ b/media-video/movit/Manifest
@@ -1,8 +1,4 @@
 DIST gtest-1.7.0.zip 1164254 BLAKE2B ba8cf5dc336e3a6889b58922b62497cdac94d9f77bc5cbac3d72e4a88f33cbe572b6f61b5323acb7ea6dfc67f92c0ba231bedc5251c276831ea7a9e77ab6d570 SHA512 8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07
-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 752 BLAKE2B de9c67e720f23eb67dc878061bf662a57d697becf1d999a9e44a5df663661562b4271c7efecaa7921e070ac82796598a6c6d9ad67f9fe1d7110d1734954d2fb3 SHA512 1c22573762ac2d6ee6a18afb2065c8d86447859073602c1dc55e9f892444914576bf8ad12e4f99db66100bf43634a58a48952f1bad124cce8600d3523972ad13
-EBUILD movit-1.6.1.ebuild 883 BLAKE2B b04c01d35eb333aaccae3ffb4594a5e35e12809db36a9a7f5626a57e55b9e8fa7cdd5b014e0528624ac144c1d078a228472e63779e4b620d48583294e961c0a5 SHA512 1022fdc6a6dd486bbe8399f602bc56bc15fe7b8dbfbb9dae2cbed855378c6ac87bb654fb090f8ffe54d43f24353a7aa4194f9ae1c2210507b6f2dccb17700ef5
 EBUILD movit-1.6.2.ebuild 887 BLAKE2B 06d30a4e51dc704ea362781c13ac182e6362261401e264e84b9db11324f59299d8d514f5e86aba68d3f929a195730856b9d94e901cad470a0625856bdbde45be SHA512 3c97c89885dd8df57944740809ca62b7bba0ad1316740615ecddc8998f9900a6df51f38b82acac7bc6b5680c3ff9daff1665076f164e9c2a66d767cb0cd8327f
 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
deleted file mode 100644
index 2559f5d8e549..000000000000
--- a/media-video/movit/movit-1.2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# no sane way to use OpenGL from within tests?
-RESTRICT="test"
-
-DESCRIPTION="Modern Video Toolkit"
-HOMEPAGE="https://movit.sesse.net/"
-# Tests need gtest, makefile unconditionally builds tests, so ... yey!
-SRC_URI="https://movit.sesse.net/${P}.tar.gz
-	https://googletest.googlecode.com/files/gtest-1.7.0.zip"
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="media-libs/mesa[X(+)]
-	>=dev-cpp/eigen-3.2.0:3
-	media-libs/libepoxy
-	sci-libs/fftw
-	media-libs/libsdl2
-	"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
-}
-
-src_test() {
-	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check
-}
diff --git a/media-video/movit/movit-1.6.1.ebuild b/media-video/movit/movit-1.6.1.ebuild
deleted file mode 100644
index 0a66dbe65a8e..000000000000
--- a/media-video/movit/movit-1.6.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-# no sane way to use OpenGL from within tests?
-RESTRICT="test"
-
-DESCRIPTION="Modern Video Toolkit"
-HOMEPAGE="https://movit.sesse.net/"
-# Tests need gtest, makefile unconditionally builds tests, so ... yey!
-SRC_URI="https://movit.sesse.net/${P}.tar.gz
-	https://googletest.googlecode.com/files/gtest-1.7.0.zip"
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/mesa[X(+)]
-	>=dev-cpp/eigen-3.2.0:3
-	media-libs/libepoxy
-	>=sci-libs/fftw-3
-	media-libs/libsdl2
-	"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf --disable-static
-}
-
-src_compile() {
-	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
-}
-
-src_test() {
-	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-video/mpeg-tools/Manifest b/media-video/mpeg-tools/Manifest
index ae1ed99efbd3..6321e128a2a8 100644
--- a/media-video/mpeg-tools/Manifest
+++ b/media-video/mpeg-tools/Manifest
@@ -3,12 +3,9 @@ AUX mpeg-tools-1.5b-as-needed.patch 1526 BLAKE2B 823889c2cb6abe1683cd72e63b7a93c
 AUX mpeg-tools-1.5b-build.patch 1414 BLAKE2B 8a0f804f670fbd75617c38726149b2db0f3594c3082e5efd66877e4214bc8bc67eccca91aabd10cbedb84da1e92c2df7ec01a5b1cf7ca368f0fdf2bfad4c6726 SHA512 f2bfe1126926c6473a149ea120898eb252c681808cd2745bed5428164ebeabfb33218cb7f98b4a9930af9d88055ca067129f1a4ffede824d5d6179762f27a4d7
 AUX mpeg-tools-1.5b-jpeg.patch 1498 BLAKE2B 32e421efe289622e34fc7387f4c56de65e210297c60a69a792a56a5e66eb8918f9df82628b705a4f98af70bc1c952dacd6f883af90eedea083170e65e6a7a8b1 SHA512 9bc509c603e825d94372f866fced352149d5d003c2ee247eb356db22f80bbf6cfbfcaaf03fb7a104ff84548e52f0f3034619e15598d0ae04df36d4b4332ea18b
 AUX mpeg-tools-1.5b-powerpc.patch 1041 BLAKE2B 9297129f0a028174c9c58f5b9e5af22fd8597c9a9d5e430ad0deacfa4f8378f2ba57ac3a1086398186187c5055f71cff3bdac903a404fd13ce0e251fe9d9a859 SHA512 f0ee310dce12d9137186b7d99aa88282cb65838855820ad3642bf090194be07d5f6cfef509561d1e097a938e68a6c2f8c61536a1921d08df458c66b83c6eaeca
-AUX mpeg-tools-1.5b-system-jpeg-7.patch 907 BLAKE2B 9ab472d932b3c1d69e1912b5eeb6fec4d03d06b16e083461d86d955c6ea3ddbff8a6f12f7974dc7b153a107ac5c4a3982f17902d537e4460792fe15e8fa75b3a SHA512 010460117a835092a42ab0a7b7f7d04dabe3ff691452541db204d34f1459e72060045af10dee4cb1c953235eb6ab2184fbe7aa032e8672454fc96c5f1d1ecde9
-AUX mpeg-tools-1.5b-system-jpeg.patch 893 BLAKE2B 0f6655d5725b978a73728150c44426bbb3151f9abfd5b72b0923bdceb5d0e028bd88a91b645c3ccbcd8f52e3149c4a1484ef6ebddfb30836752c45c6f5ed1649 SHA512 243bc75aabcdcdd1024ad33edde6dbb48e3e4ded355b54f09244792d4d854a736b69d858da5b496c059cd5e28c7ac4a2e764129a0812025ab59caf59082de787
 AUX mpeg-tools-1.5b-tempfile-convert.patch 4097 BLAKE2B f60e5bb386c468827024162cc50135fb0cfb858d2f4a373fc6ee9d4f465915be7c7206d1b8c75a1c47695cc2fdf1737979c4749bb97aa5da17c7fd1c12e336df SHA512 b90879e884e9f5a5bd61149adda293c149e533b8fdb969b6e6d579917b2abed0fb848629f1567782d80c97dcf40eaf3c005731d216c02d1e97d54543c74e6e2d
 AUX mpeg-tools-1.5b-tempfile-mpeg-encode.patch 2538 BLAKE2B 4bbc67856c745ea320a6ae70e3ce43db54b044f360c00a94e84582d30d07eeb419dccf47d6b0ec47884004861751383531c119547c11707e924a9e537ee83f5b SHA512 229fcd4e28628fa8d45a20766e6b46bcf2e3a6ea9e69b2e8764b180b2766d539a701c64a7969a4020805a06188825c5fa5a5e1146052ee6a52edbb7d3d572f1e
 AUX mpeg-tools-1.5b-tempfile-tests.patch 5256 BLAKE2B bf52a2bc69f42af32cc6e0aecd910d6c37e12c0a9391d18dd4fff9e7304a99550b9c0a08c608aa6b3bfeda14166caeabb154c6ff7af7c4c307dc23796c46dfc5 SHA512 ee616fc5b4b4bf15e547d737a00a4349fff98127c5ec836e63ae5b6b3e365c50b6cba1c535fd27de2ce6ee28ef5bd3872f5d3b7880f39fe23c7e8ebdc24508e8
 DIST mpeg_encode-1.5b-src.tar.gz 2028724 BLAKE2B 6758a34bbc7a967311f710277b37d6f7612b9f4be429e0909d623b33ff83e7c10a8f7de9de3dcbc69080a23f6312b611315732eede649165873c50e92d53f639 SHA512 df6f9def3ba05c752ebdc5311c512688d6fae380480009dad55b4183a378685eca79943c075166b21ed3bfd0cce7697761abc6ec795f57c0ed1c60c2a5cba469
-EBUILD mpeg-tools-1.5b-r4.ebuild 1842 BLAKE2B a23ef178e3df72c6288aa236892fb4704f6b797f2edaf88d52e90682aac11f8bb28bb101be7ea77897e256a3b128581be0a51d6710bd86370115cb7bf4a0af64 SHA512 c8e87b1d6a4b1383903356b0d861ac856ca05ac14208ce3655b9f4339a451765515f9d4f6d4ba2ae9e7e5c06723ef987988b3e73e5235e4fcf876155fa91a7d4
 EBUILD mpeg-tools-1.5b-r5.ebuild 1788 BLAKE2B 9a8ca3d9486b3f0bdfb31411d8bbb4579b219f76b774e13b348b314c3460b213341a8bd77659610142b5f846df790b36bc7c4814fd19a46d76d14466ca9c4b22 SHA512 f2f00e951318bf3dc3e2a628320e6f3885e9fe604ea926a97f17fc8b367f2530c47b3e2d899a6148a2b0836b99da24442a5b8015f26e0cbc52088d24ca11b77c
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg-7.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg-7.patch
deleted file mode 100644
index 3b0ad4792a54..000000000000
--- a/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg-7.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur mpeg_encode.orig/jpeg.c mpeg_encode/jpeg.c
---- mpeg_encode.orig/jpeg.c	2009-08-24 21:33:18.000000000 +0300
-+++ mpeg_encode/jpeg.c	2009-08-24 22:23:08.000000000 +0300
-@@ -80,13 +80,9 @@
- /* make it happier.... */
- #undef DCTSIZE2
- #include "jpeglib.h"
--#include "jpegint.h"
--
- 
- #define HEADER_SIZE 607   /*JFIF header size used on output images*/
- 
--
--
- /*=======================================================================*
-  *                                                                       *
-  * JMovie2JPEG                                                           *
-@@ -517,7 +513,7 @@
- #ifdef JPEG4
-   buffer_height = 8;  /* could be 2, 4,8 rows high */
- #else
--  buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size;
-+  buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_v_scaled_size;
- #endif
-   
-   for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components;
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg.patch
deleted file mode 100644
index 7be3905577c3..000000000000
--- a/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Use the system jpeg rather than the bundled one
-
---- mpeg_encode/Makefile
-+++ mpeg_encode/Makefile
-@@ -36,9 +36,9 @@
- ##############
- # JPEG STUFF #
- ##############
--JPEG_LIB = jpeg/libjpeg.a
--JPEG_DIR = -Ijpeg
--JPEG_LIB_DIR = -Ljpeg
-+JPEG_LIB = -ljpeg
-+JPEG_DIR = 
-+JPEG_LIB_DIR = 
- MP_JPEG_OBJS = jpeg.o
- MP_JPEG_SRCS = jpeg.c
- 
-@@ -57,7 +57,7 @@
- #################
- # INCLUDE FILES # 
- #################
--INCLUDEDIR = -Iheaders -I/usr/include $(JPEG_DIR)
-+INCLUDEDIR = -Iheaders
- 
- ############################################################################
- # LIBRARIES # specify library directories; need jpg lib and maybe pbm	   #
---- mpeg_encode/jpeg.c
-+++ mpeg_encode/jpeg.c
-@@ -79,7 +79,8 @@
- 
- /* make it happier.... */
- #undef DCTSIZE2
--#include "jpeg/jpeglib.h"
-+#include "jpeglib.h"
-+#include "jpegint.h"
- 
- 
- #define HEADER_SIZE 607   /*JFIF header size used on output images*/
diff --git a/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild b/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild
deleted file mode 100644
index 70ceb15423d2..000000000000
--- a/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-MY_PN=mpeg_encode
-DESCRIPTION="Tools for MPEG video"
-HOMEPAGE="http://bmrc.berkeley.edu/research/mpeg/mpeg_encode.html"
-SRC_URI="ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/encode/${MY_PN}-${PV}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	virtual/jpeg:0"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_PN}
-
-src_prepare() {
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}"/${P}-build.patch
-	epatch "${FILESDIR}"/${P}-64bit_fixes.patch
-	epatch "${FILESDIR}"/${P}-tempfile-convert.patch
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	epatch "${FILESDIR}"/${P}-powerpc.patch
-	cd "${S}"
-	rm -r jpeg
-	epatch "${FILESDIR}"/${P}-system-jpeg.patch
-	epatch "${FILESDIR}"/${P}-system-jpeg-7.patch
-	epatch "${FILESDIR}"/${P}-tempfile-mpeg-encode.patch
-	epatch "${FILESDIR}"/${P}-tempfile-tests.patch
-	# don't include malloc.h, but use stdlib.h instead
-	sed -i -e 's:#include <malloc.h>:#include <stdlib.h>:' \
-		convert/*.c convert/mtv/*.c *.c headers/*.h || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-	emake -C convert CC="$(tc-getCC)"
-	emake -C convert/mtv CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin mpeg_encode
-	doman docs/*.1
-	dodoc BUGS CHANGES README TODO VERSION
-	dodoc docs/EXTENSIONS docs/INPUT.FORMAT docs/*.param docs/param-summary
-	docinto examples
-	dodoc examples/*
-
-	cd ../convert
-	dobin eyuvtojpeg jmovie2jpeg mpeg_demux mtv/movieToVid
-	newdoc README README.convert
-	newdoc mtv/README README.mtv
-}
-
-pkg_postinst() {
-	if [[ -z $(best_version media-libs/netpbm) ]]; then
-		elog "If you are looking for eyuvtoppm or ppmtoeyuv, please"
-		elog "emerge the netpbm package.  It has updated versions."
-	fi
-}
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index db3e1b0c6844..e8bc04402f4b 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -11,6 +11,6 @@ DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de68
 DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
 DIST mplayer-1.3-ffmpeg4.patch 25679 BLAKE2B 08f9ddb05a11c9b7ce0de7fe7bb92b492d1b35e65437c09be07cd39aa70cd9541baf442ffae1ee3060fd94d78eca30fa35808db8eebfdf679456da2c1d8217e8 SHA512 9f29fcd0bfd374fecf15a40c51e2bac53d2646d939ea13e7afffc8e9854d6d2105142f95745f0b26d8f58e19938c5ccedb191af30858fb6f3520072c98db3081
 EBUILD mplayer-1.3.0-r6.ebuild 16920 BLAKE2B 95895b1bbe6b6699bbf1995a4cf451b04ca8c8d572260df33f1ada8f253aa6f4fd9958b8ffc7c59699e8f6251ce1b6ae60428594abec66db64c683961863d075 SHA512 0afc5fa912d3ef3654f0ef1acd27e64a0f861f9f01f78ba82c58d44e99faae6bcc2ea0c30a0235672d90ccd0fc66734131773f771d2917c647ec31fe3ec4ecd9
-EBUILD mplayer-1.4-r1.ebuild 16601 BLAKE2B 4db40aceb84b4b0b9534262f68778d9b80ee6eadd8a83b54d983c159039dd7be673906f3da308905ef6acfce54818c95ba95b2344ba4f668031990ee85b48d17 SHA512 b78c9abe4dc26e7bc1eb739e3bf0a11cdeda134cbac78e16eae45f77515d201b3607d2170502ae1a49991a1eb2f3a35442cf15046403613c9d0f6462ddf781fb
+EBUILD mplayer-1.4-r1.ebuild 16600 BLAKE2B 3c7db2c710bf2f2f700df724a3b57cd44471dd5834acdaff66e697064e7f568e3687babecedd1aaeacc61e85a1e2008209d38389cfe00e0c4b50df530e808041 SHA512 3584d82e9ca2a9fc1e68b9d505d6914ff10fdcd5eb7e78a07ce42fdc833d47d230c2d4168e30376982d44b4614e887f8437ef0ca47bcc222cae8ca2c6d91eca8
 EBUILD mplayer-9999.ebuild 16605 BLAKE2B 6b3f209bf2f31916826175b0806a254e5ccf8d2682f475e1d369cc10b0185b4646d63bce73cefe74164fc41e37c4d7f91c60dde71d2cc326e2622c951916e642 SHA512 870df76b212b44662ab0e1a99681d2ec5bc212aaad5b6822ce197b75a8ea0682bdd02ce7cd0452d38f5f41232f770f82a35af11775e63596896a96072eebff20
 MISC metadata.xml 2536 BLAKE2B 1a8ff751e68c46c921cd09a9364e8046372cf0a77aaf062c26ed1356eebfaa8b90eb36cac6e101fe22f9f7ddcec611806271683e76d53c642dfc1fc87ba0baa5 SHA512 01fadd14038f9bda1fb3b521f65ab92e2cfed58628352b02f26dfef710d4d5a6fd964ef00e3a123a76046557b15ae29bc7c221c5a8a692cb06763e478b3b58c7
diff --git a/media-video/mplayer/mplayer-1.4-r1.ebuild b/media-video/mplayer/mplayer-1.4-r1.ebuild
index 6be49c30001b..cc2bb32bc280 100644
--- a/media-video/mplayer/mplayer-1.4-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.4-r1.ebuild
@@ -150,7 +150,7 @@ RDEPEND+="
 SLOT="0"
 LICENSE="GPL-2"
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
 fi
 
 # faac codecs are nonfree
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 4c0587d199b0..76d37bad1453 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,5 +1,5 @@
 AUX obs-studio-25.0.8-gcc-10-build.patch 1050 BLAKE2B ccf18ba3f51de72f967fbab5b1526d1fc9a9bb628a25d1caed44ca308f4a988a15fe0ab235b218b2edc4e4eef40c86545cda989f0d748af942352ad8eb091f51 SHA512 1ff0e088eed61554268009f3d8c5a23c0888bfbe860d6cb288ddf348108446c152fd87e2cb8f54613a88378d8474550632c90f924005d5e0343bf1a801339ccc
 DIST obs-studio-25.0.8.tar.gz 9531713 BLAKE2B 4775ca8305e1beee4d926eff728351b699ca4d52f66e53409dbcfe1f73699df0286fadc0c138cb76b8eb73e70a143719e46f030b6d15d43629bdcbf23bdb88af SHA512 a97c03dc218a4e03e48f6a7dc82b4a59ebeee2039f17be66bb847681ce9ff3d25e6e015be4af78fe44739f6fad5089b6e683d7657c2e4fde8e547df9a2594a08
-EBUILD obs-studio-25.0.8-r1.ebuild 3544 BLAKE2B 2b2f4df593f1616d7ba315d7410c6ffe7a6b1858688c149bf263cb64be6864b9492bd6f5d35a0d8160de81d41c62b0616ee6f28af2613b283c602109603576b3 SHA512 b883f912e288bd1819e0baf26de55912a42ba14b8da6cfd87f2d4d174e8e2d5162429fb18a6e33b072413536c63fde55333aac9859c08accbb95e678698dc2a3
-EBUILD obs-studio-9999.ebuild 3485 BLAKE2B 59491eed9c4e0ef4e7cfe5cc9241570ee319090eda8c9575db84d8da9eee8d8867f7796e5ace284d64ba72494b74430be3c23458261fd47f9ee8e7ffb44ae283 SHA512 fc9d7d1b7de0df70a2b3bc90ec7955051ea9d0eb54fd6dccc745a3d6521eb3083eb1c7e296bd5963bfb5b7879384c87b0ff573059cbc618e1e6effec02861138
+EBUILD obs-studio-25.0.8-r1.ebuild 3546 BLAKE2B a93b384c2685c19df8c381289fe89f8fde931a34ddd785d82ff7434b2535a35ffb2b443af6b9e42abcc592d31181b4577ba9f5f089088182a853a04943487bc8 SHA512 9e8a5a4928da5e9a0fa2ef1b0bb90a0d8d2b75c0332dd485f646a7045c649a28a21aa1ffa85d06374f133cc44158cacfc4c94debab8088b13b154a0fc4d2d3b2
+EBUILD obs-studio-9999.ebuild 3487 BLAKE2B fbf41ac397689e232cbf6eebb704b247182d8d6406fb092937d5f5bb56c2ef88c3bc042123bff3b80c86063b9ab3c4e20a430e4835116a918e517f9894e7022f SHA512 9f25931871ad6b4de691666ac2010c22128ca5dc4740905d2189ecb8baf0a89e95a28d91364c9ef2a94f01933de6b8de159602ce9509c581ad147a33df33d8bb
 MISC metadata.xml 1333 BLAKE2B 64d005a96fe4861ab30cc51ff8f9b37dfc6e24eda2149b487ca2f5af9db663f2a2ce564ff4953c6cf5b35d425d1fb1c3774c86e610db0eb336119baddcbc52b5 SHA512 06ab2cd75b521a2753fdc7e379ed67bd2179a74f0868324af4365a2bffa6c132528fd72b98d319bc0a924cad9bb006e382093f368602fb5dd7dc94db94ae703b
diff --git a/media-video/obs-studio/obs-studio-25.0.8-r1.ebuild b/media-video/obs-studio/obs-studio-25.0.8-r1.ebuild
index 8bdbdd3a6e49..614dda2f9b43 100644
--- a/media-video/obs-studio/obs-studio-25.0.8-r1.ebuild
+++ b/media-video/obs-studio/obs-studio-25.0.8-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit cmake-utils python-single-r1 xdg-utils
 
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index c8ccd0308e53..b0a065e2cfe1 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit cmake-utils python-single-r1 xdg-utils
 
diff --git a/media-video/openshot/Manifest b/media-video/openshot/Manifest
index cef78220660b..eabe046d573b 100644
--- a/media-video/openshot/Manifest
+++ b/media-video/openshot/Manifest
@@ -1,9 +1,9 @@
 DIST openshot-2.4.4.tar.gz 63065376 BLAKE2B 2ee00f24d699d5935a182c394821f215a27ba2701d493f51299c19cf99452ca4df2e5b86f7a6e5734e6194e39e5b7995eb94be168c0e9f7bc7a3b78206277304 SHA512 efa71f97a83b89e691b7dab09288ba7d3e91eb25119669fa8f6e28becb8d4cb3e60a923f936ee4ff9a593d016fe3a6b0348153cff937ab7d21a5517de5dfa10c
 DIST openshot-2.5.0.tar.gz 60153193 BLAKE2B cdc79c68be7cd5b9e2714c98c4edbb5fc9ec349283da8439e9f9e26b2341688e2b8ae0f108413f59582d6e447faeb96d1da6916503299ca40939d73f5983377f SHA512 0944bff48c8957a4a3c5a37428b4d3e45e8ad6e1664812ea90b7c16d014a3c355daf2fe183ce855586114ccfa36c419b6baacc42c4bf871de29bda4c24f2a814
 DIST openshot-2.5.1.tar.gz 60217543 BLAKE2B 3f195b14a9fb004e845c731be64138c20da84ac0c90db43b547ee9ea059d32f85ada04aa0462b755a7ea5c3d3b30088fab35414147dded55deb9d5eab5926d2d SHA512 8254a45254bbe523b6485b9598022de2c46ec30818e606ac4665790d29486693c4efe9f5bc55ee43d6342de6782cf0090e4bc880e831c08e3b1218bca555af14
-DIST openshot-qt-2.4.0.tar.gz 60710408 BLAKE2B 33c8abe7ba3122ae720163d6ab91d367ee282b94d3d8986fdccf4f9efae832f54af7f946472c781a17f7e54083028762952d02d7139e6815cd0d44e80515c728 SHA512 95778effa5b02a467c44741384b0f43bf90343d4f450d5fcc2319ff1c3bee212338435dd8c781e0ff111a704aacdce3dbfb6bdcf62afa1f59bbb0668b58074ca
-EBUILD openshot-2.4.0-r1.ebuild 1283 BLAKE2B 1ca81c34d0d99593719c65c38ec59df75df5ba937ab6f62482a885068f36c5cdebde2bc351d97ab873cdcd87cb7eef6fb5303868ce687ee81526c4030da47f40 SHA512 5a86460edd21308837e2172cbbaa4cc2a02f567982de61b287a294db1d22457598a77113e4ce5f284900c8788703b643075d82885bfefdcad1ead65016fbe1e0
+DIST openshot-2.5.1_p20201203.tar.gz 64708017 BLAKE2B b95834b8b75460b60a54b2c1efab1752424c291f5e16fefd33671f7ea9eb9c29d48047a18287a9cf2837c21e3c1ea9a7217fcbdc27440bacc04ff6f8da6202a2 SHA512 668c3155489d469042220e059cb0fc4de50b4d949c28d4ae6e8ef9b6ccdd3235dd4912b5163ae4126758621052d4b40f21aa40c6e1682776a71076f0c45cbcdc
 EBUILD openshot-2.4.4-r1.ebuild 1265 BLAKE2B 1a8dc1f69f0b7c357b10bde0a6d49b3a0731798fd714bbfe0202838d19b74de9144db6e2f0c2efd4f3d1027bc6a3aad9c36bf4df0ad5973d8a5e6497fd7aeb27 SHA512 e4d50ed1ed5ca1d417f5aa3e9951e3c107d66b03acef17040007aa2c0985ae9bea16b2e877e23b68e9d084975c76e8c40b78b083206aad3e69296a1cac2444bc
 EBUILD openshot-2.5.0.ebuild 1238 BLAKE2B 3b0d72a809439def72602de855d7a31efb10a6b94196014b0207b54bf115e1064528351d43fee4fab266ba5aef05bfffe671dc2946df1d8c8d2dc771d49f2408 SHA512 6d1e743de1520665bcec187d981f3c4fa27fae6c969308a9532f2f07b2a091d42b529d844bd96f7940e8ec9e40cde686bde0f7c42e335306299cfbf90841abd7
 EBUILD openshot-2.5.1.ebuild 1243 BLAKE2B 471a504e9592f9524192cd87231ea96db33bf19910905394d681aedb0735aa99f0dccbb7877c209de56e341b1cdb63c4affa2d18b1af9c58dea6387c61e76641 SHA512 a1dff240e62fedd8d0e2785c9c1d217c66b04cc177f80bcbd56931d2bb8393776f22c8d5333abe5c8b13a8e6af21a0a2b568b37dec856f1e2d1012a5a26fc3db
+EBUILD openshot-2.5.1_p20201203.ebuild 1339 BLAKE2B a26d66d6761090f48936b73cbae5e4522b9390c80b7587e70b2d54dfaa5e0f9a770aed8c9b42a1c5d2718ddf20d67fe2ef766f4ae1b8a4b3963ebf33f8965e81 SHA512 0b846c7eac6c9a60852325a823f5dde200c41524fcff81a2084abe8d80b4098aff16c2944e7d98fa8925e42cb5af3b4689a97da725b0107efe65cb64b9173ec3
 MISC metadata.xml 520 BLAKE2B 78c1c2c7058fe041a5aa1e783622529dd897a609ce801d718466c7d14b9b5ccd05ba496f468f9100301f20ccfa04c3824aed975f39f7febce487b87bddce9282 SHA512 3d2227d47b72451b5b600384ef70b3085a8e46cba1f076d05c558b69ef50d18084dd31d2f14323237c1500842ddea664bcc78a68de9f9d5d472f44ab90a6c325
diff --git a/media-video/openshot/openshot-2.4.0-r1.ebuild b/media-video/openshot/openshot-2.4.0-r1.ebuild
deleted file mode 100644
index e426ccbfaa58..000000000000
--- a/media-video/openshot/openshot-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_REQ_USE=xml
-PYTHON_COMPAT=( python3_6 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 gnome2-utils versionator xdg-utils
-
-MY_PN="${PN}-qt"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Free, open-source, non-linear video editor to create and edit videos and movies"
-HOMEPAGE="https://www.openshot.org/ https://launchpad.net/openshot"
-SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="1"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},svg,webkit]
-		dev-python/pyzmq[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-	')
-	>=media-libs/libopenshot-0.1.8[python,${PYTHON_SINGLE_USEDEP}]
-"
-
-S="${WORKDIR}"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	# prevent setup.py from trying to update MIME databases
-	sed -i 's/^ROOT =.*/ROOT = False/' setup.py || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-video/openshot/openshot-2.5.1_p20201203.ebuild b/media-video/openshot/openshot-2.5.1_p20201203.ebuild
new file mode 100644
index 000000000000..53484ce02495
--- /dev/null
+++ b/media-video/openshot/openshot-2.5.1_p20201203.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE=xml
+DISTUTILS_SINGLE_IMPL=1
+
+COMMIT=8c3d90cca72e2051b1b74dc0d731824ed5edf0de
+MY_PN="${PN}-qt"
+inherit distutils-r1 xdg
+
+DESCRIPTION="Award-winning free and open-source video editor"
+HOMEPAGE="https://www.openshot.org/"
+SRC_URI="https://github.com/OpenShot/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${COMMIT}"
+
+LICENSE="GPL-3+"
+SLOT="1"
+# KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},gui,svg,widgets]
+		dev-python/PyQtWebEngine[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyzmq[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	')
+	>=media-libs/libopenshot-0.2.5:0=[python,${PYTHON_SINGLE_USEDEP}]
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		doc? ( dev-python/sphinx[${PYTHON_MULTI_USEDEP}] )
+	')
+"
+
+src_prepare() {
+	distutils-r1_python_prepare_all
+	# prevent setup.py from trying to update MIME databases
+	sed -i 's/^ROOT =.*/ROOT = False/' setup.py || die
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/media-video/shotcut/Manifest b/media-video/shotcut/Manifest
index efe0dd9f95c7..9a5ec3191e78 100644
--- a/media-video/shotcut/Manifest
+++ b/media-video/shotcut/Manifest
@@ -1,3 +1,5 @@
 DIST shotcut-20.10.31.tar.gz 5735908 BLAKE2B 04b9bada177216c81950a551a9dc06624efe7fd50df9cc12cbe1b358436721700d7ecd49a89c48988ce33eee8a8bcdb9c58ccf74775ee2e2828090e53567ade0 SHA512 4d0109e87c86e3b7bb20aeb4b9a38fac175f90f00b8b13b605af9f5959578a2329da5a91d96891c814a84e7f23501ee5d3be9d2ca7a4bdd1a70af9894f0f7348
+DIST shotcut-20.11.28.tar.gz 5781716 BLAKE2B 28f678a9c166c2e7e9abba3e61722cffb54ee62302e85ba494d075e0f8634dd7f2b4d88b992d7d8bde0618ac21bd6e983a33ea9b874e83746904ecbcf32cdae4 SHA512 fd4b9e2e7a5e93920980d4023d1e9803d6ce4de1d962548a7a3ad5cf815ea0e9e29c4645fec7f0db90ac8581a6ea3e92f2a3e34faf03f8991c303c371285ae7c
 EBUILD shotcut-20.10.31.ebuild 1211 BLAKE2B ccf0bd78f85110e3fc43c6ea9f9e9874a36073708fdece10f42d23731c82069d0ff32e90d7d03daa13c0e2cc20ba5b2d588c4a9a513a2552c228bdd53ed6d43a SHA512 c2ec4fc061586f4c795fe0a472e994006f37449702bcb05dd2dbdec6cb8c0d465e1b72b458ea2f67b0a37589130c316b0f675c59587cd6a8d783c079bbfd8f53
+EBUILD shotcut-20.11.28.ebuild 1238 BLAKE2B 37a8db2c7de91c3dca60ab335f49ba5919228ae8687cd3862b211bac52550dbcc7a6bfabaaccd88fe5d8bde4b07dea239369f08166ea503e8ca242206650234c SHA512 96aa7c74e48de76b24e9c6a7720faafb071a17963e4965ffcf5657b4d14d95a7d102ce79071286da2fbdbfd499a132751008dd908f991dc36b9fcefefc179665
 MISC metadata.xml 450 BLAKE2B 979a125701ee0da3a2ead50518500e32a7d4bbd78f42069b268aedd5d1c933f2a10022d63b98e2f135a2e3156a6019d4b82da62394ebd8724d55001b7d470e8a SHA512 c742013bd49807786261384f73d9350962affba6d914a6dcb1542376b760fc7cfbb847ce38b281fde1b67ea3db3d299db235c7f9716b20426329c971a485e7c3
diff --git a/media-video/shotcut/shotcut-20.11.28.ebuild b/media-video/shotcut/shotcut-20.11.28.ebuild
new file mode 100644
index 000000000000..0ce1b4f5b43b
--- /dev/null
+++ b/media-video/shotcut/shotcut-20.11.28.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 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/ https://github.com/mltframework/shotcut/"
+SRC_URI="https://github.com/mltframework/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtquickcontrols2:5
+	dev-qt/qtsql:5
+	dev-qt/qtwebsockets:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	>=media-libs/mlt-6.22.1[ffmpeg,frei0r,jack,melt(+),qt5,sdl,xml]
+	media-video/ffmpeg
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qtconcurrent:5
+	dev-qt/qtx11extras:5
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-qt/qtgraphicaleffects:5
+	dev-qt/qtquickcontrols:5
+	virtual/jack
+"
+
+src_prepare() {
+	default
+	sed -i -e '/QT.*private/d' src/src.pro || die
+}
+
+src_configure() {
+	eqmake5 \
+		PREFIX="${EPREFIX}/usr" \
+		SHOTCUT_VERSION="${PV}" \
+		DEFINES+=SHOTCUT_NOUPGRADE
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest
index c99b6f47852e..d8b2ccecadfa 100644
--- a/media-video/simplescreenrecorder/Manifest
+++ b/media-video/simplescreenrecorder/Manifest
@@ -1,5 +1,5 @@
 AUX simplescreenrecorder-0.4.2-cmake.patch 968 BLAKE2B d5d750a4ce9520b6c48f6661865d6c18a253d4af00839d42954f690a690d7a3eeadab48c09d5fcc3b391f68cfac31d75606d7e3cc4dad01144804ed7a28c7296 SHA512 6c91ad4faaa9afa3077d6ac12d9e1015ba858a8b2d629d4a1fb9f2a2dd871c2c8126364b10af3cda79fee9c9929b5eb34d98fb674d01f0fb4beed504a4efb646
 DIST simplescreenrecorder-0.4.2.tar.gz 1912151 BLAKE2B d8a4605a82e49693f94ecfac8853405a660a4528c3001961b1734d4387e49eeb4c91603929b3cd5d5b67a23a6ec839ace606b29666b916960f10322e6ec1b452 SHA512 60b0127d7f82f294e5a8f015363e37a10b5492089a0178b07a5e383c7e4b857102ed2bda7a95e3c67293a255f892481aeaf4037c583320d68d463637348ed7f7
-EBUILD simplescreenrecorder-0.4.2.ebuild 2718 BLAKE2B 0712b8298b4ec6cc393851712346083b44cb42781a23ec3cb74beab38d6022e83569103f142807614b625aac19ca8b1f42f953d0fc71434b11c959dfe0eceec9 SHA512 5cb59f76a0625debac06d75ed0c0901c9b0c2202ee72f0a181db0445cd67fcd66473c0042fb8471c4259821520351d63fcd926fa51396b59d5bb7f77b42f9625
-EBUILD simplescreenrecorder-9999.ebuild 2666 BLAKE2B c186fd39471080abef980ced16a9e56bd91edcc86f40300dfca6ba420d5e06ea2b2a5839c27398b2898fdb2cf9ea5a624997fa7158b96e581c46b38cd88782cb SHA512 27cf19b3f1adceaf8c17e7b2bc0dd500b95c948e35115fef081f7ed3cbea5e2e8550bdb92175680268364d30cd95c13f43a7b1a3f01da394a73ab49344450041
+EBUILD simplescreenrecorder-0.4.2.ebuild 2747 BLAKE2B a6e77d3793d74348efa91e82eb9d9e3c85cb1fa46259253007d5dffe33b1e0dc4baef446a2c96f4cea7cf12cd4f98365288c09e873aca65121510b2ae838c0ce SHA512 d05f247e5d810833ea4ddb489362a33eed832e53c2f5c3ae8174b94aef1730c2150f06fcd9c7b717ee3b1f026b003382a4baedbe69abc7a5f906ce661743f1e9
+EBUILD simplescreenrecorder-9999.ebuild 2674 BLAKE2B 1729b241c93e49765e3a065db2b429315df4dfacb5afe2dfc9dca02d815ae9b34a6222b00d093ecc822d6d3f4bf2d9af47dc19e5fe1d82d43cdb09bca04af2a6 SHA512 fecf50bece888992989f99621b6bf8b946fbd0e47a90310d2d7103bc7bca7f53afa137b77103c8281056fb38c12ed17c61b6744f51b705559ef1cad7b82aa8ad
 MISC metadata.xml 508 BLAKE2B c43c69903c35e9e1f87c94cb26b06a8d6c4dd1a51c8a3409027ab8c867e54851aa8e4bfcaf4a0a37298795ded69743e82d2b0a4e0bb84cb3d88d6a6c5c4a1c0f SHA512 d4879cb7f57f23d273e45b429ab5548d30a0a6eefe63e28c2c60e7cef9a44b295d8455bfedaf9d9294ff4cf16b4f841f0ddb34541c62c25cbf190f7b6c7538ce
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.2.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.2.ebuild
index 0a27ef778b0a..949f13a88fe1 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.2.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.2.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="dev-qt/linguist-tools:5"
 
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) # bug #624480, in git master
 
 pkg_pretend() {
 	if [[ "${ABI}" == amd64 ]]; then
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
index 9fb007c901bd..6a8445ffb2fa 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
@@ -40,9 +40,8 @@ RDEPEND="
 	jack? ( virtual/jack )
 	pulseaudio? ( media-sound/pulseaudio )
 "
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
 
 pkg_pretend() {
 	if [[ "${ABI}" == amd64 ]]; then
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index e832f9f0d033..949494af80c6 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,11 +1,13 @@
 AUX vlc-2.1.0-fix-libtremor-libs.patch 453 BLAKE2B 526934642617384224faee8d26c0a7fa4dec9891f718816e44fd08970a5477cdc7ae34510b26af9971fe5d20b25c96595901117c804c7679341e1e8cd5309a14 SHA512 6c25995a518aeb1d501fa217d897962e1e81f66a4f28b6bb164dde3afe7f91772bb608f946d802857fa9a272cab1f88d3990d582be89ab8e37b1a8b6681798ae
 AUX vlc-2.2.8-freerdp-2.patch 4478 BLAKE2B 24b34ae2015de5197a275e393a761535d3386138ca1cdd67f0254a8bb916c9b0b40e553846299036882da5e5389fd8b8722f6f0cdf3e114a05fe1d445b48801c SHA512 e71bf81d87e7d0daf6d5820ba8e6a365cb8041eca82674ef69cc0d1eabbb29349a9ac193b0c2ad212e6d231dda7cf07a71e76317b8e8fc44b5ef0467d8f86b2f
 AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf1644610588f373e17d18c2642ee6489ca00311772307d8fc67a07ecc8d29810b80aa8f14c40298285c3319d8ddede2552d28d2837e SHA512 890b91405cbf6105c932566fd7799fdccd1b27f1e0df0c6dae1511aeead2c28eb5fea7642b01af1abbcf546aae0559408c0ddf2ec82c92809f3b02d1d477bb51
+AUX vlc-3.0.11.1-configure_lua_version.patch 1598 BLAKE2B 589c90d0c805ff516b7957e9b9fc6931674bc23a8aac15eb27351e9bae00aa55bffb3e62a87813714d8f0d64effa16c06680f10d00ecbe4207d5b26d37c4e5ac SHA512 0f24f54add360164417e01b2899ead07cc9f37cdc872387c7a9c350890f55c6fbec35f99e1e85a96309d7154359ffb99bc2ab7c8151adb080bb1531f88d987e6
 AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab7994e4fdd8bad922070b54688d34d051fac28177a0e648d55670e0b9f0c6b45f9a05650476b0ae12ebfe759dd561e28 SHA512 68964adda04cd88e80b586984f1af0cfdccff5dbf8529070d5ab985b23402dfb7380b5d39eacfea433c1ba03434139e4f394c1c25d6b426489883d3a42cb7b5b
 AUX vlc-3.0.8-qt-5.15.patch 1003 BLAKE2B 44a64b0448a235ce1dcf7100d084c85f9ffe6cdebf6cf0b5561e915a2ab6fbf348c152ff6e3c9beb1f073157a8ce8b15f3317a29c5410d3131462aac8d7c1ea4 SHA512 ff61fdc64e2bf4bc19536e76d7b824b0f77d8aa7a1fe61578f57b400ccda1bb51a5f5d97486c42ca6760b137ada68faedc73697dc39005babc839428fafee731
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 DIST vlc-3.0.11.1.tar.xz 25886644 BLAKE2B b3cf3f8776086fcd45ca20918be8951960bf3d18c219d0d512f64bfe89d3e947300875b4b8e1a27742132400fd9a3b32f5e84afd08f52254899a23922a682361 SHA512 8ce1e2f11aabf847dc5c55cf21ce6d7c0419a1051b5f4795e36cd060eab82d5056e44b4c070b80af56744e6aa841ef538386d08bc3b397a444e7258b2ba3f76b
+EBUILD vlc-3.0.11.1-r100.ebuild 13176 BLAKE2B b6d354b79b6816cf1a3dca77cca1c68e240536645fbb14a37559f4c336846db5913b0fdf2f6031e5dd3e3943b33b83e691de0653478e6e1718f9130b8299ff0c SHA512 fd1b0fb98876300a4b72df411a87e576992e3666464a1aa904fdca691e91391a450f9a09b0fce8cd8101a6ab809faf4cb312f67195ebb416105bb423f9c498fd
 EBUILD vlc-3.0.11.1.ebuild 13032 BLAKE2B fa553af69eefea08a196bf942278bfca08e21a6547eaa3ab1b49f1f676081e85f31ace2c64b9a509cc6f7e8bd6de6665f8fe1bde56a58819afc0d348540535c7 SHA512 5f4f5eb7547cc178379ce620f526ff054c92090cb4106e24e20b4e8a856991b9c01374954f047a48896e768f156a51eb015d106af76d89fa9dd79213ab33720d
-EBUILD vlc-3.0.9999.ebuild 12972 BLAKE2B 8e482bb570241a0dd0f521969ee61ac27ca778e543b7a3a4fa929a7625cd0e665996a35cc0372029b89f2be7371b45027228d1b34122aaa5dd2a759d4b0796ae SHA512 deabd1124cf6b8a265c0efc6ae9d594a3d46a820fe857acddae873b0bc3c24ab2abcc56329579b1049845879860626fc9be94cd70ce29796fdf02f1eaa326fc1
-EBUILD vlc-9999.ebuild 12993 BLAKE2B 9229920f8ebd589629e6d01e41a4ebb6e6cd60cc90522eae3e5fab31248416f6ac3fbc11c2fa14fe99ec5dc8b2d5f79bc5d6bdd619f39c25cce8add803d45753 SHA512 9d582e9ef7529630471a6c6f79db22425c10cfb3ba0d7ce50f0713efce8f12829e9834b4fb79ede558513238ae180f204635f6816074465e292122920a9f4e68
+EBUILD vlc-3.0.9999.ebuild 13111 BLAKE2B 356da7a2561af3112065b632b8191767c26cf9a8bfa4097c5a5e83e05dc15d59450667a9bf5ef48dfad3b0f8ff07a1fbe987994999c918bdf285b3360dae1903 SHA512 26e7b85090c48cdc2f26877ce4b5e308a633c941ec1d0e7d6764d42802cd7d80ba0d23a8a8f57ea4a99913a84126b1171bf12e2e202e519070e9da6038618798
+EBUILD vlc-9999.ebuild 13132 BLAKE2B faeab356cafdaf2b56e286b8efc8a9c7427eb9ceaf654d9b9b46d236eba8ea74a8c4afab6171cdb1200a12184ceee5b289c8885e47130774d4c0994da9298209 SHA512 36fd343422f83b932fe7cab47ede87729d820fd5aa829d4f62327739d3dba1a6c21136efb02eca949279477ddc60cc23e9b77236df836ca615662c8e065498c9
 MISC metadata.xml 4911 BLAKE2B 689cbaf21ee9adbae82ea670b575286cecfe49865aaff92a92d1cb78305c26306a72d9b010e052955c79e0c39723f03301f7a858de198948759ec228e90e7baf SHA512 62442acac34bf27c40e5cf41313c2f9ed3efd54cfb9c0dc42ca0ba3b37cb8e23690e88f04a3629bbe62b774c2bc6740a33f7336d371589982c8b2578050f13d1
diff --git a/media-video/vlc/files/vlc-3.0.11.1-configure_lua_version.patch b/media-video/vlc/files/vlc-3.0.11.1-configure_lua_version.patch
new file mode 100644
index 000000000000..0bf8faf4da80
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.11.1-configure_lua_version.patch
@@ -0,0 +1,47 @@
+Only look for one single version of Lua: the one pointed to by the
+pkgconfig package 'lua'. The wrapper set up by lua eclasses will take care
+of the rest.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1676,37 +1676,10 @@
+     [disable LUA scripting support (default enabled)])])
+ if test "${enable_lua}" != "no"
+ then
+-  PKG_CHECK_MODULES(LUA, lua5.2,
++  PKG_CHECK_MODULES(LUA, lua,
+     [ have_lua=yes ],
+-    [
+-    AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua 5.1 instead])
+-
+-    PKG_CHECK_MODULES(LUA, lua5.1,
+-      [ have_lua=yes ],
+-      [
+-      AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua >= 5.1 instead])
+-      PKG_CHECK_MODULES(LUA, lua >= 5.1,
+-        [ have_lua=yes ],
+-        [
+-          AC_MSG_WARN([${LUA_PKG_ERRORS}, trying manual detection instead])
+-          have_lua=yes
+-          AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h],
+-            [],
+-            [ have_lua=no ] )
+-          AC_CHECK_LIB(  lua5.2 , luaL_newstate,
+-            [LUA_LIBS="-llua5.2"],
+-          AC_CHECK_LIB( lua5.1 , luaL_newstate,
+-            [LUA_LIBS="-llua5.1"],
+-            AC_CHECK_LIB( lua51 , luaL_newstate,
+-              [LUA_LIBS="-llua51"],
+-              AC_CHECK_LIB( lua , luaL_newstate,
+-                [LUA_LIBS="-llua"],
+-                [ have_lua=no
+-                ], [-lm])
+-            )))
+-        ])
+-      ])
+-    ])
++    [ have_lua=no ]
++    )
+   if test "x${have_lua}" != "xyes" ;  then
+       AC_MSG_ERROR([Could not find lua. Lua is needed for some interfaces (rc, telnet, http) as well as many other custom scripts. Use --disable-lua to ignore this error.])
+   fi
diff --git a/media-video/vlc/vlc-3.0.11.1-r100.ebuild b/media-video/vlc/vlc-3.0.11.1-r100.ebuild
new file mode 100644
index 000000000000..23ebcaad281a
--- /dev/null
+++ b/media-video/vlc/vlc-3.0.11.1-r100.ebuild
@@ -0,0 +1,496 @@
+# Copyright 2000-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *9999 ]] ; then
+	if [[ ${PV%.9999} != ${PV} ]] ; then
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
+	else
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
+	fi
+	inherit git-r3
+else
+	if [[ ${MY_P} = ${P} ]] ; then
+		SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+	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"
+fi
+inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
+
+DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
+HOMEPAGE="https://www.videolan.org/vlc/"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-9" # vlc - vlccore
+
+IUSE="a52 alsa 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 libcaca libnotify +libsamplerate libtar libtiger linsys lirc
+	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
+	nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp
+	run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib
+	theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X
+	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx
+	cpu_flags_x86_sse
+"
+REQUIRED_USE="
+	chromecast? ( encode )
+	directx? ( ffmpeg )
+	fontconfig? ( truetype )
+	libcaca? ( X )
+	libtar? ( skins )
+	libtiger? ( kate )
+	lua? ( ${LUA_REQUIRED_USE} )
+	skins? ( qt5 truetype X xml )
+	ssl? ( gcrypt )
+	vaapi? ( ffmpeg X )
+	vdpau? ( ffmpeg X )
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	lua? ( ${LUA_DEPS} )
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+"
+RDEPEND="
+	net-dns/libidn:=
+	sys-libs/zlib[minizip]
+	virtual/libintl
+	virtual/opengl
+	a52? ( media-libs/a52dec )
+	alsa? ( media-libs/alsa-lib )
+	aom? ( media-libs/libaom:= )
+	archive? ( app-arch/libarchive:= )
+	aribsub? ( media-libs/aribb24 )
+	bidi? (
+		dev-libs/fribidi
+		media-libs/freetype:2[harfbuzz]
+		media-libs/harfbuzz
+		virtual/ttf-fonts
+	)
+	bluray? ( media-libs/libbluray:= )
+	cddb? ( media-libs/libcddb )
+	chromaprint? ( media-libs/chromaprint:= )
+	chromecast? (
+		>=dev-libs/protobuf-2.5.0:=
+		>=net-libs/libmicrodns-0.0.9:=
+	)
+	dav1d? ( media-libs/dav1d:= )
+	dbus? ( sys-apps/dbus )
+	dc1394? (
+		media-libs/libdc1394:2
+		sys-libs/libraw1394
+	)
+	dts? ( media-libs/libdca )
+	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
+	dvd? (
+		>=media-libs/libdvdnav-4.9:0=
+		>=media-libs/libdvdread-4.9:0=
+	)
+	faad? ( media-libs/faad2 )
+	fdk? ( media-libs/fdk-aac:= )
+	ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] )
+	flac? (
+		media-libs/flac
+		media-libs/libogg
+	)
+	fluidsynth? ( media-sound/fluidsynth:= )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	gcrypt? (
+		dev-libs/libgcrypt:0=
+		dev-libs/libgpg-error
+	)
+	gme? ( media-libs/game-music-emu )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
+	ieee1394? (
+		sys-libs/libavc1394
+		sys-libs/libraw1394
+	)
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	kate? ( media-libs/libkate )
+	libass? (
+		media-libs/fontconfig:1.0
+		media-libs/libass:=
+	)
+	libcaca? ( media-libs/libcaca )
+	libnotify? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+		x11-libs/libnotify
+	)
+	libsamplerate? ( media-libs/libsamplerate )
+	libtar? ( dev-libs/libtar )
+	libtiger? ( media-libs/libtiger )
+	linsys? ( media-libs/zvbi )
+	lirc? ( app-misc/lirc )
+	live? ( media-plugins/live:= )
+	lua? ( ${LUA_DEPS} )
+	mad? ( media-libs/libmad )
+	matroska? (
+		>=dev-libs/libebml-1.3.6:=
+		media-libs/libmatroska:=
+	)
+	modplug? ( >=media-libs/libmodplug-0.8.9.0 )
+	mp3? ( media-sound/mpg123 )
+	mpeg? ( media-libs/libmpeg2 )
+	mtp? ( media-libs/libmtp:= )
+	musepack? ( media-sound/musepack-tools )
+	ncurses? ( sys-libs/ncurses:0=[unicode] )
+	nfs? ( >=net-fs/libnfs-0.10.0:= )
+	ogg? ( media-libs/libogg )
+	opus? ( >=media-libs/opus-1.0.3 )
+	png? ( media-libs/libpng:0= )
+	projectm? (
+		media-fonts/dejavu
+		media-libs/libprojectm
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		X? (
+			dev-qt/qtx11extras:5
+			x11-libs/libX11
+		)
+	)
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] )
+	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
+	sdl-image? ( media-libs/sdl-image )
+	sftp? ( net-libs/libssh2 )
+	shout? ( media-libs/libshout )
+	sid? ( media-libs/libsidplay:2 )
+	skins? (
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXpm
+	)
+	soxr? ( >=media-libs/soxr-0.1.2 )
+	speex? (
+		>=media-libs/speex-1.2.0
+		media-libs/speexdsp
+	)
+	srt? ( net-libs/srt )
+	ssl? ( net-libs/gnutls:= )
+	svg? (
+		gnome-base/librsvg:2
+		x11-libs/cairo
+	)
+	taglib? ( >=media-libs/taglib-1.9 )
+	theora? ( media-libs/libtheora )
+	tremor? ( media-libs/tremor )
+	truetype? (
+		media-libs/freetype:2
+		virtual/ttf-fonts
+		!fontconfig? ( media-fonts/dejavu )
+	)
+	twolame? ( media-sound/twolame )
+	udev? ( virtual/udev )
+	upnp? ( net-libs/libupnp:=[ipv6] )
+	v4l? ( media-libs/libv4l:= )
+	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
+	vdpau? ( x11-libs/libvdpau )
+	vnc? ( net-libs/libvncserver )
+	vorbis? ( media-libs/libvorbis )
+	vpx? ( media-libs/libvpx:= )
+	wayland? (
+		>=dev-libs/wayland-1.15
+		dev-libs/wayland-protocols
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/xcb-util
+		x11-libs/xcb-util-keysyms
+	)
+	x264? ( >=media-libs/x264-0.0.20190214:= )
+	x265? ( media-libs/x265:= )
+	xml? ( dev-libs/libxml2:2 )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zvbi? ( media-libs/zvbi )
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
+	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
+	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
+	"${FILESDIR}"/${PN}-3.0.8-qt-5.15.patch # TODO: upstream
+	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
+)
+
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	xdg_src_prepare # bug 608256
+
+	has_version 'net-libs/libupnp:1.8' && \
+		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+
+	# Bootstrap when we are on a git checkout.
+	if [[ ${PV} = *9999 ]] ; then
+		./bootstrap
+	fi
+
+	# Make it build with libtool 1.5
+	rm m4/lt* m4/libtool.m4 || die
+
+	# We are not in a real git checkout due to the absence of a .git directory.
+	touch src/revision.txt || die
+
+	# Don't use --started-from-file when not using dbus.
+	if ! use dbus ; then
+		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+	fi
+
+	# Disable running of vlc-cache-gen, we do that in pkg_postinst
+	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
+		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+
+	eautoreconf
+
+	# Disable automatic running of tests.
+	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+}
+
+src_configure() {
+	local -x BUILDCC=$(tc-getBUILD_CC)
+
+	local myeconfargs=(
+		--disable-aa
+		--disable-optimizations
+		--disable-rpath
+		--disable-update-check
+		--enable-fast-install
+		--enable-screen
+		--enable-vcd
+		--enable-vlc
+		$(use_enable a52)
+		$(use_enable alsa)
+		$(use_enable aom)
+		$(use_enable archive)
+		$(use_enable aribsub)
+		$(use_enable bidi fribidi)
+		$(use_enable bidi harfbuzz)
+		$(use_enable bluray)
+		$(use_enable cddb libcddb)
+		$(use_enable chromaprint)
+		$(use_enable chromecast)
+		$(use_enable chromecast microdns)
+		$(use_enable cpu_flags_arm_neon neon)
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable dav1d)
+		$(use_enable dbus)
+		$(use_enable dbus kwallet)
+		$(use_enable dc1394)
+		$(use_enable debug)
+		$(use_enable directx)
+		$(use_enable directx d3d11va)
+		$(use_enable directx dxva2)
+		$(use_enable dts dca)
+		$(use_enable dvbpsi)
+		$(use_enable dvd dvdnav)
+		$(use_enable dvd dvdread)
+		$(use_enable encode sout)
+		$(use_enable encode vlm)
+		$(use_enable faad)
+		$(use_enable fdk fdkaac)
+		$(use_enable ffmpeg avcodec)
+		$(use_enable ffmpeg avformat)
+		$(use_enable ffmpeg postproc)
+		$(use_enable ffmpeg swscale)
+		$(use_enable flac)
+		$(use_enable fluidsynth)
+		$(use_enable fontconfig)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable gme)
+		$(use_enable gnome-keyring secret)
+		$(use_enable gstreamer gst-decode)
+		$(use_enable ieee1394 dv1394)
+		$(use_enable jack)
+		$(use_enable jpeg)
+		$(use_enable kate)
+		$(use_enable libass)
+		$(use_enable libcaca caca)
+		$(use_enable libnotify notify)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable libtar)
+		$(use_enable libtiger tiger)
+		$(use_enable linsys)
+		$(use_enable lirc)
+		$(use_enable live live555)
+		$(use_enable lua)
+		$(use_enable macosx-notifications osx-notifications)
+		$(use_enable mad)
+		$(use_enable matroska)
+		$(use_enable modplug mod)
+		$(use_enable mp3 mpg123)
+		$(use_enable mpeg libmpeg2)
+		$(use_enable mtp)
+		$(use_enable musepack mpc)
+		$(use_enable ncurses)
+		$(use_enable nfs)
+		$(use_enable ogg)
+		$(use_enable omxil)
+		$(use_enable omxil omxil-vout)
+		$(use_enable optimisememory optimize-memory)
+		$(use_enable opus)
+		$(use_enable png)
+		$(use_enable projectm)
+		$(use_enable pulseaudio pulse)
+		$(use_enable qt5 qt)
+		$(use_enable rdp freerdp)
+		$(use_enable run-as-root)
+		$(use_enable samba smbclient)
+		$(use_enable sdl-image)
+		$(use_enable sftp)
+		$(use_enable shout)
+		$(use_enable sid)
+		$(use_enable skins skins2)
+		$(use_enable soxr)
+		$(use_enable speex)
+		$(use_enable srt)
+		$(use_enable ssl gnutls)
+		$(use_enable svg)
+		$(use_enable svg svgdec)
+		$(use_enable taglib)
+		$(use_enable theora)
+		$(use_enable tremor)
+		$(use_enable twolame)
+		$(use_enable udev)
+		$(use_enable upnp)
+		$(use_enable v4l v4l2)
+		$(use_enable vaapi libva)
+		$(use_enable vdpau)
+		$(use_enable vnc)
+		$(use_enable vorbis)
+		$(use_enable vpx)
+		$(use_enable wayland)
+		$(use_with X x)
+		$(use_enable X xcb)
+		$(use_enable X xvideo)
+		$(use_enable x264)
+		$(use_enable x264 x26410b)
+		$(use_enable x265)
+		$(use_enable xml libxml2)
+		$(use_enable zeroconf avahi)
+		$(use_enable zvbi)
+		$(use_enable !zvbi telx)
+		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
+		--disable-asdcp
+		--disable-coverage
+		--disable-cprof
+		--disable-crystalhd
+		--disable-decklink
+		--disable-gles2
+		--disable-goom
+		--disable-kai
+		--disable-kva
+		--disable-libplacebo
+		--disable-maintainer-mode
+		--disable-merge-ffmpeg
+		--disable-mfx
+		--disable-mmal
+		--disable-opencv
+		--disable-opensles
+		--disable-oss
+		--disable-rpi-omxil
+		--disable-schroedinger
+		--disable-shine
+		--disable-sndio
+		--disable-spatialaudio
+		--disable-vsxu
+		--disable-wasapi
+		--disable-wma-fixed
+	)
+	# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# Compatibility fix for Samba 4.
+	use samba && append-cppflags "-I/usr/include/samba-4.0"
+
+	if use x86; then
+		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+		append-cflags $(test-flags-CC -fno-stack-check)
+		# Bug 569774
+		replace-flags -Os -O2
+	fi
+
+	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
+	append-cxxflags -std=c++11
+
+	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+
+	if use truetype || use bidi; then
+		myeconfargs+=( --enable-freetype )
+	else
+		myeconfargs+=( --disable-freetype )
+	fi
+
+	if use truetype || use projectm; then
+		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
+		myeconfargs+=(
+			--with-default-font=${dejavu}/DejaVuSans.ttf
+			--with-default-font-family=Sans
+			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+			--with-default-monospace-font-family=Monospace
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values may break the build (bug 523144), so definition should not be removed.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
+	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
+}
+
+src_test() {
+	virtx emake check-TESTS
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
+		"/usr/$(get_libdir)/vlc/vlc-cache-gen" "/usr/$(get_libdir)/vlc/plugins/"
+	else
+		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
+		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+		ewarn "If you do not do it, vlc will take a long time to load."
+	fi
+
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
+		rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+	fi
+
+	xdg_pkg_postrm
+}
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 7b9bcc5e9502..2cd26034d19a 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+LUA_COMPAT=( lua5-{1..2} )
+
 MY_PV="${PV/_/-}"
 MY_PV="${MY_PV/-beta/-test}"
 MY_P="${PN}-${MY_PV}"
@@ -21,7 +23,7 @@ else
 	fi
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86"
 fi
-inherit autotools flag-o-matic toolchain-funcs virtualx xdg
+inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
 
 DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
 HOMEPAGE="https://www.videolan.org/vlc/"
@@ -46,6 +48,7 @@ REQUIRED_USE="
 	libcaca? ( X )
 	libtar? ( skins )
 	libtiger? ( kate )
+	lua? ( ${LUA_REQUIRED_USE} )
 	skins? ( gui truetype X xml )
 	ssl? ( gcrypt )
 	vaapi? ( ffmpeg X )
@@ -54,6 +57,7 @@ REQUIRED_USE="
 BDEPEND="
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
+	lua? ( ${LUA_DEPS} )
 	amd64? ( dev-lang/yasm )
 	x86? ( dev-lang/yasm )
 "
@@ -142,7 +146,7 @@ RDEPEND="
 	linsys? ( media-libs/zvbi )
 	lirc? ( app-misc/lirc )
 	live? ( media-plugins/live:= )
-	lua? ( >=dev-lang/lua-5.1:0= )
+	lua? ( ${LUA_DEPS} )
 	mad? ( media-libs/libmad )
 	matroska? (
 		>=dev-libs/libebml-1.3.6:=
@@ -226,6 +230,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
 	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
 	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
+	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index a93a385cb40e..bd6ded539cc6 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+LUA_COMPAT=( lua5-{1..2} )
+
 MY_PV="${PV/_/-}"
 MY_PV="${MY_PV/-beta/-test}"
 MY_P="${PN}-${MY_PV}"
@@ -21,7 +23,7 @@ else
 	fi
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86"
 fi
-inherit autotools flag-o-matic toolchain-funcs virtualx xdg
+inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
 
 DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
 HOMEPAGE="https://www.videolan.org/vlc/"
@@ -46,6 +48,7 @@ REQUIRED_USE="
 	libcaca? ( X )
 	libtar? ( skins )
 	libtiger? ( kate )
+	lua? ( ${LUA_REQUIRED_USE} )
 	skins? ( gui truetype X xml )
 	ssl? ( gcrypt )
 	vaapi? ( ffmpeg X )
@@ -54,6 +57,7 @@ REQUIRED_USE="
 BDEPEND="
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
+	lua? ( ${LUA_DEPS} )
 	amd64? ( dev-lang/yasm )
 	x86? ( dev-lang/yasm )
 "
@@ -144,7 +148,7 @@ RDEPEND="
 	lirc? ( app-misc/lirc )
 	live? ( media-plugins/live:= )
 	loudness? ( >=media-libs/libebur128-1.2.4:= )
-	lua? ( >=dev-lang/lua-5.1:0= )
+	lua? ( ${LUA_DEPS} )
 	mad? ( media-libs/libmad )
 	matroska? (
 		>=dev-libs/libebml-1.3.6:=
@@ -229,6 +233,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
 	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
+	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
diff --git a/media-video/webcamoid/Manifest b/media-video/webcamoid/Manifest
index b4e059323633..5c09af4e8ade 100644
--- a/media-video/webcamoid/Manifest
+++ b/media-video/webcamoid/Manifest
@@ -2,5 +2,5 @@ AUX webcamoid-8.1.0-ffmpeg-4.patch 7369 BLAKE2B 64c7e45b9b8b29efe6982dff8205eb30
 DIST webcamoid-8.1.0.tar.gz 10062681 BLAKE2B e9501ace9ba42abdae4be4e9e689329b02796198fe2610ef3a404535d389a6aa7a7e540148548dd63ea6ba78c9b650b30f5497396e49b37d7ab06ca8708ad056 SHA512 6db53ed29288889c05955967d961b53fa0e4171aeed12cd1557829c26bb2e2031804319fcead4c5b888a695cfd84f531a27f992be56c38366076ff2945ec2dbb
 DIST webcamoid-8.7.1.tar.gz 8900338 BLAKE2B f379811cf9e44e67caa80c301c2774f13c686fa4721b5adc85dcd803ea97edb07073e53575c7dae8dab4ebfa0a9ee4f3691511cc7ddd6b55f84ae2cc77cd3c52 SHA512 b9a4b1dd4c863ab126e304eabce47c025ec0e3eb85a5b42035d26caa004399bde733913c0a5598ada3deb01673bd42ea54c9d2b06d300608582e63dda75d9bf6
 EBUILD webcamoid-8.1.0-r1.ebuild 2173 BLAKE2B 88a417bdc552eb7967c408a61530d5ed28f3f2b8939a67aa9f62d9503be42c217ce07bc5f3590a2a75cc6765ebbd54cab90c12e15147d1a89b4e7eeba709b7bb SHA512 1ca411734d92988a89b25fa4fe81dda185ce5f2676da6623b886941bbfec779f203f5896083f145327601f82f19b9132f43a416dfac86fb954289c5f2f2abdfc
-EBUILD webcamoid-8.7.1.ebuild 1579 BLAKE2B 412bb6fe657f6615c5c71955944335b5e3969c591932c57bbafa78a3d9740861ce06ddfd78ca0578994a80c1fa3f5c76d8c2b8b237395059da0bf7aff0c5f127 SHA512 b2e297c1d07aa4b77ef53d922acf142b6180bdff973872b4f41f9499a7c1fd672ea2f3fd2338a520386af4951df44bc78ab57bfa38364c1c04e880cde1ec5cfa
+EBUILD webcamoid-8.7.1.ebuild 1586 BLAKE2B 1e4d64b0bcf3ccab556890d5e1b4d05e57f7e7a52af1d2752a850f274a7b5686db1adf530705b05ff45f408724c3a62841aab96522b51351166dd45dbc7f1f96 SHA512 3527d48529234811384c36323290788cadd0a610ff53fea24d8defb36c8f031880f8fdc9fd6a12ff3406905386899aa07eb352de4c9f3f543ab9cbdec0b67fb4
 MISC metadata.xml 784 BLAKE2B ce617d4a9bcbf3f8e4ce651fd673bf3c0015e13bc8814d4b4e97eaa4a6c5428553d4a314054315fd3dc8a6b1362b4a322a4af78745f3c3d2378e2e731bdc9ef9 SHA512 6518965213e9deffdb6163243865c9e37ec0a14b6e83558761ff27ad7984003be1b6c6518d455631cd2af29f663b6e91f60dd061151e63b3a4f5ad73e35df5cf
diff --git a/media-video/webcamoid/webcamoid-8.7.1.ebuild b/media-video/webcamoid/webcamoid-8.7.1.ebuild
index fb51238ea518..e2492b146025 100644
--- a/media-video/webcamoid/webcamoid-8.7.1.ebuild
+++ b/media-video/webcamoid/webcamoid-8.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/webcamoid/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 IUSE_AVKYS=( alsa coreaudio ffmpeg gstreamer jack libuvc oss pulseaudio qtaudio v4lutils videoeffects )
 IUSE="${IUSE_AVKYS[@]} debug headers v4l"
author	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
commit	6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree	25413d1cb3a0cbfe36029db32398c0f333609215 /media-video
parent	9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)