gentoo resync : 30.05.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-05-30 11:44:06 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-05-30 11:44:06 +0100
commit: f516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree: 8bfecb640b7b6403d7a3d662d923eed630033da7 /media-video
parent: 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)
69 files changed, 1685 insertions, 892 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index ea7bac7c784a..75236f44b412 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/dvdbackup/Manifest b/media-video/dvdbackup/Manifest
index 8cace0ade9cc..535ba8db2186 100644
--- a/media-video/dvdbackup/Manifest
+++ b/media-video/dvdbackup/Manifest
@@ -1,3 +1,4 @@
+AUX libdvdread-6.1.0.diff 2974 BLAKE2B f064abf3d1cf903706af026465cdbef3a27ce1f6a6cf1ab15c7af411bda7358b672b83072fc5ed2d0572ff6c4d736a0d7b56690f4ebcc7b7e8f3b294417b3e9f SHA512 cd16d6cd2e95d2120682659b31e1f0d6f98e7a394fe0ab08139c8519ec9b1e97845fb88c09f5117af361d22c4e22258d85392b13e3f9347073626d3868c5310c
 DIST dvdbackup-0.4.2.tar.xz 178660 BLAKE2B 1403bd66861713803a2da00712318a6cb399d5c7640cadd27f55fb1cee4e0013364f17a2dc3c78dab819d4fdb8405d36e781d0f2abd1bfb49873b0992d5f2dcc SHA512 df9abb2ca0b8a7cd7855ddff94dae249b06b2ec0ee42f3e9c53aa46aebd9885bdf26dacecbd4a20ff5f642ea10c0c64b811d25c23802c8a2b1489281900fbe0d
-EBUILD dvdbackup-0.4.2.ebuild 570 BLAKE2B 578fbf3b747e1341124cf1f558aad49de22f403432065e90950896ca0366471144bae13f74509b48d979ed36e20074e4d2381ba3a69f49077a84b66833dd2f17 SHA512 46e662a88bb53956d2b625708ae89e019294d7a4bd509e1dff8e9d79ace317533207f197c320ad019e6529df48b69db59e69f0dd76472288a18742323b4feda7
+EBUILD dvdbackup-0.4.2.ebuild 618 BLAKE2B 34c195daaecc531f865cd8a410deaeb890fda8169ec4e969fd09380a41b6914773dc626d4c1061d65c599a9bb771089fff0dc282db84f255f2b8b7b7dc647596 SHA512 abf42585d005aadf37692827b02f513f93960715a30ebe2f28c29676cf2a3ac1593119657c5819443b5d4f9704dadec9dd3b7848d79899c76c797ed2cd910add
 MISC metadata.xml 302 BLAKE2B 7d62d6d1c62ddc1245f787ac6faf77c317ce298033e48c17433c09ea2ff92acd05af2ffa44071df281a8da4bacaf6b3c35633475f0496af3a1515e038b1ec79c SHA512 85850b8f0f8de515d846da33fced47ff85195616dc93562edbc62f11bb1108a101cdcd0db7c54be28c17f56f8cea15af9839cfe34fe2b207ba002f770e9e205f
diff --git a/media-video/dvdbackup/dvdbackup-0.4.2.ebuild b/media-video/dvdbackup/dvdbackup-0.4.2.ebuild
index f4dfc5d11ca9..de49049c825e 100644
--- a/media-video/dvdbackup/dvdbackup-0.4.2.ebuild
+++ b/media-video/dvdbackup/dvdbackup-0.4.2.ebuild
@@ -16,6 +16,7 @@ RDEPEND=">=media-libs/libdvdread-4.2.0_pre
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
+PATCHES=( "${FILESDIR}/libdvdread-6.1.0.diff" )
 
 src_configure() {
 	econf \
diff --git a/media-video/dvdbackup/files/libdvdread-6.1.0.diff b/media-video/dvdbackup/files/libdvdread-6.1.0.diff
new file mode 100644
index 000000000000..06986c36c760
--- /dev/null
+++ b/media-video/dvdbackup/files/libdvdread-6.1.0.diff
@@ -0,0 +1,92 @@
+https://bugs.gentoo.org/721732
+
+https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=245228
+https://bugs.launchpad.net/dvdbackup/+bug/1869226
+
+--- a/src/dvdbackup.c
++++ b/src/dvdbackup.c
+@@ -1132,7 +1132,7 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
+ 	int size;
+
+ 	/* DVD handler */
+-	ifo_handle_t* ifo_file = NULL;
++	dvd_file_t* ifo_file = NULL;
+
+
+ 	if (title_set_info->number_of_title_sets + 1 < title_set) {
+@@ -1181,7 +1181,7 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
+ 	if ((streamout_ifo = open(targetname_ifo, O_WRONLY | O_CREAT | O_TRUNC, 0666)) == -1) {
+ 		fprintf(stderr, _("Error creating %s\n"), targetname_ifo);
+ 		perror(PACKAGE);
+-		ifoClose(ifo_file);
++		DVDCloseFile(ifo_file);
+ 		free(buffer);
+ 		close(streamout_ifo);
+ 		close(streamout_bup);
+@@ -1191,7 +1191,7 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
+ 	if ((streamout_bup = open(targetname_bup, O_WRONLY | O_CREAT | O_TRUNC, 0666)) == -1) {
+ 		fprintf(stderr, _("Error creating %s\n"), targetname_bup);
+ 		perror(PACKAGE);
+-		ifoClose(ifo_file);
++		DVDCloseFile(ifo_file);
+ 		free(buffer);
+ 		close(streamout_ifo);
+ 		close(streamout_bup);
+@@ -1200,31 +1200,31 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
+
+ 	/* Copy VIDEO_TS.IFO, since it's a small file try to copy it in one shot */
+
+-	if ((ifo_file = ifoOpen(dvd, title_set))== 0) {
++	if ((ifo_file = DVDOpenFile(dvd, title_set, DVD_READ_INFO_FILE))== 0) {
+ 		fprintf(stderr, _("Failed opening IFO for title set %d\n"), title_set);
+-		ifoClose(ifo_file);
++		DVDCloseFile(ifo_file);
+ 		free(buffer);
+ 		close(streamout_ifo);
+ 		close(streamout_bup);
+ 		return 1;
+ 	}
+ 
+-	size = DVDFileSize(ifo_file->file) * DVD_VIDEO_LB_LEN;
++	size = DVDFileSize(ifo_file) * DVD_VIDEO_LB_LEN;
+ 
+ 	if ((buffer = (unsigned char *)malloc(size * sizeof(unsigned char))) == NULL) {
+ 		perror(PACKAGE);
+-		ifoClose(ifo_file);
++		DVDCloseFile(ifo_file);
+ 		free(buffer);
+ 		close(streamout_ifo);
+ 		close(streamout_bup);
+ 		return 1;
+ 	}
+ 
+-	DVDFileSeek(ifo_file->file, 0);
++	DVDFileSeek(ifo_file, 0);
+ 
+-	if (DVDReadBytes(ifo_file->file,buffer,size) != size) {
++	if (DVDReadBytes(ifo_file,buffer,size) != size) {
+ 		fprintf(stderr, _("Error reading IFO for title set %d\n"), title_set);
+-		ifoClose(ifo_file);
++		DVDCloseFile(ifo_file);
+ 		free(buffer);
+ 		close(streamout_ifo);
+ 		close(streamout_bup);
+@@ -1234,7 +1234,7 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
+ 
+ 	if (write(streamout_ifo,buffer,size) != size) {
+ 		fprintf(stderr, _("Error writing %s\n"),targetname_ifo);
+-		ifoClose(ifo_file);
++		DVDCloseFile(ifo_file);
+ 		free(buffer);
+ 		close(streamout_ifo);
+ 		close(streamout_bup);
+@@ -1243,7 +1243,7 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
+ 
+ 	if (write(streamout_bup,buffer,size) != size) {
+ 		fprintf(stderr, _("Error writing %s\n"),targetname_bup);
+-		ifoClose(ifo_file);
++		DVDCloseFile(ifo_file);
+ 		free(buffer);
+ 		close(streamout_ifo);
+ 		close(streamout_bup);
+
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index d73b4f50ab18..0ed1728afc62 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -8,10 +8,12 @@ DIST ffmpeg-4.2.1.tar.bz2 10953293 BLAKE2B efc60a7e4a185d48a9ae7a5737fa930dea35c
 DIST ffmpeg-4.2.2-ppc64-altivec.patch.gz 7171 BLAKE2B 6676dadb22d2ab4b0f5c19b418448c5b9b54fd8c803c3f0ab517c6fa7990be08098dd6f6a2b1b3e77a1bed31a069c702366aba79ef9141ff9e23cd8c1b6e2885 SHA512 6653975017de3f7bde420860419fbdddb50ae41dbb811b819f4b5b13807bf885a4c01736f05a684515f97b0d63bd8896d5951a3276af90cc74abfe32dc2e2407
 DIST ffmpeg-4.2.2-ppc64-gcc.patch.gz 750 BLAKE2B 3a9cc7f0135e077c77179a7ca3da917bca3995d99d53b58221b23181a075f330132f83ea90a6110e89f90c7c3b5b2a7837559c5df414d9bd52dbb3ec166b1545 SHA512 701b0635e0819484a31de2062ba52d95ee03883ab56547cd75c3646a9b32bf3ecc7f719690b93f29202cfed0fdeecd26b51b9f3c66e72a999a3e8d9e97389275
 DIST ffmpeg-4.2.2.tar.bz2 10953320 BLAKE2B 53293d01bf0bb15de9a56c11195d6448ac8cad5fae2821d7e61d8fbb13894681a1a73dff44b2d46fda5c14e444c94dde6bcef219ad9d1cfebfb21d7d63318ed2 SHA512 6920bf2efb6ed665ea84c31ff3b28a0e9dc0ba3e0c8dfe4ceee4d8b8172328334490a28dbac93b0f9839d0c90ea588cb79141d88bdd3bf4bbf43fd22deb6a5e6
-EBUILD ffmpeg-3.4.6-r1.ebuild 15657 BLAKE2B 0f6636c1504758869e598b5ac889db781721993635e6e38be0e5519684147976f8ca425262548605f61e950c7be5e3eb02cf59f0984422f70f8e602244e6cfd3 SHA512 5c65848c645f8c22ea077b4a77a4ee4d43cacbe133d6600a8b8b9cfddd1db49ed64ab7fc3363fb912ffb21183f60ea9b38f0861f1761b8400c613ba17687096b
-EBUILD ffmpeg-4.1.3.ebuild 17102 BLAKE2B 5a612a6e5c9cc154d0be68a636837f410bed2a195be9d4a802d07a4e5a4a76f7bff818f7d5ce4b7d2af020c26e3c045832fbe292b88e2a3041f25e1771456db7 SHA512 2033c084f4e3ce3eb76164368800e4d8b1cf4fa863f8877cab96f4d3540454570ca6f72daf231094916c9e2cf967be3115d6e5fa30e40bdecfa3c6d5fdc9621d
-EBUILD ffmpeg-4.1.4.ebuild 17108 BLAKE2B cc8ed39c062c69568cb7fa4d7ce5ffb6ef7343cfe98e344e48deaf49726c6e6576d117f160d7f87c39f7609be4859c9ae0e6741605f04b8d5b8ae619bf419e49 SHA512 a62f5151d00b5d389fe111ba383f1d001659473ea20765e25f79eeceda57098fad1838ee5e8e164e9e324e2db506c1a55d130090cb2f37ea3a235f8a8c5dd338
-EBUILD ffmpeg-4.2.1.ebuild 17782 BLAKE2B 3254f46501887fd1d9de39091034d6ff72972e641bc38215326f6b72b215c6ac3ac6b2ddb4c68ded319ec1925216d1de2439c3a3649918535e4b2b55fa493328 SHA512 2016cdbc06e2b6c4adf76a93fde1f67267df6e145265db81fb54411d407713e854031eae0f243651f41418e56e07588d0bdbecfa9697f3c0bd3599f263fe4273
-EBUILD ffmpeg-4.2.2.ebuild 18051 BLAKE2B d9b38af293ea5347dab305f8885dd25f7b57ce7d2dd2a6946860fad2b3e1ef8c0c34bf40a2b4ff0d807522617fac2c05f4cb964d6d82a51a291a8e7c47312590 SHA512 3289338620b246e6d9da61567436df212937c20c8bcfb028eaef6cf7e1c525edd429292c60d822031f3a0e8118d45495178721f73268434b307d4703f7724b22
-EBUILD ffmpeg-9999.ebuild 17880 BLAKE2B 8a233a1d336257897f33bc2a54f3bca431f2f3f1d5343045e7976f873f4808697babf18dbb1d72bd688ddc0866c83108e5d3545fe90d31e7e40142d624e27f42 SHA512 5a9403fa1df8e1c4bff51446bcdba3a1ea4de76e58bb99dcf31305eb08d6aad120079d2a79d581f35def305ee6be5f7535e75d6289c8e01a284e27e67b80a022
+DIST ffmpeg-4.2.3.tar.bz2 10957405 BLAKE2B fbc933f1750bbdcea236442c66faec78fb04ef18aef3b59516e7585946db7efd30c5f7e096e8aad057890e7c8e301240b557414c51767afeabbdd4902c52cd7e SHA512 ca9b0c8df41783689d80e9d0a43acef8b457fb4003ff4173a7b0898cefabc76efc24257e8990ab2559a3e409c9a1a66f90343a421579a85fe7398b1a898b60b5
+EBUILD ffmpeg-3.4.6-r1.ebuild 15652 BLAKE2B 64721c6c6793ec965f780674060bb911a934138c0c210494adf491dda2e814c2daabcf5ec30221a8883a2394335fa3320c8684bfbd6bdc1e2c34fa65d7cb93c8 SHA512 f50ca040e3c0af7e9f37f26caa98bf07841beb2bcede4d7c1f66aab2e4444e3ead66a5cd4ac0a25109a9e8fd7ec05da38b9dee1e0d36e1646da1af845852f748
+EBUILD ffmpeg-4.1.3.ebuild 17097 BLAKE2B 012ac555ce9f91e37ffdc579084d2ec3050843b92ae5dae57918cad07725f0c86909dea53681e57cabd4c22855bcb50e8e408cbab15bb7d328db9140371e3b05 SHA512 5a1897b8c328eb3df90e07a9d487d774738f5c45bc468bc34d3e3d023cd02845c6f58ca84f3b6f21602a02b6a85ca7c694eb9476cc84072818b1d095f2b59898
+EBUILD ffmpeg-4.1.4.ebuild 17103 BLAKE2B 8c4217cc2f5bb4bc4894095c3d67ef2bf907a728c1034d0a00eab8f79cbd5008b6ad70dfdcb726ac6a11c0fb99bcee4e7687eaaa04cf87a03897712817b64ea4 SHA512 50e4913092edc950a33407142c914f30b58110037b53d4ba070696781bef8af3b9abce128d31becf11554e104d2cbcd4ac9899f2146b7647969192a69c7bc37b
+EBUILD ffmpeg-4.2.1.ebuild 17777 BLAKE2B 2e93d80a4456e21b354800139daee83de54ec747aef7b6fcbb35e01ae47f5fb9a954fc45bcd89b4c7a7345e32cf64b3ce709ef57eb0f2d17a8159b3e88622a0c SHA512 97fc9fc791e9f3484f1752ce4e096b64ce9401742b5eb52e83d6d61b7a88670f76f38e1ac0c6bb6d1efcebd2efd85e5dd0560918401541665b8d901c3e84e87c
+EBUILD ffmpeg-4.2.2.ebuild 18046 BLAKE2B 8262423f9cd9e21e96632d0f96d62db53161e432875b7f3f115da846e916d12130690b7d2e00b84f8b919aaaa376258e3ae46f5767fa249f6a5b3efcb0fb1a71 SHA512 b09211f4d19dac2442420249528b998c420d48a915ae7eca294a13136f4a1eef742e7268f43656b00b51a2e53fd315327222ecfed47a8d4bae16251bca46f1e0
+EBUILD ffmpeg-4.2.3.ebuild 18049 BLAKE2B 44520ec15e590afcc67f9bbad8388185882874106c7f310b958b186ddc153be7c758e72e9b2905c48f0dad88f8580f97f1c3bd912959c64187936111eae92ca2 SHA512 6efe2864eaecad5b1cf647fd4432dddee41e7e5a9c93ce351a6fcdbcd5622a371be5dea47983aaa9a79aa62a70b088f1de4024ea1456c77e606b571ec9deccaf
+EBUILD ffmpeg-9999.ebuild 17875 BLAKE2B a9355777c63046ba069ddf31f33efd1fe212bb6abc0e9531bc88e04933352d9f456db2217e78a572f82dc7a17e0a9790faf02147a064ca1561c7902ccc6bc701 SHA512 24d5f0df6573cfcfd6a12603588a473300e2314193de4b5c34f50109622aa658f28effe9bcb0fb5fa60f6d94baef31fa7db23227e3a31e6b2a73b98d9b371be1
 MISC metadata.xml 5820 BLAKE2B 01cde597d11525602c97167c405cbcc2b42c28bcf074c3d035e6994ad7cead68e5256aea89d10680a9e4b61057a69a6dd66ead329b41685d206937e20761f475 SHA512 8a8a4fc714ba566024960eeada731ba71f30577cccd9fc1b775ac86f1093568cfc3f0f204129f65aec2d921838d1372fa5a9410223a44e60b83a759c07d632cc
diff --git a/media-video/ffmpeg/ffmpeg-3.4.6-r1.ebuild b/media-video/ffmpeg/ffmpeg-3.4.6-r1.ebuild
index b8575f84c87d..66e6bc724774 100644
--- a/media-video/ffmpeg/ffmpeg-3.4.6-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.4.6-r1.ebuild
@@ -22,7 +22,7 @@ fi
 
 inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
 
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
+DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec"
 HOMEPAGE="http://ffmpeg.org/"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
diff --git a/media-video/ffmpeg/ffmpeg-4.1.3.ebuild b/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
index 8bec452d4ea6..91e2e0bddbf5 100644
--- a/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
@@ -23,7 +23,7 @@ fi
 
 inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
 
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
+DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec"
 HOMEPAGE="https://ffmpeg.org/"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
diff --git a/media-video/ffmpeg/ffmpeg-4.1.4.ebuild b/media-video/ffmpeg/ffmpeg-4.1.4.ebuild
index cc95a886113b..3c7a5baf5cd6 100644
--- a/media-video/ffmpeg/ffmpeg-4.1.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.1.4.ebuild
@@ -23,7 +23,7 @@ fi
 
 inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
 
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
+DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec"
 HOMEPAGE="https://ffmpeg.org/"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
diff --git a/media-video/ffmpeg/ffmpeg-4.2.1.ebuild b/media-video/ffmpeg/ffmpeg-4.2.1.ebuild
index a162e226c929..d04a9e8a9bf8 100644
--- a/media-video/ffmpeg/ffmpeg-4.2.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.2.1.ebuild
@@ -23,7 +23,7 @@ fi
 
 inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
 
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
+DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec"
 HOMEPAGE="https://ffmpeg.org/"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
diff --git a/media-video/ffmpeg/ffmpeg-4.2.2.ebuild b/media-video/ffmpeg/ffmpeg-4.2.2.ebuild
index cf69d359c7ec..1cc832f8624a 100644
--- a/media-video/ffmpeg/ffmpeg-4.2.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.2.2.ebuild
@@ -23,7 +23,7 @@ fi
 
 inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
 
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
+DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec"
 HOMEPAGE="https://ffmpeg.org/"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
diff --git a/media-video/ffmpeg/ffmpeg-4.2.3.ebuild b/media-video/ffmpeg/ffmpeg-4.2.3.ebuild
new file mode 100644
index 000000000000..fab119d4e8fb
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-4.2.3.ebuild
@@ -0,0 +1,551 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Subslot: libavutil major.libavcodec major.libavformat major
+# Since FFmpeg ships several libraries, subslot is kind of limited here.
+# Most consumers will use those three libraries, if a "less used" library
+# changes its soname, consumers will have to be rebuilt the old way
+# (preserve-libs).
+# If, for example, a package does not link to libavformat and only libavformat
+# changes its ABI then this package will be rebuilt needlessly. Hence, such a
+# package is free _not_ to := depend on FFmpeg but I would strongly encourage
+# doing so since such a case is unlikely.
+FFMPEG_SUBSLOT=56.58.58
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_MIN_CLONE_TYPE="single"
+	EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec"
+HOMEPAGE="https://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+	SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.bz2
+		https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-4.2.2-ppc64-altivec.patch.gz
+		https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-4.2.2-ppc64-gcc.patch.gz
+	"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+SLOT="0/${FFMPEG_SUBSLOT}"
+LICENSE="
+	!gpl? ( LGPL-2.1 )
+	gpl? ( GPL-2 )
+	amr? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	gmp? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	libaribb24? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	encode? (
+		amrenc? (
+			gpl? ( GPL-3 )
+			!gpl? ( LGPL-3 )
+		)
+	)
+	samba? ( GPL-3 )
+"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+# Options to use as use_enable in the foo[:bar] form.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
+		+gpl hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl
+		openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau
+		X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib
+		# libavdevice options
+		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
+		opengl
+		# indevs
+		libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack
+		# decoders
+		amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 dav1d:libdav1d fdk:libfdk-aac
+		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
+		libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
+		speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec
+		vorbis:libvorbis vpx:libvpx zvbi:libzvbi
+		# libavfilter options
+		appkit
+		bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r
+		fribidi:libfribidi fontconfig ladspa libass libtesseract lv2 truetype:libfreetype vidstab:libvidstab
+		rubberband:librubberband zeromq:libzmq zimg:libzimg
+		# libswresample options
+		libsoxr
+		# Threads; we only support pthread for now but ffmpeg supports more
+		+threads:pthreads
+)
+
+# Same as above but for encoders, i.e. they do something only with USE=encode.
+FFMPEG_ENCODER_FLAG_MAP=(
+	amrenc:libvo-amrwbenc mp3:libmp3lame
+	kvazaar:libkvazaar libaom
+	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
+	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+)
+
+IUSE="
+	alsa chromium doc +encode oss pic static-libs test v4l
+	${FFMPEG_FLAG_MAP[@]%:*}
+	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=(
+	cpu_flags_arm_thumb:armv5te
+	cpu_flags_arm_v6:armv6
+	cpu_flags_arm_thumb2:armv6t2
+	cpu_flags_arm_neon:neon
+	cpu_flags_arm_vfp:vfp
+	cpu_flags_arm_vfpv3:vfpv3
+	cpu_flags_arm_v8:armv8
+)
+ARM_CPU_REQUIRED_USE="
+	arm64? ( cpu_flags_arm_v8 )
+	cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
+	cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
+	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
+	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
+	cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
+"
+MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
+PPC_CPU_FEATURES=( altivec )
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
+	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
+	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
+	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
+	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
+	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
+	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
+	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
+	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
+	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
+"
+
+CPU_FEATURES_MAP=(
+	${ARM_CPU_FEATURES[@]}
+	${MIPS_CPU_FEATURES[@]}
+	${PPC_CPU_FEATURES[@]}
+	${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE}
+	${CPU_FEATURES_MAP[@]%:*}"
+
+CPU_REQUIRED_USE="
+	${ARM_CPU_REQUIRED_USE}
+	${X86_CPU_REQUIRED_USE}
+"
+
+FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
+IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
+	codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] )
+	dav1d? ( >=media-libs/dav1d-0.4.0:0=[${MULTILIB_USEDEP}] )
+	encode? (
+		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		kvazaar? ( >=media-libs/kvazaar-1.2.0[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
+		snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
+	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
+	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
+	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
+	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	iec61883? (
+		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
+	libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] )
+	libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] )
+	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
+	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
+	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
+	libtesseract? ( >=app-text/tesseract-4.1.0-r1[${MULTILIB_USEDEP}] )
+	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	libxml2? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] )
+	lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	mmal? ( media-libs/raspberrypi-userland )
+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	srt? ( >=net-libs/srt-1.3.0[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
+	svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] )
+	video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.0.18.0[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] )
+	vorbis? (
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+	)
+	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}]
+	)
+	zeromq? ( >=net-libs/zeromq-4.1.6 )
+	zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
+	postproc? ( !media-libs/libpostproc )
+"
+
+# Crypto & co provider magic
+# - libressl is a useflag meaning it should always favor libressl over openssl
+# - libressl and openssl provide more features to ffmpeg than gnutls
+#
+# The ordering is thus: libressl > openssl > gnutls
+RDEPEND="${RDEPEND}
+	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	!libressl? (
+		openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		!openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
+	)
+"
+
+DEPEND="${RDEPEND}
+	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
+	v4l? ( sys-kernel/linux-headers )
+"
+BDEPEND="
+	>=sys-devel/make-3.81
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
+	cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] )
+	doc? ( sys-apps/texinfo )
+	test? ( net-misc/wget sys-devel/bc )
+"
+
+# Code requiring FFmpeg to be built under gpl license
+GPL_REQUIRED_USE="
+	postproc? ( gpl )
+	frei0r? ( gpl )
+	cdio? ( gpl )
+	rubberband? ( gpl )
+	samba? ( gpl )
+	encode? (
+		x264? ( gpl )
+		x265? ( gpl )
+		xvid? ( gpl )
+	)
+"
+REQUIRED_USE="
+	cuda? ( video_cards_nvidia )
+	libv4l? ( v4l )
+	fftools_cws2fws? ( zlib )
+	test? ( encode )
+	${GPL_REQUIRED_USE}
+	${CPU_REQUIRED_USE}"
+RESTRICT="
+	!test? ( test )
+	gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+PATCHES=(
+	"${FILESDIR}"/chromium-r1.patch
+	"${WORKDIR}/${PN}"-4.2.2-ppc64-gcc.patch     # both ppc patches from
+	"${WORKDIR}/${PN}"-4.2.2-ppc64-altivec.patch # https://trac.ffmpeg.org/ticket/7861
+
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+build_separate_libffmpeg() {
+	use opencl
+}
+
+src_prepare() {
+	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
+		export revision=git-N-${FFMPEG_REVISION}
+	fi
+	default
+	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_FFMPEG_CONF} )
+
+	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+	use openssl || use libressl && use gpl && myconf+=( --enable-nonfree )
+	use samba && myconf+=( --enable-version3 )
+
+	# Encoders
+	if use encode ; then
+		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
+
+		# Licensing.
+		if use amrenc ; then
+			myconf+=( --enable-version3 )
+		fi
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# Indevs
+	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
+	for i in alsa oss jack ; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+
+	# Outdevs
+	for i in alsa oss ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+
+	# Decoders
+	use amr && myconf+=( --enable-version3 )
+	use gmp && myconf+=( --enable-version3 )
+	use libaribb24 && myconf+=( --enable-version3 )
+	use fdk && use gpl && myconf+=( --enable-nonfree )
+
+	for i in "${ffuse[@]#+}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+	done
+
+	# Incompatible features: openssl or libressl and gnutls
+	if use libressl ; then
+		myconf+=( --disable-gnutls --disable-openssl )
+	elif use openssl ; then
+		myconf+=( --disable-gnutls )
+	fi
+
+	# (temporarily) disable non-multilib deps
+	if ! multilib_is_native_abi; then
+		for i in frei0r libzmq ; do
+			myconf+=( --disable-${i} )
+		done
+	fi
+
+	# CPU features
+	for i in "${CPU_FEATURES_MAP[@]}" ; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	if use pic ; then
+		myconf+=( --enable-pic )
+		# disable asm code if PIC is required
+		# as the provided asm decidedly is not PIC for x86.
+		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
+	fi
+	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		[[ ${i} = native ]] && i="host" # bug #273421
+		myconf+=( --cpu=${i} )
+		break
+	done
+
+	# LTO support, bug #566282
+	is-flagq "-flto*" && myconf+=( "--enable-lto" )
+
+	# Mandatory configuration
+	myconf=(
+		--enable-avfilter
+		--enable-avresample
+		--disable-stripping
+		# This is only for hardcoded cflags; those are used in configure checks that may
+		# interfere with proper detections, bug #671746 and bug #645778
+		# We use optflags, so that overrides them anyway.
+		--disable-optimizations
+		--disable-libcelt # bug #664158
+		"${myconf[@]}"
+	)
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			*mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# doc
+	myconf+=(
+		$(multilib_native_use_enable doc)
+		$(multilib_native_use_enable doc htmlpages)
+		$(multilib_native_enable manpages)
+	)
+
+	set -- "${S}/configure" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+
+	if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then
+		einfo "Configuring for Chromium"
+		mkdir -p ../chromium || die
+		pushd ../chromium >/dev/null || die
+		set -- "${@}" \
+			--disable-shared \
+			--enable-static \
+			--enable-pic \
+			--disable-opencl
+		echo "${@}"
+		"${@}" || die
+		popd >/dev/null || die
+	fi
+}
+
+multilib_src_compile() {
+	emake V=1
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				emake V=1 tools/${i}$(get_exeext)
+			fi
+		done
+
+		if use chromium; then
+			if build_separate_libffmpeg; then
+				einfo "Compiling for Chromium"
+				pushd ../chromium >/dev/null || die
+				emake V=1 libffmpeg
+				popd >/dev/null || die
+			else
+				emake V=1 libffmpeg
+			fi
+		fi
+	fi
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install install-doc
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				dobin tools/${i}$(get_exeext)
+			fi
+		done
+
+		if use chromium; then
+			if build_separate_libffmpeg; then
+				einfo "Installing for Chromium"
+				pushd ../chromium >/dev/null || die
+				emake V=1 DESTDIR="${D}" install-libffmpeg
+				popd >/dev/null || die
+			else
+				emake V=1 DESTDIR="${D}" install-libffmpeg
+
+				# When not built separately, libffmpeg has no code of
+				# its own so this QA check raises a false positive.
+				QA_FLAGS_IGNORED+=" usr/$(get_libdir)/chromium/.*"
+			fi
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
+	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+		emake V=1 fate
+}
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 7805600ea529..055a69ae2702 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -23,7 +23,7 @@ fi
 
 inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
 
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
+DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec"
 HOMEPAGE="https://ffmpeg.org/"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
