gentoo resync : 02.09.2020

25 files changed, 208 insertions, 650 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 0259583f46a4..9691e9ced868 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 6bf6b8d0bbbf..02f97657e8e2 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -6,7 +6,7 @@ DIST ffmpeg-4.2.4.tar.bz2 10959430 BLAKE2B 932bc0046edab5587063bbc04d6ef0149876b
 DIST ffmpeg-4.3.1.tar.bz2 11301038 BLAKE2B 3b0eb332459921435b60e72f5c572034abf65d4ab79ef4cfae94fe594048eaa37eec47724d119863102a7211c2178f5a2382a6d4016b792818079b8241bde084 SHA512 831a187d8b8f2715a9f11c93c8d3ec126ff579d470797da452d3395178877de113af7ae90ed27fca0b223791ad257972570481e6dbb8361d2b7f3b010924bee8
 DIST ffmpeg-4.3.tar.bz2 11297005 BLAKE2B 41b4752aa2c1a937e4e82ec76ca38f48c1dcca633cb77f100aeb6c56f0acc218a39621d8b1046d38f65b3fa5b0871fea7ace16348266ca1244dd889620bc73ab SHA512 fdccd281407d5bed0f673ad01ddc9134cd9a31f040b55e30f3b27913b877732b9d19c6ceeda96afb360e1ff49f4930f6c320747b240cf38d541df81a8ef4272f
 EBUILD ffmpeg-4.2.4.ebuild 18169 BLAKE2B b771bf50bfce5c754963f431f085c29b962bed73e55e805e112986281abf025cf7723e8cdc5f15829d06424aadbc6899c644f5e4ca56a2a113920a13c5c8b13b SHA512 b26527dc7e5c46dbe8b958efd4d5ebd51d91e258c2a6b23d1d9c9fcc4ddbbe72f1ad9751b8dd9273ebd0840003db83db16babc15ca844e33df2a06ac16add793
-EBUILD ffmpeg-4.3.1.ebuild 18156 BLAKE2B ea2d037faa0abe0c8f22311cab890607cfd24f6418faa5a1d89476af077d9087a6f96fe6c249c9dbbe20c4289c8a28680559373dce7604fc2afc896b3af8d413 SHA512 d4dc125cf3f61962970999bc9ce09fa75aed52c185bed176d8e3b1221624650c150aae5f2e320cfe9f75d781d8bba061926dcabbaaaec11bdd73c43c52f1d6bf
+EBUILD ffmpeg-4.3.1.ebuild 18159 BLAKE2B 51a71d9b85636e6f0934232a973ee3fb235eda05323854c039cf429e879c75982d1cf8a2d348f92e1eeb163d7f79e2e93dc11578a671d161d82d9dc05e34d2f7 SHA512 1d8f010973f37afffd2cd5289c7f542c6c48986bdcd924abb3ee8ce95e01bc96581fbe06ec6ff0bc59c33fa825e1e240fe539761880c1c14a927ffe4d83eb2ef
 EBUILD ffmpeg-4.3.ebuild 18073 BLAKE2B e2d136288b39467aa76fbaf34cbe1a2a17fa31a429f77f180b11240ccc8c0f4a58c0bc1cd90d18f16a1f3e3235c74b46ef447f6b0bd86b523cd81ee878c3abe0 SHA512 0a1db2d31f8c67cc3de0234c2221158f1ea11d7fc79ed285eebe38174e3569fa3a1d128ee407b9ca46a6da127c7b1abe221d9ab6a29ecbebca220208dcadacbc
-EBUILD ffmpeg-9999.ebuild 18119 BLAKE2B 9eaf194fd418e97c87b335a7e8603ed46e1da2c9d31dbacc5884fd6e2d64f3bff197173bbdb25cc0b1310e08e926ffbeb62e3db3fe4c569b79d7897eb23ad522 SHA512 90624dca7aecc001516ddda0cd7e2661c98e084f8887acb38cd3025ad8c7ef8e59ca709fa8ab8c941e8db086de6f73dae96311d2e269a4b8c88a600b06e0ab7b
+EBUILD ffmpeg-9999.ebuild 18122 BLAKE2B 3a3af0827a4505857b5d03956aa049166e302f8f3541e968a2bf622beb57513408cf3f64b2510994b5c5b6089b550c17581ca50961e719ebfe48da438c9e7bdf SHA512 45b7f238a292b4f25c4bd4a1b82c00f02d6abd171f510e152f74bffe8b76d1a4b2794c5f32d146ffa5bc326bc83dfe0d0316ab1cf014276cb44dd0d5d0a68c14
 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 a4cbbf7a5b34..e1d995bd1cf5 100644
--- a/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
@@ -214,7 +214,7 @@ RDEPEND="
 		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
 	)
 	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=media-libs/libdc1394-2.2.1:2=[${MULTILIB_USEDEP}]
 		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
 	)
 	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index cc62b228342d..ba04a594bd2b 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -214,7 +214,7 @@ RDEPEND="
 		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
 	)
 	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=media-libs/libdc1394-2.2.1:2=[${MULTILIB_USEDEP}]
 		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
 	)
 	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index cd484d2e04b6..a3cfd1bc15dd 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,11 +1,5 @@
-AUX ffmpeg4.patch 1832 BLAKE2B 1770e99dacc641b066d79b83ad145631a1cbe0330e5bcf938b7f6b12bbf648de4185c09ef0fd0cc86e3dd257f1e99f194ab2c5cc5e1125b1c48ed24d413656ab SHA512 81d2f029f0b07e3e32a28a0a9fd6c35ea278d671a6173a58ddb7825b8eb38307d4be58e8dcfb3ca9bb19441964111438fa0b850033ec3f1cc69408b7e9bc9a66
-AUX gpac-0.7.1-configure.patch 2928 BLAKE2B 98ce3227f87c3c4576f5d4bc3a28d560ca3f8d7912414984c7ea58dd27c5717ce30f28b0508368b39fb5b19159e363892fecd0d60d137bd65a4c3d7e02a6d69f SHA512 f359693d43b3d033bc05c8af4951aff9cb432601421d888e50296c6164157b85be368ea4ae828e5229ae9344738bd49136d947ef0eb57bf545f80c3243c94046
-AUX gpac-0.7.1-openssl-1.1.patch 4037 BLAKE2B e03c781c54a78ae3b36aec5766b47a8bc1fafceccf03e04517bdf5756cc15214dc22fe3ee20a1deb1a68b4ead6b198fd30fac04bccb584fd2fda321e4ff2204e SHA512 1ffdde35f09e0ae8b037d00c0e57fabf402053acc46201ed3be791b16436bcdebd6c0ed232de45d40279891c06ddb9bf26a3a5093fd379850495808930f878bb
 AUX gpac-0.8.1-configure.patch 3221 BLAKE2B 702dc30844d48091f13b01c344a877095c09250a274be64610d49553691c24bce3b8cb4cb41bbcb06e5655a3ed9ced23a5120a90d32a5bf59508a5ac401964cf SHA512 4217ee7034ae70bd7edf9ce2c3b0d090841c314bea27a9368da34b84dd593d9d5553955423f229912f6d8d1561ba7f25330b11bb2ab0e334d6051ce6c391b993
-AUX gpac-freetype.patch 622 BLAKE2B b27d2ae313ca95cd46280b56d42b631854995d5e283269ea2f059b6be8bb547949e6c241f62ec4692b7b31626898cf31874ee8e8462e6cc414353aa8b72965cf SHA512 8361efbe7fa8989d63a8de733094e2f9e0f7467d7bf437330477bcbc4091517619c925aef056a1ee57c3cc7b0f3e973abab5cb095a5a8444ff1b220bbb7a2dde
-DIST gpac-0.7.1.tar.gz 10654838 BLAKE2B 795fd11d6bf02bb0d27d97f2c98017e9875aae26ea7d99c5587c7ec5ccc8273283fbce6444389ff4371a34d0e7d03102982ff8a8ec014c7f0c2ddd36c684cba9 SHA512 0377d9471db9e5ccf75f85dfd0c9f4e37a211108b5e128a5411ac015bd9c906257320d517717f0fa03d434e1fce24bd8a9c3a73200fac5c21b80895b716ab403
 DIST gpac-0.8.1.tar.gz 11432459 BLAKE2B 5c08d6c903b4865c19818c5cee07c0a0ebd1775f168740eadc3722d6b19ed685d4f6089cee4bbd68a52bf7cce4cf564c083deb629c47ba35eac66c754f3136cf SHA512 f2039fe91a502ea8c54330abf893d52d10fb57d4459f5f3aae28122f565ab8964011b67e6af0d79c170fa55b125ac1385fd1d280021da7d1d37b27c74ee5b6c1
