gentoo resync : 16.09.2020

19 files changed, 29 insertions, 471 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 998d10d32506..d5a0570b7b76 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/dtv-scan-tables/Manifest b/media-tv/dtv-scan-tables/Manifest
index 2b830f871555..e2fb5bc21e12 100644
--- a/media-tv/dtv-scan-tables/Manifest
+++ b/media-tv/dtv-scan-tables/Manifest
@@ -1,6 +1,6 @@
 DIST dtv-scan-tables-2017-10-03-c1986d5148d8.tar.bz2 168709 BLAKE2B fb4a7ad5b6892a7e7eed1d57ebb49b1f4493076f6f744953d2d5c51c0e1cf7fdaf864ad050c578c2697f5b11d72c245b96ee369522cb58d38a1a2cef035099a7 SHA512 e2b0cf8f52b536be6a532b4a2896421a8150fdc19613e92c92d0c8275fcfd306cb091db32fa26f97bbec0a51ef4ba61b5f98e8c974280a3f6dd36b67a3bf4aad
 DIST dtv-scan-tables-2019-09-22-f07bde777d4d.tar.bz2 270211 BLAKE2B 76d5250a8eb7e9ce5c83eb9486ea1b398f3565ed027863057f143ae15c196fa01489f17fa71082ac878f49dac653da8967673872cb3e298f99cd59376c82ee39 SHA512 806fadcfc767d09dc9b474af089c2fa68ccafd91e110b74dc47f3a2ea90ebb74f80633831a20a51578fce3fbd4556a23c6bca9f7139be7c3de8eff79d2ee321c
-EBUILD dtv-scan-tables-0_p20171003.ebuild 736 BLAKE2B e97f810aa9a13bf409de4b71a7be136a3ddae6afb724afc3d7b2e1d2041f648158619fa29ddf904288304886c5cec3470c23149f96707c1fc08d6c7af2a05dc5 SHA512 772d083bdb99c78fe8b72c9552919d333a3fd97753e5c4da07cb1c305664deb021c71a19d49ce13101bc8f768970adfe7b1f12b4ed6447100a3a69590735d286
-EBUILD dtv-scan-tables-0_p20190922.ebuild 748 BLAKE2B 09224bfa22b6642dabba0f65250a89b124f287523ffc9213527c068e9389eed1349bc99def7b4b468742d3a4e83f758209be4f6dcf7ff2e24b1b47c97e131287 SHA512 3a2df6d03e9f392eaf2f78128f1a6353a49ab80660fed160bda9365e4fbbcd7896adee3a4e2e88519c50b72abf8527631252f900481c1977425404439a0f235f
-EBUILD dtv-scan-tables-9999.ebuild 741 BLAKE2B b930164b495b422178137fa20f0758e057e7bdb22aa8e812592a22f70bcb7ec30917dbfcacb833066c93baf38f7874974851dcdb4fb7580cf566865ac255e03e SHA512 c69be11fb400fb39a66e78802d8dd19ac8edd13a79efaea589d42af2c59900778ec35ddec2d8f5029f7c0a6559985018b9c290c57d150d37fb9a663720bb0548
+EBUILD dtv-scan-tables-0_p20171003.ebuild 744 BLAKE2B 28b07ee6e3b3f5b00db5ef257ddaca946ce56c5a92e27c0585587d9a8b3fceb0e6fdb65f85d461fcfd6fef5fc195310c2d69c5e1a067dd4fc407161ac2e1e577 SHA512 4f38f1175232d793ad428b687fbc1597504cd930edf7bfeb8ec4f7e0c3ac771f0aa79c8aef8813e426d34cb195d7024911d3aa8a8ea9be66e2e7de23ad01f87c
+EBUILD dtv-scan-tables-0_p20190922.ebuild 756 BLAKE2B 3c9145ba4a6e22b6432cceac25a23eb5e37e27317071edb7c06674932b5e2520df00ac2bab8f43e0b97e368678ecde9fb5ae402da8cfe61d1e12cc2d38c4c85c SHA512 6c7a28249f067bed3ac39e71e64bee3aa6baf79c55af2f7e75713d774896f8494a5d32011729bb5030cf70dc75c9cb1c48a849d0298013eb3b75511bcfc68da6
+EBUILD dtv-scan-tables-9999.ebuild 756 BLAKE2B 3c9145ba4a6e22b6432cceac25a23eb5e37e27317071edb7c06674932b5e2520df00ac2bab8f43e0b97e368678ecde9fb5ae402da8cfe61d1e12cc2d38c4c85c SHA512 6c7a28249f067bed3ac39e71e64bee3aa6baf79c55af2f7e75713d774896f8494a5d32011729bb5030cf70dc75c9cb1c48a849d0298013eb3b75511bcfc68da6
 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20171003.ebuild b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20171003.ebuild
index 1dc91e79f7ca..8c3d27e71d2f 100644
--- a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20171003.ebuild
+++ b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20171003.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=6
@@ -18,7 +18,7 @@ HOMEPAGE="https://linuxtv.org/"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 
-DEPEND=">=media-tv/v4l-utils-1.4"
+DEPEND=">=media-tv/v4l-utils-1.4[dvb(+)]"
 
 DOCS=( README )
 
diff --git a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20190922.ebuild b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20190922.ebuild
index bf0211623cc2..83e1459c072c 100644
--- a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20190922.ebuild
+++ b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20190922.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://linuxtv.org/"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 
-BDEPEND=">=media-tv/v4l-utils-1.4"
+BDEPEND=">=media-tv/v4l-utils-1.4[dvb(+)]"
 
 DOCS=( README )
 