diff --git a/media-video/gaupol/Manifest b/media-video/gaupol/Manifest
index 943a886c5abd..82c38ef7f94d 100644
--- a/media-video/gaupol/Manifest
+++ b/media-video/gaupol/Manifest
@@ -1,8 +1,7 @@
 AUX gaupol-1.7-fix-tests.patch 5986 BLAKE2B f161262ad64c0a5fe02119522353b0348ecd96e66a52fcb5a3c1b9994098e1e1b647783ad47f7856f80e556ac4f8047693e0498bc8876f236730b56714883dbe SHA512 77dcd602e5e31886a5cbdb01fc58ed8aea216d16eaaf5a136e59a6b2fb0b0484cafb521ccefec5424edd7834cd36fa1e435477055a0c43bef7959aad7168eb26
-DIST gaupol-1.6.tar.gz 540186 BLAKE2B 4e7a2e0c01be2ac88c0ae5948d3002005c72418ef21835195daf6b0c5b71d970006b0f76fa78a1ec7337d1f9366436c44eb336e0a56d8cbb7eac905e09d4c81a SHA512 e0f258b579a34644e54456978df9c5a6f72aa019b6de79918fe6892bb59d2316c3fc093f2f49c60d6eef74832fa2a9a9e102bb1d25f64f3143fd29d3cb4966e5
+AUX gaupol-1.8-fix-audio-tracks-order.patch 6462 BLAKE2B 96e09112adf27ece07b65eee4b69d7dd1813c3b882afe790b8e35237e8e3c996809a0e71c00ce64f3c7cd0efbaf325933473f52439db31ba60869035c5a59feb SHA512 f7c001f698650c8c757818d44624201888aefe0d65689ee0fd357d85d45bd712a9f09b57e833a503c5b639ec430a6df2eebf02a40bed03a091abcd0da0bfae69
 DIST gaupol-1.7.tar.gz 524231 BLAKE2B 5f1c07a6d633fba53361ad4d9e1cdbc3236614a444bb387378c9e1ec6b358796eb7477168caace4b6101e0e6e0b83f10a2d3052acb5e0b0ab69e75f2b24db7fa SHA512 b0fa7f5216f47075aefddd58ab3aa1186265b5d70f8b4e7f7e252a1cc05bd1c4838c2af8efb4da39c0196f63dc3a64ff2269a458e2d95072606b59b4b8cada1b
 DIST gaupol-1.8.tar.gz 558627 BLAKE2B a7243310b97fe7187311585762faaff512364ca043630eb43c1ee99c55fa5400e14698e391b410b67f70f1bc7a741adb0737868d7b40c868bb4c6badacd14fb1 SHA512 a6b65316b5750a4d636b39b75393b0b2f2c44d978f1fc8cc3bd2cd2d2bcf9ba68d0161afb41bdca5b381ec39e5a2e06440f4f4676f344019966b297c4112e691
-EBUILD gaupol-1.6.ebuild 1416 BLAKE2B 8d155661f768683a2adcae10f6adfaa3ab44f4c0375e286942cade5c21eb72acbab1cd38695ab4e24b6f888a72a6a906600e73f6b9de2616de371280c726807d SHA512 2e954922a83060040a3b71422703d71801cec11b0883aaeeb3f38923e749d91a2def47ccd7c1efd20ccf12085eca5d4163bea27b31682f657f48a4ba918c95e4
 EBUILD gaupol-1.7.ebuild 1585 BLAKE2B 35ec5e82c552ce47683019f57409a27851fa5c5a3ab12e9983ec9bff0d68e2a3a7a1154d71f3e4f1d93251bb1d5e46513341d4a143022f6c867dd742a20e0b05 SHA512 38839496e3327a5f18e348cce0f67b0f72913c52962ef56c4b07c13228d4fe5c699275b26670b7bee69f781580bcb1daed10daf4171c2cd96b5662c47971271c
-EBUILD gaupol-1.8.ebuild 1542 BLAKE2B 1694a3f5c40bad998c39bd35adfcfbcc87033df71e8138cc8d046fab5983112f28d9a3b8459a1c6cda170d4a2779438a46ecc066c2bd751df311c155d9e31c0f SHA512 58bb1283f59e101f7f9455f54aafde064eddef2821843d75f5043b43182d75910daf0b3ca3f727cdb13187a8e35f47215d9501cc0fe275d68a71f25629662203
+EBUILD gaupol-1.8-r1.ebuild 1705 BLAKE2B 47748caad94180bb86b9f9ca7da1cdfdb9eca638ae99a8f662923ccd9fb39c24e9b70f82b42f93ecfc8d18a1c85d235e84c1a9641d19408ca1a07dff11822f70 SHA512 2243852259e7d77d846779da9a07db4b3c7c94627b89cac43a4d4d5b870da598eb5b0a42be0c5cd7e78ee3cd8697e97910b476d26fd0cb386e3ea0986da41bd6
 MISC metadata.xml 508 BLAKE2B 979a43569103cfe36a47d56ed16c15b7775d0a36d031d488ac064152b8d59115dc656e28a5eced25da13d9a3925be24114a760862bf043b88a89c70b8dc053e8 SHA512 1af2a5a287075a0668850c229a5c9dcbef51bbe64467516e37b870459266021d528435dbd5274e0d5abf7cf0fe2d4b8fb08f6cc470418c3b64e4da6b93dcc147