-EBUILD gpac-0.7.1-r1.ebuild 3348 BLAKE2B 794caa4244cca181c66bac42ddcb1fa1fa1a640e10629cfe5d4aa34f431d4bbd567e7c92f9e9a969edda01edd6294302027d5a2528bd4739e5a0989648ba4ed9 SHA512 b92577b53cbe98971be2eeb9464a1607cd0be5c153e9d532b89ea395461038f632cb2c3acdf86d35b64917d08851c2b4ffe019345f066eddc069d0d7751bb7c8
-EBUILD gpac-0.8.1.ebuild 3312 BLAKE2B 284037fb1c379acc3be7cda0782669eb2dc90fdd19584fc31f6a765379cfdf5e9be3222c0bc25c92c0b0feb331cccd652415ce98dd0aba46f97cacb52c3f6764 SHA512 b96e3ccc1d3b3d849b93ada2d1d6be7ac5f0ffe9dd82b300a3cf908c54b839d9a86693d126665e3a49a1855d77ce9b77545c2d7dc90558f9c8cccd248b36193c
+EBUILD gpac-0.8.1.ebuild 3307 BLAKE2B c3e648d567676021dd9410d0a9b3d155b46df03672fce0c20979d0ed49bc331c32e3c897d70a97b373636be062995a682fa7cb39452bdafa26927bec1c4b767b SHA512 e82f9528bb74a55059118839cefb2e3af0ded030d9e99184a639f5cfa5f47ec880c1e3ca3f997db800c3eb8cf051548dad9d2ba82e93a61f6631c66414c40560
 EBUILD gpac-9999.ebuild 3116 BLAKE2B ebce6b15686887a082521e278f48b33045641ce1c4fd891d5fdbc00d08e841b0c13ec9217ced028a087643f9cc2f487489fcc406daf757ec2add2031bf036c27 SHA512 0a0772d18c18c0a6e5af1878c000ddbf8657afe38486f3ad357d659eaba4650b750b47b0270a2bd2d1b0d094587bcfe86dc4168f3e99539ed98e064e2f5820a0
 MISC metadata.xml 356 BLAKE2B 02d021261f873991949e9d24bdd1f2791a93e033c6a350bd014bdc9d2fa32f733547d8f7b78733f010d95420e07d4d1c0dd63ac367757dcc505a4eb0801921bb SHA512 651073c0156c19eda006ee7622db5a127f1e2f747ed7e0cb141be1abca2084a1427ea82a888b335a68b056980b68a693f852b44d96bfe47f28cc985bf72dfac4
