gentoo resync : 18.12.2020

29 files changed, 189 insertions, 257 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 070655dd6ded..6fc9a226e2de 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/cinelerra/Manifest b/media-video/cinelerra/Manifest
deleted file mode 100644
index 5c04fbe10a6a..000000000000
--- a/media-video/cinelerra/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX ffmpeg4.patch 3163 BLAKE2B 2c7ce91de448b09d34da82d5bef7f23804d37932ad80d2717162e56141f189a2beb12cd6baf2a82712747fd547268e08c2661ce99531ba7553ba351e34a1ba65 SHA512 abaa0d7d63dc3e8ac931ebadd2d9f0057a24ca829c582b5f9e00e2d5fe1d8c9c5f92f3e7d5f8c2422bb1c4a8f6221baaa0679296ac8945ade71bb1a2e9b60262
-DIST CinelerraCV-2.3.tar.xz 25705608 BLAKE2B 70efe03d8c928faca0b60f76b83d7147a7ef68ebee06e7afcb589fd24d73ecbe96e16a375c38f5c89cf337593c824cc22dd6301790ac988946671cb12ba901e6 SHA512 908dc097af8507e3b60b4787e0350500b8ba8c4340bbbdbf3716e61d74074e5f0617500b94ed1d450e030f88f3821f948cfa37c247ec2c2571fd76974374868e
-DIST cinelerra-2.3-patchset.tar.xz 10056 BLAKE2B c50d65a991a2643267f4c9aff11fb8caf09ba1fae0abe89125207312e8129b28f5ca86846b30a94a90b6958704c1733635b0987752a4d2ec442ea185bf870d89 SHA512 9825729ed15e106b1ec2ca58da4d587597d58a6b62f4440e08e984660821fa0e3cc3dcded5da0a5daae16edf1564a45a32490f50e51d77795ce47e4a5ba39122
-EBUILD cinelerra-2.3-r1.ebuild 3276 BLAKE2B 0a555de7a6a06b2231b2654b32fd7875b3d564864faf7f37b885d4989b34b8082123ad98a4a719e340a3cc43d975dd04ce04a6744c1b0c37b132e6ef61bfb45d SHA512 03453b6317ad3abb4afb54ac582eb3ecafff2e635906c2be65ffbcdcc19da93a892f3facb50e2d1d48a5031496349494053492c32f2ca6552259c12d520efbce
-MISC metadata.xml 259 BLAKE2B d0ebadef8dc30ed8fcc89ae38ab6a5d4af940b2cd75dea1494d96c37557532dea21ef0e014d09e32ae49eca64fe3d6bd56494fb7460ad69b70f40dd4b7ebc8b0 SHA512 c81aea0e68817fa210dc6f66313aee75246139e50d6324338707f11bca2173c64e88ce8440794c85eb64194ff97cf6c6760a06b4822a121e40629bdc3a04e1fd
diff --git a/media-video/cinelerra/cinelerra-2.3-r1.ebuild b/media-video/cinelerra/cinelerra-2.3-r1.ebuild
deleted file mode 100644
index d75728d066f9..000000000000
--- a/media-video/cinelerra/cinelerra-2.3-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils ltprune multilib flag-o-matic
-
-DESCRIPTION="The most advanced non-linear video editor and compositor"
-HOMEPAGE="http://www.cinelerra.org/"
-SRC_URI="https://cinelerra-cv.org/releases/CinelerraCV-${PV}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="cpu_flags_x86_3dnow alsa altivec css debug ieee1394 cpu_flags_x86_mmx opengl oss"
-
-RDEPEND="media-libs/a52dec:=
-	media-libs/faac:=
-	media-libs/faad2:=
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	media-libs/libdv:=
-	>=media-libs/libogg-1.2:=
-	media-libs/libpng:0=
-	media-libs/libsndfile:=
-	>=media-libs/libtheora-1.1:=
-	>=media-libs/libvorbis-1.3:=
-	>=media-libs/openexr-1.5:=
-	media-libs/tiff:0=
-	media-libs/x264:=
-	media-sound/lame:=
-	>=media-video/mjpegtools-2
-	>=sci-libs/fftw-3
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXft:=
-	x11-libs/libXv:=
-	x11-libs/libXvMC:=
-	x11-libs/libXxf86vm:=
-	media-video/ffmpeg
-	|| ( media-video/ffmpeg:0[postproc(-)] media-libs/libpostproc )
-	virtual/jpeg:0
-	alsa? ( media-libs/alsa-lib:= )
-	ieee1394? (
-		media-libs/libiec61883:=
-		>=sys-libs/libraw1394-1.2.0:=
-		>=sys-libs/libavc1394-0.5.0:=
-		)
-	opengl? (
-		virtual/glu
-		virtual/opengl
-		)"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	cpu_flags_x86_mmx? ( dev-lang/nasm )"
-
-S="${WORKDIR}/CinelerraCV-${PV}"
-
-src_prepare() {
-	epatch \
-		"${WORKDIR}"/${P}-patchset/${PN}-20140710-validate_desktop_entry.patch \
-		"${WORKDIR}"/${P}-patchset/${PN}-ffmpeg.patch \
-		"${WORKDIR}"/${P}-patchset/${PN}-20140710-underlinking.patch \
-		"${WORKDIR}"/${P}-patchset/${PN}-20140710-ffmpeg-0.11.patch \
-		"${WORKDIR}"/${P}-patchset/${PN}-libav9.patch \
-		"${WORKDIR}"/${P}-patchset/${PN}-pngtoh.patch \
-		"${WORKDIR}"/${P}-patchset/${PN}-putbits-gcc52.patch \
-		"${WORKDIR}"/${P}-patchset/${PN}-implicit_decls.patch \
-		"${WORKDIR}"/${P}-patchset/${PN}-includes.patch
-
-	if has_version '>=media-video/ffmpeg-2' ; then
-		epatch "${WORKDIR}"/${P}-patchset/${PN}-ffmpeg2.patch
-	fi
-
-	if has_version '>=media-video/ffmpeg-2.9' ; then
-		epatch "${WORKDIR}"/${P}-patchset/${PN}-ffmpeg29.patch
-	fi
-
-	if has_version '>=media-video/ffmpeg-3.5' ; then
-		epatch "${FILESDIR}/ffmpeg4.patch"
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -D__STDC_CONSTANT_MACROS #321945
-	append-ldflags -Wl,-z,noexecstack #212959
-
-	local myconf
-	use debug && myconf='--enable-x-error-output'
-
-	econf \
-		$(use_enable oss) \
-		$(use_enable alsa) \
-		--disable-esd \
-		$(use_enable ieee1394 firewire) \
-		$(use_enable css) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_3dnow 3dnow) \
-		$(use_enable altivec) \
-		$(use_enable opengl) \
-		--with-plugindir=/usr/$(get_libdir)/${PN} \
-		--with-buildinfo=cust/"Gentoo - ${PV}" \
-		--with-external-ffmpeg \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dohtml -a png,html,texi,sdw -r doc/*
-
-	rm -rf "${D}"/usr/include
-	mv -vf "${D}"/usr/bin/mpeg3cat{,.hv} || die
-	mv -vf "${D}"/usr/bin/mpeg3dump{,.hv} || die
-	mv -vf "${D}"/usr/bin/mpeg3toc{,.hv} || die
-	dosym /usr/bin/mpeg2enc /usr/$(get_libdir)/${PN}/mpeg2enc.plugin
-
-	prune_libtool_files --all
-}
diff --git a/media-video/cinelerra/files/ffmpeg4.patch b/media-video/cinelerra/files/ffmpeg4.patch
deleted file mode 100644
index 982073e138bc..000000000000
--- a/media-video/cinelerra/files/ffmpeg4.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Index: CinelerraCV-2.3/quicktime/mpeg4.c
-===================================================================
---- CinelerraCV-2.3.orig/quicktime/mpeg4.c
-+++ CinelerraCV-2.3/quicktime/mpeg4.c
-@@ -625,7 +625,6 @@ static int encode(quicktime_t *file, uns
- // ffmpeg section
- 		{
- 			AVDictionary ** opts = NULL;
--			static char *video_rc_eq="tex^qComp";
- 			codec->encode_initialized[current_field] = 1;
- 			if(!ffmpeg_initialized)
- 			{
-@@ -650,7 +649,6 @@ static int encode(quicktime_t *file, uns
- 			context->pix_fmt = AV_PIX_FMT_YUV420P;
- 			context->bit_rate = codec->bitrate / codec->total_fields;
- 			context->bit_rate_tolerance = codec->bitrate_tolerance;
--			context->rc_eq = video_rc_eq;
-         	context->rc_max_rate = 0;
-         	context->rc_min_rate = 0;
-         	context->rc_buffer_size = 0;
-@@ -658,8 +656,6 @@ static int encode(quicktime_t *file, uns
- 				(!codec->fix_bitrate ? codec->quantizer : 2);
- 			context->qmax = 
- 				(!codec->fix_bitrate ? codec->quantizer : 31);
--			context->lmin = 2 * FF_QP2LAMBDA;
--			context->lmax = 31 * FF_QP2LAMBDA;
- 			context->mb_lmin = 2 * FF_QP2LAMBDA;
- 			context->mb_lmax = 31 * FF_QP2LAMBDA;
- 			context->max_qdiff = 3;
-@@ -680,8 +676,6 @@ static int encode(quicktime_t *file, uns
- 			context->frame_skip_cmp = FF_CMP_DCTMAX;
- 			context->ildct_cmp = FF_CMP_VSAD;
- 			context->intra_dc_precision = 0;
--        	context->intra_quant_bias = FF_DEFAULT_QUANT_BIAS;
--        	context->inter_quant_bias = FF_DEFAULT_QUANT_BIAS;
-         	context->i_quant_factor = -0.8;
-         	context->i_quant_offset = 0.0;
- 			context->mb_decision = FF_MB_DECISION_SIMPLE;
-@@ -689,18 +683,14 @@ static int encode(quicktime_t *file, uns
- 			context->me_sub_cmp = FF_CMP_SAD;
- 			context->me_cmp = FF_CMP_SAD;
- 			context->me_pre_cmp = FF_CMP_SAD;
--			context->me_method = ME_EPZS;
- 			context->me_subpel_quality = 8;
- 			context->me_penalty_compensation = 256;
- 			context->me_range = 0;
--			context->me_threshold = 0;
--			context->mb_threshold = 0;
- 			context->nsse_weight= 8;
-         	context->profile= FF_PROFILE_UNKNOWN;
--			context->rc_buffer_aggressivity = 1.0;
-         	context->level= FF_LEVEL_UNKNOWN;
- 			av_dict_set(opts, "umv", "1", 0);
--			context->flags |= CODEC_FLAG_AC_PRED;
-+			context->flags |= AV_CODEC_FLAG_AC_PRED;
- 
- // All the forbidden settings can be extracted from libavcodec/mpegvideo.c of ffmpeg...
-  			
-@@ -709,7 +699,7 @@ static int encode(quicktime_t *file, uns
- 			   codec->ffmpeg_id == AV_CODEC_ID_H263 ||
- 			   codec->ffmpeg_id == AV_CODEC_ID_H263P ||
- 			   codec->ffmpeg_id == AV_CODEC_ID_FLV1)
--				context->flags |= CODEC_FLAG_4MV;
-+				context->flags |= AV_CODEC_FLAG_4MV;
- // Not compatible with Win
- //			context->flags |= CODEC_FLAG_QPEL;
- 
-@@ -723,12 +713,12 @@ static int encode(quicktime_t *file, uns
- 			}
- 
- 			if(!codec->fix_bitrate)
--				context->flags |= CODEC_FLAG_QSCALE;
-+				context->flags |= AV_CODEC_FLAG_QSCALE;
- 
- 			if(codec->interlaced)
- 			{
--				context->flags |= CODEC_FLAG_INTERLACED_DCT;
--				context->flags |= CODEC_FLAG_INTERLACED_ME;
-+				context->flags |= AV_CODEC_FLAG_INTERLACED_DCT;
-+				context->flags |= AV_CODEC_FLAG_INTERLACED_ME;
- 			}
- 
- 
diff --git a/media-video/cinelerra/metadata.xml b/media-video/cinelerra/metadata.xml
deleted file mode 100644
index 17f11a20c014..000000000000
--- a/media-video/cinelerra/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>media-video@gentoo.org</email>
-		<name>Gentoo Video project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/media-video/devedeng/Manifest b/media-video/devedeng/Manifest
index 7ba28fe527df..e4bf4acb6bd2 100644
--- a/media-video/devedeng/Manifest
+++ b/media-video/devedeng/Manifest
@@ -1,4 +1,4 @@
 AUX devedeng-4.14.0-no_compress_man.patch 878 BLAKE2B f3460e0b28e1a1a80c3f9c1c41e26e608f203e4f9fa59ed93ff837e430ad14231b7375efaf14886fba16ac4f1a1f7247f03a43775441579c364ab91e6b830515 SHA512 d669cd0f55215e90f622acb1ec1895e25b29850ecb1ec5ebe2c5cbf9283f63f8448d064a5938cef250c748feeee0c0da25cdd5370f85d9a61b89532b2e5915cb
 DIST devedeng-4.16.0.tar.bz2 1763318 BLAKE2B ab3e5b3a94ed8f1dfe0482218786a8ab131c16259635c1297c7fb01a0eb7f7106d53ff24665e056f18796d87cf0430d375278e1c074026b134be9308aa8a3f3f SHA512 032c276eeecc3d85b53bf72ee2a3132aac41c2496cabfd1e30cbee7316f1ce3136c8b476bf03bb88930a532a06f6fad7a098d91f0b9a85e4ecabf9f728783f8a
-EBUILD devedeng-4.16.0-r1.ebuild 1153 BLAKE2B 4b9e797c72982028e95c64bb7ff8267b47f4da2c578758899227abca3e191d92a6f036e847e542f1554f152ea73d3b48f58e6c54a7087467f471263da362d77d SHA512 f7df38a6ee4d178fc50d8838dc395960f0f0b18f236bc86a999767f285223aa669b1c481e9fd28e57456ac6a5cbdda9b76e72fccebc262d96edccfde681ee1b0
+EBUILD devedeng-4.16.0-r1.ebuild 1155 BLAKE2B bf20936eb59d77a9fe8aa0c6441bd2eb8c99611f4fe8c36cabe4cd05ebd67cfa2d9a1c2a156a3f1a17e9e69182f1302179f425522e3d8b77297ea4fb43acdb2d SHA512 aa68a01d9c99b47a88cf18481b7fed9bf24297f34b32c04b4cf907d538f9047b26a60a2bfaf92a1756300db57e7d2bde938fd679114923fe683b0c7b4026aee3
 MISC metadata.xml 943 BLAKE2B e1e02dde0b9b21f3d398d1b38cb302842b6f5748405709ba2066dc5497c699f3d7daae40c4daf00eec37a739b5f3ab9d54a78c7e2d700f677abfaeceae75ed09 SHA512 9c5cf515b958e7125d383fc9513546f9a663ea45e4c60308fb20e85eb6eedf22c71a94561721ebffd156ee5b61d5ac309c66c9a7782d905b98a95c2ad8b7b545
diff --git a/media-video/devedeng/devedeng-4.16.0-r1.ebuild b/media-video/devedeng/devedeng-4.16.0-r1.ebuild
index ebc7d38d6cb4..54884ef59be8 100644
--- a/media-video/devedeng/devedeng-4.16.0-r1.ebuild
+++ b/media-video/devedeng/devedeng-4.16.0-r1.ebuild
@@ -16,14 +16,15 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="dev-python/pycairo[${PYTHON_USEDEP}]
+RDEPEND="
+	app-cdr/cdrtools
+	dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	x11-libs/gtk+:3
 	|| ( media-video/vlc media-video/mpv media-video/mplayer )
 	media-video/ffmpeg
 	media-video/dvdauthor
 	media-video/vcdimager
-	virtual/cdrtools
 	|| ( app-cdr/brasero kde-apps/k3b app-cdr/xfburn )"
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/media-video/dvdstyler/Manifest b/media-video/dvdstyler/Manifest
index 8dce596fd2c8..b91b9550f835 100644
--- a/media-video/dvdstyler/Manifest
+++ b/media-video/dvdstyler/Manifest
@@ -1,4 +1,4 @@
 AUX ffmpeg4.patch 541 BLAKE2B ff2ad556e881009ff5ba79b252fd55eb9054ea273f20d4af1bd76440b70d351b03f204ad1ff7648694cab950c49082728b6370a93610dd40c09c10a8609ae5bd SHA512 3ad427f51e5ab24231309f01d410e213df874d01567417ea66bcb88cd39e60d672b4771d8c3f210690eb6d145f3d6f7ff81bca8e1b9c841fb2b895f63070ed11
 DIST DVDStyler-3.0.4.tar.bz2 8870498 BLAKE2B c1ec7651d90613cebbd8d4e62b4626b8a7e2069eadc07bfe9a91e51bf33638135ca975f4857242b3f9ff34606a4e6084200059c82ebc3aa146f446f9b77483ae SHA512 2747e6a494d331b6f35405d7d2ed47789f4452bb3d4e86b0c68cf0fafffb4e6de452b28fac0e9995c312017c7e4e8a3f89ad42bf0a0c99ce19c5d6c0ca6e351a
-EBUILD dvdstyler-3.0.4.ebuild 1713 BLAKE2B 255f9ea3506b6ee50c6400f254c574be3b7a3e098746eab7850cd611e48b5f8be45c57dc9032a3a0b5112813fda531064af30b361b8859cc26871be66cb89a78 SHA512 b0eaa4118079406f85338a9eaf9963c8531d3f63459a266d6d910dd1047ccdae8d407fae0b531e77830790f90619f48a9def255650f8d1f88bfc3311e409a535
+EBUILD dvdstyler-3.0.4.ebuild 1713 BLAKE2B 58af318ed962ecbde9aa69ee0e52340d3235633a302eec9889eb72005b6b6e28994fc8e1739abcf410f42116d16e2dece0a1ddbbd188d3fef60fcbd40e311d8f SHA512 0d6cb6784398df0bfee6b22b8ae535b543304900042a3e33151f2b3512e7c976c967e122bedf147f5e2501d2eb60dc238973601551e70b8599e6d35d10df8853
 MISC metadata.xml 302 BLAKE2B 2e58ce53fb249f7e8c837a58561ac4724b7ca19ae8002465e2c98da67674103bfc4d949cebabc8fb11e313d2eda33a476482e253fb8d3d55bc00b79f3c63e633 SHA512 ebc7b7d7e9d24c31f2e6f3cd811dbf7b36e142974cb909bace0929882230be34552aca8741e471374e62ffed749675440d2ee9b723bfd774a1c503d2a5bd40c2
diff --git a/media-video/dvdstyler/dvdstyler-3.0.4.ebuild b/media-video/dvdstyler/dvdstyler-3.0.4.ebuild
index a2c8db9c5ebb..f34dcb86924f 100644
--- a/media-video/dvdstyler/dvdstyler-3.0.4.ebuild
+++ b/media-video/dvdstyler/dvdstyler-3.0.4.ebuild
@@ -18,13 +18,13 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug +udev"
 
 COMMON_DEPEND="
+	app-cdr/cdrtools
 	>=app-cdr/dvd+rw-tools-7.1
 	media-libs/libexif:=
 	>=media-libs/wxsvg-1.5.11:=
 	>=media-video/dvdauthor-0.7.1
 	>=media-video/ffmpeg-2.6:0=[encode]
 	>=media-video/xine-ui-0.99.7
-	virtual/cdrtools
 	virtual/jpeg:0
 	x11-libs/wxGTK:${WX_GTK_VER}=[gstreamer,X]
 	sys-apps/dbus
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 0faa9d140be4..0fecf5cdafe5 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,6 +1,5 @@
-AUX 1.15.3-configure-CXXFLAGS-quoting.patch 356 BLAKE2B d342f54821634f8a36d200ae9a3f54ad8400f9c7a68ad5af3a9992fdf62e2029be0cc5bd39a8da6713dec5f08972f79ae411ddabc294e48760005ef46860fbf8 SHA512 56da4d54a44805a21c35b2fae1aff1dedafd3b08782174ab140b0ead5e551d673593d652cddfbe3b0d778660f3134755cf97abf457d648b0ba739ddefd039270
 AUX makemkv-path.patch 1579 BLAKE2B 6ca7ed6c854c0357fea864bedc3f65a1051a466a52db1380bf1904c97bfa2b455beeb7ff9852fe57f6d224ed659df63d02db96a281be7a14f0587bece9aff75b SHA512 9294d3645b953fdb7ca24e83066becfbf07e03cab01d0aaf4527cf2d54fb0990649da1f766836a0f3efea9c363c8f00116b4624c49fd7bcfa197cae2ef17e6ed
-DIST makemkv-bin-1.15.3.tar.gz 8664187 BLAKE2B 37f026306a0601709659cfc2478e59251dd7fc1567f8b43326ddbefa55c9bfee77dc8f0f81d3e8e111e78ad9da0f4b32613d5ffbcae542a8978c49467be80db6 SHA512 4555c1fbb609b3b6d842fced374a8a6fab0bc69952f4349a1c6636964d7384001d1e6e7a91fae3715c4cf468cbfbd713f89d17e53eef6c5d69edfa158e47d8bd
-DIST makemkv-oss-1.15.3.tar.gz 6403409 BLAKE2B c02881c13236d65eba5bbc66d9191ba4b2da53e1d776c502427a02ee8b18091db90643d7e8c3f94be5b5c80c40dfc5df282daee6f69c42d32383937aba33e700 SHA512 11248f4d35a16793a13a94c92f8eef060206e95d2383da06ce7adeadcd445dc12d09bad79142169cc32e514594b2c6cacf9ab216d446eece531c849a8803f13a
-EBUILD makemkv-1.15.3.ebuild 3021 BLAKE2B ef64035d9c61bfa5ecd180a496a1714aa346ad01c0e2c1154a9bf1eb5f4682ab49b847016292c5b7fa2d72f4643327395e3b51ca384b41a6a116ae33d85f1e11 SHA512 bc44e4529fe32491b32fb82774168d7fd33b769702bbdf922e69a02c8e8cc7bb15d6f6e4f9c0a4fd82827a8ef3db0a75981901ddcaf612ef7ca5168ceaa61702
+DIST makemkv-bin-1.15.4.tar.gz 8976023 BLAKE2B 945d5efc61d4302690201a63caa959580476635729d78f8b9fcb0f252af9874b10b9f6a771c724eb76ffe00fa4217773890045b1657335d9910f753c8de5a5bd SHA512 f08377a77807bffc66e34f38975018ebf14a7bba91e0bb7ffce1d8376e52660b9c8f5da154ea5bf55b3d42b57ad301ac43a8c74ec97aad7d40f926029fa09c09
+DIST makemkv-oss-1.15.4.tar.gz 6405606 BLAKE2B 84e958b6004fa66a52186118be1ca696a181e300d21a2be583917181b3f1f87ee47b760e3cbcfc26b4fcdae4711fd18962c42763ce8ec6b176aaf865ab4e45b0 SHA512 f812d63363ddac68d50a0a4b3d2c3dd46000b8775d7885d61d5bf9dde013e3e9ff9cef558bcf54b2d59f5c4725dbfc014d48be3f3996d1055df761072fa4d62f
+EBUILD makemkv-1.15.4.ebuild 2967 BLAKE2B 3056d4075015a84f6878590eeedd697951e38e7bfd238296b7d8b1a07806b3e1983c08381dc4afcb24d039b9da07b0d101fa260b5f75c55d46d2ce5505965dd0 SHA512 9b8758710482309f68c1ad6e8fb862830be9c4affafc5b7dd95e37aaa4fd8b6003831c942d5886162e61bf8f300dde771af86b0d37ae94f9d8eb1b9f1011bbc4
 MISC metadata.xml 1166 BLAKE2B f2e594a7e322225101561a998472a832c3d2559dbfd79817f2fd1eaf9b0e7145fb467b9b0421d13b3df90ece45ff969d97e9e44d9147d4b0a57e4d8fd9104345 SHA512 d8e8d898cf3ee9428fc1b08e292608da7a4f753ad22053a521c475e9445dafa9ac7c2c5139ed4ab9009b0d59e95737f77773d15f8590b8a4cf0f39961d714fb7
diff --git a/media-video/makemkv/files/1.15.3-configure-CXXFLAGS-quoting.patch b/media-video/makemkv/files/1.15.3-configure-CXXFLAGS-quoting.patch
deleted file mode 100644
index 3dfe508a24a4..000000000000
--- a/media-video/makemkv/files/1.15.3-configure-CXXFLAGS-quoting.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur makemkv-oss-1.15.3~/configure makemkv-oss-1.15.3/configure
---- makemkv-oss-1.15.3~/configure	2020-10-01 13:59:27.000000000 +0000
-+++ makemkv-oss-1.15.3/configure	2020-10-03 20:49:45.588257151 +0000
-@@ -11726,7 +11726,7 @@
- ENABLE_DEBUG=$enable_debug
- 
- 
--if test -z $CXXFLAGS; then
-+if test -z "$CXXFLAGS"; then
-     CXXFLAGS='-std=c++11'
- fi
- 
diff --git a/media-video/makemkv/makemkv-1.15.3.ebuild b/media-video/makemkv/makemkv-1.15.4.ebuild
index 3c81c3d3988b..643dfc37ef2a 100644
--- a/media-video/makemkv/makemkv-1.15.3.ebuild
+++ b/media-video/makemkv/makemkv-1.15.4.ebuild
@@ -50,7 +50,6 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-path.patch
-	"${FILESDIR}"/${PV}-configure-CXXFLAGS-quoting.patch
 )
 
 src_configure() {
diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest
index f6eac22d5078..757bd42c964b 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -1,6 +1,10 @@
 AUX motion.confd-r4 773 BLAKE2B 1a7f0128ec385751d75152c4a36cc2afe57a36b55cd5efe5035af3e78df775edf11568f8bae3acbf7c986b967087cb8b633724bb08bbbf24a0102a082dc5a55f SHA512 4aff16be6fd77909751b034ada9611522acb3c8de0fd160fe67c415eb54cb63a8adad055972ffc3ea7428588a6f5673bb9b311be4660c180796d6067eb3c45e5
+AUX motion.confd-r5 884 BLAKE2B 63c497e942ae499271504d308f826f23d718ac968f7735e340ef2fa8a7b1a64d63365686cc00137141bd4b788975c00b4ea3eaf38c1dd9bd219d3d50ff0da8e0 SHA512 998dcfe4160c90adf2683f0194fcf867f0062f1e54355c1158ecb9965a5ed2c30f362147ac9a915b42ba681184d91e78c3a1d397c4b92ee48440d00f3ac0df99
 AUX motion.initd-r4 975 BLAKE2B a9f001318783f793474ef295d5724ff207d646051783d9927b2949c5c3adf65fef11ca63071f1401cab017ba1cf676f39bb2298b848e9f57185a1875c7e4c316 SHA512 ee0b471da01f7a7bb6a19fb974ec775e5d830b4970b5a690b2ba8043bddfe79245c72546d4a41b5d3bb50adbe03b79373ecc643161b50bd88386e66ee318b9ef
+AUX motion.initd-r5 1083 BLAKE2B cc013f9d529b722be26db8ead665380ce1724436f53e0131705bd99177d5f5eabaad939df78995be28d20f002753c7d43b382781660df3f56bf4126bb3cda75c SHA512 4106c502d75f6c5d58766d3bc784dc75b2a1ba0c4897093ed3afb6c1e5efc2032e150d657b8471e70f34ff932c4db93ef1adf55485159bd6906a4766fd5fb12e
 AUX motion.service-r4 462 BLAKE2B 3aeac7440cb545bbf7c41a59eb81260202e7783f701ed20ad33e8f69356bcc78ff7a23b3f518df7dc0ab0eb664d05b75e449afa7abbf1f993ad3c77b0eb83fb7 SHA512 2fbcdb381888d63d0becfc04473f915d75f97e267e4fb2bcf2554e53cbc302fd45b544b7c267a99a05540fb79ce4fcf3e3bc7e973fe08d0db5481e7728c02a1f
 DIST motion-release-4.3.1.tar.gz 849633 BLAKE2B 33039d9b8b6db0698767892997be958d84a881cc56e8cdc31d8c27242c972e629d328197c92f91c1b71a957d85807877dc602f474d430384b1e27c9213ddc697 SHA512 17033dab055c4f1d9e2912a27d0a5b419d325b0781def98428a6117e38c62201b87199210071ba93d6c4dae514733b749e39cbc1befe6242f157d4583e07dcc6
+DIST motion-release-4.3.2.tar.gz 849378 BLAKE2B 2ff49f44bb1d57123760860ae17cc241ecabf3d045ac0c45e1ca08ce3ac8be2fec308492472c37c0d869bc21a7c04658c923c763f9b8f6b547403fc094b03196 SHA512 df54297eebc44b3bc50fd40890c69a9cbbfc5936224bf7027065364e794d7201ceadd99ac99bf43113ec3368f2b5ca435d2956258b9c774e03a6750b41346a7c
 EBUILD motion-4.3.1.ebuild 2855 BLAKE2B 595ffa0920ab840308ca9562657532b61cf72d528a2bc976b384332d97ed255512710c142267479be2b04b7c255004d32ff230c5324871d7f85ba65281157667 SHA512 36bf969a4608a3156d1a798ae39f0df5d174d0557ff752dfdc060aa7e05e6146ff432827d0537b07231bdc922c8f886ef51c34a6f8f9097820ac177f239038fd
+EBUILD motion-4.3.2.ebuild 2236 BLAKE2B 3ec7e973cc902ecda2c17f48234aa2551b3f8b5e888ef1ae85ac48081b5fa06c958dac9a67c7ccbdc3ece7fff24608c2fec9c01afc6f755b90c495db625317e4 SHA512 449b61cacce85d6b183b43424881535b7ea861e5588ef4f5605b799de7b4f156dccc1120fdd9942034450af96f7e1d4f9891c26ae1eecd107f423c8f629ef8be
 MISC metadata.xml 850 BLAKE2B b9ead6c9f74bb359c2bb282c0f6f8c33707fbd42aa458314c93bc754e2f707dc51fcfe5e0e0e2216af8435c2aa10d9e1c5885a838236b1ea274453c84f95f303 SHA512 419521643cbaefd58973bc764594ec44fdc927890c837eda0733af575073a8655e58da76f4a22467ae1d014898d828b84e9de85bb442cd9505911af1a04395b1
diff --git a/media-video/motion/files/motion.confd-r5 b/media-video/motion/files/motion.confd-r5
new file mode 100644
index 000000000000..6ea8774cc4f4
--- /dev/null
+++ b/media-video/motion/files/motion.confd-r5
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+#
+# Motion OpenRC conf.d file
+# All settings are optional
+
+# Set the user and group under which motion will be run
+#MOTION_USER="motion"
+#MOTION_GROUP="motion"
+
+#Set motion's config file:
+#MOTION_CONFIGFILE="/etc/motion/motion.conf"
+
+#Set motion's log file. Leave unset for syslog:
+#MOTION_LOGFILE="/var/log/motion/motion.log"
+
+#Set log type:  1-9 for COR, STR, ENC, NET, DBL, EVT, TRK, VID, ALL
+#MOTION_LOGTYPE="9"
+
+#Set log level: 1-9 for EMG, ALR, CRT, ERR, WRN, NTC, INF, DBG, ALL
+#MOTION_LOGLEVEL="6"
+
+#Set a default dir where motion places its output
+#MOTION_DIR="/var/lib/motion"
+
+#Set the umask for the output files, for additonal security
+#MOTION_UMASK="007"
+
+#Uncomment to under under start-stop-daemon instead of supervise_daemon
+#MOTION_PIDFILE="/var/run/motion.pid"
+
diff --git a/media-video/motion/files/motion.initd-r5 b/media-video/motion/files/motion.initd-r5
new file mode 100644
index 000000000000..b13ac5d0b5b7
--- /dev/null
+++ b/media-video/motion/files/motion.initd-r5
@@ -0,0 +1,37 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+: ${MOTION_USER:="motion"}
+: ${MOTION_GROUP:="motion"}
+
+[ "${MOTION_UMASK}" ] && umask="${MOTION_UMASK}"
+[ "${MOTION_CONFIGFILE}" ] && command_args="-c ${MOTION_CONFIGFILE}"
+[ "${MOTION_LOGFILE}" ] && command_args="${command_args} -l ${MOTION_LOGFILE}"
+[ "${MOTION_LOGTYPE}" ] && command_args="${command_args} -k ${MOTION_LOGTYPE}"
+[ "${MOTION_LOGLEVEL}" ] && command_args="${command_args} -d ${MOTION_LOGLEVEL}"
+
+command=/usr/bin/motion
+command_user="${MOTION_USER}:${MOTION_GROUP}"
+
+start_pre() {
+  if [ "${MOTION_DIR}" ] ; then
+    checkpath -d -o "${MOTION_USER}":"${MOTION_GROUP}" "${MOTION_DIR}"
+    directory="${MOTION_DIR}"
+  fi
+  if [ "${MOTION_LOGFILE}" ] ; then
+    checkpath -f -o "${MOTION_USER}":"${MOTION_GROUP}" "${LOGFILE}"
+  fi
+  if [ "${MOTION_PIDFILE}" ] ; then
+    pidfile="${MOTION_PIDFILE}"
+    command_background=true
+  else
+    supervisor=supervise-daemon
+  fi
+}
+
+depend() {
+  need localmount
+  after bootmisc
+  use mysql postgresq
+}
diff --git a/media-video/motion/motion-4.3.2.ebuild b/media-video/motion/motion-4.3.2.ebuild
new file mode 100644
index 000000000000..19e930a8ae01
--- /dev/null
+++ b/media-video/motion/motion-4.3.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools readme.gentoo-r1 systemd
+
+DESCRIPTION="A software motion detector"
+HOMEPAGE="https://motion-project.github.io"
+SRC_URI="https://github.com/Motion-Project/${PN}/archive/release-${PV}.tar.gz -> ${PN}-release-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ffmpeg mariadb mmal mysql postgres sqlite v4l webp"
+
+RDEPEND="
+	acct-group/motion
+	acct-user/motion
+	virtual/jpeg:=
+	ffmpeg? ( media-video/ffmpeg:0= )
+	mariadb? ( dev-db/mariadb-connector-c )
+	mmal? ( media-libs/raspberrypi-userland )
+	mysql? ( dev-db/mysql-connector-c )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )
+	webp? ( media-libs/libwebp:= )
+"
+DEPEND="${RDEPEND}
+	net-libs/libmicrohttpd
+	v4l? (
+		media-libs/libv4l
+		virtual/os-headers
+	)
+"
+
+# Breaks src_install(), #727056
+RESTRICT="test"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+You need to setup a configuraton file (/etc/motion/motion.conf) before
+running motion for the first time.
+
+If motion is built with the mysql or mariadb use flags then please make
+sure to configure a matching database_type in the config file.
+
+Motion runs by default under user motion and group motion:
+- change this if needed in /etc/conf.d/motion
+- or add users who need access to the output files to the motion group
+
+To install motion as a service, use:
+- rc-update add motion default # with OpenRC
+- systemctl enable motion.service # with systemd
+"
+
+S="${WORKDIR}"/${PN}-release-${PV}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ffmpeg) \
+		$(use_with mariadb) \
+		$(use_with mmal) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with sqlite sqlite3) \
+		$(use_with v4l v4l2) \
+		$(use_with webp) \
+		--without-optimizecpu
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF} \
+		examplesdir=/usr/share/doc/${PF}/examples \
+		install
+
+	newinitd "${FILESDIR}/motion.initd-r5" ${PN}
+	newconfd "${FILESDIR}/motion.confd-r5" ${PN}
+	systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service"
+	readme.gentoo_create_doc
+	readme.gentoo_print_elog
+}
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 5a20f569187e..e7fdcebd386b 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,7 +1,7 @@
 DIST mpv-0.32.0.tar.gz 3148730 BLAKE2B 085c38f0074dd005462aef52ef01ad7cfd70ebf9286a1f6544635e49c8c99bf4fcc5559eeb6e07ef8471388eb77794019fb50c44ea5fcc16842b63ee382e9e7c SHA512 f6426c0254ec0bf2f120e2196904f1e15fe17032b06764abca1d5e074f0cabb452eaf1cd09f8fd9b25b591accee7b881bfc3b06c19d5c98980305c4712486bd6
 DIST mpv-0.33.0.tar.gz 3259387 BLAKE2B c9ffaccb2258493517814490ab589ef298d6a0ba66398683f5fd1bcb01e2c073c99b8276a60951bea766ee85c726456d8a4ae329cf8748de4f15bb346161a269 SHA512 5a4af74ba2c9656c6b61adcf944c734923c7b4527a49cd79ec63a0617911629438a138d887dfbd4b6c0c9c53e2c68c18839d98d9765179e52cc5675d0682e077
 DIST waf-2.0.9 103104 BLAKE2B c7e996aa49662da3ff941d076fc7e2dd23e867ade92a3b2ae07560b76d63a69e495184a1f9c76be5c51977ddb1713f9247f62e672033ecb988ac559e3a47e546 SHA512 0755170ded115b03e78a2096f197cd9fff62b5036db764153d26ce426f182ea7d7b8231cfa1a10b4a564a8480428502f3691851df66e7b83c7bca8e5fe26de7d
-EBUILD mpv-0.32.0-r2.ebuild 9727 BLAKE2B a005cd15bc4539580a5fe275df8407c83e9e3f1458ed0437899459a50e758ac5cfe642751ecc6b75e98bc4bc33d0414b28f812df7c393810e4ca180ab4276e61 SHA512 01e3f0bf828665e36f2bfd4fd310189c49d1a60e9f5f1fc6e841ea81c1af323011a3d90d438b17dedd8252bbd1e8b62f20e3fd9f8d9bef41cd111bc80b865323
-EBUILD mpv-0.33.0.ebuild 9401 BLAKE2B a53f23a42019bade8a2c6ee0613a048e1cbf75333ee18e6f5def9a4abec67a5a34a0dd9ac32c98bebd04b932b0421ebaac89be863cae95a9f4e4331b73e8ec47 SHA512 45e957fb502398b66d1a5588892cb32980da96da2a547718b0dfac81a1a4650fa77f1ebf81d977c53983a7b0d2914aec7845b34ecbae8ac8f84be45613d6cb9e
-EBUILD mpv-9999.ebuild 9401 BLAKE2B a53f23a42019bade8a2c6ee0613a048e1cbf75333ee18e6f5def9a4abec67a5a34a0dd9ac32c98bebd04b932b0421ebaac89be863cae95a9f4e4331b73e8ec47 SHA512 45e957fb502398b66d1a5588892cb32980da96da2a547718b0dfac81a1a4650fa77f1ebf81d977c53983a7b0d2914aec7845b34ecbae8ac8f84be45613d6cb9e
+EBUILD mpv-0.32.0-r2.ebuild 9728 BLAKE2B 6d82550003be24ecf3fdd2f4d6e36c9c78cf86476a68e54e8114245e940059d91ecd7b346959a92cf3a3e034463117138063de49488c16eef4703e3b693cbff0 SHA512 6f04a328b862cf18ec29accbf60aed2166b9b7beb1eb110999ef35eb0fc21d216c9453ca1f280bbe73466e3217b3064e4e565bcce5e2a5ae2de269d874a3ae5b
+EBUILD mpv-0.33.0.ebuild 9402 BLAKE2B 27d1b87eb595164284c98259b9659964c54ff9afeb3bebea7966de2e912fbab21e4ee4be4129653942a6cad75f7dd98452f439c7e5b27892b078f977a8dd1c31 SHA512 3c80283e1cd1baf3dd63b9e81e5c340eb2eabb5df3f1c196706489928e63a7883eff32aed948b1319e5028096cefd14f070647780fc50b1c48fc72302d50c8ad
+EBUILD mpv-9999.ebuild 9402 BLAKE2B 27d1b87eb595164284c98259b9659964c54ff9afeb3bebea7966de2e912fbab21e4ee4be4129653942a6cad75f7dd98452f439c7e5b27892b078f977a8dd1c31 SHA512 3c80283e1cd1baf3dd63b9e81e5c340eb2eabb5df3f1c196706489928e63a7883eff32aed948b1319e5028096cefd14f070647780fc50b1c48fc72302d50c8ad
 MISC metadata.xml 2325 BLAKE2B ea9ce00b54f9aabf4f37dcbf20c94f6583e219638f6831e0f8f3292df0768d7e6c597a9072903604f8dbb7f88ef15cad87b2cbe57a41d22554e554cc6e9663b1 SHA512 84802287f2655571923a44c7383bac2f70838890b18222d0b060a371a79dbe5022bb7c186bb1ac6496b930c62dacafbc132178b60b0746bd2cce4eb08a5c6be7
diff --git a/media-video/mpv/mpv-0.32.0-r2.ebuild b/media-video/mpv/mpv-0.32.0-r2.ebuild
index 2c3b877590fe..5fdd039b1778 100644
--- a/media-video/mpv/mpv-0.32.0-r2.ebuild
+++ b/media-video/mpv/mpv-0.32.0-r2.ebuild
@@ -87,7 +87,7 @@ COMMON_DEPEND="
 	)
 	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
 	lua? (
-		!luajit? ( <dev-lang/lua-5.3:= )
+		!luajit? ( <dev-lang/lua-5.3:0= )
 		luajit? ( dev-lang/luajit:2 )
 	)
 	openal? ( >=media-libs/openal-1.13 )
diff --git a/media-video/mpv/mpv-0.33.0.ebuild b/media-video/mpv/mpv-0.33.0.ebuild
index d2374bfb2e4a..e60b0b482c2b 100644
--- a/media-video/mpv/mpv-0.33.0.ebuild
+++ b/media-video/mpv/mpv-0.33.0.ebuild
@@ -84,7 +84,7 @@ COMMON_DEPEND="
 	virtual/ttf-fonts
 	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
 	lua? (
-		!luajit? ( <dev-lang/lua-5.3:= )
+		!luajit? ( <dev-lang/lua-5.3:0= )
 		luajit? ( dev-lang/luajit:2 )
 	)
 	openal? ( >=media-libs/openal-1.13 )
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index d2374bfb2e4a..e60b0b482c2b 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -84,7 +84,7 @@ COMMON_DEPEND="
 	virtual/ttf-fonts
 	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
 	lua? (
-		!luajit? ( <dev-lang/lua-5.3:= )
+		!luajit? ( <dev-lang/lua-5.3:0= )
 		luajit? ( dev-lang/luajit:2 )
 	)
 	openal? ( >=media-libs/openal-1.13 )
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 76d37bad1453..4c0587d199b0 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 3546 BLAKE2B a93b384c2685c19df8c381289fe89f8fde931a34ddd785d82ff7434b2535a35ffb2b443af6b9e42abcc592d31181b4577ba9f5f089088182a853a04943487bc8 SHA512 9e8a5a4928da5e9a0fa2ef1b0bb90a0d8d2b75c0332dd485f646a7045c649a28a21aa1ffa85d06374f133cc44158cacfc4c94debab8088b13b154a0fc4d2d3b2
-EBUILD obs-studio-9999.ebuild 3487 BLAKE2B fbf41ac397689e232cbf6eebb704b247182d8d6406fb092937d5f5bb56c2ef88c3bc042123bff3b80c86063b9ab3c4e20a430e4835116a918e517f9894e7022f SHA512 9f25931871ad6b4de691666ac2010c22128ca5dc4740905d2189ecb8baf0a89e95a28d91364c9ef2a94f01933de6b8de159602ce9509c581ad147a33df33d8bb
+EBUILD obs-studio-25.0.8-r1.ebuild 3544 BLAKE2B 2b2f4df593f1616d7ba315d7410c6ffe7a6b1858688c149bf263cb64be6864b9492bd6f5d35a0d8160de81d41c62b0616ee6f28af2613b283c602109603576b3 SHA512 b883f912e288bd1819e0baf26de55912a42ba14b8da6cfd87f2d4d174e8e2d5162429fb18a6e33b072413536c63fde55333aac9859c08accbb95e678698dc2a3
+EBUILD obs-studio-9999.ebuild 3485 BLAKE2B 59491eed9c4e0ef4e7cfe5cc9241570ee319090eda8c9575db84d8da9eee8d8867f7796e5ace284d64ba72494b74430be3c23458261fd47f9ee8e7ffb44ae283 SHA512 fc9d7d1b7de0df70a2b3bc90ec7955051ea9d0eb54fd6dccc745a3d6521eb3083eb1c7e296bd5963bfb5b7879384c87b0ff573059cbc618e1e6effec02861138
 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 614dda2f9b43..8bdbdd3a6e49 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,8} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 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 b0a065e2cfe1..c8ccd0308e53 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,8} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils python-single-r1 xdg-utils
 
diff --git a/media-video/rav1e/Manifest b/media-video/rav1e/Manifest
index 8397547aee32..1c9f0e9c7086 100644
--- a/media-video/rav1e/Manifest
+++ b/media-video/rav1e/Manifest
@@ -234,6 +234,6 @@ DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST y4m-0.5.3.crate 11447 BLAKE2B d3a7081899f12a50907ecbce6f63f1b1119618aefdc97bf967d5fe5b908b234552aac0fe96cc359f12aad7018af8b47b34b6219e0d87d036c8b4df1c1bcf1a27 SHA512 2d414d178c4bc16db7f5804987494629d12b85b409327012db2e9e868a7bb952cb630a86190fb455228ae40776b2c30c042eca65a1d3730e8425daf53f034991
 EBUILD rav1e-0.3.3.ebuild 4153 BLAKE2B 96f69c97721839eb9eaf7249780a50c95f3eaf7acc59d405cc618a8502bcfc480f93faa7518fb38a4e75fbeb1a1b09f910917dd1123de0b1cd8b7f2ec972f194 SHA512 dfdeccc66fba51e839cacc73c6c6502b86c30d6e7e771e186f7803cc5e82633858b2dba88b7baf73fa144ede00e1dc96a7f02314d286b05be11c9a92bf0efbf7
-EBUILD rav1e-0.3.4.ebuild 4209 BLAKE2B 157f908ac8703990d365535724e1bab189414007b433a9b3f1625e50a62f67e6e66db4c68146ec2d93e0b4721e53fda13787db24a100e84c65e0531411fe7013 SHA512 72c7588c92ab56084ce3e6a401cb4e34ca0470bdd6be2c0f5d4921eef4c3f09cb859d26925e2a5d15208331f5b84053aa4098ca102944b8f5cc4cbac2dfbb7aa
+EBUILD rav1e-0.3.4.ebuild 4206 BLAKE2B 780afff57f232730b4a2350bea35bde861106b5f009185996d0519a4b3cc2e9882509c55d253a9fd12c8dc78ec61193f79210a356dddb88c94808ffbdbab7713 SHA512 1d3905625b10cb8f8003eb4094f3d5a0a5871fa3cbea8472d357006d91a2c2efae68b7dfc1cb4c8527399cbb25de58caab31b81afd2dfe4660cd7f0abc0d5042
 EBUILD rav1e-9999.ebuild 1361 BLAKE2B 8eaf63b69c5eef56c0e7fb725aea974e688da362dec3cfe1bac18562f281102e0f4430c1dd612c66425e60d7146b2b8e5504717229cd19e260834c2d2bd6e74b SHA512 e0f16779f8646fe7f283a5f0a07b3374aa5db1f31155637780a0dc3d25148664373e92907e27d4a1259e063d7a392c8a9e320a21bf05c4bbc4fe756fa5b8d1c9
 MISC metadata.xml 396 BLAKE2B 3f15123aeeca6df02c1b6a886418af6cfd4e4e977a5a93b2cc13301ae8e5a17a918a9e8116e19ae120cc27e42bcdaeb5e6c546f99b0333144bbc4aa9960b862e SHA512 4d650221196a5f48b12f2dcd6ccd3ea56abc7ec205e78d470aae267c7706cf81f03a691ca916d5c2a8c9e09a62c07b0802b5c688bc60bbc09d74ea7a135278ed
diff --git a/media-video/rav1e/rav1e-0.3.4.ebuild b/media-video/rav1e/rav1e-0.3.4.ebuild
index dfbd0d979e89..74e42d2b18e4 100644
--- a/media-video/rav1e/rav1e-0.3.4.ebuild
+++ b/media-video/rav1e/rav1e-0.3.4.ebuild
@@ -180,7 +180,7 @@ else
 		https://github.com/xiph/rav1e/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		$(cargo_crate_uris ${CRATES})
 		"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 fi
 
 DESCRIPTION="The fastest and safest AV1 encoder"
diff --git a/media-video/streamdvd/Manifest b/media-video/streamdvd/Manifest
index 8fc94982adb6..d3cfc3e0371d 100644
--- a/media-video/streamdvd/Manifest
+++ b/media-video/streamdvd/Manifest
@@ -5,5 +5,5 @@ AUX streamdvd-0.4-libdvdread.patch 1460 BLAKE2B 68577f49d3c837c9d2148838459e3e3b
 AUX streamdvd-0.4-makefile.patch 1378 BLAKE2B d8a244cb91f246eefa9da4f39a861f9f6bef84580a0b2faff3f01d0ad7c0c7ecc2f8a62711b4f5abca8c6e985a6d70934f49724bb052be8e284c506fe70d59c3 SHA512 5234433fd985ef561c43420a6f7a1ee30c4748ce5a4c04e3a6864e95f42fae1b97c8c0e1a6adb0c6c395500a7f007263621cab8779dc57535287a6ba81a32988
 AUX streamdvd-0.4.patch 785 BLAKE2B 665bf98e78727abeba771b5dc84eaaccadc14fafe8978e21bde1480630d197a6dfa213e9f8d662d4813078d1ab66ffd4f33bc2513f99e6d93684cb3aa086eebb SHA512 81edce3f825c38a28aeafe25fcd1dad3b71413fdc22892fcbe5d0af32235b43f2256a6f38b3997dfea1306f492d2f4c96e0b85fe39802111502bea4af17013a7
 DIST streamdvd-0.4.tar.gz 152669 BLAKE2B 700ce4f03eabf3e3531bac4ab7b618c55a96e636c459368740597124353f9639cfd7c6b00a5a4eacfd438c3a6a7966c0c8dd42dedd3ab877ad96317a8658aa1e SHA512 81e8fdaf028799be7269c239ec5717bd5da58254b7eeef35ee5d436c4408fb02f9badbc5ff8a661903d10ec43bbaca68d8792f729293f6330c2a9e92ee0c48a5
-EBUILD streamdvd-0.4-r2.ebuild 1509 BLAKE2B a0c78477a3e6013ef698da81af49a3deeb7a72d1da7e866743065cb674e9550dbb01cc17867cbc076e0ee46ec11e3304dc8df740fe74bbe8ecf813804a72ece8 SHA512 1fb72131f1cc5b1ef74f56b648135179fdf06656c421c5964c75f1e80777a8102ba05d6e4337c4fc78d9012229daba8001ea9c283246d22d17f9edde25316e1f
+EBUILD streamdvd-0.4-r2.ebuild 1511 BLAKE2B f4236a3382bf6cdc1a0731987a80e109dcfa56caa84a8bd02f02f4b5411c7b9c981cd99c9bd2b965ee7f93a543cc3ebe608c13b5bd246770cf3a0eca1dd9385c SHA512 47990c7a782feb3e75ad68fc0e6dfb4a59eb3ecfb84384868565b80cf3317d6435cfc2c46523be8d10788d67dfa8d70b5eaebc05b7500d071d50dfc4c5cc3012
 MISC metadata.xml 559 BLAKE2B d5dd932f55599c1f38b5c68472a7e635852dd846d3c4cb85bf99f783c861be56cf5f846da27fb81460e68b97666b2bcd229655e987380a84c74c352f20668516 SHA512 17ff5079ade1e6a7c74298fe8e6f5737cb3fd0822f3318b198c32af761043c218739bb90865c616229ffba5698711a970d48f83df02716e7f82ab819c3c8fa98
diff --git a/media-video/streamdvd/streamdvd-0.4-r2.ebuild b/media-video/streamdvd/streamdvd-0.4-r2.ebuild
index 9c889d779a06..c235978a8e29 100644
--- a/media-video/streamdvd/streamdvd-0.4-r2.ebuild
+++ b/media-video/streamdvd/streamdvd-0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,11 +15,12 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE="X"
 
-DEPEND="media-libs/libdvdread
+DEPEND="
+	app-cdr/cdrtools
+	media-libs/libdvdread
 	media-video/lsdvd
 	X? ( dev-perl/Tk
 	dev-perl/Tk-JPEG-Lite
-	virtual/cdrtools
 	>=media-video/dvdauthor-0.6.5
 	>=app-cdr/dvd+rw-tools-5.13.4.7.4 )"
 
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index b5657b59939e..de064fa35bd8 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -3,5 +3,5 @@ AUX xine-ui-0.99.10-libcaca.patch 977 BLAKE2B f91dd8813b549ea00db0028e6a86d04ff7
 DIST xine-ui-0.99.10.tar.xz 1762968 BLAKE2B eede1a7b43f3fca37c092541145a4d13813185a740c396503bdfc93fd96d4d3bf52ad2daed4389634e2a517972c1233e3d9b1af74b718dd9def58eb2e702d967 SHA512 73cbc72375b27335e9d5f5527c35dab12d1ae40539b587630b3d8709471e4c61ce7b619062b75f587252c0647c234ffcf611f3b4e38e0447f7041b7ca5d7289e
 DIST xine-ui-0.99.12.tar.xz 1980672 BLAKE2B ac1a9b17b48005c667d53129e51f4db2cfe2933c0fca9ba8b6f1d999f903568217a061c84806abfec31d4afcc238579c232a1ae6f4b04afcac465c340826f037 SHA512 bc04cb8df730abce147485b488250331a304e4318fc28ebab890c6485242a5edeafd953547c637622e2312c65aa1e36aaae6117d608dd668781d841804f2ae86
 EBUILD xine-ui-0.99.10.ebuild 2028 BLAKE2B 153fb6819a95fab8058fc3d7241419ac9f5b5797042ba077088bec627f3906017da9f349c3af63da76b3a1a74505c2d5a3103ac5689411177355116cd46a12fc SHA512 ae9301c83a7d404229d6b7714f5b761e1224f173f01666ce9fd47c6be74fb765ffc091717674e484af2c15d7954acf1d559c5563eb1f730b6cc23c7da12fa64f
-EBUILD xine-ui-0.99.12.ebuild 2007 BLAKE2B a421631ee8e5fa2e0d57fbfd2be68e2082dc3d4411a36645f483167e8c7cbf80ee170192e437dd7ae6b80479d8ad8bddc9a4ca983b42d5a07c1f9c42e0e2050d SHA512 ef126e93efaabc3cf022fd73d598a79858e4d2bcfe5e26c0526675b0bab0bf0847229e8885b1601bfc7e8d568dde1242e3c0b2829b5c933845e529b6c64e8e6c
+EBUILD xine-ui-0.99.12.ebuild 2004 BLAKE2B 91945b6d3b4983f7ff33a63f450acc9e48ed4c76615d31fe3d9b9b01ad69306f32a615f6bf7afd7c3be68b3881b7b8901651c3cc787b318e2ab66727d68962cb SHA512 670c1c65bd22d5e01f104f58cacedd53744190ac530ada52f8b771bfdb74c215f858d73666eff9ab0e5c250b02dd26ed8392eb9022ffd23c432a073813a0f903
 MISC metadata.xml 386 BLAKE2B 8874545c1b0a0b9f60505dc08c933e3268f42b64fb1eed4e889d30af4ba3b6c74b1b1986f06425aa00ca81ab91e993a37e2c723ec4f53bbf69a2ccae8ba3ed69 SHA512 ead8587493161ece36b38168e0c628a05a97d1dfc7dddec3d7a966a783621634be28bd661a6e0d65e370dd7066ef49019265967f7394aa4026b3ae97de26a820
diff --git a/media-video/xine-ui/xine-ui-0.99.12.ebuild b/media-video/xine-ui/xine-ui-0.99.12.ebuild
index dfd01debeaae..4564f30e7d86 100644
--- a/media-video/xine-ui/xine-ui-0.99.12.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~x86"
 IUSE="aalib curl debug libcaca lirc nls readline vdr X xinerama"
 
 RDEPEND="