diff --git a/media-video/gaupol/files/gaupol-1.8-fix-audio-tracks-order.patch b/media-video/gaupol/files/gaupol-1.8-fix-audio-tracks-order.patch
new file mode 100644
index 000000000000..3f554c4ef335
--- /dev/null
+++ b/media-video/gaupol/files/gaupol-1.8-fix-audio-tracks-order.patch
@@ -0,0 +1,174 @@
+From e26cfcfe002c87a39eac63bbaa5ad0d4d69c95a4 Mon Sep 17 00:00:00 2001
+From: Quentin Gliosca <quentin.gliosca@gmail.com>
+Date: Tue, 12 May 2020 16:48:31 +0200
+Subject: [PATCH 1/3] Fix the order of languages in audio track selection
+
+Fix #129
+---
+ gaupol/player.py | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/gaupol/player.py b/gaupol/player.py
+index 836abea2..c266e0b9 100644
+--- a/gaupol/player.py
++++ b/gaupol/player.py
+@@ -118,7 +118,8 @@ def _ensure_default_segment(self):
+ 
+     def get_audio_languages(self):
+         """Return a sequence of audio languages or ``None``."""
+-        return tuple(x.get_language() for x in self._info.get_audio_streams())
++        return tuple(self._playbin.emit("get-audio-tags", i).get_string("language-code")[1]
++                     for i in range(self._playbin.props.n_audio))
+ 
+     def get_duration(self, mode=None):
+         """Return duration of video stream or ``None``."""
+@@ -356,6 +357,10 @@ def set_uri(self, uri):
+             dialog.add_button(_("_OK"), Gtk.ResponseType.OK)
+             dialog.set_default_response(Gtk.ResponseType.OK)
+             gaupol.util.flash_dialog(dialog)
++        else:
++            # Make stream tags available from _playbin
++            self._playbin.set_state(Gst.State.PAUSED)
++            self._playbin.get_state(Gst.CLOCK_TIME_NONE)
+ 
+     def stop(self):
+         """Stop."""
+
+From 9ace4fefe5d246c5588538a715a185c796e218ef Mon Sep 17 00:00:00 2001
+From: Quentin Gliosca <quentin.gliosca@gmail.com>
+Date: Tue, 12 May 2020 17:27:35 +0200
+Subject: [PATCH 2/3] Improve names of audio tracks in menu
+
+---
+ gaupol/agents/video.py | 18 ++++++++++++++----
+ gaupol/player.py       | 20 ++++++++++++++++----
+ 2 files changed, 30 insertions(+), 8 deletions(-)
+
+diff --git a/gaupol/agents/video.py b/gaupol/agents/video.py
+index d434255a..0f6b935c 100644
+--- a/gaupol/agents/video.py
++++ b/gaupol/agents/video.py
+@@ -27,7 +27,11 @@
+ from gi.repository import Gtk
+ 
+ with aeidon.util.silent(Exception):
++    from gi import require_version
++    require_version('GstTag', '1.0')
+     from gi.repository import Gst
++    from gi.repository import GstTag
++
+ 
+ 
+ class VideoAgent(aeidon.Delegate):
+@@ -348,11 +352,17 @@ def _update_languages_menu(self):
+         """Update the audio language selection menu."""
+         menu = self.get_menubar_section("audio-languages-placeholder")
+         menu.remove_all()
+-        languages = self.player.get_audio_languages()
+-        for i, language in enumerate(languages):
+-            language = language or _("Undefined")
++        tracks = self.player.get_audio_infos()
++        for i, track in enumerate(tracks):
++            title = track.title or "{} {}".format(_("Track"), i + 1)
++            lang = None
++            if track.language_code is not None:
++                lang = GstTag.tag_get_language_name(track.language_code)
++            if lang is None:
++                lang = track.language_name
++            name = title if lang is None else "{} - [{}]".format(title, lang.title())
+             action = "win.set-audio-language::{:d}".format(i)
+-            menu.append(language, action)
++            menu.append(name, action)
+             if i == self.player.audio_track:
+                 action = self.get_action("set-audio-language")
+                 action.set_state(str(i))
+diff --git a/gaupol/player.py b/gaupol/player.py
+index c266e0b9..ee1e96dc 100644
+--- a/gaupol/player.py
++++ b/gaupol/player.py
+@@ -21,6 +21,7 @@
+ import gaupol
+ import time
+ 
++from collections import namedtuple
+ from aeidon.i18n   import _
+ from gi.repository import GLib
+ from gi.repository import Gtk
+@@ -56,6 +57,8 @@ class VideoPlayer(aeidon.Observable):
+ 
+     signals = ("state-changed",)
+ 
++    TrackInfo = namedtuple("TrackInfo", ["title", "language_code", "language_name"])
++
+     def __init__(self):
+         """Initialize a :class:`VideoPlayer` instance."""
+         aeidon.Observable.__init__(self)
+@@ -116,10 +119,19 @@ def _ensure_default_segment(self):
+         self._playbin.seek_simple(Gst.Format.TIME, seek_flags, pos)
+         self._in_default_segment = True
+ 
+-    def get_audio_languages(self):
+-        """Return a sequence of audio languages or ``None``."""
+-        return tuple(self._playbin.emit("get-audio-tags", i).get_string("language-code")[1]
+-                     for i in range(self._playbin.props.n_audio))
++    def get_audio_infos(self):
++        """Return a sequence of audio track infos."""
++        return tuple(
++            self._make_track_infos(self._playbin.emit("get-audio-tags", i))
++            for i in range(self._playbin.props.n_audio)
++        )
++
++    def _make_track_infos(self, tags):
++        return self.TrackInfo(
++            tags.get_string("title")[1],
++            tags.get_string("language-code")[1],
++            tags.get_string("language-name")[1]
++        )
+ 
+     def get_duration(self, mode=None):
+         """Return duration of video stream or ``None``."""
+
+From f50b4e54dc9aa84fc1b3eb403d680b8a0be77dc3 Mon Sep 17 00:00:00 2001
+From: Quentin Gliosca <quentin.gliosca@gmail.com>
+Date: Wed, 13 May 2020 07:29:27 +0200
+Subject: [PATCH 3/3] Cosmetic changes
+
+---
+ gaupol/__init__.py     | 1 +
+ gaupol/agents/video.py | 4 +---
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/gaupol/__init__.py b/gaupol/__init__.py
+index f7a9663d..fc02287b 100644
+--- a/gaupol/__init__.py
++++ b/gaupol/__init__.py
+@@ -44,6 +44,7 @@
+     "Gst": "1.0",
+     "GstPbutils": "1.0",
+     "GstVideo": "1.0",
++    "GstTag": "1.0",
+ }.items():
+     with aeidon.util.silent(Exception):
+         gi.require_version(module, version)
+diff --git a/gaupol/agents/video.py b/gaupol/agents/video.py
+index 0f6b935c..3c9e3113 100644
+--- a/gaupol/agents/video.py
++++ b/gaupol/agents/video.py
+@@ -27,8 +27,6 @@
+ from gi.repository import Gtk
+ 
+ with aeidon.util.silent(Exception):
+-    from gi import require_version
+-    require_version('GstTag', '1.0')
+     from gi.repository import Gst
+     from gi.repository import GstTag
+ 
+@@ -354,7 +352,7 @@ def _update_languages_menu(self):
+         menu.remove_all()
+         tracks = self.player.get_audio_infos()
+         for i, track in enumerate(tracks):
+-            title = track.title or "{} {}".format(_("Track"), i + 1)
++            title = track.title or _("Track {:d}").format(i + 1)
+             lang = None
+             if track.language_code is not None:
+                 lang = GstTag.tag_get_language_name(track.language_code)
diff --git a/media-video/gaupol/gaupol-1.6.ebuild b/media-video/gaupol/gaupol-1.6.ebuild
deleted file mode 100644
index 359bb2291dc2..000000000000
--- a/media-video/gaupol/gaupol-1.6.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 gnome2-utils virtualx xdg-utils
-
-DESCRIPTION="A subtitle editor for text-based subtitles"
-HOMEPAGE="https://otsaloma.io/gaupol/"
-SRC_URI="https://github.com/otsaloma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="spell test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-text/iso-codes
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	spell? (
-		app-text/gtkspell:3
-		>=dev-python/pyenchant-1.4[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	sys-devel/gettext
-	test? (
-		${RDEPEND}
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( AUTHORS.md NEWS.md TODO.md README.md README.aeidon.md )
-
-python_test() {
-	virtx pytest -vv
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "Previewing support needs MPV, MPlayer or VLC."
-
-		if use spell; then
-			elog "Additionally, spell-checking requires a dictionary, any of"
-			elog "Aspell/Pspell, Ispell, MySpell, Uspell, Hspell or AppleSpell."
-		fi
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-video/gaupol/gaupol-1.8.ebuild b/media-video/gaupol/gaupol-1.8-r1.ebuild
index 9fa5bf5a0ca1..33dec788257c 100644
--- a/media-video/gaupol/gaupol-1.8.ebuild
+++ b/media-video/gaupol/gaupol-1.8-r1.ebuild
@@ -37,6 +37,8 @@ DEPEND="
 
 DOCS=( AUTHORS.md NEWS.md TODO.md README.md README.aeidon.md )
 
+PATCHES=( "${FILESDIR}/${P}-fix-audio-tracks-order.patch" )
+
 python_test() {
 	virtx pytest -vv
 }
@@ -45,7 +47,9 @@ pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_icon_cache_update
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "Previewing support requires MPV, MPlayer or VLC."
+		elog "The integrated video player requires media-plugins/gst-plugins-gtk."
+		elog ""
+		elog "External video previewing support requires MPV, MPlayer or VLC."
 		if use spell; then
 			elog ""
 			elog "Spell-checking requires a dictionary, any of app-dicts/myspell-*"
diff --git a/media-video/griffith/Manifest b/media-video/griffith/Manifest
deleted file mode 100644
index c3cb5b420682..000000000000
--- a/media-video/griffith/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 0.10-fix_lib_path.patch 666 BLAKE2B 03dcaf2732c753885bd34254c988a5d6b5be12df812de334bffae8ef3368700e0d31488665ca3fe934aee0765ceaf1cec871829976327021e12846657668a506 SHA512 f8831dd13f640ed4700d1c3e9d2a8e856f9525b9583338b93465491b2da6a7e5c485d297cd8dc34842c101dbd8a9678e68e310dd16d9be924b7d8a09ec1ac3a5
-AUX griffith-0.13-validators.patch 549 BLAKE2B fb8b53aeea53d331ff01b74a7bfbad05615b7de8f7e2d09057674a582191381a4a4a9348573a22ba9d42814946598f2e5592288799dba39b682509b814cb81f4 SHA512 0ce26c62d26d397fb4b212ada76895af826dfc11ea289f928d1761809bcd67d3e9c0de4a2c3ac402f4cb550ed9b50dc067689d4cc0c8e05f5117317c968e7c9b
-DIST griffith-0.13.tar.gz 1565903 BLAKE2B d3d806ef2a7cef76ce548e3ad785e96938447cb6425ac95fdbb4b5ae233adb2aeb4a274aa24c9e502607bc1287ea30ce8806cb1608fc194531757943e499b0e7 SHA512 dc8117b1a89253a87eb303c5229e6cdffde26b52de9ac4a3409dcc3f6dca64105f13a98cace225a932aefb2d620e828eea66bae57f40328b7ee3c06a944f0bed
-DIST griffith-extra-artwork-0.9.4.tar.gz 124008 BLAKE2B 992f8e4995d0465e891eacfe601eead2323754c60ad0c0a96ea9568dbecf5790039f58212e8a115f382532e1787e4db267b1259ac91de40728f7911f6b2178ae SHA512 09e912b4511c5c4a7b501d9a8f98223d20e58574e667cdb759e66f743cce14b45cce8bf0f9502ff2aacfc09e7a7b37966a887205a74a6e028b832703a65a2734
-EBUILD griffith-0.13-r3.ebuild 2184 BLAKE2B 4ae2ac0dd60cdb9cc1d2c53006317534360f826c7593fecb9442f307635cd4958ef46ffb628cd6874614cb310083a13d0edef76f1ecf54a4a491c869adc4da0a SHA512 1c0b70e5dd0517c319ea5d1ac76d4b98fb79dd213fc404294445c22f6fcc28f4e992d282456f6ec4a60f52db230f1e8cbd04157f344f7bed18646f33059b3e0d
-MISC metadata.xml 345 BLAKE2B 2c1e03aeaaa718018760dc5853f6ed18c915c5c436f7fa64e101ebf8cde36b442d41641a0a6bb3b05ecc3cffd138a749bfff1721430a78300c7ce9a312a4b9c2 SHA512 c259fe792b25d60fa4112e229076beeecb198cdb5e7b3b737f8546954039995ad321253d9004d939fb7232b67fb44d4ea0d6cae5e5240baa0c0ad0b9265f5592
diff --git a/media-video/griffith/files/0.10-fix_lib_path.patch b/media-video/griffith/files/0.10-fix_lib_path.patch
deleted file mode 100644
index 9c918b25f487..000000000000
--- a/media-video/griffith/files/0.10-fix_lib_path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/initialize.py
-===================================================================
---- a/lib/initialize.py
-+++ b/lib/initialize.py
-@@ -73,7 +73,7 @@ def locations(self, home_dir):
-             os.environ['LANG'] = lang
- 
-     elif os.name == 'posix':
--        locations['share'] = os.path.abspath(os.path.join(locations['lib'], '..'))
-+        locations['share'] = os.path.abspath(os.path.join(locations['lib'], '../../share/griffith/'))
-         locations['glade'] = os.path.join(locations['share'], 'glade')
-         locations['i18n']  = os.path.abspath(os.path.join(locations['share'], '..', 'locale'))
-         if not os.path.isdir(locations['i18n']):
diff --git a/media-video/griffith/files/griffith-0.13-validators.patch b/media-video/griffith/files/griffith-0.13-validators.patch
deleted file mode 100644
index 9c39feec0095..000000000000
--- a/media-video/griffith/files/griffith-0.13-validators.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- griffith-0.13/lib/db/validators.py
-+++ griffith-0.13/lib/db/validators.py
-@@ -23,7 +23,13 @@
- 
- import logging
- 
--from sqlalchemy.orm.interfaces import AttributeExtension, InstrumentationManager
-+from sqlalchemy.orm.interfaces import AttributeExtension
-+try:
-+    # sql alchemy 0.8 (and above)
-+    from sqlalchemy.ext.instrumentation import InstrumentationManager
-+except:
-+    # sql alchemy 0.7
-+    from sqlalchemy.orm.interfaces import InstrumentationManager
- from sqlalchemy.orm import ColumnProperty
- from sqlalchemy.types import String
- 
diff --git a/media-video/griffith/griffith-0.13-r3.ebuild b/media-video/griffith/griffith-0.13-r3.ebuild
deleted file mode 100644
index d606fd887aac..000000000000
--- a/media-video/griffith/griffith-0.13-r3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='sqlite'
-
-inherit python-single-r1
-
-ARTWORK_PV="0.9.4"
-
-DESCRIPTION="Movie collection manager"
-HOMEPAGE="http://www.griffith.cc/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz
-	https://dev.gentoo.org/~hwoarang/distfiles/${PN}-extra-artwork-${ARTWORK_PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	gnome-base/libglade[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygtk-2.6.1:2[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/sqlalchemy-0.5.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/reportlab-1.19[${PYTHON_MULTI_USEDEP}]
-	')"
-DEPEND="${RDEPEND}
-	doc? ( app-text/docbook2X )"
-
-PATCHES=(
-	"${FILESDIR}/0.10-fix_lib_path.patch"
-	"${FILESDIR}/griffith-0.13-validators.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	use doc || { sed -i -e '/docs/d' Makefile || die ; }
-	sed -i \
-		-e 's#/pl/#/pl.UTF-8/#' \
-		"${S}"/docs/pl/Makefile || die "sed failed"
-
-	sed -i \
-		-e 's/ISO-8859-1/UTF-8/' \
-		"${S}"/lib/gconsole.py || die "sed failed"
-
-	default
-}
-
-src_compile() {
-	# Nothing to compile and default `emake` spews an error message
-	true
-}
-
-src_install() {
-	if ! use doc ; then
-		sed -i -e '/docs/d' Makefile || die
-	fi
-
-	emake \
-		LIBDIR="${D}/usr/$(get_libdir)/griffith" \
-		DESTDIR="${D}" DOC2MAN=docbook2man.pl install
-	dodoc AUTHORS ChangeLog README THANKS TODO NEWS TRANSLATORS
-
-	cd "${WORKDIR}/${PN}-extra-artwork-${ARTWORK_PV}/" || die
-	emake DESTDIR="${D}" install
-	# This carries over from -0.13 but appears to have no effect.
-	python_optimize "${ED}"/usr/share/${PN}
-}
-
-pkg_postinst() {
-	einfo
-	einfo "${PN} can make use of the following optional dependencies"
-	einfo "dev-python/chardet: CSV file encoding detections"
-	einfo "dev-python/mysql-python: Python interface for MySQL connectivity"
-	einfo ">=dev-python/psycopg-2.4: Python interface for PostgreSQL connectivity"
-	einfo
-}
diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
index 10b709297cef..257cbb2628d1 100644
--- a/media-video/guvcview/Manifest
+++ b/media-video/guvcview/Manifest
@@ -1,3 +1,3 @@
 DIST guvcview-src-2.0.6.tar.gz 1131013 BLAKE2B ec8d7a82344e26890fe184d0edf77d0e415aa708bdf3cf55f96c555aaef479b1b7441a0425db035d10a6dc31f90282c169afff2d13684599ab1c005a5ea50ab1 SHA512 f73ba0a013f5afadb45c9bf60f723058ee31e99e204c951c49335a8ef9902a2caa752d6d51f6dd20ae960217cc25155e70efe4c49299a95e6780aaf8034078ec
-EBUILD guvcview-2.0.6-r1.ebuild 1611 BLAKE2B 0c0f731a3571920247b32aab7b0695360ebd4f8fe5c21d3fad200cb60253cfe1fd1a93eb5fed0d529580ff9081410463ad7949689ef5f369956808491986637e SHA512 b72f4fe652f11956684bba8aecf1146b136eba94a8e99d91a3ea11285c2716821a65299fd5bbd91c2145080a009bc87aaa641e99f4ec749ada9ff39b82ef3df3
+EBUILD guvcview-2.0.6-r1.ebuild 1610 BLAKE2B eddf35f32d6994c0f318eddeca65c1e8365bf273f3d95586e1a18afedc149c0fa03f478cfadadb9a3ba934576f5fbf9d86947f79e63c9ca06e223e51463bd9fe SHA512 6b1bc640756e808280333fc2d5386b550824db427b5cfe195f51e937da6d6e902c622dd16b9446637e292d519a47787491f3abe27775a9547e31445aba5a5892
 MISC metadata.xml 380 BLAKE2B 0059009c82869365d8ad9bd1266dbd048b97c3e24bad5d47e9598ae1f90a348395089faa27ae52982525dbd02a6ad3c48961c8b66eba9077a09ffde6f1a8eaf9 SHA512 6eb897ab0df42c6ecb1b5559eea22eccaca63cfa72f350361634b424baa1d7405175968930e57151164d2999e2d2db28e2606576994895259c065ae07d623f1d
diff --git a/media-video/guvcview/guvcview-2.0.6-r1.ebuild b/media-video/guvcview/guvcview-2.0.6-r1.ebuild
index 76ae9ce37c01..a24e2f2d3041 100644
--- a/media-video/guvcview/guvcview-2.0.6-r1.ebuild
+++ b/media-video/guvcview/guvcview-2.0.6-r1.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit autotools flag-o-matic qmake-utils toolchain-funcs
+EAPI=7
 
 MY_P=${PN}-src-${PV}
+inherit autotools flag-o-matic qmake-utils toolchain-funcs
 
 DESCRIPTION="Simple Qt5 or GTK+3 interface for capturing and viewing video from v4l2 devices"
 HOMEPAGE="http://guvcview.sourceforge.net/"
@@ -16,17 +15,22 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="gsl pulseaudio qt5"
 
+BDEPEND="
+	dev-util/intltool
+	sys-devel/autoconf-archive
+	sys-devel/gettext
+	virtual/pkgconfig
+"
 RDEPEND="
 	>=dev-libs/glib-2.10
 	media-libs/libpng:0=
 	media-libs/libsdl2
 	media-libs/libv4l
 	>=media-libs/portaudio-19_pre
-	media-video/ffmpeg
+	>=media-video/ffmpeg-2.8:0=
 	virtual/libusb:1
 	virtual/udev
 	gsl? ( >=sci-libs/gsl-1.15 )
-	>=media-video/ffmpeg-2.8:0=
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
 	qt5? (
 		dev-qt/qtcore:5
@@ -37,12 +41,8 @@ RDEPEND="
 "
 # linux-headers: bug 448260
 DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/autoconf-archive
-	sys-devel/gettext
 	>=sys-kernel/linux-headers-3.4-r2
 	virtual/os-headers
-	virtual/pkgconfig
 "
 
 S="${WORKDIR}/${MY_P}"
@@ -73,5 +73,5 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index ae26c03ddb52..b0c62803a5cc 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -6,7 +6,9 @@ AUX handbrake-9999-remove-dvdnav-dup.patch 809 BLAKE2B 16cde838dcf59753e5438df0d
 AUX handbrake-9999-remove-faac-dependency.patch 3697 BLAKE2B b0f7d0a1c4d464d3287ab233b756f5036d6ffa7e9e59a2f98a8ffb2ae59e46d25e56edb3e5bf9c04a16330f3dc50f4c2426f252b35834b7c9c9e6b4904244368 SHA512 9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc
 DIST handbrake-1.2.2.tar.bz2 18010777 BLAKE2B 75ace4565bef22a6ee8cd3291a393dd20d9a8fcc57b16bca15393f9a5f18949bf104ad69b536453013598ea3dc0ddbceddf85b96e234f09ef2c119810242f48e SHA512 434e6db1acbe01771aeefd2f257bdc58ad84e63ba441f4977f634b9ccb3c708176b928adf1dfa9e20d4948b65876ae9b4dfdc35f9c56f03f34858380090ab29c
 DIST handbrake-1.3.0.tar.bz2 16801695 BLAKE2B 2a71674f557562317ed643064f252f3f88815a0b2fbbf9478f79efdd18282304443a29120effdce8ed9b07d00896d0946be0a7f4a94ae65252f9935c97829fb4 SHA512 40801a5a3756feb33f374e68e7ed743841d33f7a6b22dd2361034f182b32cdcead3ff02a7a6e16f0ffbc7b693541747b048dc606deadf7a8e490aad193e07c4d
+DIST handbrake-1.3.2.tar.bz2 16813741 BLAKE2B b59186f60d12a5478b2a34f736c9450ce6bba98f0606fc42af11c64f55b2324177302d49089003a39d0a8c1d82776211573a7c4ef1b6b6fabdbc35aed2e5cde7 SHA512 857f358a8754b08e55acfddb1431d99cc1035cf52174ab1d5243524fffe60e6cbc7d2a5d5912d55e6dc6b8ec621d503ebd21614a9064706a95c920e72a760f6a
 EBUILD handbrake-1.2.2-r3.ebuild 4053 BLAKE2B cfd4cccdeeaccdb243d14dc2ef8ffb645d69604ddab11eca57ef9c3b59a73ba6ced001f1c3b345fd6baab060408b730377229b0b967a3d7b0e2b3a3c366e4111 SHA512 948b6247b83f802106a8fb17443702f4ccc1018e34179c7df08b9d75b13ea8ae2b7888c6b7035ec00305cd05b17ebb9dcf97c119381d9d8fb5a6ba4b7b160787
 EBUILD handbrake-1.3.0-r2.ebuild 4203 BLAKE2B 89736df13485b16b800b1d8f9a06e8554b7340a007fb95fd88f260a53a76510e21f3b2c63a37cde91bbcbf87999d195d38ef0035dc3bcf8de5da77659e7620fd SHA512 bcea747db43f8fe530771480dd77c84e0cf0e58db32880d908d563a6eb00d3829e31a800662271e6a26249540fbe5123926dce2a75250bedf3e41ef2c293ed21
+EBUILD handbrake-1.3.2.ebuild 4120 BLAKE2B a9467740cca2b941eafa5c0fb01a03ddf459d5af1cd1eba6be890b814e18006888b4bba704d974ab4706280fe22d5ab977cf6570bd6a9d46e8274112d3c0f251 SHA512 61e713ca6e82650cf39dc16154489ebb74118c2bf5e0ec5246a58c04b47a0b057b73dc764b9170729b57bf28485423c26275c2ab7211fd6ef0d605e05fcfcafc
 EBUILD handbrake-9999.ebuild 4141 BLAKE2B 6da162374851a5a0283c9404587e17386913dca3e39c747831007eeb8a102e4d68d828de48e99876c90848679ae0451fb62f5b7c870f676c91de6ef3847a6cbb SHA512 df20db4d5da687c300af75302890028141b9a7acbe7e09dfded90d6454dec6b1579a6ff832e3c7a6ace6377ac88d12cf8902db8e56580162296d18227f48c081
 MISC metadata.xml 1019 BLAKE2B 041873a5db7246fc3a6c6b5544fc4c28b981e6e15996c68c53413fabc46ada335333936e4e6ab160f6fad2b9eafafdb9f37d6651cb692e0d69f814acb02557f5 SHA512 41bb1e4656da0cf4a99fd158da5dcf9ccef2b4355f2cdb8e0017a84d8a65cc21ab382734dd967eaeeaf2d55c11e617e6dabe28eeb0bdd40388e8325a8e4ae42a
diff --git a/media-video/handbrake/handbrake-1.3.2.ebuild b/media-video/handbrake/handbrake-1.3.2.ebuild
new file mode 100644
index 000000000000..e5a5b3021946
--- /dev/null
+++ b/media-video/handbrake/handbrake-1.3.2.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	MY_P="HandBrake-${PV}"
+	SRC_URI="https://github.com/HandBrake/HandBrake/releases/download/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
+HOMEPAGE="http://handbrake.fr/"
+LICENSE="GPL-2"
+
+SLOT="0"
+IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
+
+REQUIRED_USE="^^ ( fdk libav-aac )"
+
+RDEPEND="
+	app-arch/xz-utils
+	media-libs/speex
+	dev-libs/jansson
+	dev-libs/libxml2
+	media-libs/a52dec
+	media-libs/libass:=
+	>=media-libs/libbluray-1.0
+	>=media-libs/dav1d-0.5.1
+	media-libs/libdvdnav
+	media-libs/libdvdread:=
+	media-libs/libsamplerate
+	media-libs/libtheora
+	media-libs/libvorbis
+	>=media-libs/libvpx-1.8
+	nvenc? ( media-libs/nv-codec-headers )
+	media-libs/opus
+	media-libs/x264:=
+	media-sound/lame
+	sys-libs/zlib
+	>=media-video/ffmpeg-4.2.1:0=[fdk?]
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-ugly:1.0
+		media-plugins/gst-plugins-a52dec:1.0
+		media-plugins/gst-plugins-libav:1.0
+		media-plugins/gst-plugins-x264:1.0
+		media-plugins/gst-plugins-gdkpixbuf:1.0
+	)
+	gtk? (
+		>=x11-libs/gtk+-3.10
+		dev-libs/dbus-glib
+		dev-libs/glib:2
+		dev-libs/libgudev:=
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/libnotify
+		x11-libs/pango
+	)
+	fdk? ( media-libs/fdk-aac )
+	x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
+	"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-lang/yasm
+	dev-util/intltool
+	sys-devel/automake"
+
+PATCHES=(
+	# Remove libdvdnav duplication and call it on the original instead.
+	# It may work this way; if not, we should try to mimic the duplication.
+	"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
+
+	# Remove faac dependency; TODO: figure out if we need to do this at all.
+	"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
+
+	# Use whichever python is set by portage
+	"${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
+)
+
+src_prepare() {
+	# Get rid of leftover bundled library build definitions,
+	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
+		"${S}"/make/include/main.defs \
+		|| die "Contrib removal failed."
+
+	default
+
+	cd "${S}/gtk"
+	# Don't run autogen.sh.
+	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
+	eautoreconf
+}
+
+src_configure() {
+	# Libav was replaced in 1.2 with ffmpeg by default
+	# but I've elected to not make people change their use flags for AAC
+	# as its the same code anyway
+	./configure \
+		--force \
+		--verbose \
+		--prefix="${EPREFIX}/usr" \
+		--disable-gtk-update-checks \
+		--disable-flatpak \
+		--disable-gtk4 \
+		$(use_enable libav-aac ffmpeg-aac) \
+		$(use_enable fdk fdk-aac) \
+		$(usex !gtk --disable-gtk) \
+		$(usex !gstreamer --disable-gst) \
+		$(use_enable numa) \
+		$(use_enable nvenc) \
+		$(use_enable x265) || die "Configure failed."
+}
+
+src_compile() {
+	emake -C build
+
+	# TODO: Documentation building is currently broken, try to fix it.
+	#
+	# if use doc ; then
+	# 	emake -C build doc
+	# fi
+}
+
+src_install() {
+	emake -C build DESTDIR="${D}" install
+
+	dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
+}
+
+pkg_postinst() {
+	einfo "Gentoo builds of HandBrake are NOT SUPPORTED by upstream as they"
+	einfo "do not use the bundled (and often patched) upstream libraries."
+	einfo ""
+	einfo "Please do not raise bugs with upstream because of these ebuilds,"
+	einfo "report bugs to Gentoo's bugzilla or Multimedia forum instead."
+
+	einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
+	if use gtk ; then
+		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
+	fi
+
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-video/jubler/Manifest b/media-video/jubler/Manifest
index 730b6722b0a0..f17ad52d125a 100644
--- a/media-video/jubler/Manifest
+++ b/media-video/jubler/Manifest
@@ -1,3 +1,3 @@
 DIST jubler-5.1.tar.bz2 1815531 BLAKE2B 59f9c3c57b906a73e16b32841900ef16450758115d930e767bc4d63882ad2b8a35100a34057ab6bb353f4bea87cb4036e080d8d13a844ae4bfcae8bb361d5b18 SHA512 e2a0da737362a3c8dc12966aec1e9939291237fc714a586186b72daa16abf967c8fea8dac04fb191cb803aa11db20cf6d67468d2383f17f5c6114a643860acef
-EBUILD jubler-5.1.ebuild 1702 BLAKE2B 9a8c6d5bbca022ec8add190204624a07519841e065023b9bc39f6d925eee8669dca9b81ea5be59be76ade21a025bf60885d2997440e80378c13204d826387829 SHA512 d4e24438b6e58c44781e271159bfa834be0a5e0d5b34aed1c96606bf8d517f37d93472479ff5301866cf18c9d98a3dbb1c0fe22742786dcf529c63e0ec5e4c7e
+EBUILD jubler-5.1.ebuild 1700 BLAKE2B 098237229034dfffe89c1d3969d8add192985ee95ace7068b8bad233e112e7a4d2a6a984106431fce9587e6e8365abc9c7d92beb8708398068d25e0b28764e81 SHA512 e22be68c79e860dba210e75f10f30ad5cd464253e08c99f49dafab95e58ac63af8c3fb743c500e746e3d88dd461f57672f591b5262d118ad7b93d29b0876482d
 MISC metadata.xml 292 BLAKE2B 9d8724a93d3fe4fb781615a11ad6e90963fcedcead3075387baf4dafb9dde7e31f0e2ade52adfdae19122d3a24682c4f58a9630c676ba040813569ca41c41b74 SHA512 c7131847c06b95cec1212b3ead2a170abc2a5eeae13d6e7db0683370c7e8949e6ebbcffd320f54c3bf26cf50b88cdd44bc02a7e315e7a943407a68c8747c4031
diff --git a/media-video/jubler/jubler-5.1.ebuild b/media-video/jubler/jubler-5.1.ebuild
index eba4d6276365..3acfb460574d 100644
--- a/media-video/jubler/jubler-5.1.ebuild
+++ b/media-video/jubler/jubler-5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit java-pkg-2 java-ant-2 xdg-utils
 MY_PN="${PN^}"
 
 DESCRIPTION="Java subtitle editor"
-HOMEPAGE="http://www.jubler.org/"
+HOMEPAGE="https://www.jubler.org/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-source-${PV}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index de8cf9095f27..542c80753f71 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -2,9 +2,11 @@ DIST mkvtoolnix-37.0.0.tar.xz 7307984 BLAKE2B 4ee59d6ed186e7181733f5723fc8ab5abe
 DIST mkvtoolnix-42.0.0.tar.xz 7486620 BLAKE2B e364f2522013b3705484c5e0ad60600300ea82cc7b8bdc15d9e1f107329abd3b22a873d687328df8177a66eb7b6103fb89de62eb038d180d70dd16f5af155396 SHA512 2dfe267c6b9bc3c976637a18df3da04d7e82dd46d7134ab041959615f090afb2996eb2b15277f36cb257cac7cb5304451e131c0ec6aa608ff10c80c5fec9702a
 DIST mkvtoolnix-43.0.0.tar.xz 7486252 BLAKE2B b74577627e503cf7f5f83232ef7b0cf362384dbd4867247d2945a8b93317e7ec87ba778e7cf7b691ae9c33812d5df2a9c0a7c95fb601e3c8baaeb06a6bc7a921 SHA512 dec32df70aeb53ecdfbffff8b773a3f61bb224d630536ba41e36d9687c3b66ae47347c85d8c8d75763d270b7605c6b7010b0bb04c4bdb1e6d6b624c85edeb663
 DIST mkvtoolnix-45.0.0.tar.xz 7500448 BLAKE2B 6725ac716a8882e061c31d05670d6fe5fe5900755b8e1fb0bc089c6d42529120fec9053925505f51d0453a06e46be502680321225375f2013ea3908f0ce92595 SHA512 373400c66ad8ea70b775d946842783c241fea04f4c5c9628f1652e45128e34abc41037045cbd47b83e70e350a338e5dc188cf0b51662726e0ff2e8288f0423dc
+DIST mkvtoolnix-46.0.0.tar.xz 7505996 BLAKE2B 22c0a3951241ec87c6004c2ed9eaf43d217a219572f48f9c47ed26625276ede180b25018f7f561f36f68e8fdf484f9cd1d51b5d6faf109916ecbfc1bc34c372b SHA512 8c88ba82a5b3eeb1eda2e1387a9beac1c3265761e189088d51464a4f6af0a9e6ba299254bbe84253ed7c832f2c4642513751617c928f1fdc52d8d7b286b6974c
 EBUILD mkvtoolnix-37.0.0.ebuild 2633 BLAKE2B 4bb1bc4c3defb6dfd672ca24322f9c220155b29ee11a355720de0aea495b9dc5d9a9a21f76c75bf7a91df8d96ed52850ac8e8b371efee6a4fbc9eda4770b0028 SHA512 22ec4a4753909bd92426841c2e2025ace80b3bc6de57e00182c67ab1c2bc8d1e7d03acd0312123f6979b09f6756ecb511ec1f2f97b6e939a591476a03f40bc7b
 EBUILD mkvtoolnix-42.0.0.ebuild 2644 BLAKE2B 9f7f8e110b7f5a7797f7cc56035728fa463f420c95178ea1725bd2040b22c6acb139ddc1f6a7e7d6c04253736c350353dbea43bb63bd2d15707c43a8e7a045d7 SHA512 3d5162c4456d29e8e7149d54cb4ea782de77d961515623ec47f062ee8466a975b19a85fa7c9af93b991eae7b4a9c5548c463fb64d213a2a77ce1ffd0aa237fdc
 EBUILD mkvtoolnix-43.0.0.ebuild 2644 BLAKE2B 9f7f8e110b7f5a7797f7cc56035728fa463f420c95178ea1725bd2040b22c6acb139ddc1f6a7e7d6c04253736c350353dbea43bb63bd2d15707c43a8e7a045d7 SHA512 3d5162c4456d29e8e7149d54cb4ea782de77d961515623ec47f062ee8466a975b19a85fa7c9af93b991eae7b4a9c5548c463fb64d213a2a77ce1ffd0aa237fdc
 EBUILD mkvtoolnix-45.0.0.ebuild 2644 BLAKE2B 9f7f8e110b7f5a7797f7cc56035728fa463f420c95178ea1725bd2040b22c6acb139ddc1f6a7e7d6c04253736c350353dbea43bb63bd2d15707c43a8e7a045d7 SHA512 3d5162c4456d29e8e7149d54cb4ea782de77d961515623ec47f062ee8466a975b19a85fa7c9af93b991eae7b4a9c5548c463fb64d213a2a77ce1ffd0aa237fdc
+EBUILD mkvtoolnix-46.0.0.ebuild 2644 BLAKE2B 9f7f8e110b7f5a7797f7cc56035728fa463f420c95178ea1725bd2040b22c6acb139ddc1f6a7e7d6c04253736c350353dbea43bb63bd2d15707c43a8e7a045d7 SHA512 3d5162c4456d29e8e7149d54cb4ea782de77d961515623ec47f062ee8466a975b19a85fa7c9af93b991eae7b4a9c5548c463fb64d213a2a77ce1ffd0aa237fdc
 EBUILD mkvtoolnix-9999.ebuild 2644 BLAKE2B 9f7f8e110b7f5a7797f7cc56035728fa463f420c95178ea1725bd2040b22c6acb139ddc1f6a7e7d6c04253736c350353dbea43bb63bd2d15707c43a8e7a045d7 SHA512 3d5162c4456d29e8e7149d54cb4ea782de77d961515623ec47f062ee8466a975b19a85fa7c9af93b991eae7b4a9c5548c463fb64d213a2a77ce1ffd0aa237fdc
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/mkvtoolnix-46.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-46.0.0.ebuild
new file mode 100644
index 000000000000..6c3ac899f3d8
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-46.0.0.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
+	EGIT_SUBMODULES=()
+	inherit autotools git-r3
+else
+	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Tools to create, alter, and inspect Matroska files"
+HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug nls pch test qt5"
+RESTRICT="!test? ( test )"
+
+# check NEWS.md for build system changes entries for boost/libebml/libmatroska
+# version requirement updates and other packaging info
+RDEPEND="
+	>=dev-libs/boost-1.60:=
+	>=dev-libs/libebml-1.3.7:=
+	>=dev-libs/libfmt-5.3.0:=
+	dev-libs/pugixml:=
+	media-libs/flac:=
+	>=media-libs/libmatroska-1.5.0:=
+	media-libs/libogg:=
+	media-libs/libvorbis:=
+	sys-apps/file
+	sys-libs/zlib
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtconcurrent:5
+		dev-qt/qtmultimedia:5
+		app-text/cmark:0=
+	)
+"
+DEPEND="${RDEPEND}
+	dev-cpp/nlohmann_json
+	dev-libs/utfcpp
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-ruby/rake
+	virtual/pkgconfig
+	nls? (
+		sys-devel/gettext
+		app-text/po4a
+	)
+"
+
+src_prepare() {
+	xdg_src_prepare
+	if [[ ${PV} == *9999 ]]; then
+		./autogen.sh || die
+	fi
+
+	# remove bundled libs
+	rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
+}
+
+src_configure() {
+	# bug 692322, use system dev-libs/utfcpp
+	append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(usex pch "" --disable-precompiled-headers)
+		$(use_enable qt5 qt)
+		$(use_with nls gettext)
+		$(usex nls "" --with-po4a-translate=false)
+		--disable-update-check
+		--disable-optimization
+		--with-boost="${ESYSROOT}"/usr
+		--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
+	)
+
+	if use qt5 ; then
+		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
+		myeconfargs+=(
+			--with-moc=$(qt5_get_bindir)/moc
+			--with-uic=$(qt5_get_bindir)/uic
+			--with-rcc=$(qt5_get_bindir)/rcc
+			--with-qmake=$(qt5_get_bindir)/qmake
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	rake V=1 -j$(makeopts_jobs) || die
+}
+
+src_test() {
+	rake V=1 -j$(makeopts_jobs) tests:unit || die
+	rake V=1 -j$(makeopts_jobs) tests:run_unit || die
+}
+
+src_install() {
+	DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
+
+	einstalldocs
+	dodoc NEWS.md
+	doman doc/man/*.1
+}
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 4d35df2a35a7..b1169f596c80 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.ebuild 3362 BLAKE2B 04879c362d42af156306d92cb6cbab49200c310c5840113731f378085bb896255f32be6f0ed8a645751ffcb67bdca172f75baa73be46761de759bc8c55009583 SHA512 576a73250a45d5e475e10c310f2b34ebc4284f36b4a2fc677cd93cddf6b5ec99c42f88ce8d4f743347d5bb0cb79158765e2ea6135ed6bf1c7d9486bab39ab4f7
-EBUILD obs-studio-9999.ebuild 3303 BLAKE2B e8a91627cd8eb223ecd5dbb3e1942c469869077dad2e9f5002480e469cb32ef90291e343b5ddb76ae7217a5b800d9b0c8bbd530a86a9e56ee70c7e8626606675 SHA512 8a1ac4260ee446de6dc01f7fd4edb1bb125bd8c3ac2689bd0294dad5c59f57870b086a96a2b5ba03891ba365283cf8d32b4622b7f27f56bd5d0589a4ceea3818
+EBUILD obs-studio-25.0.8-r1.ebuild 3589 BLAKE2B bac73d6a9b685b8d76b32ca72078c028d6011ba71f95110fdd36952a6ebe1e53f944c46bf7b6c4063e6de2ab7374cc313cb5ddae771e3517938596baf94667a0 SHA512 f301a7f9bfbb40f39989ad54bcdcab864bed1ac88f96dccadeb2dedd516f88ab6f7e0e37aefeb4b1c5f50f0edae0868902f01012ff60b892cfda6d89ad29add1
+EBUILD obs-studio-9999.ebuild 3530 BLAKE2B 9f7a66e32bb6d0c9630282ad7c23124ab11f8b88ff243965c517b29de49e02db3979ce2de9eb396442674567ea0d80d9fa9375cab85fea2474bee89e80736f94 SHA512 d07a1c5827af7364d31ed164ef61fc220374fbb1683c92cf2f81b8b7269f67fbca71a947b0169990dcebdca4d7864ca72674ac3713c0ceff56452be9f9481f40
 MISC metadata.xml 1333 BLAKE2B 64d005a96fe4861ab30cc51ff8f9b37dfc6e24eda2149b487ca2f5af9db663f2a2ce564ff4953c6cf5b35d425d1fb1c3774c86e610db0eb336119baddcbc52b5 SHA512 06ab2cd75b521a2753fdc7e379ed67bd2179a74f0868324af4365a2bffa6c132528fd72b98d319bc0a924cad9bb006e382093f368602fb5dd7dc94db94ae703b
diff --git a/media-video/obs-studio/obs-studio-25.0.8.ebuild b/media-video/obs-studio/obs-studio-25.0.8-r1.ebuild
index a97ec6617d42..ee66d6d6d66f 100644
--- a/media-video/obs-studio/obs-studio-25.0.8.ebuild
+++ b/media-video/obs-studio/obs-studio-25.0.8-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_SUBMODULES=()
 else
 	SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Software for Recording and Streaming Live Video Content"
@@ -120,6 +120,13 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+src_install() {
+	cmake-utils_src_install
+	#external plugins may need some things not installed by default, install them here
+	insinto /usr/include/obs/UI/obs-frontend-api
+	doins UI/obs-frontend-api/obs-frontend-api.h
+}
+
 pkg_postinst() {
 	xdg_icon_cache_update
 
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index 33ca63777c33..a433abe939fa 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_SUBMODULES=()
 else
 	SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Software for Recording and Streaming Live Video Content"
@@ -118,6 +118,13 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+src_install() {
+	cmake-utils_src_install
+	#external plugins may need some things not installed by default, install them here
+	insinto /usr/include/obs/UI/obs-frontend-api
+	doins UI/obs-frontend-api/obs-frontend-api.h
+}
+
 pkg_postinst() {
 	xdg_icon_cache_update
 
diff --git a/media-video/obs-v4l2sink/Manifest b/media-video/obs-v4l2sink/Manifest
new file mode 100644
index 000000000000..19588765905d
--- /dev/null
+++ b/media-video/obs-v4l2sink/Manifest
@@ -0,0 +1,3 @@
+DIST obs-v4l2sink-0.1.0_p20181012.tar.gz 21392 BLAKE2B 7f024a89c900588a4b3a45d598622e05d25b2eabbd007d5ce701d82ab935fa5a267faaf903925ec19e74071b5f4d32a5f39c810d181c97ea047060bfa69c145c SHA512 c64cff7feff7722e8cfd66f92daa46d8cb189da5adc50dabddd21baaa97e033611b94f1dafb9a9ad9a58504930fb40e05d7e5a4d128ee703b60993be7edc063c
+EBUILD obs-v4l2sink-0.1.0_p20181012.ebuild 864 BLAKE2B e15126b24c1ded6adc299b09941b2908551cd523d5a8ba2ee2bde398d4a06d6cec456b818be596c08bc724080f3665dfc8bd3c9e7dae673798531503cc6e0a14 SHA512 f4d6b544ae9020536b00108c7c7eb89cc96c7c982a29fa4cf2507de067e791ba1eedc5aa6f574d992d8ff0fbc074ef4c4f9bfa39eb41c0d3cb86272e01d5caba
+MISC metadata.xml 343 BLAKE2B 6d8ec79efa0900dedd95ea0553bf90149d71f20b3b5daac1ad96df17dbc62c338a987b47344674a708f88060ae4210bf3d763b69e310b75437ef8dcc09bb649a SHA512 0d0dceaa03c65f0df6d9aeda0a1ee8972a181305444735395aec2a6d74c3273c27928008fc4a6d6719d5901ece2a0e69473d7c9df137aff9421483b15b65085e
diff --git a/media-video/griffith/metadata.xml b/media-video/obs-v4l2sink/metadata.xml
index ec78ebbf0801..4c547b226a11 100644
--- a/media-video/griffith/metadata.xml
+++ b/media-video/obs-v4l2sink/metadata.xml
@@ -1,11 +1,11 @@
 <?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 type="person">
+    <email>zerochaos@gentoo.org</email>
+    <name>Rick Farina</name>
   </maintainer>
   <upstream>
-    <remote-id type="launchpad">griffith</remote-id>
+    <remote-id type="github">CatxFish/obs-v4l2sink</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-video/obs-v4l2sink/obs-v4l2sink-0.1.0_p20181012.ebuild b/media-video/obs-v4l2sink/obs-v4l2sink-0.1.0_p20181012.ebuild
new file mode 100644
index 000000000000..64a8a9cd5f21
--- /dev/null
+++ b/media-video/obs-v4l2sink/obs-v4l2sink-0.1.0_p20181012.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_REMOVE_MODULES_LIST="FindLibObs"
+inherit cmake
+
+DESCRIPTION="obs studio output plugin for Video4Linux2 device"
+HOMEPAGE="https://github.com/CatxFish/obs-v4l2sink"
+COMMIT="1ec3c8ada0e1040d867ce567f177be55cd278378"
+SRC_URI="https://github.com/CatxFish/obs-v4l2sink/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-video/obs-studio-25.0.8-r1
+		dev-qt/qtwidgets:5
+		dev-qt/qtgui:5
+		dev-qt/qtcore:5
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_prepare() {
+	sed -i -e '/include(external\/FindLibObs.cmake)/d' -e 's#../UI#UI#' CMakeLists.txt
+	cmake_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DLIBOBS_INCLUDE_DIR="/usr/include/obs/"
+	)
+	cmake_src_configure
+}
diff --git a/media-video/openshot/Manifest b/media-video/openshot/Manifest
index a298910fdbc1..cef78220660b 100644
--- a/media-video/openshot/Manifest
+++ b/media-video/openshot/Manifest
@@ -1,7 +1,9 @@
 DIST openshot-2.4.4.tar.gz 63065376 BLAKE2B 2ee00f24d699d5935a182c394821f215a27ba2701d493f51299c19cf99452ca4df2e5b86f7a6e5734e6194e39e5b7995eb94be168c0e9f7bc7a3b78206277304 SHA512 efa71f97a83b89e691b7dab09288ba7d3e91eb25119669fa8f6e28becb8d4cb3e60a923f936ee4ff9a593d016fe3a6b0348153cff937ab7d21a5517de5dfa10c
 DIST openshot-2.5.0.tar.gz 60153193 BLAKE2B cdc79c68be7cd5b9e2714c98c4edbb5fc9ec349283da8439e9f9e26b2341688e2b8ae0f108413f59582d6e447faeb96d1da6916503299ca40939d73f5983377f SHA512 0944bff48c8957a4a3c5a37428b4d3e45e8ad6e1664812ea90b7c16d014a3c355daf2fe183ce855586114ccfa36c419b6baacc42c4bf871de29bda4c24f2a814
+DIST openshot-2.5.1.tar.gz 60217543 BLAKE2B 3f195b14a9fb004e845c731be64138c20da84ac0c90db43b547ee9ea059d32f85ada04aa0462b755a7ea5c3d3b30088fab35414147dded55deb9d5eab5926d2d SHA512 8254a45254bbe523b6485b9598022de2c46ec30818e606ac4665790d29486693c4efe9f5bc55ee43d6342de6782cf0090e4bc880e831c08e3b1218bca555af14
 DIST openshot-qt-2.4.0.tar.gz 60710408 BLAKE2B 33c8abe7ba3122ae720163d6ab91d367ee282b94d3d8986fdccf4f9efae832f54af7f946472c781a17f7e54083028762952d02d7139e6815cd0d44e80515c728 SHA512 95778effa5b02a467c44741384b0f43bf90343d4f450d5fcc2319ff1c3bee212338435dd8c781e0ff111a704aacdce3dbfb6bdcf62afa1f59bbb0668b58074ca
 EBUILD openshot-2.4.0-r1.ebuild 1283 BLAKE2B 1ca81c34d0d99593719c65c38ec59df75df5ba937ab6f62482a885068f36c5cdebde2bc351d97ab873cdcd87cb7eef6fb5303868ce687ee81526c4030da47f40 SHA512 5a86460edd21308837e2172cbbaa4cc2a02f567982de61b287a294db1d22457598a77113e4ce5f284900c8788703b643075d82885bfefdcad1ead65016fbe1e0
 EBUILD openshot-2.4.4-r1.ebuild 1265 BLAKE2B 1a8dc1f69f0b7c357b10bde0a6d49b3a0731798fd714bbfe0202838d19b74de9144db6e2f0c2efd4f3d1027bc6a3aad9c36bf4df0ad5973d8a5e6497fd7aeb27 SHA512 e4d50ed1ed5ca1d417f5aa3e9951e3c107d66b03acef17040007aa2c0985ae9bea16b2e877e23b68e9d084975c76e8c40b78b083206aad3e69296a1cac2444bc
 EBUILD openshot-2.5.0.ebuild 1238 BLAKE2B 3b0d72a809439def72602de855d7a31efb10a6b94196014b0207b54bf115e1064528351d43fee4fab266ba5aef05bfffe671dc2946df1d8c8d2dc771d49f2408 SHA512 6d1e743de1520665bcec187d981f3c4fa27fae6c969308a9532f2f07b2a091d42b529d844bd96f7940e8ec9e40cde686bde0f7c42e335306299cfbf90841abd7
+EBUILD openshot-2.5.1.ebuild 1243 BLAKE2B 471a504e9592f9524192cd87231ea96db33bf19910905394d681aedb0735aa99f0dccbb7877c209de56e341b1cdb63c4affa2d18b1af9c58dea6387c61e76641 SHA512 a1dff240e62fedd8d0e2785c9c1d217c66b04cc177f80bcbd56931d2bb8393776f22c8d5333abe5c8b13a8e6af21a0a2b568b37dec856f1e2d1012a5a26fc3db
 MISC metadata.xml 520 BLAKE2B 78c1c2c7058fe041a5aa1e783622529dd897a609ce801d718466c7d14b9b5ccd05ba496f468f9100301f20ccfa04c3824aed975f39f7febce487b87bddce9282 SHA512 3d2227d47b72451b5b600384ef70b3085a8e46cba1f076d05c558b69ef50d18084dd31d2f14323237c1500842ddea664bcc78a68de9f9d5d472f44ab90a6c325
diff --git a/media-video/openshot/openshot-2.5.1.ebuild b/media-video/openshot/openshot-2.5.1.ebuild
new file mode 100644
index 000000000000..20bc674050f7
--- /dev/null
+++ b/media-video/openshot/openshot-2.5.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE=xml
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 xdg
+
+MY_PN="${PN}-qt"
+
+DESCRIPTION="An award-winning free and open-source video editor"
+HOMEPAGE="https://www.openshot.org/"
+SRC_URI="https://github.com/OpenShot/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},gui,svg,webkit,widgets]
+		dev-python/pyzmq[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	')
+	>=media-libs/libopenshot-0.2.5:0=[python,${PYTHON_SINGLE_USEDEP}]
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		doc? ( dev-python/sphinx[${PYTHON_MULTI_USEDEP}] )
+	')
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	distutils-r1_python_prepare_all
+	# prevent setup.py from trying to update MIME databases
+	sed -i 's/^ROOT =.*/ROOT = False/' setup.py || die
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/media-video/projectx/Manifest b/media-video/projectx/Manifest
index 0de6ae83b758..fe9e33218ee9 100644
--- a/media-video/projectx/Manifest
+++ b/media-video/projectx/Manifest
@@ -13,5 +13,5 @@ DIST projectx-icon.png 1692 BLAKE2B 6da85b69961b81f64638b04860b467e8cf599287513d
 DIST projectx-idctfast.tar.xz 12444 BLAKE2B e4b2a6ab235601dbdd1acf8a73a14fecb5da455670bad52598e0dbd8a7300305fad1b22b3d550dd046dcac68975af4b225e042f7c968ce9108f702d01586302f SHA512 85dd6dd0011c166aaefd47a47c4455dda68ba6da65c9eda5a996f7d078ce3900168714c0c72c6250f7b99181fda84c6d81e3afb392ace9c12c3c5690de01c1d8
 DIST xdg-20100731.java.xz 648 BLAKE2B 8bd082c445d64051c65c66e8a22b61e582d04f1f650e3b15ee2f3400d47b10f137d245bd8a7633d96299e2c688f7bf836b59a4dd49ea3c181684a78fa55304c3 SHA512 8b5d8e695f3f052f889002dc93742da8ba9eada173cb10ad1db525e1ad89d1c8f44200d79dc02068ccf93fdbf2e8daa5bb359dae77bacbc89cb6d4895732774b
 EBUILD projectx-0.91.0.10-r1.ebuild 3245 BLAKE2B 34d050b55d561562d6d6b3c6fbe4beff8f1e4b657f8ce987144a6dca1df17fb40704e3d4cbfb557a0b60e5a1fd26ed5e8be98d0b874aceb1b0b824c12fe21f85 SHA512 c92fc0fc8983ccf588dea251f381e8f7df8c79905dd96f7f7e7bb3cb801d9d9a4eaf537e4afc66ab84a3a62e9ee17c9de9d8dbe3be3541047ce43f99321d3290
-EBUILD projectx-0.91.0.10-r2.ebuild 3280 BLAKE2B ee6a8b69281992f88cfe43d542c83ba095704ba6f949efa1ab308ebe6c470446332071e1c2a516c5cffc6cc32ef3a891e25bd0b18e2f62d5abd556f7438a73f6 SHA512 fcd8c4926920ae05663cf62f91da13d0390fb578f0ba7fcc6b8f3cf2fe821b5393a4efb0aedc28ecfe90aa2ad9c8683c6763abd01ecfa3d4a76e2dabdf87289d
+EBUILD projectx-0.91.0.10-r2.ebuild 3277 BLAKE2B a682a39f1869f45ddea86f759fe04375da69e0b0b9f40894d385e1e758c287aa608fa0b362c8161455b5fd3fca558f1f8557b3dbc27d6ad9880188e35cf0be20 SHA512 bf4a4c64e156feabf89e2b0f81097c6d2a809e7ea065601eff23fe8a78b746887a30b5c1a7bccba3d835e6fadc90d232f2a4182dd3d22425669233da7d11b531
 MISC metadata.xml 742 BLAKE2B 5aacc52def6d49258139e9435aa1db4f2295a07e4491a921db142c262c84a3deaaf8b9b22d7bc68dcd00ee142cb4f9912463f4ab2fb79eae74ea461375b1467c SHA512 3a5546c1efbafa335ee5d05ff24c2b22f0f49d8944e242348bef9627ac5e72205d9bd3e697b3d89c7d0ef3e34d98fe19b58c021f41bcaff872c74373a6803341
diff --git a/media-video/projectx/projectx-0.91.0.10-r2.ebuild b/media-video/projectx/projectx-0.91.0.10-r2.ebuild
index 664b3f10673d..9dc9a50eaad6 100644
--- a/media-video/projectx/projectx-0.91.0.10-r2.ebuild
+++ b/media-video/projectx/projectx-0.91.0.10-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
@@ -18,7 +18,7 @@ SRC_URI="https://dev.gentoo.org/~billie/distfiles/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="X cpu_flags_x86_mmx cpu_flags_x86_sse"
 
 COMMON_DEPEND="
diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest
index 42d57d8fa952..9ee3635d106c 100644
--- a/media-video/simplescreenrecorder/Manifest
+++ b/media-video/simplescreenrecorder/Manifest
@@ -1,7 +1,6 @@
-AUX simplescreenrecorder-0.4.0-metainfo.patch 1332 BLAKE2B 717e54de67f5fb8d535351adea928dce5c3645ed721bdb3b297d675d8d5628c4125f54ed8f25672fe18908c360efc938f04a4d16928d98a5397bbc353407dece SHA512 3746d9d693849927f9c79365d4014aa36145aaeced2dc6be7b47222b5651fc500ebf747ae64b79eaa125d60e536b7152ac43659524a9d058c8f4a5b6d8ea4e25
-DIST simplescreenrecorder-0.4.0.tar.gz 1867593 BLAKE2B 0997c4e72c142ebfa74658c1fd27d8d01ceb3810f659df0bf899004224d3944a58476fd6b54b318d712fa4d284684a221f387c7e3e63d4b397312ab9e0786988 SHA512 aa4970aba010884153c9d3155a0869288a5b9b8723cf617471148ad875f1af29f594403c1682303345c578cc0dc3f0a4b3596e4937d3afa949a652b83dcd0b36
 DIST simplescreenrecorder-0.4.1.tar.gz 1893293 BLAKE2B d05765788b23073bd03997b92dfa34e3437514ccd88216dea429305f4d43ac25019d141b248ee4a4844d72fd6a87f196579e876ee16a235da34cb3f2404ce5e3 SHA512 b890fafb65a87c298562d25388384577408d7ccbb0b1280bb4fdad198c9b9581893e68b99aa9e478a61c59736689ae40be0f30132d56ee9a9796b8885541d8d5
-EBUILD simplescreenrecorder-0.4.0.ebuild 2714 BLAKE2B 1c8b16b796bd070cddae51575ac83bfc329073556f119c70d114ff2abbefe3844e6d41136986918566731ae85a25b9f8874167636a37e82e14aef588cf406ff7 SHA512 8339288cef69d808926462250f617879c84d840ec1d3ef3e45d40785d66d3a3528cbf6deb8e6eba88e68eed864aad6fffe4725b1cec3dcd494723d37aaa19d1a
+DIST simplescreenrecorder-0.4.2.tar.gz 1912151 BLAKE2B d8a4605a82e49693f94ecfac8853405a660a4528c3001961b1734d4387e49eeb4c91603929b3cd5d5b67a23a6ec839ace606b29666b916960f10322e6ec1b452 SHA512 60b0127d7f82f294e5a8f015363e37a10b5492089a0178b07a5e383c7e4b857102ed2bda7a95e3c67293a255f892481aeaf4037c583320d68d463637348ed7f7
 EBUILD simplescreenrecorder-0.4.1.ebuild 2659 BLAKE2B 8ab589afbac89613d77dcfb6d09268db0df42df7b5e6e30b3d964eab23b04aed105f6c7507e6b0c4353b27ff3169d41206bdf0106992028aad52b5e2c80a72c6 SHA512 6fbbee990963fbc68dd9ec72d65877dde9c7bedee319834615696600e184d03cb92acee9945b64ac368d4cdaeac5ce3e44e00f96f931ac63b5798646a14d5ade
+EBUILD simplescreenrecorder-0.4.2.ebuild 2659 BLAKE2B 8ab589afbac89613d77dcfb6d09268db0df42df7b5e6e30b3d964eab23b04aed105f6c7507e6b0c4353b27ff3169d41206bdf0106992028aad52b5e2c80a72c6 SHA512 6fbbee990963fbc68dd9ec72d65877dde9c7bedee319834615696600e184d03cb92acee9945b64ac368d4cdaeac5ce3e44e00f96f931ac63b5798646a14d5ade
 EBUILD simplescreenrecorder-9999.ebuild 2659 BLAKE2B 8ab589afbac89613d77dcfb6d09268db0df42df7b5e6e30b3d964eab23b04aed105f6c7507e6b0c4353b27ff3169d41206bdf0106992028aad52b5e2c80a72c6 SHA512 6fbbee990963fbc68dd9ec72d65877dde9c7bedee319834615696600e184d03cb92acee9945b64ac368d4cdaeac5ce3e44e00f96f931ac63b5798646a14d5ade
 MISC metadata.xml 508 BLAKE2B c43c69903c35e9e1f87c94cb26b06a8d6c4dd1a51c8a3409027ab8c867e54851aa8e4bfcaf4a0a37298795ded69743e82d2b0a4e0bb84cb3d88d6a6c5c4a1c0f SHA512 d4879cb7f57f23d273e45b429ab5548d30a0a6eefe63e28c2c60e7cef9a44b295d8455bfedaf9d9294ff4cf16b4f841f0ddb34541c62c25cbf190f7b6c7538ce
diff --git a/media-video/simplescreenrecorder/files/simplescreenrecorder-0.4.0-metainfo.patch b/media-video/simplescreenrecorder/files/simplescreenrecorder-0.4.0-metainfo.patch
deleted file mode 100644
index 799afe23e264..000000000000
--- a/media-video/simplescreenrecorder/files/simplescreenrecorder-0.4.0-metainfo.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 47078d2790e8c2f982dacfe27f998b7307b600c9 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Thu, 9 Apr 2020 13:06:54 +0200
-Subject: [PATCH] Rename appdata to metainfo
-
-See https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
-chapter 2.1.2 "Filesystem locations"
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- CMakeLists.txt                                                | 4 ++--
- ...recorder.appdata.xml => simplescreenrecorder.metainfo.xml} | 0
- 2 files changed, 2 insertions(+), 2 deletions(-)
- rename data/{simplescreenrecorder.appdata.xml => simplescreenrecorder.metainfo.xml} (100%)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7d7167b..760c889 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -86,8 +86,8 @@ if(WITH_SIMPLESCREENRECORDER)
- 		DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/applications
- 	)
- 	install(
--		FILES data/simplescreenrecorder.appdata.xml
--		DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/appdata
-+		FILES data/simplescreenrecorder.metainfo.xml
-+		DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/metainfo
- 	)
- 
- 	# icons
-diff --git a/data/simplescreenrecorder.appdata.xml b/data/simplescreenrecorder.metainfo.xml
-similarity index 100%
-rename from data/simplescreenrecorder.appdata.xml
-rename to data/simplescreenrecorder.metainfo.xml
--- 
-2.26.0
-
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.0.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.2.ebuild
index 6e9238488995..98efd341c929 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.0.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.2.ebuild
@@ -45,10 +45,6 @@ DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-0.4.0-metainfo.patch"
-)
-
 pkg_pretend() {
 	if [[ "${ABI}" == amd64 ]]; then
 		elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 110cee30c8ba..eff3eac35f74 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -8,5 +8,5 @@ DIST smplayer-19.10.2.tar.bz2 5178186 BLAKE2B e87efa8e433a304d4579bd852590690d23
 DIST smplayer-20.4.2.tar.bz2 5197394 BLAKE2B fe5f3ce279be478f93a71c521070e2564df331c56c6ac9410e0707101b7e662a16cbe65b439a194d253d3c4f49ce8e735eb19ad9a195e0e1f5d42461d3162925 SHA512 03404c2e7ba00d257ab2db82fe837eb4ab314c2b32a262ad18e75b245d43f812533f7e4609a6fe335c5c2e370cfb5fac8f0b3b8917c33a22c5b84f0074039156
 EBUILD smplayer-18.6.0.ebuild 3198 BLAKE2B 9308361b80dda582ba1894bed9e47e2fd66a48be962d21fb267fa5909f1b73cc523aac8cc87f4d2ecc43be9044a18c5585be0e54da2935cd57e0336be068754b SHA512 c9f8da664cc37fdb2e7ac780f15ed87d4b6089a6c4015ad747f36e3a9ae0b96e4fd66c2ace62a15cb9b42887cd81b6f7e83dafd59b215f71117ea90e77f714a2
 EBUILD smplayer-19.10.2.ebuild 3154 BLAKE2B de825ff508e94ef4a44612134b3eef149bf603dadbd6b1439321537cb49d64fe132b83c48865e15834d68024c0eb28743981912e333d04873e57e817c126d9bc SHA512 49615613aeca2723f69d4e262e93ff09343c030fae71746873cd8a25e7725f757d47b2160fd171433601fc43c0064ca8c9ebf531c62e73ecf7a0201aa222eb13
-EBUILD smplayer-20.4.2.ebuild 3275 BLAKE2B 2b0e9f7e85d207057ba72f3accbb734b8f08e9832d47eb72fbc73628a79cdd4684408397c9e3c1633c889f33c7687827d4b8b6d6ad9d7579a7a2e2d148ba799d SHA512 a4036169b5bbceed17ecbd94f3a155edfaf08f60d318b42b525cb02fbe7db0bc3b5a89e09f71a613675462e4f78d09793cd6df49a36978f27d6b1a0c1670383a
+EBUILD smplayer-20.4.2.ebuild 3274 BLAKE2B 817e93f3ea94eb78a05597689527a1ec2181a65fc57c23e58a03df0a10de437cc973cc737536393b467406b1db27bf55fc3f8ca18606776a2f3d96a6950c35ce SHA512 fd3b0a56bbe83a954f8d2295225d60c25aaca9439ca0f9c8e868654505bc4d83ea70f7692e677089842838e3bcf2c731dbf09fcbb6961a6083228ab6f7c65002
 MISC metadata.xml 886 BLAKE2B 93069f16c27051f346dfd71113b7998f84c09efc7b1b7ad05600f82712e1693368a99bd51e4833cb8ec5c6433ec41f002370e564a2f67aace9e65fea14ce7653 SHA512 e82489ac4436ddbecd44783d694f1056a8a40b278ef941faa236079ad4cfdf0d542cee8c73b7ae1492efe76c2cac31c6a641e2187e01a1210d4b5cd519a839f4
diff --git a/media-video/smplayer/smplayer-20.4.2.ebuild b/media-video/smplayer/smplayer-20.4.2.ebuild
index 2b1009f423cd..411550ccc7d4 100644
--- a/media-video/smplayer/smplayer-20.4.2.ebuild
+++ b/media-video/smplayer/smplayer-20.4.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="autoshutdown bidi debug mpris"
 
 BDEPEND="dev-qt/linguist-tools:5"
diff --git a/media-video/smtube/Manifest b/media-video/smtube/Manifest
index 839f54e69c77..9d661dc3f7ed 100644
--- a/media-video/smtube/Manifest
+++ b/media-video/smtube/Manifest
@@ -1,3 +1,5 @@
 DIST smtube-19.6.0.tar.bz2 748844 BLAKE2B 55e662fc85ec44f067cba037c28b26fbfe08439bafea294dfcd1c4187e8df9f1f066780dd80c765dc4e584ba5b3917d8982a46253039b6327a30ff9d842b9e0b SHA512 f61e432b8f99e34ddbd9415064eecf30c9a3a6731d646073253d63690cf531321a7a5038117db981d036d1abfdbd3150df21bc22c9ae75e32c63ade3a859ecef
+DIST smtube-20.1.0.tar.bz2 749306 BLAKE2B 27d8b8c45264311f324d826768c44750373161521e8a3a9778b7b929d2ac437cfbfa9131b772c19d065d6a9e7646a381a2dd52c0e4fdf1d7a202ce982f22d9e2 SHA512 91a3b53c7bf23b567cc9e35f6c12cfc37e4286c0b60938d4ea9e275f1f459db6ff149f3b316b05a4810a62b0f224ee360ecf10f1e5c1d101178a949280eb8e2f
 EBUILD smtube-19.6.0.ebuild 1306 BLAKE2B 8fb0f5bccd487400fd3b26c66c97ab0f1582ff6cbb7ee163795f085d9db74c71da2c4e1b23832f2c0b73343f976bb755bc95ac469f381925f55ca85c8bbc481a SHA512 bd3b4bd7fcf47036a34e54d9a352930f6a1913f38b0af5ecfce420ccb6c8012ec089ea41f57457a7ace1ca79223cbdd709016c410b023dd7e1af0c3241a97b43
+EBUILD smtube-20.1.0.ebuild 1308 BLAKE2B 15e21bebefdb0c52dc0090d52b7246044cc6b84005e02adbce0e4f18b19ceb5c2a4940b4bd5001d27231368d5e0f85f179ea61e702272071f9fc327232984ba1 SHA512 fa5238315c00f9fcc9e4053a48391342916a04a91a0b482d9b3748fdad7105e779207af8807eb92e04ce11f8aefb9a1a6621317e0da4a5882a6fb0b7cc1a1fa1
 MISC metadata.xml 553 BLAKE2B 5818030e41958376eb0a4566f79a245d8bd1142dbcbf56aaeb21434e4194d2e8c7208bfd7b7e15b11f688f0e8ef47be2e1748740883a09cce1cda04836a70e24 SHA512 0e833e9f3075e066d059871c97bc951acb2d68152719388b9c1eb92776f50822585c88f662e8c5544ef15861f11bd76e469a34c593c98f3bc76ccf898eb202a6
diff --git a/media-video/smtube/smtube-20.1.0.ebuild b/media-video/smtube/smtube-20.1.0.ebuild
new file mode 100644
index 000000000000..6cb45ba9dad7
--- /dev/null
+++ b/media-video/smtube/smtube-20.1.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="bg cs da de en_GB en es eu fr gl he_IL hr hu it ja ko ms nn_NO pl pt_BR pt ru sq sr tr uk zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+inherit desktop l10n qmake-utils
+
+DESCRIPTION="YouTube Browser for SMPlayer"
+HOMEPAGE="http://smplayer.sourceforge.net/smtube"
+SRC_URI="mirror://sourceforge/smtube/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtscript:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	|| (
+		media-video/smplayer
+		media-video/mpv
+		media-video/mplayer
+		media-video/vlc
+		media-video/totem
+	)
+"
+
+gen_translation() {
+	"$(qt5_get_bindir)"/lrelease ${PN}_${1}.ts
+	eend $? || die "failed to generate $1 translation"
+}
+
+src_compile() {
+	eqmake5 src/${PN}.pro
+	emake
+
+	cd src/translations || die
+	l10n_for_each_locale_do gen_translation
+}
+
+install_locale() {
+	insinto /usr/share/${PN}/translations
+	doins src/translations/${PN}_${1}.qm
+	eend $? || die "failed to install $1 translation"
+}
+
+src_install() {
+	dobin ${PN}
+	domenu ${PN}.desktop
+	newicon icons/${PN}_64.png ${PN}.png
+	dodoc Changelog
+
+	l10n_for_each_locale_do install_locale
+}
diff --git a/media-video/streamdeck-ui/Manifest b/media-video/streamdeck-ui/Manifest
new file mode 100644
index 000000000000..d140f54e6e9c
--- /dev/null
+++ b/media-video/streamdeck-ui/Manifest
@@ -0,0 +1,4 @@
+DIST streamdeck-ui-0.0_p20200102.tar.gz 2512712 BLAKE2B f5abad75c77410127f51de0e4ad7ce112f59ff3652afa32f9aefe44cbb69e16a09991322091ba39d259d9bb1e35dd0833a1b58457d095f21eec258b8967ded9e SHA512 345d0a2cfadb23e20925749e06e99976d533968fffe8b6db77dfeffbb1716c4042f84e6c1c616e0986e7da3592be2046f2a6e0de1942da34b6712de70cdce649
+EBUILD streamdeck-ui-0.0_p20200102-r1.ebuild 1225 BLAKE2B d18f735ce7208c191374b724118ac558d243d77d2a7886c097a787758cb139cba8c93483cda574d2efe1d3be7cff2d09240320415fde97f0cfedf23058a1fe52 SHA512 046930d66d877326f358d81f738709b014d7ab2cfe771e95be34b9f1d312c5a0d76e272161516cf29d06c7b2b363690ef1765fba2998095a2bd9c61fd9294630
+EBUILD streamdeck-ui-9999.ebuild 1225 BLAKE2B d18f735ce7208c191374b724118ac558d243d77d2a7886c097a787758cb139cba8c93483cda574d2efe1d3be7cff2d09240320415fde97f0cfedf23058a1fe52 SHA512 046930d66d877326f358d81f738709b014d7ab2cfe771e95be34b9f1d312c5a0d76e272161516cf29d06c7b2b363690ef1765fba2998095a2bd9c61fd9294630
+MISC metadata.xml 337 BLAKE2B b3a6948c70d02d280e606193de4834cbd22ad83c611dc38a000d8fedf0e3b283bd55a67a997070b8accb4a2e8058d42e7251eff07674011ae49533dedf5dc929 SHA512 c90b856e15519e66601cce878ab0df0372f2bdb707069e34588d2d138027ab5827d697cd05637e385cbf08f29e87cc077aac85a8e5a90a8ec78decd2c96950df
diff --git a/media-video/streamdeck-ui/metadata.xml b/media-video/streamdeck-ui/metadata.xml
new file mode 100644
index 000000000000..64951f439f8a
--- /dev/null
+++ b/media-video/streamdeck-ui/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sidhayn@gmail.com</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">timothycrosley/streamdeck-ui</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/streamdeck-ui/streamdeck-ui-0.0_p20200102-r1.ebuild b/media-video/streamdeck-ui/streamdeck-ui-0.0_p20200102-r1.ebuild
new file mode 100644
index 000000000000..df568550786c
--- /dev/null
+++ b/media-video/streamdeck-ui/streamdeck-ui-0.0_p20200102-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1
+
+DESCRIPTION="A Linux compatible UI for the Elgato Stream Deck"
+HOMEPAGE="https://github.com/timothycrosley/streamdeck-ui"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/timothycrosley/streamdeck-ui.git"
+else
+	COMMIT="9b6678d2d3027963ddac147ee3aeda322ec77f29"
+	SRC_URI="https://github.com/timothycrosley/streamdeck-ui/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pynput[${PYTHON_USEDEP}]
+		dev-python/pyside2[${PYTHON_USEDEP},designer]
+		media-libs/elgato-streamdeck[${PYTHON_USEDEP}]
+		dev-libs/hidapi"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i "s#os.path.dirname(os.path.abspath(__file__))#'/usr/share/streamdeck-ui'#" streamdeck_ui/config.py
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	insinto /usr/share/streamdeck-ui
+	doins streamdeck_ui/logo.png
+	doins -r streamdeck_ui/fonts
+	distutils-r1_src_install
+}
diff --git a/media-video/streamdeck-ui/streamdeck-ui-9999.ebuild b/media-video/streamdeck-ui/streamdeck-ui-9999.ebuild
new file mode 100644
index 000000000000..df568550786c
--- /dev/null
+++ b/media-video/streamdeck-ui/streamdeck-ui-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1
+
+DESCRIPTION="A Linux compatible UI for the Elgato Stream Deck"
+HOMEPAGE="https://github.com/timothycrosley/streamdeck-ui"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/timothycrosley/streamdeck-ui.git"
+else
+	COMMIT="9b6678d2d3027963ddac147ee3aeda322ec77f29"
+	SRC_URI="https://github.com/timothycrosley/streamdeck-ui/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pynput[${PYTHON_USEDEP}]
+		dev-python/pyside2[${PYTHON_USEDEP},designer]
+		media-libs/elgato-streamdeck[${PYTHON_USEDEP}]
+		dev-libs/hidapi"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i "s#os.path.dirname(os.path.abspath(__file__))#'/usr/share/streamdeck-ui'#" streamdeck_ui/config.py
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	insinto /usr/share/streamdeck-ui
+	doins streamdeck_ui/logo.png
+	doins -r streamdeck_ui/fonts
+	distutils-r1_src_install
+}
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index e33e302959b1..c409f37a21d6 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,7 +1,8 @@
 AUX ffmpeg4.patch 28911 BLAKE2B f1189589a39ea9801e1620bd138499f5f5a29429cc7372ebf65b38901f1f4f0b71957a216a65367108660709ea5ca001e5ce68d67dfd478ed471963acef087a3 SHA512 1550b2de1ca0265703513d3b7fca3441f6216d89792dc68e224f5f2d99386275cdfdf7ef7b01abaf69f5de5d9af1f221617697aff6345d3d1b2e5a06d30e1f6d