diff --git a/media-video/gpac/files/ffmpeg4.patch b/media-video/gpac/files/ffmpeg4.patch
deleted file mode 100644
index 61f329806a55..000000000000
--- a/media-video/gpac/files/ffmpeg4.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gpac-0.7.1/applications/dashcast/video_encoder.c
-===================================================================
---- gpac-0.7.1.orig/applications/dashcast/video_encoder.c
-+++ gpac-0.7.1/applications/dashcast/video_encoder.c
-@@ -144,7 +144,7 @@ int dc_video_encoder_open(VideoOutputFil
- 	}
- 
- 	//the global header gives access to the extradata (SPS/PPS)
--	video_output_file->codec_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+	video_output_file->codec_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
- 
- 	video_output_file->vstream_idx = 0;//video_stream->index;
- 
-Index: gpac-0.7.1/modules/ffmpeg_in/ffmpeg_decode.c
-===================================================================
---- gpac-0.7.1.orig/modules/ffmpeg_in/ffmpeg_decode.c
-+++ gpac-0.7.1/modules/ffmpeg_in/ffmpeg_decode.c
-@@ -49,7 +49,7 @@
- static uint8_t * ffmpeg_realloc_buffer(uint8_t * oldBuffer, u32 size) {
- 	uint8_t * buffer;
- 	/* Size of buffer must be larger, see avcodec_decode_video2 documentation */
--	u32 allocatedSz = sizeof( char ) * (FF_INPUT_BUFFER_PADDING_SIZE + size);
-+	u32 allocatedSz = sizeof( char ) * (AV_INPUT_BUFFER_PADDING_SIZE + size);
- 	if (oldBuffer)
- 		gf_free(oldBuffer);
- 	buffer = (uint8_t*)gf_malloc( allocatedSz );
-@@ -577,7 +577,7 @@ static GF_Err FFDEC_GetCapabilities(GF_B
- 		capability->cap.valueInt = 1;
- 		return GF_OK;
- 	case GF_CODEC_PADDING_BYTES:
--		capability->cap.valueInt = FF_INPUT_BUFFER_PADDING_SIZE;
-+		capability->cap.valueInt = AV_INPUT_BUFFER_PADDING_SIZE;
- 		return GF_OK;
- 	case GF_CODEC_REORDER:
- 		capability->cap.valueInt = 1;
-@@ -669,7 +669,7 @@ static GF_Err FFDEC_GetCapabilities(GF_B
- 		break;
- 
- 	case GF_CODEC_PADDING_BYTES:
--		capability->cap.valueInt = FF_INPUT_BUFFER_PADDING_SIZE;
-+		capability->cap.valueInt = AV_INPUT_BUFFER_PADDING_SIZE;
- 		break;
- 	default:
- 		capability->cap.valueInt = 0;
diff --git a/media-video/gpac/files/gpac-0.7.1-configure.patch b/media-video/gpac/files/gpac-0.7.1-configure.patch
deleted file mode 100644
index 8bc3ec9f9079..000000000000
--- a/media-video/gpac/files/gpac-0.7.1-configure.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- gpac-0.7.1/Makefile.orig	2017-07-25 09:34:51.910379115 -0600
-+++ gpac-0.7.1/Makefile	2017-07-25 09:36:18.906385736 -0600
-@@ -252,7 +252,9 @@
- 	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/include/gpac/enst/*.h "$(DESTDIR)$(prefix)/include/gpac/enst"
- endif
- 	mkdir -p "$(DESTDIR)$(prefix)/$(libdir)"
-+ifeq ($(STATIC_LIBS),yes)
- 	$(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/$(libdir)"
-+endif
- 	$(MAKE) installdylib
- 
- uninstall-lib:
---- gpac-0.7.1/src/Makefile.orig	2017-07-25 09:37:48.157392528 -0600
-+++ gpac-0.7.1/src/Makefile	2017-07-25 09:39:06.092398459 -0600
-@@ -267,16 +267,20 @@
- 
- ifeq ($(CONFIG_DARWIN),yes)
- 
-+ifeq ($(STATICLIBS),yes)
- 	$(LIBTOOL) -s -o ../bin/gcc/libgpac_static.a $(OBJS)
- 	$(RANLIB) ../bin/gcc/libgpac_static.a
-+endif
- ifneq ($(STATICBUILD),yes)
- 	$(CC) $(SHFLAGS) $(LD_SONAME) -o $@ $(OBJS) $(EXTRALIBS)  $(LDFLAGS)
- endif
- 
- else
- 
-+ifeq ($(STATICLIBS),yes)
- 	$(AR) cr ../bin/gcc/libgpac_static.a $(OBJS)
- 	$(RANLIB) ../bin/gcc/libgpac_static.a
-+endif
- ifneq ($(STATICBUILD),yes)
- 	$(CC) $(SHFLAGS) $(LD_SONAME) -o $@ $(OBJS) $(EXTRALIBS)	 $(LDFLAGS)
- 	mv $@ $@.$(VERSION_SONAME)
---- gpac-0.7.1/configure.orig	2017-07-25 10:01:58.789502926 -0600
-+++ gpac-0.7.1/configure	2017-07-25 10:02:54.110507136 -0600
-@@ -109,6 +109,7 @@
- has_openjpeg="no"
- gprof_build="no"
- static_build="no"
-+static_libs="no"
- want_pic="no"
- want_gcov="no"
- has_joystick="no"
-@@ -260,6 +261,7 @@
-   --enable-amr-wb          enable AMR WB library
-   --enable-amr             enable both AMR NB and WB libraries
-   --enable-static-bin      link statically against libgpac
-+  --enable-static-lib      GPAC static libraries build
-   --static-mp4box          configure for static linking of MP4Box only.
-   --enable-depth           enables depth handling in the compositor
- 
-@@ -705,15 +707,6 @@
-     CFLAGS="$CFLAGS -Wno-pointer-sign"
- fi
- 
--
--#GCC opt
--if test "$no_gcc_opt" = "no"; then
--    CFLAGS="-O3 $CFLAGS"
--else
--    CFLAGS="-O0 $CFLAGS"
--fi
--
--
- #GCC PIC
- if test "$cross_prefix" != "" ; then
-     want_pic="no"
-@@ -1885,6 +1878,8 @@
-             ;;
-         --enable-static-bin) static_build="yes";
-             ;;
-+        --enable-static-lib) static_libs="yes";
-+            ;;
-         --disable-ipv6) has_ipv6="no"
-             ;;
-         --disable-wx) has_wx="no"
-@@ -2559,6 +2554,7 @@
- echo "debug version: $debuginfo"
- echo "GProf enabled: $gprof_build"
- echo "Static build enabled: $static_build"
-+echo "Static libs enabled: $static_libs"
- echo "Memory tracking enabled: $use_memory_tracking"
- echo "Fixed-Point Version: $use_fixed_point"
- echo "IPV6 Support: $has_ipv6"
-@@ -3194,6 +3190,7 @@
- echo "GPROFBUILD=$gprof_build" >> config.mak
- echo "MP4BOX_STATIC=$static_mp4box" >> config.mak
- echo "STATICBUILD=$static_build" >> config.mak
-+echo "STATICLIBS=$static_libs" >> config.mak
- 
- echo "CONFIG_IPV6=$has_ipv6" >> config.mak
- if test "$has_ipv6" = "yes" ; then
diff --git a/media-video/gpac/files/gpac-0.7.1-openssl-1.1.patch b/media-video/gpac/files/gpac-0.7.1-openssl-1.1.patch
deleted file mode 100644
index e25a5bca78bb..000000000000
--- a/media-video/gpac/files/gpac-0.7.1-openssl-1.1.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From e64a7d229fdcb5c190064b7860ade50124dcc735 Mon Sep 17 00:00:00 2001
-From: Aurelien David <aurelien.david@telecom-paristech.fr>
-Date: Fri, 6 Oct 2017 16:46:18 +0200
-Subject: [PATCH] compatibility with OpenSSL 1.1.x (#616)
-
-diff --git a/src/utils/downloader.c b/src/utils/downloader.c
-index b8c923b88..3b7d37b41 100644
---- a/src/utils/downloader.c
-+++ b/src/utils/downloader.c
-@@ -204,7 +204,7 @@ struct __gf_download_manager
- 	u32 limit_data_rate, read_buf_size;
- 	u64 max_cache_size;
- 	Bool allow_broken_certificate;
--	
-+
- 	GF_List *skip_proxy_servers;
- 	GF_List *credentials;
- 	GF_List *cache_entries;
-@@ -392,10 +392,18 @@ static Bool init_ssl_lib() {
- 		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTPS] Error while initializing Random Number generator, failed to init SSL !\n"));
- 		return GF_TRUE;
- 	}
-+
-+	/* per https://www.openssl.org/docs/man1.1.0/ssl/OPENSSL_init_ssl.html
-+	** As of version 1.1.0 OpenSSL will automatically allocate all resources that it needs so no explicit initialisation is required.
-+	** Similarly it will also automatically deinitialise as required.
-+	*/
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 	SSL_library_init();
- 	SSL_load_error_strings();
- 	SSLeay_add_all_algorithms();
- 	SSLeay_add_ssl_algorithms();
-+#endif
-+
- 	_ssl_is_initialized = GF_TRUE;
- 	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTPS] Initalization of SSL library complete.\n"));
- 	return GF_FALSE;
-@@ -422,6 +430,7 @@ static int ssl_init(GF_DownloadManager *dm, u32 mode)
- 	}
- 
- 	switch (mode) {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 	case 0:
- 		meth = SSLv23_client_method();
- 		break;
-@@ -436,6 +445,11 @@ static int ssl_init(GF_DownloadManager *dm, u32 mode)
- 	case 3:
- 		meth = TLSv1_client_method();
- 		break;
-+#else /* for openssl 1.1+ this is the prefered method */
-+	case 0:
-+		meth = TLS_client_method();
-+		break;
-+#endif
- 	default:
- 		goto error;
- 	}
-@@ -771,7 +785,7 @@ void gf_dm_sess_del(GF_DownloadSession *sess)
- 		gf_sk_del(sess->sock);
- 	gf_list_del(sess->headers);
- 	gf_mx_del(sess->mx);
--	
-+
- 	gf_free(sess);
- 	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[Downloader] gf_dm_sess_del(%p) : DONE\n", sess ));
- }
-@@ -1145,7 +1159,7 @@ GF_DownloadSession *gf_dm_sess_new_simple(GF_DownloadManager * dm, const char *u
- {
- 	GF_DownloadSession *sess;
- 	if (!dm) return NULL;
--	
-+
- 	GF_SAFEALLOC(sess, GF_DownloadSession);
- 	if (!sess) {
- 		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("%s:%d Cannot allocate session for URL %s: OUT OF MEMORY!\n", __FILE__, __LINE__, url));
-@@ -1166,8 +1180,8 @@ GF_DownloadSession *gf_dm_sess_new_simple(GF_DownloadManager * dm, const char *u
- 		gf_free(sess);
- 		return NULL;
- 	}
--	
--	
-+
-+
- 	assert( dm );
- 
- 	*e = gf_dm_sess_setup_from_url(sess, url);
-@@ -1225,7 +1239,7 @@ static GF_Err gf_dm_read_data(GF_DownloadSession *sess, char *data, u32 data_siz
- 		gf_mx_v(sess->mx);
- 		return GF_IP_CONNECTION_CLOSED;
- 	}
--	
-+
- #ifdef GPAC_HAS_SSL
- 	if (sess->ssl) {
- 		s32 size;
-@@ -1451,7 +1465,11 @@ static void gf_dm_connect(GF_DownloadSession *sess)
- 							const GENERAL_NAME *altname = sk_GENERAL_NAME_value(altnames, i);
- 							if (altname->type == GEN_DNS)
- 							{
--								unsigned char *altname_str = ASN1_STRING_data(altname->d.ia5);
-+								#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+									unsigned char *altname_str = ASN1_STRING_data(altname->d.ia5);
-+								#else
-+									unsigned char *altname_str = (unsigned char *)ASN1_STRING_get0_data(altname->d.ia5);
-+								#endif
- 								gf_list_add(valid_names, altname_str);
- 							}
- 						}
-@@ -1806,7 +1824,7 @@ GF_DownloadManager *gf_dm_new(GF_Config *cfg)
- 		dm->limit_data_rate = 1000 * atoi(opt) / 8;
- 	else
- 		gf_cfg_set_key(cfg, "Downloader", "MaxRate", "0");
--	
-+
- 
- 	dm->read_buf_size = GF_DOWNLOAD_BUFFER_SIZE;
- 	//when rate is limited, use smaller smaller read size
-@@ -2943,7 +2961,7 @@ static GF_Err wait_for_header_and_parse(GF_DownloadSession *sess, char * sHTTP)
- 			hdrp->value = gf_strdup(hdr_val);
- 			gf_list_add(sess->headers, hdrp);
- 		}
--	
-+
- 		if (sep) sep[0]=':';
- 		if (hdr_sep) hdr_sep[0] = '\r';
- 	}
diff --git a/media-video/gpac/files/gpac-freetype.patch b/media-video/gpac/files/gpac-freetype.patch
deleted file mode 100644
index 98224aff30e1..000000000000
--- a/media-video/gpac/files/gpac-freetype.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: gpac-0.7.1/configure
-===================================================================
---- gpac-0.7.1.orig/configure
-+++ gpac-0.7.1/configure
-@@ -1117,8 +1117,8 @@ if docc $CFLAGS_DIR $ft_cflags $ft_lflag
- fi
- if test "$cross_prefix" = "" ; then
-     if test "$has_ft" = "no" ; then
--        ft_cflags="`freetype-config --cflags 2>>$logs`"
--        ft_lflags="`freetype-config --libs 2>>$logs`"
-+        ft_cflags="`pkg-config --cflags freetype2 2>>$logs`"
-+        ft_lflags="`pkg-config --libs freetype2 2>>$logs`"
-         if docc $ft_cflags $ft_lflags $LDFLAGS ; then
-             has_ft="system"
-         fi
diff --git a/media-video/gpac/gpac-0.7.1-r1.ebuild b/media-video/gpac/gpac-0.7.1-r1.ebuild
deleted file mode 100644
index bdac8071f899..000000000000
--- a/media-video/gpac/gpac-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999 ]] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/gpac/gpac"
-else
-	SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-fi
-
-inherit flag-o-matic toolchain-funcs ${SCM}
-
-DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C"
-HOMEPAGE="https://gpac.wp.imt.fr/"
-
-LICENSE="GPL-2"
-# subslot == libgpac major
-SLOT="0/7"
-IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl oss png
-	pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
-
-RDEPEND="
-	media-libs/libogg
-	a52? ( media-libs/a52dec )
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	mad? ( media-libs/libmad )
-	opengl? (
-		media-libs/freeglut
-		virtual/glu
-		virtual/opengl
-	)
-	png? ( media-libs/libpng:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	theora? ( media-libs/libtheora )
-	truetype? ( media-libs/freetype:2 )
-	sdl? ( media-libs/libsdl )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	vorbis? ( media-libs/libvorbis )
-	X? (
-		x11-libs/libXt
-		x11-libs/libX11
-		x11-libs/libXv
-		x11-libs/libXext
-	)
-	xml? ( dev-libs/libxml2:2 )
-	xvid? ( media-libs/xvid )
-"
-# disabled upstream, see applications/Makefile
-# wxwidgets? ( =x11-libs/wxGTK-2.8* )
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dvb? ( sys-kernel/linux-headers )
-"
-
-# DOCS="AUTHORS BUGS Changelog README.md TODO doc/CODING_STYLE doc/*.doc doc/*.bt doc/SceneGenerators doc/ipmpx_syntax.bt doc/*.txt"
-PATCHES=(
-	"${FILESDIR}/${PN}-0.7.1-configure.patch"
-	"${FILESDIR}/ffmpeg4.patch"
-	"${FILESDIR}/${PN}-freetype.patch"
-	"${FILESDIR}/${P}-openssl-1.1.patch"
-)
-
-DOCS=(
-	doc/CODING_STYLE
-	doc/GPAC\ UPnP.doc
-	doc/ISO\ 639-2\ codes.txt
-	doc/SceneGenerators
-	doc/ipmpx_syntax.bt
-	Changelog
-	AUTHORS
-	BUGS
-	README.md
-	TODO
-)
-HTML_DOCS="doc/*.html"
-
-my_use() {
-	local flag="$1" pflag="${2:-$1}"
-	if use ${flag}; then
-		echo "--use-${pflag}=system"
-	else
-		echo "--use-${pflag}=no"
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
-}
-
-src_configure() {
-	tc-export CC CXX AR RANLIB
-
-	local myeconfargs=(
-		--extra-cflags="${CFLAGS}"
-		--cc="$(tc-getCC)"
-		--libdir="/$(get_libdir)"
-		--verbose
-		--enable-pic
-		--enable-svg
-		--disable-amr
-		--disable-wx
-		--use-js=no
-		--use-ogg=system
-		$(use_enable alsa)
-		$(use_enable debug)
-		$(use_enable dvb dvb4linux)
-		$(use_enable ipv6)
-		$(use_enable jack jack yes)
-		$(use_enable opengl 3d)
-		$(use_enable oss oss-audio)
-		$(use_enable pulseaudio pulseaudio yes)
-		$(use_enable sdl)
-		$(use_enable ssl)
-		$(use_enable static-libs static-lib)
-		$(use_enable X x11)
-		$(use_enable X x11-shm)
-		$(use_enable X x11-xv)
-		$(my_use a52)
-		$(my_use aac faad)
-		$(my_use dvb dvbx)
-		$(my_use ffmpeg)
-		$(my_use jpeg)
-		$(my_use jpeg2k openjpeg)
-		$(my_use mad)
-		$(my_use png)
-		$(my_use theora)
-		$(my_use truetype ft)
-		$(my_use vorbis)
-		$(my_use xvid)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	einstalldocs
-	emake STRIP="true" DESTDIR="${D}" install
-	emake STRIP="true" DESTDIR="${D}" install-lib
-}
diff --git a/media-video/gpac/gpac-0.8.1.ebuild b/media-video/gpac/gpac-0.8.1.ebuild
index 82441609b590..4404cc739152 100644
--- a/media-video/gpac/gpac-0.8.1.ebuild
+++ b/media-video/gpac/gpac-0.8.1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/gpac/gpac"
 else
 	SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 fi
 
 inherit flag-o-matic toolchain-funcs ${SCM}
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index aa4c69564478..82beaaccbb55 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,6 +1,8 @@
 AUX pipewire-0.2.7-fno-common.patch 1235 BLAKE2B 59e5c9376a3097d3427c0f0623827e3163298bb23d1888d3791504928c50850cf59d41392e78d90b07d4f5a481af60d37661a96ca47c61f939a938c54a523839 SHA512 87a67a14289b5dde0ff174e90cb94c3884ea7b3189d00b7c8fc195445a5555fbba0ee8a641edd8e1b5322508082f8c2e52c14a18a392038a9ba9c27ff470bd2b
 DIST pipewire-0.2.7.tar.gz 421644 BLAKE2B d2ccb56a9ea5ea7782678deb6eae0b0a70da1fa69e807398062d388733901839f15a2f0f7db982fbebd2b2759f443709e6c1950b6367f3ed4801d6c2d6109e73 SHA512 10d3e20cc3d233fbcd1fc39702ae3043a656ebcd9cd3c39c77f0cc2bf42ff4956fc03e7933c7b397bca446c63f45ddacea948d5ec7e4a3300499fa2794f14334
+DIST pipewire-0.3.10.tar.gz 1148297 BLAKE2B d890b8e6697b17be9f8706a7228b9c79631120550ac51d7fbea8b5d05ca161ce6142a5666a6a61db618d4da0519676160ba1180cf9274865d879f4bb0da2a8e7 SHA512 f2f3dd7ce9b9f3a5ab55b6da97cd64419dad5115714848ce8893795c0ed2fd2fe0059240ec9fe1c92fb1442caf8d7071e415afe6712500be1c29fd001293cf0d
 DIST pipewire-0.3.7.tar.gz 1095307 BLAKE2B 31f266d39683f53ea8cd7823d40b241bae29a59c2658f390fb9178dbdbbe1f7145638b5bd1bdae0dc13a30c1d8d2f44ff224f230211e75ab5936cfb8ccacc928 SHA512 2adaa8689b77c5a3a4710f979d23a737daa66f37ebfca9cf95f6c6a1dad770c52a2998959d52c45540b5b885568146b42981d106a2653ff8f167e0b531ee92f9
 EBUILD pipewire-0.2.7.ebuild 1650 BLAKE2B 3e94b6c00adb56c37e01df3f0adafc7d0d2115b2a27a1da3622245731ee341550f8bc8421e7d85693ca41a0a2ba17c192c06017f59e62bcd758babaf4bedfa20 SHA512 f924725947d243452b8bec1f03f7d113de2d4668ef3db18b2922a4b1695c87d4ac9def44e2d79d38fac3013a09dadb84af11fe8dc9aec4fe0ba475340f17b295
+EBUILD pipewire-0.3.10.ebuild 3389 BLAKE2B 61426a7a2d1cce9442eae8a937cc3a1046c1b09c0ab02eac2dc53b4a66ac313186cdd41ce751e07c9c7614deca0cf0bf4bae25aa31190624ae762f8e123a590c SHA512 fbfb5fd2a1583ce61e76360272ad865c7a683ef225883ac0f94b1d99fa8a291f920498c463749e3f4e4b71be569194ce36ec0c9113ae9ab1de9b8f284b4f0f3e
 EBUILD pipewire-0.3.7.ebuild 3389 BLAKE2B 61426a7a2d1cce9442eae8a937cc3a1046c1b09c0ab02eac2dc53b4a66ac313186cdd41ce751e07c9c7614deca0cf0bf4bae25aa31190624ae762f8e123a590c SHA512 fbfb5fd2a1583ce61e76360272ad865c7a683ef225883ac0f94b1d99fa8a291f920498c463749e3f4e4b71be569194ce36ec0c9113ae9ab1de9b8f284b4f0f3e
 MISC metadata.xml 760 BLAKE2B 7ce012dfa532fe563c70ec4782b43db76a9d2f6bdf439d0a524f59f9e8df8ea5aff513abb71d55aba5fe74277f71d7f0b20bb40182903a5d50b72bdffa3cfc9f SHA512 d3f9b3c4f80d282337c5c538680190f8b060ac28813ac6510c81c23e003c384ee3f6995e2eb5bb646e7af9d52a73a2e2c7578b313bcb11a5f86de94400c71246
diff --git a/media-video/pipewire/pipewire-0.3.10.ebuild b/media-video/pipewire/pipewire-0.3.10.ebuild
new file mode 100644
index 000000000000..7396ae3ab65d
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.10.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/PipeWire/pipewire.git"
+	EGIT_BRANCH="work"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0.3"
+IUSE="bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X"
+
+BDEPEND="
+	app-doc/xmltoman
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	>=media-libs/alsa-lib-1.1.7
+	media-libs/libsdl2
+	>=media-libs/libsndfile-1.0.20
+	sys-apps/dbus
+	virtual/libudev
+	bluetooth? (
+		media-libs/sbc
+		net-wireless/bluez:=
+	)
+	ffmpeg? ( media-video/ffmpeg:= )
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack? ( >=media-sound/jack2-1.9.10:2 )
+	pulseaudio? (
+		dev-libs/glib:2
+		>=media-sound/pulseaudio-11.1
+	)
+	systemd? ( sys-apps/systemd )
+	vulkan? ( media-libs/vulkan-loader )
+	X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	spa_use() {
+		if ! in_iuse ${1} || ! use ${1}; then
+			sed -e "/^add-spa-lib.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
+				-e "/^load-module.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
+				-i src/daemon/pipewire.conf.in || die
+		fi
+	}
+
+	default
+	spa_use libcamera
+	spa_use rtkit
+	spa_use bluetooth bluez5
+	spa_use jack
+	spa_use vulkan
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dexamples=true # contains required pipewire-media-session
+		-Dman=true
+		-Dspa=true
+		-Dspa-plugins=true
+		--buildtype=$(usex debug debugoptimized plain)
+		# alsa plugin and jack/pulseaudio emulation
+		-Dpipewire-alsa=true
+		$(meson_use jack pipewire-jack)
+		$(meson_use pulseaudio pipewire-pulseaudio)
+		# spa-plugins
+		# we install alsa support unconditionally
+		$(meson_use bluetooth bluez5)
+		$(meson_use ffmpeg)
+		$(meson_use jack)
+		$(meson_use vulkan)
+		# libcamera is not packaged
+		# misc
+		$(meson_use doc docs)
+		$(meson_use gstreamer)
+		$(meson_use systemd)
+		$(meson_use test test)
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+
+# 	# TODO: this breaks alsa users
+# 	if use alsa; then
+# 		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+# 	fi
+}
+
+pkg_postinst() {
+	elog "Package has optional sys-auth/rtkit RUNTIME support that may be disabled"
+	elog "by setting DISABLE_RTKIT env var."
+	elog "To enable rtkit, uncomment the load-module line in /etc/pipewire/pipewire.conf"
+	elog
+	if use jack; then
+		elog "Please note that even though the libraries for JACK emulation have"
+		elog "been installed, this ebuild is not yet wired up to replace a JACK server."
+		elog
+	fi
+	if use pulseaudio; then
+		elog "Please note that even though the libraries for PulseAudio emulation have"
+		elog "been installed, this ebuild is not yet wired up to replace PulseAudio."
+		elog
+	fi
+	elog "Read INSTALL.md for information about ALSA plugin or JACK/PulseAudio emulation."
+}
diff --git a/media-video/subliminal/Manifest b/media-video/subliminal/Manifest
index c5237624cf15..f90ece6262cd 100644
--- a/media-video/subliminal/Manifest
+++ b/media-video/subliminal/Manifest
@@ -1,7 +1,6 @@
 AUX subliminal-2.1.0-fix-pytest-warning.patch 315 BLAKE2B e04d8f7d9dca768cb805f8b0a5ec3872c7a758c12adc1d3aba931ebc545fcfdfcdbac19cfccef6d2efc6fb5951d6336f3ab97432e18aa7dad4a87f815af1015b SHA512 c3d03c1ed84c8964b04ac4999e8383a31d4d931753f674f10ef1948b581986f2f8bf4a665921c8900ccd441c564e839ef43f3cdcd7f92a5ae3252ee260ff15f7
 DIST matroska_test_w1_1.zip 184550509 BLAKE2B f111725aa08267661942072c2d4ac019d3d322c4e933aad10afb3aa6f69bb3469114c4400d161e53d8a7618b818b22465177460003804a7ac3e69fa4f4db000d SHA512 f170a8e83dab15228f992b3692330163da2402b8e436c7fa195ac1ecc06cf1eaf1a48d8c99a85c031122c158c2d4006023aae75d5b7805385ba25a6d601cb78f
 DIST subliminal-2.1.0.tar.gz 5480458 BLAKE2B 249bdd027d99dfb0b81d939af2dc08f62b52dca2c8618f1006ca76eee41c2443b450076eddc1aa533997beca8cdf9016b884d7eceeebbf4e48ced91dae1a2361 SHA512 9b26ae594895470830547eed604aa5b28b75f590e5be12c2d5a478c5daf798d405f209639bd54dce0565b0e27d1b0daa5bef87dfa8590af61f2ab1e287c41060
-EBUILD subliminal-2.1.0-r1.ebuild 2686 BLAKE2B 43505d2294961bd670e895d18892895f20d4156e5390aab96cc6ae88a41f927f60f727cbea4223f25e6ca9f43665518d7af218b2d655f70b3d85481d937188ee SHA512 5ba1c2e74268f4faa74b8ad25eff2a4b7a7dee7915012f8f1899c4b429376574fc02a1af2439544b7193abe8289cf6c7c2110cddb52135c64ea5afd8a7f86670
-EBUILD subliminal-2.1.0.ebuild 2734 BLAKE2B 3f8f3ecab0d6c7ebe3bfde78a5d153f756088fa28769ed8bcd781976778bff03f471e1cfc9b68778bc6745265848a50aaef2bc2898ca3d80901c638ae25cb794 SHA512 f19d33f491fd65c3dd8e7880356a72051a09b0f68c46b0a81eb15f965b4c5cb167a35d872e1cb47ec8f96970ea748b4b447badf31e32ee209a20c6d56b9279a2
+EBUILD subliminal-2.1.0-r1.ebuild 2685 BLAKE2B 94bbdf35376366027b4c2dfe5c017569b28a53a3b099aeea2f89dd2829613db11ea1fb009da144ba26b0348e5906ae071497cb356891591b1680883826395536 SHA512 ea7f5b0955cc3778735a80171e8e6744de3627800478de31d5de9fcf602a98d77f68d23a3092a09a738891855599d207c803ec077cc98843dd06a834b189e505
 EBUILD subliminal-9999.ebuild 2670 BLAKE2B 39ff4c726f698a6787458d2bf663affcd2a1adbf0e9a20c8228eace9806774d6c45fa3f29a49de2a3352a0e0a276c99f4c0ffe261290c11b12a7cfcfb2177dc7 SHA512 4d3f5f2a77b6151f0e328a8bb4e13a9453801c514bf91a4e24b74c2cee53dd126d194488f79b8ddbb8a674f6ce8cfc56d2b3a405a786f497ce3ce67919917dbb
 MISC metadata.xml 446 BLAKE2B 41fe81b3e05395bd7e23e081358069335f4ea6eb7aea9c345de035c5595985a76153ca0f7792be40ec0f039e09905bd788043ed2b6efdcadc5b1d8742cdc21a6 SHA512 22f6b1198815e6ed85456fa498a8b3b2fbb5649b872482ab6b78dff643e3fd2a24a99594685504e4491772be67dae2bda08852dbe9a89de7f2f6a3435357301a
diff --git a/media-video/subliminal/subliminal-2.1.0-r1.ebuild b/media-video/subliminal/subliminal-2.1.0-r1.ebuild
index 4bba8befdc11..2176be52fa51 100644
--- a/media-video/subliminal/subliminal-2.1.0-r1.ebuild
+++ b/media-video/subliminal/subliminal-2.1.0-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI+=" test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.z
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 BDEPEND="
 	test? (
diff --git a/media-video/subliminal/subliminal-2.1.0.ebuild b/media-video/subliminal/subliminal-2.1.0.ebuild
deleted file mode 100644
index c5d5ae29caa4..000000000000
--- a/media-video/subliminal/subliminal-2.1.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE='xml(+)'
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-SRC_URI=""
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Diaoul/${PN}.git"
-	EGIT_BRANCH="develop"
-else
-	SRC_URI="https://github.com/Diaoul/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="Python library to search and download subtitles"
-HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.org/project/subliminal/"
-SRC_URI+=" test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.3[${PYTHON_USEDEP}]
-	>=dev-python/babelfish-0.5.2[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-4.4.0:4[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/click-4.0[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/enzyme-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/guessit-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pysrt-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2012c[${PYTHON_USEDEP}]
-	>=dev-python/rarfile-2.7[compressed,${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		app-arch/unzip
-		dev-python/sympy[${PYTHON_USEDEP}]
-		>=dev-python/vcrpy-1.6.1[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-pytest-warning.patch"
-)
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	# Needed to unpack the test data
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	fi
-}
-
-python_prepare_all() {
-	# Disable code checkers as they require unavailable dependencies.
-	sed -i -e 's/--\(pep8\|flakes\)//g' pytest.ini || die
-
-	# Disable unconditional dependency on dev-python/pytest-runner.
-	sed -i -e "s|'pytest-runner'||g" setup.py || die
-
-	if use test ; then
-		mkdir -p tests/data/mkv || die
-		ln -s "${WORKDIR}"/test*.mkv tests/data/mkv/ || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local skipped_tests=(
-		tests/test_core.py::test_scan_archive_with_one_video
-		tests/test_core.py::test_scan_archive_with_multiple_videos
-		tests/test_core.py::test_scan_archive_with_no_video
-		tests/test_core.py::test_scan_password_protected_archive
-	)
-
-	# Two tests that list providers rely on entry points
-	# so they need the package to be installed
-	distutils_install_for_testing
-	pytest -vv --ignore ${PN}/test/test_core.py ${skipped_tests[@]/#/--deselect } \
-		|| die "Tests fail with ${EPYTHON}"
-}
diff --git a/media-video/vdr2jpeg/Manifest b/media-video/vdr2jpeg/Manifest
index d5e79a9132a7..cf10eefbefb3 100644
--- a/media-video/vdr2jpeg/Manifest
+++ b/media-video/vdr2jpeg/Manifest
@@ -1,9 +1,7 @@
 AUX vdr2jpeg-0.1.9-ffmpeg.patch 13036 BLAKE2B 4e8aac9ba3ad62c80c7ce739cc9f87d1935ba92c39f1e74cd4fc3b4e25c6cee2b4d27a70c69e27b8b73f5e819877abc7b14f304c23dc7a8c4f051e34223bb15e SHA512 0a7d261dffe1960bb69366b0645b0f5543a2ee82f821f34b3d70606689e971e29981ea5888870e0de9515da5e7419f6a919fc9ac9d82043cff587f0399de1070
 AUX vdr2jpeg-0.1.9-ffmpeg1.patch 8787 BLAKE2B 0ade0368504c397be765446cf88a078fa6e9b5bc13ac7fe431f582afc390213193fd9c12456eb45209d8eae33369cdfa78a494eb58962221148b0c30f607a4c4 SHA512 d7ab3a5d5dff70d914036da98c42fa6931e71f54b88580bcfac84a81a2c256811d8c59e25b55e3bf3f2cfed1d6c3997c68e24b81b9d5ac7bc0c13b97693a5ee3
 AUX vdr2jpeg-0.1.9-libav9.patch 2072 BLAKE2B f9ace5a099c3030234524065aceefe3f5f72d65d3e62763a53d1c02057e4ad23737b454afcc6362159729d255c92843d78629b302cff4c823a844bc96440fb80 SHA512 d8122499f7f5db79f359bd38801fcc3b72b9ddce1305a854260d40d6f55e2162fb1a23b2a8acd3902c3a93aab1ee66bce418fcd6f5ad72363d98c4bf5f68400a
-DIST vdr2jpeg-0.1.9.tgz 31160 BLAKE2B 6f84e82167f45b8fe3c2a00e72ed5ad660b7a895e1c33110ce47e1cbb2d6f5fc979454761e693f1793f1fae0c1f1694af77a0f47b4483bb6359840ffcc88e6e9 SHA512 e2309fd08591d5efa08246c2ecde70811036ea293e21f7e5ae989af5acef5e795216cbc31455d2f0b65de575a876863efe55ddf4397ab4eadf3d67a627579d99
 DIST vdr2jpeg-0.2.0.tgz 20027 BLAKE2B c79a84c6e7010eae762fb31bdd9771dcdae1e78761afd07c536a55e834b0271fb55dcd4bb49f87a2d28695496d37f94c90350dd70b50229bb6248026422faee0 SHA512 65f3e0acb2ecd3a5341e527c45fafd454266841f1369c89b10750fce86f2326fba76329abd17a05d67aea3b43a7b1299a49cfa9eee9a784bb99c940253ca5952
-EBUILD vdr2jpeg-0.1.9-r2.ebuild 916 BLAKE2B eb61f6015259445e215f7f18b9095b4684ae4cf74eb42d0aaad773ff1538bba426e38a078f2a4453e01e0dd5e9520acb321a2e86cedbfd94d506ac9b0510c55e SHA512 45a256d52fd3ed4f2ff28bee3e425e6c3cfd578a6d555774814b28ebbd6e50bd3c86df09923243eb4e703153a5973d0b70a64d37be95917188c963e5163d19f4
-EBUILD vdr2jpeg-0.2.0-r4.ebuild 905 BLAKE2B 6a364869a9e6a4581a5f6e0eeb7559d4dc20d3b3ad1259542ec248e543d407d0541666c50a69964bb31746b063b59834c53ff966139fabddbb1e7eff85e6a9b6 SHA512 daaa092a54ad3da17fe95f673b6766278659a4faee9bf0379f3befede355c3f8bcea4c1ce9e3cd5f5abce1a0edde3eb4a66809204cce0812f8af5474bc9d1507
+EBUILD vdr2jpeg-0.2.0-r5.ebuild 955 BLAKE2B 833f5f39df32de9e61346dc163a264a297de2405acc019dfd423a2e6bd5056b0e1adb332d23d6d959837c70d7a13ae863447bcf5f082effe869b1ec9c1cf48a3 SHA512 7691acf8b96078c33a0704c11156a8a6635af97f6cbdaa13793c15e056e94b142cfecd09ae843b3bdb37b762016b2c8ab1e83d30a7f8b93c9d8217f1934355b9
 EBUILD vdr2jpeg-0.2.0.ebuild 746 BLAKE2B 75735a74aa5919f60c0c6a0f96819171804924b4bf9fda3960b91917eb318adf5ed0e0eecf5e96e38307ef5d739128728e4dcc288e0c279787978ae9fca88582 SHA512 7926d51958586a15fca14872298dab5d97e46c3c7d4fbf82a81fb018bc5a027863337288a10f0534c6c93fb74f97d342c77ab8f6c95c69dca0c95499f119ad33
 MISC metadata.xml 372 BLAKE2B 09d9b98f1ba8033a7ec2df65cc2358ce180dc647bd986587f696fc951fd69e2e9dbb5521dc61d93432f3ea5aec677c21b6388ee1de443538beb02747241aebc8 SHA512 b8b077cff248569cff49f30519346cd85efa88e5d19adca6fd13fc2ee49966630b4d6fb161845a301a18ff2f94da763c68d2c37237fdbe68aa63c452a612e5de
diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.1.9-r2.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.1.9-r2.ebuild
deleted file mode 100644
index 1966f4a0dae8..000000000000
--- a/media-video/vdr2jpeg/vdr2jpeg-0.1.9-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-VERSION="717" # every bump, new version
-
-RESTRICT="strip"
-
-DESCRIPTION="Addon needed for XXV - WWW Admin for the Video Disk Recorder"
-HOMEPAGE="https://projects.vdr-developer.org/projects/xxv"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz
-		mirror://gentoo/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-video/ffmpeg"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i \
-		-e "s:usr/local:usr:" \
-		-e "s:-o vdr2jpeg:\$(LDFLAGS) -o vdr2jpeg:" \
-		Makefile || die
-	epatch "${FILESDIR}/${P}-ffmpeg.patch" \
-		"${FILESDIR}/${P}-ffmpeg1.patch" \
-		"${FILESDIR}/${P}-libav9.patch"
-
-	if has_version ">=media-video/ffmpeg-2"; then
-		sed -e "s:CodecID:AVCodecID:" -i ffm.cpp
-	fi
-}
-
-src_install() {
-	dobin vdr2jpeg
-	dodoc README LIESMICH
-}
diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.2.0-r4.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.2.0-r5.ebuild
index 0e099a60c244..5352e19c60ab 100644
--- a/media-video/vdr2jpeg/vdr2jpeg-0.2.0-r4.ebuild
+++ b/media-video/vdr2jpeg/vdr2jpeg-0.2.0-r5.ebuild
@@ -22,6 +22,9 @@ DEPEND="${RDEPEND}"
 
 BDEPEND="virtual/pkgconfig"
 
+# bug 731212
+QA_FLAGS_IGNORED="usr/bin/vdr2jpeg"
+
 DOCS=( README LIESMICH )
 
 src_prepare() {
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 6209d1b9fb25..c069c456f376 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -8,8 +8,8 @@ DIST vlc-3.0.10.tar.xz 26096828 BLAKE2B c189c91e9b4b3601552ea5c00faa6bee9944550e
 DIST vlc-3.0.11.1.tar.xz 25886644 BLAKE2B b3cf3f8776086fcd45ca20918be8951960bf3d18c219d0d512f64bfe89d3e947300875b4b8e1a27742132400fd9a3b32f5e84afd08f52254899a23922a682361 SHA512 8ce1e2f11aabf847dc5c55cf21ce6d7c0419a1051b5f4795e36cd060eab82d5056e44b4c070b80af56744e6aa841ef538386d08bc3b397a444e7258b2ba3f76b
 DIST vlc-3.0.11.tar.xz 26041744 BLAKE2B 1afa0ae9e54449e32a441e9ec563fedc78476b4c0438286cbe273d9f8185f6f8be1e14688878e40180db5c6a7673f14ed53c0e763d376f5e6bb9dc1b02719bf2 SHA512 8219cc46e434c7b2f12321d4e1b21eae123a546eeb22f768c463537a4a4986ab395053f8a794628cfd17236f81665f12b2b3f6867af73b102b81628204b6c444
 EBUILD vlc-3.0.10-r1.ebuild 13009 BLAKE2B 915363b2715e7271fb89c6fac555681283253093365b9ef5ccfdf2eee7b5be0ffe2160ad815851828b31f3af93760b2a1c556b159cdea76ab3c101ebe473de72 SHA512 432477a62d98ad60fd95feaef9c990b1f8af0f388f8c950b8afb1981d370633ea9c1c86a6c516e79d97cc284c1e545eb55fa1f33bdf22aa262404a6363cda060
-EBUILD vlc-3.0.11.1.ebuild 13031 BLAKE2B 571e5e8eeb6c1e6d106762a6735550b48cd1126a39801f94e0c94f9d080afc2ad8c54876a8e2b6a06063c20aa59f94c31a242da50bf940814578a112540c5931 SHA512 c78aaf1027fef003a830fb5bc9415107dc541660f36ed73d8b3efb31103b9af75e34978cf42bb351b195b67f6a866d514fa39837c9362218d9907a63b14dce09
-EBUILD vlc-3.0.11.ebuild 13030 BLAKE2B e59e2318c28d4bfc050baa2a447bfe0f0d010a311b212f2fd0db926e83086480df06404f60d56d782340c27754bd6bbcb94667b8456c2cb637cbc39beb0256e7 SHA512 007a1aca0faa60190e9234b5a89de62d15b89175c25ac1010ba8109679acc35cbfddb9715bd11e570c5a48fd23cd14cf35ce917165d53d577a10289ebfa18fcd
-EBUILD vlc-3.0.9999.ebuild 13031 BLAKE2B 571e5e8eeb6c1e6d106762a6735550b48cd1126a39801f94e0c94f9d080afc2ad8c54876a8e2b6a06063c20aa59f94c31a242da50bf940814578a112540c5931 SHA512 c78aaf1027fef003a830fb5bc9415107dc541660f36ed73d8b3efb31103b9af75e34978cf42bb351b195b67f6a866d514fa39837c9362218d9907a63b14dce09
-EBUILD vlc-9999.ebuild 12937 BLAKE2B 0706fe59186e82855680acfb51ccf60c9aa8fefc9e018e5cb7ca820eb64854e21e4081b57251c32a27f3910faac7e48926fe885255b68cadd13149565ae7b2b4 SHA512 78f9120d87c905832a40bf05e76046569830f687a6bf3eabc1e97456cc797263b38f382d911b567f2da80cdd4af322cc31ac06b18ad28fb2a80974bc7acd3090
-MISC metadata.xml 4746 BLAKE2B 797c2f7c113915fe8e1508eef1a110db4c7717fa0ee5bfdd49c4260532be2929b6551a453a79c08aa9a6e62f109396778ce9efc823eb18db2bf25f3e9db10068 SHA512 49828ab8f168e49210c7c259b7c0242f9c68bfc9fa9151e5663a8dea781d34f40a6cb22e354332b9efba0610b70995b511ffef20b844914d0dea0118251905b8
+EBUILD vlc-3.0.11.1.ebuild 13034 BLAKE2B 51d55a3eb1f0be21bf1c77051bcd7efe3ef58e6410dc054acf0a54638d087582a91e2979c6dc91fed093c237aeff0a3d05cbf9db7db51b6d43ff417963f03a87 SHA512 6fe634a69d04cdee4a4472afcfbbd8b589a8c1bb475c8fdcbcce92e32ea7fea61adb70b9c363fd3c2f6930545f7fbdf9d38d4279a6d866f272fdb6c01485c35d
+EBUILD vlc-3.0.11.ebuild 13013 BLAKE2B 60a4e52693fdc2bd57c9ceddfb162219b5880d3e56f03c43277f4e015bf400a293978edec82b22d5233cb554abdd9d4749db2b930724489c0bfe35e7f94c5c6a SHA512 eeb8ad807680cb9e23a37ba21c8a96876a6b85f9c9369d44bcaf1fc4e7b875a997048bef2c211128a6d52475874fa32eeb28f744ed402d27aa565474cca6b9b0
+EBUILD vlc-3.0.9999.ebuild 12972 BLAKE2B 8e482bb570241a0dd0f521969ee61ac27ca778e543b7a3a4fa929a7625cd0e665996a35cc0372029b89f2be7371b45027228d1b34122aaa5dd2a759d4b0796ae SHA512 deabd1124cf6b8a265c0efc6ae9d594a3d46a820fe857acddae873b0bc3c24ab2abcc56329579b1049845879860626fc9be94cd70ce29796fdf02f1eaa326fc1
+EBUILD vlc-9999.ebuild 12993 BLAKE2B 9229920f8ebd589629e6d01e41a4ebb6e6cd60cc90522eae3e5fab31248416f6ac3fbc11c2fa14fe99ec5dc8b2d5f79bc5d6bdd619f39c25cce8add803d45753 SHA512 9d582e9ef7529630471a6c6f79db22425c10cfb3ba0d7ce50f0713efce8f12829e9834b4fb79ede558513238ae180f204635f6816074465e292122920a9f4e68
+MISC metadata.xml 4911 BLAKE2B 689cbaf21ee9adbae82ea670b575286cecfe49865aaff92a92d1cb78305c26306a72d9b010e052955c79e0c39723f03301f7a858de198948759ec228e90e7baf SHA512 62442acac34bf27c40e5cf41313c2f9ed3efd54cfb9c0dc42ca0ba3b37cb8e23690e88f04a3629bbe62b774c2bc6740a33f7336d371589982c8b2578050f13d1
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 8442a26823a0..0e818723404b 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Gentoo Video project</name>
 	</maintainer>
 	<use>
-		<flag name="aom">Enable experimental support for AV1 codec</flag>
+		<flag name="aom">Enable AV1 encoding/decoding support using <pkg>media-libs/libaom</pkg></flag>
 		<flag name="archive">Enable support for libarchive stream extractor</flag>
 		<flag name="aribsub">Enable support for decoding ARIB STD-B24 subtitles</flag>
 		<flag name="bluray">Enable libbluray for Blu-ray disc support</flag>
@@ -30,6 +30,7 @@
 		<flag name="libtiger">Enable Ogg Kate subtitles rendering using libtiger</flag>
 		<flag name="linsys">Enable support for Linux Linear Systems Ltd. SDI and HD-SDI input cards</flag>
 		<flag name="live">Enable live555 streaming media support (client support for rtsp)</flag>
+		<flag name="loudness">Enable loudness normalisation according to the EBU R128 standard using <pkg>media-libs/libebur128</pkg></flag>
 		<flag name="lua">Enable Lua scripting support, needed for including support for Jamendo (online music platform) and similar things</flag>
 		<flag name="macosx-notifications">Enable Mac OS X notifications module (formerly growl)</flag>
 		<flag name="matroska">Enable matroska support using reference libraries (fallback on other existing matroska support if disabled, i.e., matroska enabled FFmpeg)</flag>
diff --git a/media-video/vlc/vlc-3.0.11.1.ebuild b/media-video/vlc/vlc-3.0.11.1.ebuild
index c88bc2c4ce25..14d2c16fc755 100644
--- a/media-video/vlc/vlc-3.0.11.1.ebuild
+++ b/media-video/vlc/vlc-3.0.11.1.ebuild
@@ -19,7 +19,7 @@ else
 	else
 		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 	fi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 -sparc x86"
 fi
 inherit autotools flag-o-matic toolchain-funcs virtualx xdg
 
@@ -196,7 +196,7 @@ RDEPEND="
 	)
 	twolame? ( media-sound/twolame )
 	udev? ( virtual/udev )
-	upnp? ( net-libs/libupnp:= )
+	upnp? ( net-libs/libupnp:=[ipv6] )
 	v4l? ( media-libs/libv4l:= )
 	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
 	vdpau? ( x11-libs/libvdpau )
diff --git a/media-video/vlc/vlc-3.0.11.ebuild b/media-video/vlc/vlc-3.0.11.ebuild
index b8d9427fbadf..362aad443acd 100644
--- a/media-video/vlc/vlc-3.0.11.ebuild
+++ b/media-video/vlc/vlc-3.0.11.ebuild
@@ -79,7 +79,7 @@ RDEPEND="
 	chromaprint? ( media-libs/chromaprint:= )
 	chromecast? (
 		>=dev-libs/protobuf-2.5.0:=
-		>=net-libs/libmicrodns-0.0.9:=
+		>=net-libs/libmicrodns-0.1.2:=
 	)
 	dav1d? ( media-libs/dav1d:= )
 	dbus? ( sys-apps/dbus )
@@ -227,7 +227,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.8-qt-5.15.patch # TODO: upstream
+	"${FILESDIR}"/${PN}-3.0.8-qt-5.15.patch
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index c88bc2c4ce25..7b9bcc5e9502 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -29,16 +29,15 @@ 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
+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 +gui 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 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 )
@@ -47,7 +46,7 @@ REQUIRED_USE="
 	libcaca? ( X )
 	libtar? ( skins )
 	libtiger? ( kate )
-	skins? ( qt5 truetype X xml )
+	skins? ( gui truetype X xml )
 	ssl? ( gcrypt )
 	vaapi? ( ffmpeg X )
 	vdpau? ( ffmpeg X )
@@ -79,7 +78,7 @@ RDEPEND="
 	chromaprint? ( media-libs/chromaprint:= )
 	chromecast? (
 		>=dev-libs/protobuf-2.5.0:=
-		>=net-libs/libmicrodns-0.0.9:=
+		>=net-libs/libmicrodns-0.1.2:=
 	)
 	dav1d? ( media-libs/dav1d:= )
 	dbus? ( sys-apps/dbus )
@@ -109,6 +108,16 @@ RDEPEND="
 	gme? ( media-libs/game-music-emu )
 	gnome-keyring? ( app-crypt/libsecret )
 	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		X? (
+			dev-qt/qtx11extras:5
+			x11-libs/libX11
+		)
+	)
 	ieee1394? (
 		sys-libs/libavc1394
 		sys-libs/libraw1394
@@ -154,16 +163,6 @@ RDEPEND="
 		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 )
@@ -227,7 +226,6 @@ 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
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
@@ -321,6 +319,7 @@ src_configure() {
 		$(use_enable gme)
 		$(use_enable gnome-keyring secret)
 		$(use_enable gstreamer gst-decode)
+		$(use_enable gui qt)
 		$(use_enable ieee1394 dv1394)
 		$(use_enable jack)
 		$(use_enable jpeg)
@@ -353,7 +352,6 @@ src_configure() {
 		$(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)
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index c501e315737d..a93a385cb40e 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -29,16 +29,15 @@ HOMEPAGE="https://www.videolan.org/vlc/"
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/12-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 kms
-	libass libcaca libnotify libplacebo +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
+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 +gui ieee1394 jack jpeg kate kms
+	libass libcaca libnotify libplacebo +libsamplerate libtar libtiger linsys lirc live
+	loudness lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
+	nfs ogg omxil optimisememory opus png projectm pulseaudio 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 )
@@ -47,7 +46,7 @@ REQUIRED_USE="
 	libcaca? ( X )
 	libtar? ( skins )
 	libtiger? ( kate )
-	skins? ( qt5 truetype X xml )
+	skins? ( gui truetype X xml )
 	ssl? ( gcrypt )
 	vaapi? ( ffmpeg X )
 	vdpau? ( ffmpeg X )
@@ -79,9 +78,9 @@ RDEPEND="
 	chromaprint? ( media-libs/chromaprint:= )
 	chromecast? (
 		>=dev-libs/protobuf-2.5.0:=
-		>=net-libs/libmicrodns-0.0.9:=
+		>=net-libs/libmicrodns-0.1.2:=
 	)
-	dav1d? ( media-libs/dav1d:= )
+	dav1d? ( >=media-libs/dav1d-0.5.0:= )
 	dbus? ( sys-apps/dbus )
 	dc1394? (
 		media-libs/libdc1394:2
@@ -109,6 +108,16 @@ RDEPEND="
 	gme? ( media-libs/game-music-emu )
 	gnome-keyring? ( app-crypt/libsecret )
 	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		X? (
+			dev-qt/qtx11extras:5
+			x11-libs/libX11
+		)
+	)
 	ieee1394? (
 		sys-libs/libavc1394
 		sys-libs/libraw1394
@@ -125,7 +134,6 @@ RDEPEND="
 	libnotify? (
 		dev-libs/glib:2
 		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
 		x11-libs/libnotify
 	)
 	libplacebo? ( media-libs/libplacebo )
@@ -135,6 +143,7 @@ RDEPEND="
 	linsys? ( media-libs/zvbi )
 	lirc? ( app-misc/lirc )
 	live? ( media-plugins/live:= )
+	loudness? ( >=media-libs/libebur128-1.2.4:= )
 	lua? ( >=dev-lang/lua-5.1:0= )
 	mad? ( media-libs/libmad )
 	matroska? (
@@ -156,16 +165,6 @@ RDEPEND="
 		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 )
@@ -322,6 +321,7 @@ src_configure() {
 		$(use_enable gme)
 		$(use_enable gnome-keyring secret)
 		$(use_enable gstreamer gst-decode)
+		$(use_enable gui qt)
 		$(use_enable ieee1394 dv1394)
 		$(use_enable jack)
 		$(use_enable jpeg)
@@ -337,6 +337,7 @@ src_configure() {
 		$(use_enable linsys)
 		$(use_enable lirc)
 		$(use_enable live live555)
+		$(use_enable loudness ebur128)
 		$(use_enable lua)
 		$(use_enable macosx-notifications osx-notifications)
 		$(use_enable mad)
@@ -355,7 +356,6 @@ src_configure() {
 		$(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)
@@ -396,7 +396,6 @@ src_configure() {
 		--disable-asdcp
 		--disable-coverage
 		--disable-cprof
-		--disable-crystalhd
 		--disable-decklink
 		--disable-gles2
 		--disable-goom