diff --git a/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild b/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild
index 73d9b36229da..83e1459c072c 100644
--- a/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild
+++ b/media-tv/dtv-scan-tables/dtv-scan-tables-9999.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
@@ -9,7 +9,7 @@ if [[ ${PV#9999} != ${PV} ]]; then
 else
 	COMMIT="f07bde777d4d"
 	SRC_URI="https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${PV:3:4}-${PV:7:2}-${PV:9:2}-${COMMIT}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 	S="${WORKDIR}/usr/share/dvb"
 fi
 
@@ -18,7 +18,7 @@ HOMEPAGE="https://linuxtv.org/"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 
-BDEPEND=">=media-tv/v4l-utils-1.4"
+BDEPEND=">=media-tv/v4l-utils-1.4[dvb(+)]"
 
 DOCS=( README )
 
diff --git a/media-tv/ivtv-utils/Manifest b/media-tv/ivtv-utils/Manifest
index e60f93557b17..a7e60f76313f 100644
--- a/media-tv/ivtv-utils/Manifest
+++ b/media-tv/ivtv-utils/Manifest
@@ -2,4 +2,4 @@ AUX ivtv-utils-1.4.0-gentoo.patch 2423 BLAKE2B cf0cb7fb1ea7c0d9cd62b6d2fce3e342b
 AUX ivtv-utils-1.4.1-overflow.patch 1774 BLAKE2B 7ec6fe101125f367a90f54b771f9ac6bd2179e94986115177e34d2fc294cffd9d893b9aeb15e629f1990c99c5d7d3d6d5b4189d3dac8cc24f572b2b2bab91796 SHA512 5c19bc5420f0e7f1f501b0e117fdd3108799607f380bc8609ccd9126eb6fade4da21a41918f88613127969afd6712ab19bcb2dbc295d93454f5da918609c66eb
 DIST ivtv-utils-1.4.1.tar.gz 189918 BLAKE2B 7880b532ffb3a1ffa13c38b74b57f82a199486ba5bc8e310cb5447ad78d05a0380b51070a0dc67e4f1120d49c8c7d9a2b829e3922585484906efccc4f2b96fb5 SHA512 719c922fb819ba7f0ca3d4bbede571c416dc9f282bd8a7e2fbe7d9b4298541a104f8a848e113379eeec052206658b7a0a2e0eea1b7917e90f2aee37fe0010bed
 EBUILD ivtv-utils-1.4.1.ebuild 869 BLAKE2B 7d163c5e7a93c37320e7a6bd870e9077b3ad55df0fd968288b10e54bae249e1c96a51795854b721baf0e41ab10dfd8020ccdad5dd582bcc09e5a3f92be5409c7 SHA512 81d1f135939dc1c590cb15c9fcc585ea396efa6bf57604a7cd5912306e898746731e99ebddf563aa47cf6ad37e3e72407a770656f5fad90e7e73b68704194677
-MISC metadata.xml 302 BLAKE2B 98fc025993a88c607187f0b8e9fe7295800fce7a4d0db4378118175be7dd9af2131130e5872b79faf415dd404d635c72524395927e8f5c4e7184d24e75e97937 SHA512 fd8133b38c4139c841e83a26e24cb2695a6f711b0f9a5495d8f9363d9ae32bc26d03e7e1b5a708d549fbe72452af853c5b326b1a2d27cd5dc630bda8a6fed9a2
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/media-tv/ivtv-utils/metadata.xml b/media-tv/ivtv-utils/metadata.xml
index d2cd6812aa5c..1b2becffa26c 100644
--- a/media-tv/ivtv-utils/metadata.xml
+++ b/media-tv/ivtv-utils/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
-  <longdescription>
-    Driver for ivtv based tv tuner cards, currently supports Hauppauge 
-    PVR-[23]50 cards
-  </longdescription>
 </pkgmetadata>
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index f1d9a9b32bb0..013129c2b726 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,17 +1,17 @@
 AUX kodi-18-remove-useless-test.patch 1295 BLAKE2B 36c6408ee1ef404539f097822952fa4000b4913ed5b54526bb4f2b452a553335eb3935e5a6cbcec0b1e497eed86d5417784016404596d31a063d608ca1f44d51 SHA512 73c50bf728d04117ad1493505bea561ade6c49e2e58de24a453374946d0931e11e094b749bad9d90ea48197521808a12b87c42e496acb6091380f4953b959567
 AUX kodi-18.5-cassert.patch 1402 BLAKE2B 02f2b63856cf1fd75749d78a0f9cf37cac55b20fc22302846011781c56e8902312a10e71c3e1b21f44aaa362efba2acefb73c5ae68643b569c541508f44d97bd SHA512 fbaa126dd647559749944c09e5424a76dccdaa5d8dc6299a52cb6215f20af29f3cf8d0596280f335e8a9be1ffe556fa47b33c9d28b22c2b47f51d738219aeb8c
 DIST ffmpeg-kodi-4.0.4-Leia-18.4.tar.gz 12430413 BLAKE2B 6de6fde2c16264f851466b46f87c23c34e7d503203f69d47342d46034f153860190d196da51221f866315405c8a33325b2160283333256ee5d5e293336afae99 SHA512 c6dd75dbff7119adeeda246cfb640b5e8d3b4c242ef83e5ba070207b60f0c715c3fe3cb328d87687b70a133f122a03aba990f0e95f3aac7d5dbcee25bec59078
-DIST ffmpeg-kodi-4.3-Matrix-Alpha1.tar.gz 13478011 BLAKE2B 6219293fba86981c34c22b1a91c6dce0c298d523ecafe2e0ddce8b1ec4213d4f8f65610e4555a124a582d7fa8e858d0ad6921015fa4e639d64a02e955f7faf46 SHA512 23220650b550fe2008c38c955e10baf55e1ceaac780cf170db5349b156ac399ff3eda39509773f0c973c50083e75823b1da8e92b3751c04bb06a7f5687bef850
+DIST ffmpeg-kodi-4.3.1-Matrix-Alpha1-2.tar.gz 13477450 BLAKE2B c33a2aad8b895be3ea5be76de238680284487d38a8c22ce57f17c3944a6ba214c0dfa9ef1e4717244ff8f70f6dd640b36715842d61ddaed65867a6c096470283 SHA512 7f614d0dd2b319414cb31853be9cd52e5e81b780a4049e36470f992e78e52bcd65e99bfd268df5f8781ad030bb60f99d15bd5e8c4d7c2fd9a4011b55a3efc40c
 DIST kodi-18-libmicrohttpd-0.9.71.patch 84981 BLAKE2B e07c7df63bdfbaf9dfc5d0989adf96eb663a8c99ea11c42dfc585d8b91343a3445e9bc2f1797e845b0895e79568526e8e594a76e8cb3d7b591153a0ad45ce807 SHA512 286a1466174d847eac460b2a7a1b66b082148f2a3e91c4f5f881b909a59b8fdb2037eda074bd3c6e5dbe6a65dc2bef9f1d6746d7db2cb78d285c4b7750c366c2
 DIST kodi-18.7.tar.gz 51051040 BLAKE2B 7ff04cd0ddcf74e46eef4318cf870662b9e076b362322958a6b8019d49134e37981f7ca21b5806e38b942adc4c29ea2b25a19f46e5da3d469613cf19a29f4e8c SHA512 7e5678f5e23e8af929056a49b0ce0b992a1f53a1fe970a149610c5a24adb591085bb06cc405e8bdc6040eef853d23e99df660d7006fc1ea4e79afd3a697875c5
 DIST kodi-18.8.tar.gz 51052219 BLAKE2B 6e49b08b5e2bfe778dafb687658e82b90226a9f1c1a7827a4290d601fe4c98e5cbaabaa39563c19a2956b83ce3a76640f081a56a41dfea4d65fb8b503c6f37b0 SHA512 242eaa9144ba0d9b15f02ab41282295de76d375cf66d595e7f6687d47c996133fcf5647448dcd06759df9f30bd86cdba239720b9bdd8b57827b6f261c08c4aaa
-DIST kodi-19.0_alpha1_p20200830.tar.gz 51683611 BLAKE2B 8957e76bc0558d5ba8efb4c9884021b644376a8fe56d1d23086485d596d5f91ccf110bdbe2fdb9fd650da03eed5558fb55dd017ef1550b2b676b2baeae13c554 SHA512 4a9c407b2a0384297083bbfa279dda07fd70489e2da45542182a8faf9f1fbe92fb17f6aa9b8b14f8e95d7e00b5edd732587667649d91ff89b2ff43f3da95b32f
+DIST kodi-19.0_alpha1_p20200914.tar.gz 52061486 BLAKE2B b3dbee93256394dd821cf969ef8c3fd3a8913b5d3598340b7217d5464194d91cbf6f39d4ac4a92f2d506ca0e9502cb53a3e33f4df6ae465557f909320e41f2f9 SHA512 9181f6002ca99a4c07304d71e22521c9aedd1983a0cd5cc7fa24cbfa2775ecaf55056e726332723d290eeca72d0fda3167a2b58cd8492c738f06b1a8c11b410f
 DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e
 DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355 SHA512 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72
 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
 EBUILD kodi-18.7.ebuild 9762 BLAKE2B ed5b1e0bba1ae29387f59acc9f454872abdae8506b19570fa4df7ceda32a3551f684bc3f7be2b8426f4041d24a3bed830076d76c897a310c79d87773b7e3c566 SHA512 f0b4362ef5665ebb17618b09f6f25179423526cd9244c585d333349f8894a6d5543a76ccb181f0b0445de50305ce1813998720a8c5c1ac245ca5872b20bcc67f
 EBUILD kodi-18.8.ebuild 9624 BLAKE2B f2fb687517e5fc0fc6ed480fda971fa5316f6699762df338392d8b9a9df68531fd38468e9667d23567352ce797fc4c790c1340c06fb0e5d5274cfe7c2883f760 SHA512 0de173c95440f2b5901f5a83649153fd791f678cc88606a41180df5a75a3bcd23d183fd38260e99f642ee1d9a201fa6c4b2a630c1991e50b218063e6390f489c
-EBUILD kodi-19.0_alpha1_p20200830.ebuild 9312 BLAKE2B 0ba1f48d13e0fc62eeb7eca48c97f01650b2526341b4e7f7ebc5535b6edc9014506cfb939480fb1dff7932b5f7ff805abbfa8959d133cda1f0e11fb88c8bf3ee SHA512 df981507a4b4525bcf52e744d6bcdc6092f99e7adaaecbc551de71c0a11ee15f27b4e84564b8af4778d52805017ea643f5bd5b82b23f58d74e4d2aed49e9d88e
-EBUILD kodi-19.9999.ebuild 9376 BLAKE2B 344550b72b9f98ac7d4a46a035c5ecc8aaf75f6665e87f93527f0fd983adbf4eb2c0cdac2d5c998e8a9435f98708f0c67c529821d1ede2a9e69eba6dc317cb22 SHA512 906cc1f7abf61fe22c697b60e9cedf9e5699abd6bd821f070360084a90d7868b630612404c5e6381afc25903caf7b0d940eb7b397a444b90c8ca5e22f6595ca3
-EBUILD kodi-9999.ebuild 9376 BLAKE2B 344550b72b9f98ac7d4a46a035c5ecc8aaf75f6665e87f93527f0fd983adbf4eb2c0cdac2d5c998e8a9435f98708f0c67c529821d1ede2a9e69eba6dc317cb22 SHA512 906cc1f7abf61fe22c697b60e9cedf9e5699abd6bd821f070360084a90d7868b630612404c5e6381afc25903caf7b0d940eb7b397a444b90c8ca5e22f6595ca3
+EBUILD kodi-19.0_alpha1_p20200914.ebuild 9316 BLAKE2B 2c0b805f5256a3f06e1142099999584235d71afc36baeb02af4431c5b9fe51ae1747a04e9b3f38a05db237751fba345b866f9e50d998e6dcfe62da8769aa363b SHA512 5c36318119058add537aa4a157e40f6f99e4540580a37406f96325864fc31137ab605ef3aa0d10feafb5aeb6144fdd2f1e630b313172d406a4b3f5c1c4570c91
+EBUILD kodi-19.9999.ebuild 9380 BLAKE2B 66211917196a787d232e005250020ef890754a7f5c5ddda1f4c7582c70bdb85744f6d5db133b057cc6532e178a9af620361bdbc0c20a4c55e30c3dc9d503bea7 SHA512 32a271ab2799d691ee9fe35a3cd801b1b4e8b1581d24ebdee086982b0b1b8b6f56d1fc34c8c5f6ddda9da1249b9292fa42a85823aa4a59a33f070c590ee634c2
+EBUILD kodi-9999.ebuild 9380 BLAKE2B 66211917196a787d232e005250020ef890754a7f5c5ddda1f4c7582c70bdb85744f6d5db133b057cc6532e178a9af620361bdbc0c20a4c55e30c3dc9d503bea7 SHA512 32a271ab2799d691ee9fe35a3cd801b1b4e8b1581d24ebdee086982b0b1b8b6f56d1fc34c8c5f6ddda9da1249b9292fa42a85823aa4a59a33f070c590ee634c2
 MISC metadata.xml 1796 BLAKE2B da81fcbb0abedc4f78e82fa6f9453e4ffe824b1cedefcc9a1261dc09e0bd43482a7bd03e908f959d1a3033c284188d79644a1a9bca5064836eb3d0908b7d0d7f SHA512 d76d9f8d4683df4ab488dd30852437649810d0b093f0590db8f95404445f25aca7efdaa9d706d3222d67104cb2c4b02896154fcd7df1173b0bfe7e2557d73847
diff --git a/media-tv/kodi/kodi-19.0_alpha1_p20200830.ebuild b/media-tv/kodi/kodi-19.0_alpha1_p20200914.ebuild
index 59fcf9edb60c..b48786cb6f77 100644
--- a/media-tv/kodi/kodi-19.0_alpha1_p20200830.ebuild
+++ b/media-tv/kodi/kodi-19.0_alpha1_p20200914.ebuild
@@ -7,9 +7,9 @@ PYTHON_REQ_USE="libressl?,sqlite,ssl"
 LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
 LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
 LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
-FFMPEG_VERSION="4.3"
+FFMPEG_VERSION="4.3.1"
 CODENAME="Matrix"
-FFMPEG_KODI_VERSION="Alpha1"
+FFMPEG_KODI_VERSION="Alpha1-2"
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
 	inherit git-r3
 else
-	GIT_COMMIT="a3d5f733751021dcd172954f5b618934b80a4a55"
+	GIT_COMMIT="a8fdb87b82070c0d250e007067b5a7da401e9605"
 	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S=${WORKDIR}/xbmc-${GIT_COMMIT}
diff --git a/media-tv/kodi/kodi-19.9999.ebuild b/media-tv/kodi/kodi-19.9999.ebuild
index 123db14e3779..0857f7cb2309 100644
--- a/media-tv/kodi/kodi-19.9999.ebuild
+++ b/media-tv/kodi/kodi-19.9999.ebuild
@@ -7,9 +7,9 @@ PYTHON_REQ_USE="libressl?,sqlite,ssl"
 LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
 LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
 LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
-FFMPEG_VERSION="4.3"
+FFMPEG_VERSION="4.3.1"
 CODENAME="Matrix"
-FFMPEG_KODI_VERSION="Alpha1"
+FFMPEG_KODI_VERSION="Alpha1-2"
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 123db14e3779..0857f7cb2309 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -7,9 +7,9 @@ PYTHON_REQ_USE="libressl?,sqlite,ssl"
 LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
 LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
 LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
-FFMPEG_VERSION="4.3"
+FFMPEG_VERSION="4.3.1"
 CODENAME="Matrix"
-FFMPEG_KODI_VERSION="Alpha1"
+FFMPEG_KODI_VERSION="Alpha1-2"
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 9940816adb1b..f54cc13c2d1e 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -17,6 +17,5 @@ AUX xinitrc-r1 234 BLAKE2B 0227ea065f1c43e1b2f1583bcbc798db76e9a08d345bbd8ed8837
 DIST mythtv-30.0_p20190808.tar.gz 101208060 BLAKE2B af8966dd6353fc514c9a95083f28e8b7b19f16e1bd5a4f7590a946c306bf16a09f0028c76da975e423136834f8f06d7f2a570b43957ef4ae5e42ee241b579f0a SHA512 c02371c0b2162556e40a560a0fd9cb121f46f2ccedbc2ca74cd03aa9caf2b7ea4bbaa09ae6320eb782f932190f449e7fdd274a6d6ba9676e5fd9b7f5432632a2
 DIST mythtv-31.0.tar.gz 102552136 BLAKE2B b09b41230eb2cae19d770c3cc59151863e0a56e95a86627473d52613e62f0acf3bd0c4bb37afb340ab874c222899f9d3c219ded470785d27960db9b39d784ceb SHA512 d53817231409934ef37d12739c38cf6936f04f816b0ba1c9738ce99b5b4ff387c70b683ccd84f649ff2f74992b2158829f5f1d1ffe06c8768da1922b90439f6e
 EBUILD mythtv-30.0_p20190808-r3.ebuild 12593 BLAKE2B 4b147dc08cb1b1113536e6c95d3e07f683f7d3e750b3e9871d60ff8b784306573d6c7e1e226ac52d0b0f984ad90e400e1051973f5b73f5ac66ebb8fa6c5f2e6a SHA512 11b498e4664204ccbd15210cdb7a5790930111bfee2ca54cd2457380b3a041c55706d9ee67fd6f8d8297e8a2fc729291e952326302e4e74d58451ed410e43557
-EBUILD mythtv-31.0-r1.ebuild 12345 BLAKE2B cb5a9fbf31781d2d024ff1ef83136da8105b5bb6216b4deab3271195ec9cbc909eb6d252042998164751523430d34ef3e8cdc79b3c90812117712d631abe1b3c SHA512 3dca774f047b5ac1b8f095316fa90429002fec668abe7f67d89cb7a92688efe60725c73e306b8ad257942fb775ceb34e44557e2c0093628f4767b2aae9712b79
-EBUILD mythtv-31.0-r2.ebuild 12454 BLAKE2B e38590cc4034291d3852f8c66b7d568784aaddf409c0dfc3b563cd75560d4ab5fc5a7ed1518250db1d1db1558287e926c6ddcdf8f0118add15d3f998259d6e28 SHA512 754b6adf5d2f5e9671c9b738e6a379e41a0b389d471296f5e0ed7181201b16584fa6ac4ddcb6a2e3160d03da56cbb1dd9fbedf8d23091a74c4566de31604afb9
+EBUILD mythtv-31.0-r3.ebuild 12429 BLAKE2B dc865772d4db73c2378c70e179e03e99c371f0996fedd7f62e1ca0ac9bb527051ca3d0387abba599c6299c5a1c50b438b49aadcf35b52f2e355a004271f55389 SHA512 8d3df7c1daf3d561b52620328f31126420efea81bc7e384b4b28c3bca32994a59754686edeb2450b8f5ea25c64e03b3f958d3d08919504cfc1fc627973ed4893
 MISC metadata.xml 2285 BLAKE2B cbc924af3ac54973580a7ab7f73669d24da3b1da9edfc8717fb1996ee59193337b1490a909ef0ab8ef400e323120dedab938d79564b306d196c167ca22a9476c SHA512 8bd3b71213ebf3bced2aa83cc85d3117e200138b64217eb40d8c73c84290c00c0fca7f6b18801fbc7a07f9d55234dfd01da33a47b2ea5b561329200260284983
diff --git a/media-tv/mythtv/mythtv-31.0-r1.ebuild b/media-tv/mythtv/mythtv-31.0-r1.ebuild
deleted file mode 100644
index caa46bd6d11a..000000000000
--- a/media-tv/mythtv/mythtv-31.0-r1.ebuild
+++ /dev/null
@@ -1,436 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-MY_P=${P%_p*}
-MY_PV=${PV%_p*}
-
-inherit eutils flag-o-matic python-any-r1 qmake-utils readme.gentoo-r1 systemd user-info
-
-MYTHTV_BRANCH="fixes/${P%.*}"
-
-DESCRIPTION="Open Source DVR and media center hub"
-HOMEPAGE="https://www.mythtv.org https://github.com/MythTV/mythtv"
-SRC_URI="https://github.com/MythTV/mythtv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-IUSE_INPUT_DEVICES="input_devices_joystick"
-IUSE_VIDEO_CAPTURE_DEVICES="v4l ivtv ieee1394 hdpvr hdhomerun vbox ceton"
-IUSE="alsa altivec asi autostart bluray cdda cdr cec debug dvd dvb egl exif fftw jack java
-	+lame lcd libass lirc nvdec +opengl oss perl pulseaudio python raw systemd vaapi vdpau vpx
-	+wrapper x264 x265 +xml xmltv +xvid +X zeroconf
-	${IUSE_INPUT_DEVICES} ${IUSE_VIDEO_CAPTURE_DEVICES}"
-
-REQUIRED_USE="
-	bluray? ( xml )
-	cdr? ( cdda )
-"
-RDEPEND="
-	acct-user/mythtv
-	dev-libs/glib:2
-	dev-libs/lzo
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtsql:5[mysql]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-fonts/corefonts
-	media-fonts/dejavu
-	media-fonts/liberation-fonts
-	media-fonts/tex-gyre
-	media-gfx/exiv2:=
-	media-libs/freetype:2
-	media-libs/libsamplerate
-	media-libs/taglib
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	autostart? (
-		net-dialup/mingetty
-		x11-apps/xset
-		x11-wm/evilwm
-	)
-	bluray? (
-		dev-libs/libcdio:=
-		media-libs/libbluray:=[java?]
-		sys-fs/udisks:2
-	)
-	cec? ( dev-libs/libcec )
-	dvd? (
-		dev-libs/libcdio:=
-		media-libs/libdvdcss
-		sys-fs/udisks:2
-	)
-	egl? ( media-libs/mesa[egl] )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	hdhomerun? ( media-libs/libhdhomerun )
-	ieee1394? (
-		media-libs/libiec61883
-		sys-libs/libavc1394
-		sys-libs/libraw1394
-	)
-	jack? ( media-sound/jack-audio-connection-kit )
-	java? ( dev-java/ant-core )
-	lame? ( media-sound/lame )
-	lcd? ( app-misc/lcdproc )
-	libass? ( media-libs/libass:= )
-	lirc? ( app-misc/lirc )
-	nvdec? ( x11-drivers/nvidia-drivers )
-	opengl? ( dev-qt/qtopengl:5 )
-	pulseaudio? ( media-sound/pulseaudio )
-	systemd? ( sys-apps/systemd:= )
-	vaapi? ( x11-libs/libva:=[opengl] )
-	vdpau? ( x11-libs/libvdpau )
-	vpx? ( media-libs/libvpx:= )
-	x264? (	media-libs/x264:= )
-	X? (
-		x11-apps/xinit
-		x11-libs/libX11:=
-		x11-libs/libXext:=
-		x11-libs/libXinerama:=
-		x11-libs/libXrandr:=
-		x11-libs/libXv:=
-		x11-libs/libXxf86vm:=
-		x11-misc/wmctrl:=
-	)
-	x265? (	media-libs/x265 )
-	xml? ( dev-libs/libxml2:2 )
-	xmltv? (
-		dev-perl/XML-LibXML
-		dev-qt/qtwebkit:5
-		media-tv/xmltv
-	 )
-	xvid? ( media-libs/xvid )
-	zeroconf? (
-		dev-libs/openssl:=
-		net-dns/avahi[mdnsresponder-compat]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	opengl? ( virtual/opengl )
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="
-	${RDEPEND}
-	dev-lang/yasm
-	x11-base/xorg-proto
-	perl? (
-		dev-perl/DBD-mysql
-		dev-perl/DBI
-		dev-perl/HTTP-Message
-		dev-perl/IO-Socket-INET6
-		dev-perl/LWP-Protocol-https
-		dev-perl/Net-UPnP
-		dev-perl/XML-Simple
-	)
-	python? (
-		$(python_gen_any_dep '
-			dev-python/future[${PYTHON_USEDEP}]
-			dev-python/lxml[${PYTHON_USEDEP}]
-			dev-python/mysqlclient[${PYTHON_USEDEP}]
-			dev-python/simplejson[${PYTHON_USEDEP}]
-		')
-	)
-"
-python_check_deps() {
-	use python || return 0
-	has_version "dev-python/future[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/lxml[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/mysqlclient[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-30.0_p20190808-respect_LDFLAGS.patch"
-	"${FILESDIR}/${P}-Remove_ldconfig.patch"
-	"${FILESDIR}/${P}-Include_QPainterPath.patch"
-)
-
-# mythtv and mythplugins are separate builds in the github mythtv project
-S="${WORKDIR}/${P}/mythtv"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-If a MYSQL server is installed, a mythtv MySQL user and mythconverg database
-is created if it does not already exist.
-You will be prompted for your MySQL root password.
-
-A mythtv user is maintained by acct-user/mythtv. An existing mythtv user
-may be modified to the configuration defined by acct-user/mythtv.
-The mythtv user's primary group is now mythtv. (formerly video)
-An existing mythtv user may be changed which may alter some functionality.
-If it breaks mythtv you may need to (choose one):
-	* Restore the original mythtv user
-	* Create custom acct-user/mythtv overlay for your system
-	* Fix you system to use mythtv as daemon only (recommended)
-Failure to emerge acct-user/mythtv indicates that the existing mythtv user
-is customized and not changed. Corrective action (choose one):
-	* Ignore emerge failure
-	* Create custom acct-user/mythtv overlay for your system
-	* Fix you system to use mythtv as daemon only
-	* Delete existing user and try again (dangerous)
-
-Mythtv is updated to use correct FHS/Gentoo policy paths.
-Updating mythtv installations may report:
-	* mythtv is in use, cannot update home
-	* There was an error when attempting to update the home directory for mythtv
-	* Please update it manually on your system (as root):
-	*       usermod -d "/var/lib/mythtv" "mythtv"
-This can be ignored. The previous default was "/home/mythtv".
-Use caution if you change the home directory.
-
-To have this machine operate as recording host for MythTV,
-mythbackend must be running. Run the following:
-rc-update add mythbackend default
-
-Your recordings folder must be owned 'mythtv'. e.g.
-chown -R mythtv /var/lib/mythtv
-
-Want mythfrontend to start automatically?
-Set USE=autostart. Details can be found at:
-https://dev.gentoo.org/~cardoe/mythtv/autostart.html
-
-Note that the systemd unit now restarts by default and logs
-to journald via the console at the notice verbosity.
-"
-
-pkg_setup() {
-	use python && python-any-r1_pkg_setup
-	# The acct-user/mythtv package creates/manages the user 'mythtv'
-}
-
-src_prepare() {
-	default
-
-	# Perl bits need to go into vender_perl and not site_perl
-	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
-		-i "${S}"/bindings/perl/Makefile || die "Cannot convert site_perl to vendor_perl!"
-
-	# Fix up the version info when using the fixes/${PV} branch
-#	echo "SOURCE_VERSION=\"v${MY_PV}\"" > "${S}"/VERSION
-#	echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/VERSION
-#	echo "SOURCE_VERSION=\"${BACKPORTS}\"" > "${S}"/EXPORTED_VERSION
-#	echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/EXPORTED_VERSION
-}
-
-src_configure() {
-	local -a myconf
-
-	# Setup paths
-	myconf+=(--prefix="${EPREFIX}"/usr)
-	myconf+=(--libdir="${EPREFIX}"/usr/$(get_libdir))
-	myconf+=(--libdir-name=$(get_libdir))
-	myconf+=(--mandir="${EPREFIX}"/usr/share/man)
-
-	if use debug; then
-		myconf+=(--compile-type=debug)
-		myconf+=(--disable-stripping) # FIXME: does not disable for all files, only for some
-		myconf+=(--enable-valgrind) # disables timeouts for valgrind memory debugging
-	else
-		myconf+=(--compile-type=release)
-	fi
-
-	# Build boosters
-	has ccache "${FEATURES}" || myconf+=(--disable-ccache)
-	has distcc "${FEATURES}" || myconf+=(--disable-distcc)
-
-	# CPU settings
-	# Mythtv's configure is borrowed from ffmpeg,
-	# Bug #172723
-	# Try to get cpu type based on CFLAGS.
-	# 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 march) $(get-flag mcpu) $(get-flag mtune) ; do
-		[ "${i}" = "native" ] && i="host" # bug #273421
-		myconf+=(--cpu="${i}")
-		break
-	done
-	myconf+=($(use_enable altivec))
-
-	# Sound Output Support
-	myconf+=(
-		$(use_enable oss audio-oss)
-		$(use_enable alsa audio-alsa)
-		$(use_enable jack audio-jack)
-		$(use_enable pulseaudio audio-pulseoutput)
-	)
-
-	# Input Support
-	myconf+=(
-		$(use_enable lirc)
-		$(use_enable input_devices_joystick joystick-menu)
-		$(use_enable cec libcec)
-		$(use_enable ieee1394 firewire)
-		$(use_enable hdhomerun)
-		$(use_enable vbox)
-		$(use_enable ceton)
-		$(use_enable v4l v4l2)
-		$(use_enable ivtv)
-		$(use_enable hdpvr)
-		$(use_enable dvb)
-		$(use_enable asi)
-	)
-
-	# Video Output Support
-	myconf+=(
-		$(use_enable X x11)
-		$(use_enable X xrandr)
-	)
-
-	# Hardware accellerators
-	myconf+=(
-		$(use_enable nvdec)
-		$(use_enable vaapi)
-		$(use_enable vdpau)
-		$(use_enable opengl)
-		$(use_enable libass)
-	)
-
-	# System tools
-	myconf+=(
-		$(use_enable systemd systemd_notify)
-		$(use_enable systemd systemd_journal)
-		$(use_enable xml libxml2)
-		$(use_enable zeroconf libdns-sd)
-	)
-
-	# Bindings
-	if use perl && use python; then
-		myconf+=(--with-bindings=perl,python)
-	elif use perl; then
-		myconf+=(--without-bindings=python)
-		myconf+=(--with-bindings=perl)
-	elif use python; then
-		myconf+=(--without-bindings=perl)
-		myconf+=(--with-bindings=python)
-	else
-		myconf+=(--without-bindings=perl,python)
-	fi
-	use python && myconf+=(--python="${EPYTHON}")
-	myconf+=($(use_enable java bdjava))
-
-	# External codec library options (used for mythffmpeg and streaming transcode)
-	# lame is required for some broadcasts for silence detection of commercials
-	# default enable in IUSE with +lame
-	myconf+=(
-		$(use_enable lame libmp3lame)
-		$(use_enable xvid libxvid)
-		$(use_enable x264 libx264)
-		$(use_enable x265 libx265)
-		$(use_enable vpx libvpx)
-	)
-
-	# Clean up DSO load times and other compiler bits
-	myconf+=(--enable-symbol-visibility)
-	myconf+=(--enable-pic)
-
-	if tc-is-cross-compiler ; then
-		myconf+=(--enable-cross-compile --arch=$(tc-arch-kernel))
-		myconf+=(--cross-prefix="${CHOST}"-)
-	fi
-
-	myconf+=($(use_enable bluray libbluray_external))
-
-	# econf sets these options that are not handled by configure:
-	# --build --host --infodir --localstatedir --sysconfdir
-
-	einfo "Running ./configure ${myconf[@]} - THIS MAY TAKE A WHILE."
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-cxxflags="${CXXFLAGS}" \
-		--extra-ldflags="${LDFLAGS}" \
-		--qmake=$(qt5_get_bindir)/qmake \
-		"${myconf[@]}"
-}
-
-src_install() {
-	emake STRIP="true" INSTALL_ROOT="${D}" install
-	use python && python_optimize  # does all packages by default
-	dodoc AUTHORS UPGRADING README
-	readme.gentoo_create_doc
-
-	insinto /usr/share/mythtv/database
-	doins database/*
-
-	newinitd "${FILESDIR}"/mythbackend.init-r3 mythbackend
-	newconfd "${FILESDIR}"/mythbackend.conf-r1 mythbackend
-	if use systemd; then
-		systemd_newunit "${FILESDIR}"/mythbackend.service-28 mythbackend.service
-	fi
-
-	dodoc keys.txt
-
-	keepdir /etc/mythtv
-	fowners -R mythtv /etc/mythtv
-	keepdir /var/log/mythtv
-	fowners -R mythtv /var/log/mythtv
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/mythtv.logrotate.d-r4 mythtv
-
-	insinto /usr/share/mythtv/contrib
-	# Ensure we don't install scripts needing the perl bindings (bug #516968) Finding none is OK.
-	if ! use perl; then
-		find contrib/ -name '*.pl' -exec rm {} \;
-	fi
-	# Ensure we don't install scripts needing the python bindings (bug #516968) Finding none is OK.
-	if ! use python; then
-		find contrib/ -name '*.py' -exec rm {} \;
-	fi
-	doins -r contrib/*
-
-	# Install our mythfrontend wrapper which is similar to Mythbuntu's
-	if use wrapper; then
-		mv "${ED}/usr/bin/mythfrontend" "${ED}/usr/bin/mythfrontend.real" || die "Failed to install mythfrontend.real"
-		newbin "${FILESDIR}"/mythfrontend.wrapper mythfrontend
-		newconfd "${FILESDIR}"/mythfrontend.conf mythfrontend
-	fi
-
-	if use autostart; then
-		newenvd - 95mythtv <<- _EOF_
-			CONFIG_PROTECT=\"$(egethome mythtv)\"
-		_EOF_
-		insinto $(egethome mythtv)
-		newins "${FILESDIR}"/bash_profile .bash_profile
-		newins "${FILESDIR}"/xinitrc-r1 .xinitrc
-	fi
-
-	# Make Python files executable but not files named "__init__.py"
-	find "${ED}/usr/share/mythtv" -type f -name '*.py' -exec expr \( {} : '.*__init__.py' \) = 0 \; \
-		-exec chmod a+x {} \; || die "Failed to make python file $(basename ${file}) executable"
-
-	# Ensure that Python scripts are executed by Python 2
-	use python && python_fix_shebang "${ED}/usr/share/mythtv"
-
-	# Make shell & perl scripts executable
-	find "${ED}" -type f \( -name '*.sh' -o -name '*.pl' \) -exec chmod a+x {} \; || die "Failed to make script executable"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
-
-pkg_info() {
-	return
-}
-
-pkg_config() {
-	if [[ -e "${EROOT}"/usr/bin/mysql ]]; then
-		"${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql
-	fi
-}
diff --git a/media-tv/mythtv/mythtv-31.0-r2.ebuild b/media-tv/mythtv/mythtv-31.0-r3.ebuild
index 8c2640774db3..b45f36f1ae77 100644
--- a/media-tv/mythtv/mythtv-31.0-r2.ebuild
+++ b/media-tv/mythtv/mythtv-31.0-r3.ebuild
@@ -77,7 +77,7 @@ RDEPEND="
 		sys-libs/libavc1394
 		sys-libs/libraw1394
 	)
-	jack? ( media-sound/jack-audio-connection-kit )
+	jack? ( virtual/jack )
 	java? ( dev-java/ant-core )
 	lame? ( media-sound/lame )
 	lcd? ( app-misc/lcdproc )
diff --git a/media-tv/nvtv/Manifest b/media-tv/nvtv/Manifest
index 82ab74ffe27e..4acbdfbac27e 100644
--- a/media-tv/nvtv/Manifest
+++ b/media-tv/nvtv/Manifest
@@ -2,4 +2,4 @@ AUX nvtv.start 425 BLAKE2B 605018e20976a40736da4494cb6a5d5ec7efb57bcb711d9147d7d
 AUX respect-cflags.patch 865 BLAKE2B b146217e8d5bd7e5c9768d92e52be09de8f37f926ebd43e2d5ea6748c99f7dfaf3c679aa1eb9c4659514c86635ab9c82d6a9bdd5b75843cace6024870f642b7d SHA512 abe0a9ccce9c9a9a729aadf444c4bd91e7c94ab3c04817ad12fa471f77fb8fa54235ddc86c798fac94c988cfa58075d3bf2fc40ef26fdd3c629b6f81848951e5
 DIST nvtv-0.4.7.tar.gz 419564 BLAKE2B 95010c42162c790293b159eb3c43ebc436933f9126cce0130e0d2e616219a47173d12570a4fbb8a45d32f59a92314b8734bd51b83fcadbd22a1e1c1f7306d929 SHA512 086de916b3b783a2071906e8f2eb98009f2f73627dc75ee086bde9864de3fb18ddf6d981c56225ac3dca3c837ff3575deb2aeca042be4cca9dc7a876cc41282d
 EBUILD nvtv-0.4.7-r3.ebuild 809 BLAKE2B 31e68a4ecb3283eb5809c1031a3870b864ac86d5fe9bd16e043351e4a44d292ae831b73ba0dab47fcd658de7d101b479f80338f54c48490ecb9c5eeec7cf863f SHA512 81d83bd02fa21e36986ab3424fa2ba4b0ce1ce79dd9f08be54679e283e122e759489edd2546c0b99155dbc1690e40a2be72eb1151e8c95dc9b57998ce7bd5d85
-MISC metadata.xml 306 BLAKE2B 473e2fe51f275d4303e22d8fc32dbca9f023f58848aa05854db2b36f6eee2c8de264809f308744678f0de0c8bf89bc2f16e40cca8b087510a914132f6a95ed7e SHA512 fb364cfd967773a1db12aafedcae8812dba9413da3eea5513a29537733214ee128432296bc5a51a79ba72863b8344e8dcac657092d6b199e8c34f56052cc7d6d
+MISC metadata.xml 246 BLAKE2B 15ba29459d6511d137441b1188e200155bbb22ce25f8215043b06804c70f6effe7ec3f88f3deafb4f5629b2f2bd89c339d8ea23a420b5c21dda1675fc1255849 SHA512 f63aef306d24a7f661235409b5f1672788ea7057844b781d42b324552cdb6ff6f5ba462250f2581df696426335fa83950d0755832356c4799b45d988f3b59332
diff --git a/media-tv/nvtv/metadata.xml b/media-tv/nvtv/metadata.xml
index 3f29b9b27482..ca1f8c56f268 100644
--- a/media-tv/nvtv/metadata.xml
+++ b/media-tv/nvtv/metadata.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription>TV-Out for NVidia cards</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">nv-tv-out</remote-id>
 	</upstream>
diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index 47c8f06385d9..a64f207c041b 100644
--- a/media-tv/v4l-utils/Manifest
+++ b/media-tv/v4l-utils/Manifest
@@ -4,7 +4,7 @@ AUX v4l-utils-1.6.2-sysmacros.patch 1853 BLAKE2B ed1f474be9650b0b4e5812746499935
 DIST v4l-utils-1.10.1.tar.bz2 1352235 BLAKE2B 7ececae8ad5ebd999070b0c3626fdf5b0a4bc81562d2c2a712ff9625025d3e6c4ff664ba85998dedaa1ee77295d3cea39306305c20573c07156a07ec0ac8d10a SHA512 524bfd4e93e82f2dd55f0baa3e8be5850d4675b46fd0197b6d1287fc0d502c6b5c64bdf461af9630345f2d847d6aa5b6dc483693cee452da0b6729f156a5d98d
 DIST v4l-utils-1.16.6.tar.bz2 1893768 BLAKE2B f31cf794f6949fa2c1f45db8bae99a10a5fbc67af356889f636ab03cfd04011a82939a10f01145c56001b91655664530cfbda7d64c523752b8bb77159a1c80ab SHA512 f011218591e32b0ca3239373d9ea4739d7cfe3a6bef5f8a996253cea9b9d836ba488132e2a1b8f6f61cd69f1bcecc20e4b5c26f9c95a2a912e17c400b9fa9b58
 DIST v4l-utils-1.20.0.tar.bz2 2030419 BLAKE2B 218082b88c42dcb9da3dbdd81b184c0e7402ca7ba35678a2905e16c11db1fe7065a19ec84b5fd57e2ed4718965c3e8097f8e8bdd04a38a485716efe3ec62e42a SHA512 179ca8dbbf7af5fa4870b70f17645d7834fe6ba52670ae6b58473efa257db0cd812ce14f16574cc4491c0bcb218835e4c29f1354882a151687eecec97852fc63
-EBUILD v4l-utils-1.10.1.ebuild 1670 BLAKE2B 1d9d03cd1cbb0a59a570d42984155db7e6e9b9d59edb7fddaa644fd773150443b5ae7192def7368ef0cfe912470d3defbf5184e609df3dc4156186a5602f7385 SHA512 b8994091122f8498fa8ec7a0fa4a95b9ee7b49ad446facbdba4eb0abee8fc213364fd145bf87799e7a3b6484deae26b0f2ef9e08f4d7fdb9228dc63ac23b52d0
-EBUILD v4l-utils-1.16.6.ebuild 1899 BLAKE2B ee9875b6515d18728bbde8a5e1d8babe9c49403c9388286a2d746ad36d7f24900ff72c17b1a601cc07a11c3ae024e6c1c19b6125a84930c7952eb734dbf30d29 SHA512 e88848d6b0849f4049e71c968baf876046ed47d5673d08f4a6f020f04c9633bda772d918fabdfe37a07d354da8c4672080a3b95ce018982e95ed22661789b38e
+EBUILD v4l-utils-1.10.1.ebuild 1678 BLAKE2B eb2011a597123c47921bac2267279ff09c4af54682e7fa166ef7e1096d36534ae7f98bc820e4db8159c41efa672800ed7c39d7bffbd51a1ee41079e43bea8a9b SHA512 f1c5684c7f530bebc44dfff4e2265da131b41a8ca213636f92fa3270415536aa8ecb78cce2dbe3f6e80ab563cf3327e0b02e77f257ea95108e242cc77a53bb3d
+EBUILD v4l-utils-1.16.6.ebuild 1906 BLAKE2B 7fe8c527fedbe0dc969f4cf616b2a72948ebe84f9b6d460a708a2969c8802735a6a2dfb61781246b78cd78f4f43dd06f32105fb44d79149ce02e8ad68250e4cf SHA512 1af08108099c2eccda0f6ae054861cf4c33b79b05ccdf6c7260e55edeafb4d592f4625815cdb08c8450167a89e860e917273984f6aaa7f509fef6683e22ddf61
 EBUILD v4l-utils-1.20.0.ebuild 2067 BLAKE2B 6b5ee3a762345d2574258becfa815188868e78058fb700df786f8e1308d42ba3ff8e6cd0f66076273ae9503e009ef7ae299d3c161c5633a93b2e53a05e0a4257 SHA512 01c38429c9e2cca3c7d39599da9b35978d39c4f36c6c701612c1ce573d1e74f419f991957e702f5b1646088f3e7bf3b1699020d38a9866b85f3a1d07201b12b4
 MISC metadata.xml 322 BLAKE2B 0e97d8cbd1e3c9efd375500604308990419a8a1684241309406bf2516eab3b2c381c3efeb3838715c1f55fa72d906d9e7a05e6130619b7be0235621b63659f5d SHA512 e5f448069693b582de3044925082100a530a1c7e246b3d61a81accaa49918548a48f39b3785e96462c702361409b45d1aa95040dcdc33d742f45126d8531c9d2
diff --git a/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild b/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild
index e18fe0d18460..911dc9e62692 100644
--- a/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 ~sparc x86"
 IUSE="qt5 udev"
 
-RDEPEND=">=media-libs/libv4l-${PV}
+RDEPEND=">=media-libs/libv4l-${PV}[dvb(+)]
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
diff --git a/media-tv/v4l-utils/v4l-utils-1.16.6.ebuild b/media-tv/v4l-utils/v4l-utils-1.16.6.ebuild
index 5b1881372f23..9ce273040219 100644
--- a/media-tv/v4l-utils/v4l-utils-1.16.6.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.16.6.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc x86"
 IUSE="+bpf opengl qt5"
 
-RDEPEND=">=media-libs/libv4l-${PV}[jpeg]
+RDEPEND=">=media-libs/libv4l-${PV}[dvb(+),jpeg]
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5