+AUX transcode-1.1.7-gcc10-fno-common.patch 860 BLAKE2B c564b28e99ef397694243e9411e10feec4fe9c1b5efb8f6ea4c76621a61116a6c0d643a3c21a9544960763e9ff68221e747be1b66598f31bf638edaf585131cd SHA512 edfc821ec0beb4c0edd9fc7a6f2f5f49417190a03c7c79b62b386e34a4746c327fcf7bfe8d0ee339cc374a6333b55bf1399d7cc9c300620c348f22b658247861
 AUX transcode-1.1.7-swresample.patch 674 BLAKE2B 733a3490d2a25b20555cce3624f8e1753d22e3ae945a9656b835a5bf0eabf1b2f16fc1df1f817931dfc618b644c9e359c1c37939ef169f3f59006455a4fa2c75 SHA512 a9a79215082506882f1d1549cbe51706670f7ccf9d5da1400f9bf81482d4f410a855772183eeac8d9fa865d5d6086e10cbe8f4d7176802959a0a8b5df0759abb
 DIST transcode-1.1.7-patchset.tar.bz2 16379 BLAKE2B fbdc188bffeb8751814abfa7e119a1053e482f194bc1b87a721c48e2b66e107df146d38b3ea11a88d066c49d8862489b88b74f61fa36ce3f8a1a782da3762615 SHA512 bedc82aa4fbc17774e34d8fc24799d70b8460c6c1dd728549bcaa5c387492f56e520674fdf8bb976c0b5fcc9ccefb765f2ee26816e0d2b96a83402a21cee3f6d
 DIST transcode-1.1.7.tar.bz2 2183627 BLAKE2B 25001d4cae83d86e5295917bcd9e2e77dd61637e238394a2d603398baf810201dc61d8b0de5b54a7b8848ac3bcef5fb211e8f2b43ed7da4e56e335b8d4d2fbe1 SHA512 d6f9674f3f5c3346194120585741ca660eb9ee133085cfce9460a14eaa0cf16fdf291761bd1db78e1c784e4d69a9481c7470cf8357dc7638ee3017620500f45f
 EBUILD transcode-1.1.7-r4.ebuild 4131 BLAKE2B ebcdf29ad43555dc557fc9f05c8830efa680cf8f50286850b3d0d8b36ae0c931293f2e7ac69f95b471b2ef458470ab75a465757323ae6fe05d3f329846c41733 SHA512 1134536dcfcbbc4418bd8b9a4a7fac6aa2e87f7c4aa1c2897a373fa46a5e0f48692859b67dcf696634a36dbb89e3fa89821e6cec54d778a4156112a8f2939f18
-EBUILD transcode-1.1.7-r5.ebuild 4189 BLAKE2B a25f43e7bd15eb2b45a4414a4d8b4350f3d8539d471d16ac82fa5c201e5e3bf3ef79dd7ca08ae5020ba57be9b149f1dec56eee24fb9ea0a867e71637922b242d SHA512 db8f579e41169dbee17b34835a8244d872ae514f2f135497409a50ef5a9976fb9ae88dc102de65661ae2909a7b55e9fe7f3e062c1a86cea3137a6a8a2d1b44f0
+EBUILD transcode-1.1.7-r5.ebuild 4232 BLAKE2B ad831e1ea1fd05fa2d3c4e0a02847cb6661ce2dac17ce313f12fdb869b9c0b86ab2e9aed281b041ec2a42acabb2a00d2cdbfa9b953361b86f53eeee3a9e9ed4e SHA512 5f823ca59191cb040e1f75cc60d6becff6e88621f65fc3dc537a8942c9c488a10a728bca95727215607d8bdffb36fae4134fcb75a3f31b3a1fe63240cd554d44
 MISC metadata.xml 619 BLAKE2B fa440f0f00bd7afe2834108078f48dc93dfe5ea38d343587267e2b45f4c4187762fdf16e1f023e4fc3af69d181ec77cbedec4a39df98eb8d4a098b98248c7b56 SHA512 043d39001850f8088e33e7277a579af7cb45b6fd2b3fe4483eb7771340dae8eab14927184f0fab9aedc8934a6d2599ce6231726308079d0ae16e7710f826ad1b
diff --git a/media-video/transcode/files/transcode-1.1.7-gcc10-fno-common.patch b/media-video/transcode/files/transcode-1.1.7-gcc10-fno-common.patch
new file mode 100644
index 000000000000..fcee415deee1
--- /dev/null
+++ b/media-video/transcode/files/transcode-1.1.7-gcc10-fno-common.patch
@@ -0,0 +1,48 @@
+--- a/import/demux_pass.c
++++ b/import/demux_pass.c
+@@ -32,8 +32,6 @@
+ #include "packets.h"
+ 
+ 
+-int gop, gop_pts, gop_cnt;
+-
+ /* if you listen carefully, then you can hear the desesperate
+  * whisper of this code calling for a rewrite. Or for a redesign.
+  * Or both. --  FR
+--- a/import/extract_ac3.c
++++ b/import/extract_ac3.c
+@@ -334,7 +334,6 @@
+ FILE *fd;
+ 
+ #define MAX_BUF 4096
+-char audio[MAX_BUF];
+ 
+ 
+ /* from ac3scan.c */
+@@ -472,6 +471,8 @@
+ void extract_ac3(info_t *ipipe)
+ {
+ 
++    char audio[MAX_BUF];
++
+     int error=0;
+ 
+     avi_t *avifile;
+--- a/import/extract_mp3.c
++++ b/import/extract_mp3.c
+@@ -243,7 +243,6 @@
+ }
+ 
+ #define MAX_BUF 4096
+-char audio[MAX_BUF];
+ 
+ /* ------------------------------------------------------------
+  *
+@@ -258,6 +257,7 @@
+ 
+ void extract_mp3(info_t *ipipe)
+ {
++    char audio[MAX_BUF];
+ 
+     int error=0;
+ 
diff --git a/media-video/transcode/transcode-1.1.7-r5.ebuild b/media-video/transcode/transcode-1.1.7-r5.ebuild
index 7a878b4fd548..6af3a27f9474 100644
--- a/media-video/transcode/transcode-1.1.7-r5.ebuild
+++ b/media-video/transcode/transcode-1.1.7-r5.ebuild
@@ -67,6 +67,7 @@ PATCHES=(
 	"${WORKDIR}"/${P}-patchset/${P}-freetype251.patch
 	"${WORKDIR}"/${P}-patchset/${P}-ffmpeg24.patch
 	"${FILESDIR}"/${P}-swresample.patch #722296
+	"${FILESDIR}"/${P}-gcc10-fno-common.patch
 )
 
 src_prepare() {
diff --git a/media-video/ttcut/Manifest b/media-video/ttcut/Manifest
index 2d6b6419c31f..f22c61a0cc63 100644
--- a/media-video/ttcut/Manifest
+++ b/media-video/ttcut/Manifest
@@ -1,5 +1,4 @@
 AUX ttcut.desktop 304 BLAKE2B 9f0f6c6de3beae152b280a280953ddc156373cd3bfeacb35f265648b8e1d0c92b001bb4456ac3e1208edf6730a2a75e90cd9d879aaee73eff0c9aa198ffa8430 SHA512 82f004f65755ea24ba6b379f18e15c5fe8736da0afe4854cc5ed3e8ceeb55b0b8b6c4f3def3e4a09c25b179a3415d0a47dfcd5d8b92cb34fb7270c6a24c714ad
 DIST ttcut-0.19.6_p1.tar.gz 283304 BLAKE2B ee0d000a1cc091be1848746d3b32930ae5f59865d7fc04779be9aac4bc9621eaace88a6d9263c767671643d9ce381af2cf57fc5b87707903a5abe8a59eb6cb99 SHA512 9d104436145ef209db4eaca1566d718ccdf84636a391e3f47bd829a165741f57a6123942f37ba2eb361dd46716e78e36832cb9a459ca9ed0130a70af92287494
-EBUILD ttcut-0.19.6_p1-r1.ebuild 816 BLAKE2B e26d3df8f9001560562e652de8cf1afc54ff670fab9523314687a1da560ddb7cd247f9ddc4a440b343792d90213e0db3b24c185affddd2d887ea9270883138b7 SHA512 cf3681f3ee86c1dd160e8fe788b187dd1e1c55365f8d86a337f754ef6a3378f7f23269677d742b85db2d3377ffd511f35be2fe6fdfd83d0e780ee0ce47e7e2c9
-EBUILD ttcut-0.19.6_p1.ebuild 783 BLAKE2B 34fa0238ad096f8bf8d8b6cb6ca8abc455bcea9b00e76b4c7ba04b3f01479af17343f3f52be0b9702843d0bbd75011830c9f040df91bb701ebf21bc7b9b15307 SHA512 f5504ee9ad8ef713418dfd2f808d49b710f7f02b45e8c4bfaee68178a735558ff1d1779a41205106f108677c358d80a4c2cf19cc59791b3dfc53ccdbc327eb60
+EBUILD ttcut-0.19.6_p1-r1.ebuild 814 BLAKE2B 9bd2902fae91284852995e61a934aca830f07f76f3bb3642a38a03dce5418d46a54fd9c1010d13997688cda67b358483f68ee40fbc73a9ba1f7db92fa89d9d6b SHA512 883688d0470a75ae7286fb4513819d6aa9ad171120815453e80daffaa6fa90fec73e9517f9f5358896d678d47820ed9fccb23cd5204c7ace57262fab71d7d9bb
 MISC metadata.xml 929 BLAKE2B d33a2f957a306c08d1d4b03d947b975db3f77bd726df50d60de1ab4803dc2abcadd0f19d8a48f19692cde36f094556172cd9adfb120c6b5d053870c713a767c3 SHA512 b22ede083a2bec13d32c88a9f503a7ceddd13892c521bd0532168d4d7fdf8537415f256fa7548240e19ca1c949ad3215c28f6533a0eaa5ee37fcfa7093fde0ca
diff --git a/media-video/ttcut/ttcut-0.19.6_p1-r1.ebuild b/media-video/ttcut/ttcut-0.19.6_p1-r1.ebuild
index 2ca5c574c244..bdfcdaa583b5 100644
--- a/media-video/ttcut/ttcut-0.19.6_p1-r1.ebuild
+++ b/media-video/ttcut/ttcut-0.19.6_p1-r1.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
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~billie/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-video/ttcut/ttcut-0.19.6_p1.ebuild b/media-video/ttcut/ttcut-0.19.6_p1.ebuild
deleted file mode 100644
index c5036eaad53d..000000000000
--- a/media-video/ttcut/ttcut-0.19.6_p1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils qmake-utils xdg
-
-DESCRIPTION="Tool for cutting MPEG files especially for removing commercials"
-HOMEPAGE="https://github.com/templer/ttcut"
-SRC_URI="https://dev.gentoo.org/~billie/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=media-libs/libmpeg2-0.4.0
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	virtual/glu
-	virtual/opengl"
-RDEPEND="${DEPEND}
-	media-video/mplayer
-	>=media-video/ffmpeg-1.0.8[encode]"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	default
-
-	eqmake5 ttcut.pro
-}
-
-src_install() {
-	dobin ttcut
-
-	domenu "${FILESDIR}"/${PN}.desktop
-
-	dodoc AUTHORS BUGS CHANGELOG README.* TODO
-}
diff --git a/media-video/unifi-video/Manifest b/media-video/unifi-video/Manifest
index eda0fa825351..7f43b7cdd734 100644
--- a/media-video/unifi-video/Manifest
+++ b/media-video/unifi-video/Manifest
@@ -3,6 +3,8 @@ AUX unifi-video.initd 467 BLAKE2B c68d4b1efc3a2583e8624d306d667585022d27aa0ad4f2
 AUX unifi-video.service 209 BLAKE2B fd4d96fbd353c795621ec6ad2cb23d8c27132071ebee2843364283da712e46f8fb1d1fcb9ce7b3f042938a55cf3689c7976095ed2f5e72b71bb915ae8a32763d SHA512 ea6eb21bc15c887f4f5e27669bb72eb31db9d8af48d9efdfc32901f1eeff2fb1626ce161dab2bf636eabd4a49c16966cfc55dcd8e572f01a829f491248f7b474
 DIST unifi-video.Ubuntu18.04_amd64.v3.10.10.deb 162697298 BLAKE2B 6cf3d93916830f781ba075abf222402609c8e9935149fc5729767ff05333c61db22709762a992ff510d4898d9b4860f3d61bd50fe0e2d55522a7eb8be7fc378a SHA512 01927d893e7d258641d38daa3018670cb8913d371a984d8f7595322ea0bb7d1879d9ba16125c8dca927d0a274e52922a5a3d1df60f31f7fc3a09de0cc7cc3766
 DIST unifi-video.Ubuntu18.04_amd64.v3.10.11.deb 163522410 BLAKE2B b6a81fc0cf04a5bdd15c5e8e58b2df35718a990faccda103e3600fe79a333904522047fce2a0acf92c53679fe39ca48f6982e5473536bfc308df99f02219c2c8 SHA512 6af7f87d6011021395ca420a89d213feefabc8547cef620231f58a9a419c404ecb9650c88b7ef48bcc9a10f685d8b897f3d6781d47f92166dd453fecd6ff7912
+DIST unifi-video.Ubuntu18.04_amd64.v3.10.12.deb 190853456 BLAKE2B db6286274f31d35a70eff1c311f27accf5bb6d2def29c2662d4b5585b62e06d2b883a1145af6ac21dda548cab18fc187359acc72b0ffc56876fb64cffb9d9023 SHA512 9f63e96b0dca35d8ac28a642bd03bcfc680c4f7b3278845cbeadf8f21779e67aa24773888f9e82f6a9eed23747c5f24fafa75fa556c6f91211fa26a1b25d9c2c
 EBUILD unifi-video-3.10.10.ebuild 2065 BLAKE2B 9d3cb1f004b187bb6ca76de8e163f94e1d0a84f23372ab2553b72d6877e88e172a567d782994a2e63fe9dcbf2698c7612d89d575b52fd0ff2ddbc9d83576e054 SHA512 b7c7efd2e4217dd5aa2db083b259be912eb42114011ceeff355719a33c82e473043c296e4e47d2058d1448a4c435cfc8f729516bdb08f032855ccb19a6c60fe0
 EBUILD unifi-video-3.10.11.ebuild 2065 BLAKE2B 6265b3e87d70f11a1725ddad67f99b538d69b6e83afa528f0a7f4da8bd13ea80737b3bb4b43441a61c7d0f677b6e61dc85fab7cf84811e43c64fa02a80aeeba0 SHA512 ea3b4096d304a9a003569eab4fecc26c6188cc99e9b10ecdacb14440accdbf8d8d2d71c5e21c0f04b09682cd189e7fd0d1b657e64b7d4a546646a0fdca38308d
+EBUILD unifi-video-3.10.12.ebuild 2065 BLAKE2B 6265b3e87d70f11a1725ddad67f99b538d69b6e83afa528f0a7f4da8bd13ea80737b3bb4b43441a61c7d0f677b6e61dc85fab7cf84811e43c64fa02a80aeeba0 SHA512 ea3b4096d304a9a003569eab4fecc26c6188cc99e9b10ecdacb14440accdbf8d8d2d71c5e21c0f04b09682cd189e7fd0d1b657e64b7d4a546646a0fdca38308d
 MISC metadata.xml 245 BLAKE2B 5323e1eec795a67d15f768c9c6dea0f5501b8f0350586558ad25708a6b13398fc55b6afa97e621e5895a879bdf1594b8323d98a31e39735e2338a6e938288668 SHA512 1b915771c263fd188289f5f3c0168e44a651d52d173dbd35f9dc94795a3227fd1133f2c08a0f30341b42a0cba6f5b0d0ce68dcd6dfc66ff3e225c98b443eb00c
diff --git a/media-video/unifi-video/unifi-video-3.10.12.ebuild b/media-video/unifi-video/unifi-video-3.10.12.ebuild
new file mode 100644
index 000000000000..adc9830fd4e3
--- /dev/null
+++ b/media-video/unifi-video/unifi-video-3.10.12.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user
+
+MY_PV="${PV/_beta/-beta.}"
+DESCRIPTION="UniFi Video Server"
+HOMEPAGE="https://www.ubnt.com/download/unifi-video/"
+SRC_URI="https://dl.ubnt.com/firmwares/ufv/v${MY_PV}/unifi-video.Ubuntu18.04_amd64.v${MY_PV}.deb"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="mirror"
+
+DEPEND=""
+RDEPEND="dev-db/mongodb
+	dev-java/commons-daemon
+	sys-apps/lsb-release
+	sys-apps/util-linux
+	sys-libs/libcap
+	virtual/jre:1.8"
+
+S=${WORKDIR}
+QA_PREBUILT="usr/lib*/${PN}/lib/*.so usr/lib*/${PN}/bin/*"
+
+pkg_setup() {
+	enewuser ${PN}
+	enewgroup ${PN}
+}
+
+src_unpack() {
+	default
+	unpack "${WORKDIR}"/data.tar.gz
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/commons-daemon-move.patch
+	sed -i usr/sbin/${PN} \
+		-e '/require_root$/d' \
+		-e '/update_limits$/d' \
+		-e '/ulimit/d' \
+		-e '/coredump_filter/d' || die
+	default
+}
+
+src_install() {
+	export CODEPATH=/usr/lib/${PN}
+	export DATAPATH=/var/lib/${PN}
+	LOGPATH=${DATAPATH}/logs
+	VARLOGPATH=/var/log/${PN}
+
+	rm .${CODEPATH}/bin/ubnt.updater
+	rm .${CODEPATH}/tools/updater
+
+	insinto /usr/lib
+	doins -r .${CODEPATH}
+	into /usr
+	dosbin usr/sbin/unifi-video
+
+	dodir ${LOGPATH}
+	fowners -R ${PN}:${PN} ${DATAPATH}
+	dosym ${LOGPATH} ${VARLOGPATH}
+	dosym ${LOGPATH} ${CODEPATH}/logs
+
+	dosym ${DATAPATH} ${CODEPATH}/data
+
+	fperms 500 ${CODEPATH}/bin/ubnt.avtool
+	fperms 500 ${CODEPATH}/bin/evostreamms
+	fperms 500 /usr/sbin/${PN}
+	fperms 500 ${CODEPATH}/tools/ufvtools
+	fowners -R ${PN}:${PN} ${CODEPATH}
+	fperms -R 0400 ${CODEPATH}/lib/
+	fperms 500 ${CODEPATH}/lib/
+
+	echo "CONFIG_PROTECT=\"${DATAPATH}/system.properties\"" > "${T}"/99${PN}
+	doenvd "${T}"/99${PN}
+
+	dosym /usr/bin/mongod ${CODEPATH}/bin/mongod
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	if [[ ! -f ${DATAPATH}/system.properties ]]; then
+		cp ${CODEPATH}/etc/system.properties ${DATAPATH}/system.properties
+		echo uuid=$(uuidgen) >> ${DATAPATH}/system.properties
+	fi
+}
diff --git a/media-video/vidcutter/Manifest b/media-video/vidcutter/Manifest
new file mode 100644
index 000000000000..f0873a107659
--- /dev/null
+++ b/media-video/vidcutter/Manifest
@@ -0,0 +1,4 @@
+DIST vidcutter-6.0.0.tar.gz 9877867 BLAKE2B 91f153222f37d452ed8af5c4f24e32790189f058b5cbb3c80f7805ed48b5e953bfeeb8be92f04e049384dc30f416d0ee603237b8a59a329b0bc0cd61bf0fdbe2 SHA512 9970d9918cca9a7681bc5ca8d8b5d16212cf3dad0f2bc3e9c6727340c340801696dcb7ff4e901c2c0a25b86e9cb165bb3f783c18b4a8fd5f4ddba8490a7fd7a0
+EBUILD vidcutter-6.0.0.ebuild 937 BLAKE2B 9d8ac9428cfff9d2b5ce92819ac904af7cfe2f7ddb76e0d305e5e919f67c95d2bcb31df12add844ec6bf4a10604bd64e66a8ab2ad38d0f55c7795dabb4578214 SHA512 0b03f716111381019c0c679784dd8f9aa2359036951387150a01ee3bb3a06aea77052c31f49fab4021afbd59cfcde6401920f4a4d6074b8283606ed980743109
+EBUILD vidcutter-9999.ebuild 937 BLAKE2B 9d8ac9428cfff9d2b5ce92819ac904af7cfe2f7ddb76e0d305e5e919f67c95d2bcb31df12add844ec6bf4a10604bd64e66a8ab2ad38d0f55c7795dabb4578214 SHA512 0b03f716111381019c0c679784dd8f9aa2359036951387150a01ee3bb3a06aea77052c31f49fab4021afbd59cfcde6401920f4a4d6074b8283606ed980743109
+MISC metadata.xml 341 BLAKE2B b4ba35e0ab8990d8adff9beca129b517683baf99330f3df941a01beffaaf3f736b1dcd0d7978b368bc8267fc93d7234649b952c0eba83f8940a56278461fae13 SHA512 89d95e914de7d3ac60dea1040efbcebd2c4c7e048aafa0daa531ffa628dfb6bb9eb75c4c69a888499a8aa4bdf76a53ea2dde595f1134e46d17d334fa81b6809f
diff --git a/media-video/vidcutter/metadata.xml b/media-video/vidcutter/metadata.xml
new file mode 100644
index 000000000000..a56d19341fbd
--- /dev/null
+++ b/media-video/vidcutter/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zerochaos@gentoo.org</email>
+    <name>Rick Farina</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ozmartian/vidcutter</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/vidcutter/vidcutter-6.0.0.ebuild b/media-video/vidcutter/vidcutter-6.0.0.ebuild
new file mode 100644
index 000000000000..925afa62e558
--- /dev/null
+++ b/media-video/vidcutter/vidcutter-6.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="FFmpeg-based simple video cutter & joiner with a modern PyQt5 GUI"
+HOMEPAGE="http://vidcutter.ozmartians.com https://github.com/ozmartian/vidcutter"
+
+if [[ ${PV} == 9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ozmartian/vidcutter"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ozmartian/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	>=media-video/mpv-0.25[libmpv]
+"
+RDEPEND="${DEPEND}
+	>=dev-python/PyQt5-5.7[dbus,multimedia,${PYTHON_USEDEP}]
+	media-video/mediainfo
+	virtual/ffmpeg[X,encode]"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_install() {
+	distutils-r1_src_install
+	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
+}
diff --git a/media-video/vidcutter/vidcutter-9999.ebuild b/media-video/vidcutter/vidcutter-9999.ebuild
new file mode 100644
index 000000000000..925afa62e558
--- /dev/null
+++ b/media-video/vidcutter/vidcutter-9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="FFmpeg-based simple video cutter & joiner with a modern PyQt5 GUI"
+HOMEPAGE="http://vidcutter.ozmartians.com https://github.com/ozmartian/vidcutter"
+
+if [[ ${PV} == 9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ozmartian/vidcutter"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ozmartian/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	>=media-video/mpv-0.25[libmpv]
+"
+RDEPEND="${DEPEND}
+	>=dev-python/PyQt5-5.7[dbus,multimedia,${PYTHON_USEDEP}]
+	media-video/mediainfo
+	virtual/ffmpeg[X,encode]"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_install() {
+	distutils-r1_src_install
+	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
+}
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index e10fdd42df5e..319d06f3c374 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -5,9 +5,7 @@ AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab
 AUX vlc-3.0.8-qt-5.15.patch 1003 BLAKE2B 44a64b0448a235ce1dcf7100d084c85f9ffe6cdebf6cf0b5561e915a2ab6fbf348c152ff6e3c9beb1f073157a8ce8b15f3317a29c5410d3131462aac8d7c1ea4 SHA512 ff61fdc64e2bf4bc19536e76d7b824b0f77d8aa7a1fe61578f57b400ccda1bb51a5f5d97486c42ca6760b137ada68faedc73697dc39005babc839428fafee731
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 DIST vlc-3.0.10.tar.xz 26096828 BLAKE2B c189c91e9b4b3601552ea5c00faa6bee9944550e0591a451723464ef6c1884388286638c0e4c936ff4299cac92eff026ba683c71e0e1ffd25f2a9fd701c86d55 SHA512 dcfa39e3e61bf522ea3a0e1686251356ec262dd8826fc64ccae5ac34a62f72ddc9fe9f2e2b45588013d5907e39649cf39d0c9156980d1eb679eac9b9cb434341
-DIST vlc-3.0.8.tar.xz 26041520 BLAKE2B 4a507206e5a183fe036a95c84d7e94592973a0bd913aa764881bf73928b3c770a776fde1fce7878c4385cf11876813c7d7d48dfe219e71b0e13a9f6be9aa701a SHA512 5ade0b350e98fd6fa90035bffabda96f0addb3844a7c0a242b4db1cab6a746e1adb1d713ddcb48ae51a7d1736090f096f5d3b0637a9f958ccf4fcf27e838cf70
-EBUILD vlc-3.0.10-r1.ebuild 12997 BLAKE2B a31b43dfec44afef1ac10f33a4983a5353abb1e8792afa7f280b2221691c309c5f1f12b0f25d1dad76e1ea6c66003e306c69b72bb9948df16a29a5f3bcb2e841 SHA512 df72bce7d63a9df17ba4384b7f37bca2763ebefbe223da89f31ba472ac9b03eec82052c6f31d20fbae65f8dff2b71878c2d05333f6e6a4feb1c44a9fa9d4d4b4
-EBUILD vlc-3.0.8-r1.ebuild 12953 BLAKE2B 127a5f74a9c7e88a7f1929261c2334213abfdba7c105cb7e6bd1d0ba61abbb07eb65a9bb1a5b2c76e0dd1311ea5da57a08efe0b7de4d298f6cc1491c9cbb3480 SHA512 b13e4e6b896d433f0ff3132663059470c74f6812a85b99e513e7e9d1a7f7a261c7dd13531f1f4c5953daf6336622db7730d80c9a1bb8c6b7bc3f9d817f9ce207
-EBUILD vlc-3.0.9999.ebuild 13019 BLAKE2B 6331fcc72c164b70a82240811e65c43cdb76e0a1646ea15d9446ece6d6174688b5bfaa68e3a8171dfe237c95c9cecf93107ed2c8e942915938ff1745f523f149 SHA512 4311201b2966d3013ee195083ab22bc7b8a06bcfec190e02f54cb62f07a7d42b7a3c5f65a38bbd67450edf111d5692740f151cd1aa322aa226f550f08f7db943
+EBUILD vlc-3.0.10-r1.ebuild 12972 BLAKE2B 8fa70c594d1a261bb6d503e82c9f23055517dc1f77c91c9606fad86c5a3cd993a6240fc28a9eb76f0de95d4abfabaea677114f30d71ff7cd20b256faaac97392 SHA512 5bb8238db59b808a2774216ce1fed656989ef570d8db8986d0242f85624dc36ffed69a5600603e6900d33d2a5aabdad78183057e0cc545edaf18851a3ff6bda6
+EBUILD vlc-3.0.9999.ebuild 12994 BLAKE2B cf787ab08247fb4c73c59b8180b81f6478e4c0c4051ed0b7d2a88e19f57821be6aff64ea255b1a7588e826062eb4b0ea4758c900fe7369bd2afbed96f78a08b0 SHA512 b1dd32b8bb665efe15a533ff7bfc996d0b6db134248c22a8d6b4706356e0e12ea4a50b702ec133b23d5363336fd5a97fc32873178d0bcf78c27d52ecce0075b3
 EBUILD vlc-9999.ebuild 12900 BLAKE2B bcc4c8ec26fb90538d98399a466fd6cec60b3abc0ef74a485c6e46e699d9f7248d85e14154837ed4bf53c64206936ff1dc5aeb798d14f19bc363c9eb13fa34f0 SHA512 a1ad27c395f7549ab5e0530272984d4e709ac5fb4f481ac22348617fce9fcdd2e677abe4aa9869afbeb07ed9a743433767195c8d077cbe163c9964cb5cb4978d
 MISC metadata.xml 4746 BLAKE2B 797c2f7c113915fe8e1508eef1a110db4c7717fa0ee5bfdd49c4260532be2929b6551a453a79c08aa9a6e62f109396778ce9efc823eb18db2bf25f3e9db10068 SHA512 49828ab8f168e49210c7c259b7c0242f9c68bfc9fa9151e5663a8dea781d34f40a6cb22e354332b9efba0610b70995b511ffef20b844914d0dea0118251905b8
diff --git a/media-video/vlc/vlc-3.0.10-r1.ebuild b/media-video/vlc/vlc-3.0.10-r1.ebuild
index b323abbd162a..4ba64203f453 100644
--- a/media-video/vlc/vlc-3.0.10-r1.ebuild
+++ b/media-video/vlc/vlc-3.0.10-r1.ebuild
@@ -400,7 +400,6 @@ src_configure() {
 		--disable-kai
 		--disable-kva
 		--disable-libplacebo
-		--disable-macosx-qtkit
 		--disable-maintainer-mode
 		--disable-merge-ffmpeg
 		--disable-mfx
diff --git a/media-video/vlc/vlc-3.0.8-r1.ebuild b/media-video/vlc/vlc-3.0.8-r1.ebuild
deleted file mode 100644
index bdfb4ef11006..000000000000
--- a/media-video/vlc/vlc-3.0.8-r1.ebuild
+++ /dev/null
@@ -1,489 +0,0 @@
-# Copyright 2000-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *9999 ]] ; then
-	if [[ ${PV%.9999} != ${PV} ]] ; then
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
-	else
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
-	fi
-	inherit git-r3
-else
-	if [[ ${MY_P} = ${P} ]] ; then
-		SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
-	else
-		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-	fi
-	KEYWORDS="amd64 ~arm arm64 ppc ppc64 -sparc x86"
-fi
-inherit autotools flag-o-matic toolchain-funcs virtualx xdg
-
-DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
-HOMEPAGE="https://www.videolan.org/vlc/"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-9" # vlc - vlccore
-
-IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast
-	dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
-	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
-	libass 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_x86_mmx cpu_flags_x86_sse
-"
-REQUIRED_USE="
-	chromecast? ( encode )
-	directx? ( ffmpeg )
-	fontconfig? ( truetype )
-	libcaca? ( X )
-	libtar? ( skins )
-	libtiger? ( kate )
-	skins? ( qt5 truetype X xml )
-	ssl? ( gcrypt )
-	vaapi? ( ffmpeg X )
-	vdpau? ( ffmpeg X )
-"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
-"
-RDEPEND="
-	net-dns/libidn:=
-	sys-libs/zlib[minizip]
-	virtual/libintl
-	virtual/opengl
-	a52? ( media-libs/a52dec )
-	alsa? ( media-libs/alsa-lib )
-	aom? ( media-libs/libaom:= )
-	archive? ( app-arch/libarchive:= )
-	aribsub? ( media-libs/aribb24 )
-	bidi? (
-		dev-libs/fribidi
-		media-libs/freetype:2[harfbuzz]
-		media-libs/harfbuzz
-		virtual/ttf-fonts
-	)
-	bluray? ( media-libs/libbluray:= )
-	cddb? ( media-libs/libcddb )
-	chromaprint? ( media-libs/chromaprint:= )
-	chromecast? (
-		>=dev-libs/protobuf-2.5.0:=
-		>=net-libs/libmicrodns-0.0.9:=
-	)
-	dav1d? ( media-libs/dav1d:= )
-	dbus? ( sys-apps/dbus )
-	dc1394? (
-		media-libs/libdc1394:2
-		sys-libs/libraw1394
-	)
-	dts? ( media-libs/libdca )
-	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
-	dvd? (
-		>=media-libs/libdvdnav-4.9:0=
-		>=media-libs/libdvdread-4.9:0=
-	)
-	faad? ( media-libs/faad2 )
-	fdk? ( media-libs/fdk-aac:= )
-	ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] )
-	flac? (
-		media-libs/flac
-		media-libs/libogg
-	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	gcrypt? (
-		dev-libs/libgcrypt:0=
-		dev-libs/libgpg-error
-	)
-	gme? ( media-libs/game-music-emu )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
-	ieee1394? (
-		sys-libs/libavc1394
-		sys-libs/libraw1394
-	)
-	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
-	kate? ( media-libs/libkate )
-	libass? (
-		media-libs/fontconfig:1.0
-		media-libs/libass:=
-	)
-	libcaca? ( media-libs/libcaca )
-	libnotify? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
-		x11-libs/libnotify
-	)
-	libsamplerate? ( media-libs/libsamplerate )
-	libtar? ( dev-libs/libtar )
-	libtiger? ( media-libs/libtiger )
-	linsys? ( media-libs/zvbi )
-	lirc? ( app-misc/lirc )
-	live? ( media-plugins/live:= )
-	lua? ( >=dev-lang/lua-5.1:0= )
-	mad? ( media-libs/libmad )
-	matroska? (
-		>=dev-libs/libebml-1.3.6:=
-		media-libs/libmatroska:=
-	)
-	modplug? ( >=media-libs/libmodplug-0.8.9.0 )
-	mp3? ( media-sound/mpg123 )
-	mpeg? ( media-libs/libmpeg2 )
-	mtp? ( media-libs/libmtp:= )
-	musepack? ( media-sound/musepack-tools )
-	ncurses? ( sys-libs/ncurses:0=[unicode] )
-	nfs? ( >=net-fs/libnfs-0.10.0:= )
-	ogg? ( media-libs/libogg )
-	opus? ( >=media-libs/opus-1.0.3 )
-	png? ( media-libs/libpng:0= )
-	projectm? (
-		media-fonts/dejavu
-		media-libs/libprojectm
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		X? (
-			dev-qt/qtx11extras:5
-			x11-libs/libX11
-		)
-	)
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] )
-	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
-	sdl-image? ( media-libs/sdl-image )
-	sftp? ( net-libs/libssh2 )
-	shout? ( media-libs/libshout )
-	sid? ( media-libs/libsidplay:2 )
-	skins? (
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXpm
-	)
-	soxr? ( >=media-libs/soxr-0.1.2 )
-	speex? (
-		>=media-libs/speex-1.2.0
-		media-libs/speexdsp
-	)
-	srt? ( net-libs/srt )
-	ssl? ( net-libs/gnutls:= )
-	svg? (
-		gnome-base/librsvg:2
-		x11-libs/cairo
-	)
-	taglib? ( >=media-libs/taglib-1.9 )
-	theora? ( media-libs/libtheora )
-	tremor? ( media-libs/tremor )
-	truetype? (
-		media-libs/freetype:2
-		virtual/ttf-fonts
-		!fontconfig? ( media-fonts/dejavu )
-	)
-	twolame? ( media-sound/twolame )
-	udev? ( virtual/udev )
-	upnp? ( net-libs/libupnp:= )
-	v4l? ( media-libs/libv4l:= )
-	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
-	vdpau? ( x11-libs/libvdpau )
-	vnc? ( net-libs/libvncserver )
-	vorbis? ( media-libs/libvorbis )
-	vpx? ( media-libs/libvpx:= )
-	wayland? (
-		>=dev-libs/wayland-1.15
-		dev-libs/wayland-protocols
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/xcb-util
-		x11-libs/xcb-util-keysyms
-	)
-	x264? ( >=media-libs/x264-0.0.20190214:= )
-	x265? ( media-libs/x265:= )
-	xml? ( dev-libs/libxml2:2 )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zvbi? ( media-libs/zvbi )
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
-	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
-	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
-	"${FILESDIR}"/${P}-qt-5.15.patch
-)
-
-DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	xdg_src_prepare # bug 608256
-
-	has_version 'net-libs/libupnp:1.8' && \
-		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
-
-	# Bootstrap when we are on a git checkout.
-	if [[ ${PV} = *9999 ]] ; then
-		./bootstrap
-	fi
-
-	# Make it build with libtool 1.5
-	rm m4/lt* m4/libtool.m4 || die
-
-	# We are not in a real git checkout due to the absence of a .git directory.
-	touch src/revision.txt || die
-
-	# Don't use --started-from-file when not using dbus.
-	if ! use dbus ; then
-		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
-	fi
-
-	# Disable running of vlc-cache-gen, we do that in pkg_postinst
-	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
-		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
-
-	eautoreconf
-
-	# Disable automatic running of tests.
-	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-aa
-		--disable-optimizations
-		--disable-rpath
-		--disable-update-check
-		--enable-fast-install
-		--enable-screen
-		--enable-vcd
-		--enable-vlc
-		$(use_enable a52)
-		$(use_enable alsa)
-		$(use_enable altivec)
-		$(use_enable aom)
-		$(use_enable archive)
-		$(use_enable aribsub)
-		$(use_enable bidi fribidi)
-		$(use_enable bidi harfbuzz)
-		$(use_enable bluray)
-		$(use_enable cddb libcddb)
-		$(use_enable chromaprint)
-		$(use_enable chromecast)
-		$(use_enable chromecast microdns)
-		$(use_enable cpu_flags_arm_neon neon)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable dav1d)
-		$(use_enable dbus)
-		$(use_enable dbus kwallet)
-		$(use_enable dc1394)
-		$(use_enable debug)
-		$(use_enable directx)
-		$(use_enable directx d3d11va)
-		$(use_enable directx dxva2)
-		$(use_enable dts dca)
-		$(use_enable dvbpsi)
-		$(use_enable dvd dvdnav)
-		$(use_enable dvd dvdread)
-		$(use_enable encode sout)
-		$(use_enable encode vlm)
-		$(use_enable faad)
-		$(use_enable fdk fdkaac)
-		$(use_enable ffmpeg avcodec)
-		$(use_enable ffmpeg avformat)
-		$(use_enable ffmpeg postproc)
-		$(use_enable ffmpeg swscale)
-		$(use_enable flac)
-		$(use_enable fluidsynth)
-		$(use_enable fontconfig)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable gme)
-		$(use_enable gnome-keyring secret)
-		$(use_enable gstreamer gst-decode)
-		$(use_enable ieee1394 dv1394)
-		$(use_enable jack)
-		$(use_enable jpeg)
-		$(use_enable kate)
-		$(use_enable libass)
-		$(use_enable libcaca caca)
-		$(use_enable libnotify notify)
-		$(use_enable libsamplerate samplerate)
-		$(use_enable libtar)
-		$(use_enable libtiger tiger)
-		$(use_enable linsys)
-		$(use_enable lirc)
-		$(use_enable live live555)
-		$(use_enable lua)
-		$(use_enable macosx-notifications osx-notifications)
-		$(use_enable mad)
-		$(use_enable matroska)
-		$(use_enable modplug mod)
-		$(use_enable mp3 mpg123)
-		$(use_enable mpeg libmpeg2)
-		$(use_enable mtp)
-		$(use_enable musepack mpc)
-		$(use_enable ncurses)
-		$(use_enable nfs)
-		$(use_enable ogg)
-		$(use_enable omxil)
-		$(use_enable omxil omxil-vout)
-		$(use_enable optimisememory optimize-memory)
-		$(use_enable opus)
-		$(use_enable png)
-		$(use_enable projectm)
-		$(use_enable pulseaudio pulse)
-		$(use_enable qt5 qt)
-		$(use_enable rdp freerdp)
-		$(use_enable run-as-root)
-		$(use_enable samba smbclient)
-		$(use_enable sdl-image)
-		$(use_enable sftp)
-		$(use_enable shout)
-		$(use_enable sid)
-		$(use_enable skins skins2)
-		$(use_enable soxr)
-		$(use_enable speex)
-		$(use_enable srt)
-		$(use_enable ssl gnutls)
-		$(use_enable svg)
-		$(use_enable svg svgdec)
-		$(use_enable taglib)
-		$(use_enable theora)
-		$(use_enable tremor)
-		$(use_enable twolame)
-		$(use_enable udev)
-		$(use_enable upnp)
-		$(use_enable v4l v4l2)
-		$(use_enable vaapi libva)
-		$(use_enable vdpau)
-		$(use_enable vnc)
-		$(use_enable vorbis)
-		$(use_enable vpx)
-		$(use_enable wayland)
-		$(use_with X x)
-		$(use_enable X xcb)
-		$(use_enable X xvideo)
-		$(use_enable x264)
-		$(use_enable x264 x26410b)
-		$(use_enable x265)
-		$(use_enable xml libxml2)
-		$(use_enable zeroconf avahi)
-		$(use_enable zvbi)
-		$(use_enable !zvbi telx)
-		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
-		--disable-asdcp
-		--disable-coverage
-		--disable-cprof
-		--disable-crystalhd
-		--disable-decklink
-		--disable-gles2
-		--disable-goom
-		--disable-kai
-		--disable-kva
-		--disable-libplacebo
-		--disable-macosx-qtkit
-		--disable-maintainer-mode
-		--disable-merge-ffmpeg
-		--disable-mfx
-		--disable-mmal
-		--disable-opencv
-		--disable-opensles
-		--disable-oss
-		--disable-rpi-omxil
-		--disable-schroedinger
-		--disable-shine
-		--disable-sndio
-		--disable-spatialaudio
-		--disable-vsxu
-		--disable-wasapi
-		--disable-wma-fixed
-	)
-	# ^ We don't have these disabled libraries in the Portage tree yet.
-
-	# Compatibility fix for Samba 4.
-	use samba && append-cppflags "-I/usr/include/samba-4.0"
-
-	if use x86; then
-		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
-		append-cflags $(test-flags-CC -fno-stack-check)
-		# Bug 569774
-		replace-flags -Os -O2
-	fi
-
-	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
-	append-cxxflags -std=c++11
-
-	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
-	if use truetype || use bidi; then
-		myeconfargs+=( --enable-freetype )
-	else
-		myeconfargs+=( --disable-freetype )
-	fi
-
-	if use truetype || use projectm; then
-		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
-		myeconfargs+=(
-			--with-default-font=${dejavu}/DejaVuSans.ttf
-			--with-default-font-family=Sans
-			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
-			--with-default-monospace-font-family=Monospace
-		)
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
-	# Other values may break the build (bug 523144), so definition should not be removed.
-	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
-	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
-}
-
-src_test() {
-	virtx emake check-TESTS
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
-		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
-		"/usr/$(get_libdir)/vlc/vlc-cache-gen" "/usr/$(get_libdir)/vlc/plugins/"
-	else
-		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
-		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
-		ewarn "If you do not do it, vlc will take a long time to load."
-	fi
-
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
-		rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
-	fi
-
-	xdg_pkg_postrm
-}
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 8e8124b25a95..926e7eda205d 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -400,7 +400,6 @@ src_configure() {
 		--disable-kai
 		--disable-kva
 		--disable-libplacebo
-		--disable-macosx-qtkit
 		--disable-maintainer-mode
 		--disable-merge-ffmpeg
 		--disable-mfx
diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest
index 3b431d86bbd7..82badbd4e894 100644
--- a/media-video/yle-dl/Manifest
+++ b/media-video/yle-dl/Manifest
@@ -1,5 +1,3 @@
-DIST yle-dl-20200222.tar.gz 87059 BLAKE2B 25d645505d67d71b3662589c77c30f905ded81e2d64874cf6036dcaf0738e521e96650543a78c18031a4477fc3bcf121e7497c980d22c84e21bebc2bd7cb154a SHA512 2b4a98c19a12812bc3c00de6173d50c78c981de0186c29021c8d88349ae88759a4987f6488d758ee5397d2b0992cd03029680bb08a4882cb2280a28807d4bf14
 DIST yle-dl-20200419.tar.gz 87267 BLAKE2B 2637620758c1a083502eb9468bbe5e7353855051c3379d448f6a4b9adcf8113293e4a7a8887138df68fcfd16938ab3846034a8f57cb9d366467a22c23b53ebaa SHA512 3d064e080e0c9172e15134eaa179ae96240ed9fc74a7a8a9a9aa18049397e0fea62465f5768db488928f23af1fa1195d78a8a4a6bbafcab4bcda6d05cda70ccf
-EBUILD yle-dl-20200222.ebuild 1695 BLAKE2B 25884cea797340b5796c15f591fad21fc0af4f5b2afe32465659baf6d9ea2768a97db8a07691a5a5e8a93502a7702d7ce08d57a2fb67de1c591022dcc91bc52a SHA512 43c9c542c50bd715dc0ebb0c41a85cd220dbf50698233a2d9c74ce9379b1c7f982469a3da2391703e9e2355f889cf671b83b9246826403abfbe9b64743a20dbd
-EBUILD yle-dl-20200419.ebuild 1993 BLAKE2B 0e7ad46255054a3a764f52ea85a865bdf6cb5bd14ee10273c8342e7177f98985186252020c40fb99d5cc6424fe504d2b064928a6be132926265b03b898725b88 SHA512 ef9791616b96f526a66d57f70f95da4fc3c133a28970a59b6687d3e5b991e4f12e77bf461f4fc490c984abea582c1128ed3b70f0f5e43fdf9fff95013ae8dc4c
-MISC metadata.xml 415 BLAKE2B 3961cdbc02847f65011c6987b811207c31c49ae40c3bea44b481f35ac04e75dabfa8ceae74f6adc816f211129efb8faaa0ba63700d95eec569b3f51cfe64bd42 SHA512 96f1afba4a47f7b5dca75ba1d5300baf9815bdcf3eda12f5b6044aea7cfc09683c76db210a0b4965626aac050016fc39f44c4e5c63597894e0ae6457dc2aeb90
+EBUILD yle-dl-20200419.ebuild 1991 BLAKE2B 45b62f2c5c0edc407c076bba5d0124b738d9cb6122c559ddaa9cefdfd5ef44cbd9522d609c9230ff0aa641896414f387a95287b6d1d469a31bdf166a26119fe7 SHA512 19c6ebad053e90841f3ab6132cc702da9d6685e421b6b2af59955e5c7a27c383811850c02c40ad58952788426d9e94c38572510b007e5fa5f41cca0f24380e17
+MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/media-video/yle-dl/metadata.xml b/media-video/yle-dl/metadata.xml
index 025d4dde75df..6b0a0fb3a729 100644
--- a/media-video/yle-dl/metadata.xml
+++ b/media-video/yle-dl/metadata.xml
@@ -5,8 +5,4 @@
     <email>juippis@gentoo.org</email>
     <name>Joonas Niilola</name>
   </maintainer>
-  <use>
-    <flag name='php'>Use a PHP script as download backend</flag>
-    <flag name='youtube-dl'>Use youtube-dl script as a download backend</flag>
-  </use>
 </pkgmetadata>
diff --git a/media-video/yle-dl/yle-dl-20200222.ebuild b/media-video/yle-dl/yle-dl-20200222.ebuild
deleted file mode 100644
index 9f7caaad6307..000000000000
--- a/media-video/yle-dl/yle-dl-20200222.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Download media files from Yle Areena"
-HOMEPAGE="https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl"
-SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="php test +youtube-dl"
-
-# Requires an active internet connection during tests
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/attrs-18.1.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.13.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/mini-amf[${PYTHON_USEDEP}]
-	dev-python/progress[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	media-video/ffmpeg
-	net-misc/wget
-	php? (
-		dev-lang/php:*[bcmath,cli,curl,simplexml]
-		>=dev-libs/openssl-1.0.2:0=
-		media-video/rtmpdump
-	)
-	youtube-dl? ( net-misc/youtube-dl[${PYTHON_USEDEP}] )
-"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( COPYING ChangeLog README.fi README.md yledl.conf.sample )
-
-src_prepare() {
-	default
-
-	# Gentoo doesn't ship pycryptodomex with pycryptodome
-	sed -i 's/pycryptodomex/pycryptodome/g' setup.py || die
-}
-
-python_test() {
-	# For tests to run succesfully, you need to disable network stricting
-	# feature first.
-	#  FEATURES="-network-sandbox test" emerge -a yle-dl
-	esetup.py test
-}
-
-pkg_postinst() {
-	elog "Sample configuration file has been installed in "
-	elog " /usr/share/doc/yle-dl-${PV}/yledl.conf.sample.bz2"
-}
diff --git a/media-video/yle-dl/yle-dl-20200419.ebuild b/media-video/yle-dl/yle-dl-20200419.ebuild
index 51021c5c90a3..8cc058141422 100644
--- a/media-video/yle-dl/yle-dl-20200419.ebuild
+++ b/media-video/yle-dl/yle-dl-20200419.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
author	V3n3RiX <venerix@redcorelinux.org>	2020-05-30 11:44:06 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-05-30 11:44:06 +0100
commit	f516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree	8bfecb640b7b6403d7a3d662d923eed630033da7 /media-video
parent	1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)