16 files changed, 15 insertions, 312 deletions
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index b48e97f2149a..dad5c27c2950 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 32c2cada8b1a..b2f8a158b794 100644
--- a/media-tv/dtv-scan-tables/Manifest
+++ b/media-tv/dtv-scan-tables/Manifest
@@ -3,6 +3,6 @@ DIST dtv-scan-tables-2019-09-22-f07bde777d4d.tar.bz2 270211 BLAKE2B 76d5250a8eb7
 DIST dtv-scan-tables-2021-04-30-4181e93a30ab.tar.bz2 272870 BLAKE2B b9672235ad2ed826205278ffd06ed793126f743fe2b0b8af4369c1cb24825662e579f9246a287df1d61efad7985e2e18d59097d359fe84626149464bfc253bc5 SHA512 c15c07937cabefad731f4b3f8b6e9f993e500f7c59b17ef5e5c46f9bb86f9cbdf748f7d875c363c641ed9f3333a03b5033cc7d0272e96323d36be944ea35379d
 EBUILD dtv-scan-tables-0_p20171003.ebuild 737 BLAKE2B 239cd08dda04b32e1090c15edbea043c5319af646256c89389bb28f1dfaf32051365ee54b395932bea67fc31f13b0ed28b66edda834b0884c88bd0c1cbc3c821 SHA512 b75a884494995705e88bd2a5808e0671511487c3e3d9d891816034d24d285b31aad5a0d580e62a990c2ed158226da3f993babe6b75cdc71c10bb1489561610f6
 EBUILD dtv-scan-tables-0_p20190922.ebuild 749 BLAKE2B c8354f3eb9dacaef712d03310899fa9d3f1141f462631a71701c13effbb9266e0441ae2be60b1b6d63ecf344c2e0d7ef50226a5625d48d99e96c5826b76eaecb SHA512 71c288a544feb26a214896dd51a697b4fd93768f03d0e4801e4d66fc5a7d3d2344164ea2f5058eb863eb6cbd723f566ad5a1293a149bd835006daabdad1182ad
-EBUILD dtv-scan-tables-0_p20210430.ebuild 746 BLAKE2B 83ba513847bd299ca99387f7f56a0fbcf05ade2c146fd0977491af98acc8baa618c2f23a60a6d270926db0dbcd92dac48d9c362b72f5f195ab737c8dd8daa358 SHA512 ae2d6068e4d2e31213be498fcd6b69fc2a23670b1603276d66e213bd50624109d1e385725268dcc870d1408d86c836281352b6e48b0b7f282f96d333cf7703d5
+EBUILD dtv-scan-tables-0_p20210430.ebuild 745 BLAKE2B 5414b2207d57e8b475641302178849c578542cd9f5e602447849173db7b60636350b6a89e4545a786014197d02ee381c62310625cc477487fbe665494a04fe2f SHA512 de155cca135d59a4936353f7e92b0c330eadf083a1547544abd3c1e491424a8bbce66b0fc958baee99a3e92ca3f835cfc883e84c4396324d4be475d2ec09d725
 EBUILD dtv-scan-tables-9999.ebuild 749 BLAKE2B c8354f3eb9dacaef712d03310899fa9d3f1141f462631a71701c13effbb9266e0441ae2be60b1b6d63ecf344c2e0d7ef50226a5625d48d99e96c5826b76eaecb SHA512 71c288a544feb26a214896dd51a697b4fd93768f03d0e4801e4d66fc5a7d3d2344164ea2f5058eb863eb6cbd723f566ad5a1293a149bd835006daabdad1182ad
 MISC metadata.xml 248 BLAKE2B 97ed0d2320e1aa2d1cca6b63b0cf9cb07669ea73ac0dad7a8f7db4f510d3b2dc28cbf5a7c019f15ac87c25c5e51e619386694b49d21fc19f4092047c8e382287 SHA512 23bb29604f7cc644073025158d751004189a85fe6be88a7817afebad685c3b73f21cdb3e5d05f16699baa5d6b52f1e3a1f365b1ad7ea09bfcd204182e646f203
diff --git a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20210430.ebuild b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20210430.ebuild
index b406df7c9116..ed209bd82845 100644
--- a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20210430.ebuild
+++ b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20210430.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV#9999} != ${PV} ]]; then
 else
 	COMMIT="4181e93a30ab"
 	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 arm64 ~ppc x86"
+	KEYWORDS="amd64 arm arm64 ~ppc x86"
 	S="${WORKDIR}/usr/share/dvb"
 fi
 
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index d68f5cc8d062..3355ece37cdf 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -10,7 +10,7 @@ DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173
 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
 EBUILD kodi-19.0-r1.ebuild 10827 BLAKE2B 36f09ef533f53e7022fd3143eec46e3bb016e98b7d9a5649da8ad8b49f366fad469006f568ca17e18252dfa61aebf73bc0d72706aeb28f8234cb383be2254345 SHA512 e09aca92ca458f529273a9468c18be18beeb1144e65b6db2f3d289849c02b48f95792eb0847e93c18395dbba4296f2bb936e6766f9c7a7c5b352e6efa995290a
 EBUILD kodi-19.1-r1.ebuild 10850 BLAKE2B 79852614ea4a3fde03141edb4fceec64b7b00c5f8104b3df80c6f2bf11e6912b59bf2660effc4711ce2ff407fce8f3e751a31a80e52324d6bd0dec11cffb6583 SHA512 122a8a60ba9d1995d971e87e757d86fb1eaa95e380dcd2d12ca6ebf541b822ec98419bc5150c084b242eac3f2e152ac8d4789801bc90d91c946badc88dea21b7
-EBUILD kodi-19.2.ebuild 10836 BLAKE2B 03c56146a2a54c0f5624b6a4d7b4cebae6e8a7dadb5636634cd5a3591653754ef21823c65a0829f7b66ccfd3c39696b3ad0be9ff6d3c029efe0957df0236adc5 SHA512 a71b0d0fa0a9b4ce0523d4a83c0b2010aaa1ac4ec4ab093e46f1ddf4f1ed4b8145b09dce2794e9e150271a0bbf633b77a2860e2d7a84e583441d5b03cd972047
-EBUILD kodi-19.9999.ebuild 10836 BLAKE2B 03c56146a2a54c0f5624b6a4d7b4cebae6e8a7dadb5636634cd5a3591653754ef21823c65a0829f7b66ccfd3c39696b3ad0be9ff6d3c029efe0957df0236adc5 SHA512 a71b0d0fa0a9b4ce0523d4a83c0b2010aaa1ac4ec4ab093e46f1ddf4f1ed4b8145b09dce2794e9e150271a0bbf633b77a2860e2d7a84e583441d5b03cd972047
+EBUILD kodi-19.2.ebuild 10835 BLAKE2B 71045fccda99c818aefed48861006704a455bf9168d1e866d4a0dbecafb6ab7a3dc07ee16d826029d316f1b7d9ba7db4a326b6287b8f01dc5891a8efe4f74a41 SHA512 2c6812a2f86db7ece3d3625b46cae124878290b30316e3355bfe91a0501d1805b49eebed2f9d58af6a8f2445b170b8158f828555edc8edd24086ea085bccd6f6
+EBUILD kodi-19.9999.ebuild 10835 BLAKE2B 71045fccda99c818aefed48861006704a455bf9168d1e866d4a0dbecafb6ab7a3dc07ee16d826029d316f1b7d9ba7db4a326b6287b8f01dc5891a8efe4f74a41 SHA512 2c6812a2f86db7ece3d3625b46cae124878290b30316e3355bfe91a0501d1805b49eebed2f9d58af6a8f2445b170b8158f828555edc8edd24086ea085bccd6f6
 EBUILD kodi-9999.ebuild 10883 BLAKE2B bde5172b18271d7b694317013e1a10ee7a3fd8dab3dd33ae55d2814dbeaef8beee579c7c874dfa02f28c5938183b07f0815475077eb9ee4aa6e1d09b91ef2494 SHA512 b8652e57b708c213b92767d47855c03d5b1afcf198d0e725e3a91d09d8d6933ffd917ab5e0b3845abbbd840655c0138e8a3caf749f6d9fa191e139fe789c5a2e
 MISC metadata.xml 2763 BLAKE2B 6ec3b7c4eb4e0686de8f7cc0b8ead41538afe9c1cfb77952087a515647474797ee2901bd47a919c0634551196937d2810e624f0a5ecacd11afa0aaead88342a6 SHA512 c476b5108d33ce322f45268bdcbb224b045584f6b110fda25c074426dced4e87379d82b2c16bfe43157b882390e1cd5affa27da283e49c60e328a094eaa7e588
diff --git a/media-tv/kodi/kodi-19.2.ebuild b/media-tv/kodi/kodi-19.2.ebuild
index fa8cb42d4342..297409ecfaf0 100644
--- a/media-tv/kodi/kodi-19.2.ebuild
+++ b/media-tv/kodi/kodi-19.2.ebuild
@@ -26,7 +26,7 @@ else
 	MY_PV=${MY_PV/_rc/RC}
 	MY_PV="${MY_PV}-${CODENAME}"
 	MY_P="${PN}-${MY_PV}"
-	SRC_URI+=" https://github.com/xbmc/xbmc/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S=${WORKDIR}/xbmc-${MY_PV}
 fi
diff --git a/media-tv/kodi/kodi-19.9999.ebuild b/media-tv/kodi/kodi-19.9999.ebuild
index fa8cb42d4342..297409ecfaf0 100644
--- a/media-tv/kodi/kodi-19.9999.ebuild
+++ b/media-tv/kodi/kodi-19.9999.ebuild
@@ -26,7 +26,7 @@ else
 	MY_PV=${MY_PV/_rc/RC}
 	MY_PV="${MY_PV}-${CODENAME}"
 	MY_P="${PN}-${MY_PV}"
-	SRC_URI+=" https://github.com/xbmc/xbmc/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S=${WORKDIR}/xbmc-${MY_PV}
 fi
diff --git a/media-tv/linuxtv-dvb-apps/Manifest b/media-tv/linuxtv-dvb-apps/Manifest
index 2db581aaee89..391ad2be51a8 100644
--- a/media-tv/linuxtv-dvb-apps/Manifest
+++ b/media-tv/linuxtv-dvb-apps/Manifest
@@ -5,5 +5,5 @@ AUX linuxtv-dvb-apps-1.1.1.20140321-gcc10.patch 413 BLAKE2B 0d66160c487ef9f952e1
 AUX linuxtv-dvb-apps-glibc-2.31.patch 291 BLAKE2B b03833abf623175e9697a2745e9d99c7510b34e3823b42e4a394739d39a534cb4781a076879c85794fc4f9f703ded73778695b8334324186c4bafb3285d0dbb7 SHA512 efd1e8aa91cdcdff7f17856f13bb8689d3eb0288e2ff45c05bc55b44b32a137854c194cb3ee477a243b5377b44f221481e3323c9caa0065eb551cddf37a89c41
 AUX linuxtv-dvb-apps-no-ca_set_pid.patch 1004 BLAKE2B 36ab3817546d5a832473f4d69a2ce97642f3a6d7d8b17cb036d8976398274c4c9e040cb60a909e8f28f1ff25e6cfbb990dfe0b44b4c729b7e8abe30e645704bc SHA512 1cef92aee99ee03255115e1979b0342bbf9b45bd55c6f9ff6a8529edaf6f3a36c172a145c01706341486aae5d6e0a3fde52b535af97e020cb7009d23e0c9cf72
 DIST linuxtv-dvb-apps-1.1.1.20140321.tar.bz2 368759 BLAKE2B 5ef1bc4ee4f0ab167cda8d87a73c83566b40005e16fbaa79525af4fb0b117dec19a4883eedad8bcfedd269c2e295dd7f9e055f905dff5f39dffe1ff052e87547 SHA512 ceb057f760fa0b3902e6824e74b9392be9a7bd3318a1a83f206c99672da17904060ffdc35e84c89d3b8af60ac29d4427acad44e9ae16797baaeb5738e2ab1bf5
-EBUILD linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild 2254 BLAKE2B f68ef40fcab238ca6a44a746a8812cb5f1d4d20a0e9bbba7a1471e9e537ad39710e05fa68b355e3cc11e93ff1ebd5cbc93713f7238fe738e8fa85e992094afd8 SHA512 e668cd9b98701ac0af54cb4a5e45dcf1420bd763fa97591ffdddc21426f8583cc0c12055d214cf0b6660b7bb637b493f6924c0712f933d8d587d9bca27e577b7
+EBUILD linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild 2253 BLAKE2B f6f8fca8da15c34771ffb9840c47d60d9f7b3841a0736d6a722719fef244c99674c8941f4efce470a07bc2de37857ab901ff15d9f50c73baa9bf577151382ce4 SHA512 6907354b6d476acc7c74aba265967392bbdf40894bab17ce4f06c456591e2eadc58ea115e99e461dd219646e41d81645b44ae1ffc797254c02ed2c4b3fd0d308
 MISC metadata.xml 231 BLAKE2B b5dc028019638020965a9345da438ade5810c8573efbc39a05c4ad7f8271992c7a7bd46ea9724032078bf79ea23fe396cef68c1cafa889a36377865981c59ddf SHA512 bcee889112d8fb0374dd6de6c65ab3795d65390818416a6cb783d3adaeae012c186b972dfe5f285b3a8f82f18af5bb0430888fd90ce5bd6f703218aa9492f59b
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild
index bc87cd4d1982..ce54345e3aea 100644
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.linuxtv.org/hg/dvb-apps/archive/3d43b280298c.tar.bz2 -> ${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc x86"
+KEYWORDS="amd64 arm arm64 ppc x86"
 IUSE="alevt usb"
 
 RDEPEND="
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index bebda1533139..747f006eae1d 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -11,6 +11,6 @@ AUX tvheadend.confd 359 BLAKE2B 3b44e47b9216daaa2defa69254700693015619e8b0196060
 AUX tvheadend.initd 375 BLAKE2B 6fbf53a0a67957ee5756b56189d42b741adb7603b5590aa5fa0fd6b2a1d1ba930af05de8ebedba343302aa861f7fb42d3eb25b67acf6b43aa7c956d4965ab944 SHA512 6f17fa6bee502f586b4500c5f5541c9c6ce095deed7ddb3c1d1ad129a2e22fa66de0e72b712866659f7080753c73f67154d6dcdbf8539d6c8a942bea29bb1aa7
 AUX tvheadend.service 573 BLAKE2B e99853082623ca0522bf83aec4be33f2cdc62ba3e3e09bd22246f93c93d5342180be409ba9ad8f862830aca68ca0dbfafd3da0ecb9033e43d6a7e50a523c0bd8 SHA512 8f8e8f9feed45c20919bca402ef9179208a305cd7b06b47dfbbc368fc85d739c3dca2b53e6964bff10f8581cc4c8091660ac2be3b975d80941dc7a16cbb3fb49
 DIST tvheadend-4.2.8.tar.gz 21875281 BLAKE2B fdd99ca6aff56f8daa073394f9c58e9cba4ea988a2884e24c2288fd4870dd0460624fb700838ba92867a57473cc4133fed5fbd56f0e40f02a0878ffcd0642c00 SHA512 e629ffe1802e76b5121d5c22d11be86640f17816a5e902ed4842b2fd21df506d00d9caebafd931d71995e9d9049cb675c032478c9bed4f1ce82fc3f255f6166f
-EBUILD tvheadend-4.2.8-r2.ebuild 3530 BLAKE2B 4b887b29b81b2ff1ae5b4ff378541f654bdfc8e0631521583df8e7645b88f2d06b5d9c66fef7b858c1d9a17d0e3662a9ece86bedd31ea3d0d3f71ac2c6b317be SHA512 7573fa5a8344f44e6504a6c28b8ac048433bab783dce79da905a3bcc90d885a67d883d0b8bfa5bb508e25dafc5299f11769dbf20a9f5e0da0c03e003d6035c8b
+EBUILD tvheadend-4.2.8-r2.ebuild 3529 BLAKE2B a9b7b39b6c5d5445364632b35a488a8bfc45af4816fd5c137e459843b558bbf5f5286441bb7740a094502ab0f15a3cc04d94e4e7737e2b5abcdb0660277e5339 SHA512 f018cbbcdb47f34ddfba572343f48ad8c09af9fcbfa5430537f14b3e7858baf93d9f079c1891d8437f1356ddd0f41674b69a6984465bf269426b4fb653c2569a
 EBUILD tvheadend-9999.ebuild 4135 BLAKE2B 07f636e118cabae70d477bb09f979932af0ad7769eeaf354801ffbac18951be1387e39beedec3c7631f37bc594120fc8fca878a97ab73e59ecd526c3251056bf SHA512 473f5418b410cd2282596c56e72e47d195a0ce33826a4a025619506bfa3d272bb6edf6c33a149f40fe23045d4d23d574d7863ac4f3a14ce18c0b50efd1b7289d
 MISC metadata.xml 1446 BLAKE2B 622295d497db162d2a214c94187f0e15a9c23b8cc7d484255618f2bb3d10c5de9ecd9aaacbceeb05c27e5d53ffa2338fcd2678cdfdc386104033c1c57aa51c96 SHA512 5e34e61e7ecec9a997ece8b50f6a45f1158e203df0759e08e8d3735a4973baa795a556f9bcac1aaf8069cd25974655adc3f393c0f1670cf6e6a3762903d84759
diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
index dc2993fb7b90..28147deb7b63 100644
--- a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
 
 IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun +imagecache +inotify iptv satip systemd +timeshift uriparser xmltv zeroconf zlib"
 
diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index 57ad1ba69e5a..09a21b59cb50 100644
--- a/media-tv/v4l-utils/Manifest
+++ b/media-tv/v4l-utils/Manifest
@@ -1,4 +1,4 @@
 AUX v4l-utils-1.20.0-automagic.patch 1603 BLAKE2B f17cf8a132a96bf48abd33d8dab488c8acb58fe2fdba145c0457e331e0ab40cbc5710e11afb8443dcfd2bc752d8e331b36f4200886c32f9ddff56481633f5c67 SHA512 a603eae9b9bec5f45320cf66f8a6c8dfbc6070505bf0b250d1e4efa6530c7dce1656810c6bf63a83f20a0fd0e039c7150db13b2719947517505619e22b254c32
 DIST v4l-utils-1.20.0.tar.bz2 2030419 BLAKE2B 218082b88c42dcb9da3dbdd81b184c0e7402ca7ba35678a2905e16c11db1fe7065a19ec84b5fd57e2ed4718965c3e8097f8e8bdd04a38a485716efe3ec62e42a SHA512 179ca8dbbf7af5fa4870b70f17645d7834fe6ba52670ae6b58473efa257db0cd812ce14f16574cc4491c0bcb218835e4c29f1354882a151687eecec97852fc63
-EBUILD v4l-utils-1.20.0.ebuild 2447 BLAKE2B 0036ee1bef177cab6b6875b5b770d95f133ab6e1d77f2efdf985bed23ed006ef91769f0a6ca0afbd9e4a66fd93013c35942bcbd23b1788050dabce5956a09623 SHA512 c118c0ebb17ff7ba72df6a912373edf9204cb1ec01d9c3b58a2edafb2080a38f357d7927891be11ea69c81091b5b77ad2573d87beaef8c317858729188c78619
+EBUILD v4l-utils-1.20.0.ebuild 2446 BLAKE2B 39b9192ddee93f01b4ee75db9813a426b083ab302db54c0923fde944b843677146a8bec48cde8eb939ec97a90bba2ff1a491fc33cc73b85c8ae8b5f44ac68058 SHA512 c50f3149199bacfd770cc1ef241f0d621621b3867dc9911c0a9b778f0e6d1598eb844ee6c28ca2e1760e8145836614979ac6145b6dbec617f5f1a2102bc67c21
 MISC metadata.xml 323 BLAKE2B 79c864de29f9e92372f16bc835f1d260bc7de2c2c809c625806cc18611c50d992abc69de9b8754afa683fabd6a9422e4eb619d87490d4cf5ae1142f05af3557f SHA512 89ec71cc2961d7a6787e4d0e95c959823d1068602ea6cbeac7065ffe926e6c218ad7984c32271131e2624f49f314507cccf1a639e68e3669481d979dcc50bdc7
diff --git a/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild b/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
index 71e15ab03e4a..4965c6c3c704 100644
--- a/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ppc ~ppc64 ~sparc x86"
 IUSE="+bpf dvb opengl qt5 +udev"
 
 RDEPEND="
diff --git a/media-tv/xmltv/Manifest b/media-tv/xmltv/Manifest
index df1a4b6b95e7..ff2671f133d6 100644
--- a/media-tv/xmltv/Manifest
+++ b/media-tv/xmltv/Manifest
@@ -1,5 +1,3 @@
-DIST xmltv-0.6.1.tar.gz 838051 BLAKE2B d4011ee31b56096ae275647e0cbd85b11c2edbc3d150208aa619900c9741ac3bed2a1255d778622883b3d24a32ce3b803f5719fdd2273549bafa31ebdcb1a887 SHA512 137dad875c6f7f77fb986b4662b411766424676df0a2422f3dc123c8cec4e1dff123ea68577add65c0e5bcf2d0bdf89d7fba0ed423502ec27e2aa82ec6b10bc2
 DIST xmltv-1.0.0.tar.gz 780014 BLAKE2B dd39f77ebbaf321450db525b0c58401728ac1fece8e31e71a3d917fc72b914fbf9a471c2a77258f46a72913b2f86a84164576878dc28b38d3a77bdb9dab03494 SHA512 72df61cbcdfa7ba31d899b37e7f5308e845d263d8b9402c067bbd5761a7502ad7d272604a1d132337041a4d6bb2afa58a93b324239879294431108c1ac0ef09b
-EBUILD xmltv-0.6.1-r1.ebuild 5972 BLAKE2B 4e089470ce4aee09b85f8b2dca3f4df9da81b9ec352d92522e840622bd2a85a91c7d8b377188ae43e9ccf77c5ca75284bda30bfc0deb88260caa7c1724263239 SHA512 1375ca63cf2e18b9d23182dcd5799bce6e22e2dd843bf72f79cd8d6c1e8e0cfa3b07670fda72d2228e2e9e023eb0cb55d73700468bba5b64c330baa1091bd43e
-EBUILD xmltv-1.0.0.ebuild 5124 BLAKE2B db2598ed40dae82faa872c3052a3223405c980830da19794fcd702aa05bebddd2e3cb05e88d4d58620c52a1fcca49897f8922ed66e2a56e70968d3c94feb8804 SHA512 ff0053b3f96405064df7a9c4e637f06559b07c401adfc33f5ecf3723fd35b2036f94e9fd5920c9b5186ae5f7dc5cbe96e3094f8620918657275125e49e2b592c
-MISC metadata.xml 2443 BLAKE2B 9b757f8cc44780d11b7d046fb8013ff67292e6c1c92a49b4c58e8ab27e7daef58239f5d001bce5c76f3d41878c2bdcc2ce09a42d109e2adc08816adf3922c2af SHA512 f71f22fcf50da36cf2d80d9721511e18c8e3aaece46093d217b807147577b9e079a1eb8442762749f09e22a816e87f109dbdb858728e5bf6dc23bec8fdbe767c
+EBUILD xmltv-1.0.0.ebuild 5120 BLAKE2B da86471227e37128487b41916dae7a67cbe1da9fc30f8e0d5b5cb92ceb4a45cf918750f5c6a35e46e33313d23c86061b70c5eb743c119252907def07157e2d83 SHA512 ab35739c3cb5ccdc74087fcaa304094cb351a3108abcfaf39a5dacb277112db3e1a29a07cd7424fc670b85fe0fb783bafbaa6c080eb0d88fb3d01699813508f5
+MISC metadata.xml 1958 BLAKE2B eb4fe6e760882f5953097d65028dc105d65f70e6524cf30bdd484a083a955b5f6c85a7dece17290d0c9e5f1311cbd27bbac7e4be6787eadc0e4c46c6f444c056 SHA512 142aee0f79acc9dc26c206d5eb6b0ca9e764d567ab4e0876c0a00d2d1eb24430b95f07068e064098a2258b7db32d086443ea546c362ae4110e926cf40dc4ff40
diff --git a/media-tv/xmltv/metadata.xml b/media-tv/xmltv/metadata.xml
index a0f91caa55d6..700de9f2614c 100644
--- a/media-tv/xmltv/metadata.xml
+++ b/media-tv/xmltv/metadata.xml
@@ -12,31 +12,23 @@
 	<use>
 		<flag name="ar">Argentina tv listing grabber</flag>
 		<flag name="ch-search">Grabber for Switzerland</flag>
-		<flag name="dk">Denmark tv listing grabber</flag>
-		<flag name="dtvla">Latin America digital tv listing grabber</flag>
-		<flag name="eu-dotmedia">Grabber for Europe (xmltv.se / dotmedia)</flag>
 		<flag name="eu-epgdata">include fanart URLs for some European countries.</flag>
 		<flag name="eu-xmltvse">Grabbber for Europe [replaces eu-dotmedia and se-tvzon]</flag>
 		<flag name="fi">Finland tv listing grabber (0.6.1 add ampparit telsu)</flag>
 		<flag name="fi-sv">Grabber for Finland (Swedish)</flag>
 		<flag name="fr">France tv listing grabber</flag>
 		<flag name="huro">Hungarian tv listing grabber</flag>
-		<flag name="il">Israel tv listing grabber</flag>
 		<flag name="is">Iceland tv listing grabber</flag>
 		<flag name="it">Italy tv listing grabber (RUV)</flag>
 		<flag name="it-dvb">Italy tv listing grabber</flag>
 		<flag name="na-dd">North America tv listing grabber</flag>
 		<flag name="na-dtv">North America Direct TV grabber</flag>
 		<flag name="na-tvmedia">Grabber for North America (TVMedia)</flag>
-		<flag name="pt-meo">Grabber for Portugal (MEO)</flag>
 		<flag name="pt-vodafone">Grabber for Portugal (Vodafone)</flag>
-		<flag name="se-swedb">Sweden tv listing grabber</flag>
-		<flag name="se-tvzon">Sweden (tvzon.se) tv listing grabber</flag>
 		<flag name="tr">Turkey (Digiturk) tv listing grabber</flag>
 		<flag name="tv-check">enable GUI checking</flag>
 		<flag name="tv-combiner">enable grabbers combiner</flag>
 		<flag name="tv-pick-cgi">enable CGI support</flag>
-		<flag name="uk-bleb">Britain tv listing grabber</flag>
 		<flag name="uk-tvguide">UK and Ireland tv listing grabber using TV Guide website</flag>
 		<flag name="zz-sdjson">Grabber for schedulesDirect.org SD-JSON service (many countries)</flag>
 		<flag name="zz-sdjson-sqlite">Grabber for schedulesDirect.org SD-JSON service (sqlite DB)</flag>
diff --git a/media-tv/xmltv/xmltv-0.6.1-r1.ebuild b/media-tv/xmltv/xmltv-0.6.1-r1.ebuild
deleted file mode 100644
index b88c635fc279..000000000000
--- a/media-tv/xmltv/xmltv-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit perl-module
-
-DESCRIPTION="Set of utilities to manage TV listings stored in the XMLTV format"
-HOMEPAGE="http://wiki.xmltv.org/index.php/XMLTVProject https://github.com/XMLTV/xmltv"
-SRC_URI="https://github.com/XMLTV/xmltv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc x86 ~x86-linux"
-
-IUSE="ar ch-search dk dtvla eu-dotmedia eu-epgdata eu-xmltvse fi fi-sv fr
-huro il is it na-dd na-dtv na-tvmedia pt-meo pt-vodafone se-swedb se-tvzon tr
-tv-check tv-combiner tv-pick-cgi uk-bleb uk-tvguide zz-sdjson zz-sdjson-sqlite"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/Date-Manip
-	dev-perl/File-Slurp
-	dev-perl/JSON
-	dev-perl/libwww-perl
-	dev-perl/Lingua-Preferred
-	dev-perl/PerlIO-gzip
-	dev-perl/Term-ProgressBar
-	dev-perl/TermReadKey
-	dev-perl/XML-Parser
-	dev-perl/XML-TreePP
-	dev-perl/XML-Twig
-	dev-perl/XML-Writer
-	dev-perl/Unicode-String
-	virtual/perl-Memoize
-	virtual/perl-Storable
-	virtual/perl-IO-Compress
-	ar? (
-		dev-perl/DateTime
-		dev-perl/HTML-Parser
-		dev-perl/HTML-Tree
-		dev-perl/HTTP-Cookies
-	)
-	ch-search? (
-		dev-perl/HTML-Tree
-		dev-perl/HTML-Parser
-		dev-perl/HTTP-Cookies
-		dev-perl/URI
-	)
-	dk? (
-		dev-perl/DateTime
-		dev-perl/IO-stringy
-	)
-	dtvla? (
-		dev-perl/DateTime
-		dev-perl/HTML-Parser
-		dev-perl/HTML-Tree
-		dev-perl/HTTP-Cookies
-	)
-	eu-dotmedia? (
-		dev-perl/HTTP-Cache-Transparent
-		dev-perl/IO-stringy
-	)
-	eu-epgdata? (
-		dev-perl/Archive-Zip
-		dev-perl/DateTime
-		dev-perl/DateTime-Format-Strptime
-		dev-perl/HTML-Parser
-		dev-perl/HTTP-Message
-	)
-	eu-xmltvse? (
-		dev-perl/HTTP-Cache-Transparent
-		dev-perl/IO-stringy
-	)
-	fi? (
-		dev-perl/HTML-Tree
-		dev-perl/LWP-Protocol-https
-		dev-perl/URI
-	)
-	fi-sv? (
-		dev-perl/DateTime
-		dev-perl/HTML-Tree
-		dev-perl/IO-stringy
-	)
-	fr? (
-		dev-perl/DateTime
-		dev-perl/DateTime-TimeZone
-		dev-perl/HTML-Parser
-		dev-perl/HTML-Tree
-	)
-	huro? (
-		dev-perl/HTML-Parser
-		dev-perl/HTML-Tree
-	)
-	il? ( dev-perl/DateTime )
-	is? (
-		dev-perl/HTML-Parser
-		dev-perl/HTML-Tree
-		dev-perl/URI
-		dev-perl/XML-DOM
-		dev-perl/XML-LibXSLT
-	)
-	it? (
-		dev-perl/HTML-Parser
-		dev-perl/HTML-Tree
-		dev-perl/URI
-	)
-	na-dd? ( dev-perl/SOAP-Lite )
-	na-dtv? (
-		dev-perl/DateTime
-		dev-perl/HTTP-Cookies
-		dev-perl/URI
-	 )
-	na-tvmedia? ( dev-perl/XML-LibXML )
-	pt-meo? (
-		dev-perl/DateTime
-		dev-perl/XML-LibXML
-	)
-	pt-vodafone? (
-		dev-perl/DateTime
-		dev-perl/URI
-		dev-perl/XML-LibXML
-	)
-	se-swedb? (
-		dev-perl/HTTP-Cache-Transparent
-		dev-perl/IO-stringy
-		dev-perl/XML-LibXML
-	)
-	se-tvzon? (
-		dev-perl/XML-LibXML
-		dev-perl/IO-stringy
-		dev-perl/HTTP-Cache-Transparent
-	)
-	tr? (
-		dev-perl/DateTime
-		dev-perl/HTTP-Cache-Transparent
-		dev-perl/HTTP-Cookies
-		dev-perl/URI
-	)
-	uk-bleb? (
-		dev-perl/Archive-Zip
-		dev-perl/IO-stringy
-	)
-	uk-tvguide? (
-		dev-perl/DateTime
-		dev-perl/HTML-Tree
-		dev-perl/HTTP-Cache-Transparent
-		dev-perl/HTTP-Cookies
-		dev-perl/URI
-	)
-	zz-sdjson? (
-		dev-lang/perl
-		dev-perl/DateTime
-		virtual/perl-Digest-SHA
-		dev-perl/HTTP-Message
-		dev-perl/LWP-Protocol-https
-		dev-perl/Try-Tiny
-		dev-perl/XML-LibXML
-	)
-	zz-sdjson-sqlite? (
-		dev-lang/perl
-		dev-perl/DateTime
-		dev-perl/DateTime-Format-ISO8601
-		dev-perl/DateTime-Format-SQLite
-		dev-perl/DateTime-TimeZone
-		dev-perl/DBD-SQLite
-		dev-perl/DBI
-		virtual/perl-Digest-SHA
-		dev-perl/File-HomeDir
-		dev-perl/File-Which
-		dev-perl/List-MoreUtils
-		dev-perl/LWP-UserAgent-Determined
-		dev-perl/XML-LibXML
-	)
-	tv-check? (
-		dev-perl/Tk
-		dev-perl/Tk-TableMatrix
-	)
-	tv-combiner? ( dev-perl/XML-LibXML )
-	tv-pick-cgi? ( dev-perl/CGI )
-"
-
-PREFIX="/usr"
-
-pkg_setup() {
-	# Uses Data::Manip in various places which can fail
-	# if TZ is still set to Factory as it is in stock gentoo
-	# install media
-	export TZ=UTC
-}
-
-src_prepare() {
-	default
-	# Add revision number to version info.
-	# Remove the doc/COPYING file from documentation.
-	sed -i \
-		-e "s:\$VERSION = '${PV}':\$VERSION = '${PVR}':" \
-		-e "/^@docs/s:doc/COPYING ::" \
-		Makefile.PL || die
-}
-
-src_configure() {
-	# Must match the order of elements in @opt_components in Makefile.PL
-	make_config() {
-		# Never except default configuration
-		echo "no"
-
-		# Enable Agentina
-		usex ar
-		# Enable Switzerland Search
-		usex ch-search
-		# Enable Denmark
-		usex dk
-		# Enable Latin America
-		usex dtvla
-		# Enable Europe (DEPRECATED, xmltv.se / dotmedia)
-		usex eu-dotmedia
-		# Enable EU epgdata.com including fanart
-		usex eu-epgdata
-		# Enable Europe (xmltv.se / xmltvse)
-		usex eu-xmltvse
-		# Enable Finland
-		usex fi
-		# Enable Swedish listings in Finland
-		usex fi-sv
-		# Enable France
-		usex fr
-		# Enable Hungary and Romania
-		usex huro
-		# Enable Israel
-		usex il
-		# Enable Iceland
-		usex is
-		# Enable Italy
-		usex it
-		# Enable Italy from DVB-S stream
-		echo "no" # missing Linux::DVB
-		# Enable North America using DataDirect
-		usex na-dd
-		# Enable North America from directv.com
-		usex na-dtv
-		# Enable North America XMLTVListings.com
-		usex na-tvmedia
-		# Enable Portugal EPG from sappo.pt
-		usex pt-meo
-		# Enable Portugal EPG from Vodafone
-		usex pt-vodafone
-		# Enable Sweden
-		usex se-swedb
-		# Enable Sweeden Alternative (Repace with eu_xmltvse)
-		usex se-tvzon
-		# Enable Turkey
-		usex tr
-		# Enable UK fast alternative grabber
-		usex uk-bleb
-		# Enable UK/Ireland TV Guide
-		usex uk-tvguide
-		# Enable Schedules Direct JSON
-		usex zz-sdjson
-		# Enable Schedules Direct JSON (SQLite version)
-		usex zz-sdjson-sqlite
-		# rules to improve episode numbering
-		usex tv-check
-		# Enable combiner
-		usex tv-combiner
-		# Enable CGI support
-		usex tv-pick-cgi
-	}
-
-	pm_echovar=`make_config`
-	perl-module_src_configure
-}
-
-src_install() {
-	perl-module_src_install
-
-	if use tv-pick-cgi; then
-		dobin choose/tv_pick/tv_pick_cgi
-	fi
-}
-
-pkg_postinst() {
-	if use tv-pick-cgi; then
-		elog "To use tv_pick_cgi, please link it from /usr/bin/tv_pick_cgi"
-		elog "to where the ScriptAlias directive is configured."
-	fi
-}
diff --git a/media-tv/xmltv/xmltv-1.0.0.ebuild b/media-tv/xmltv/xmltv-1.0.0.ebuild
index b7f0b18388fb..9e11263f40e9 100644
--- a/media-tv/xmltv/xmltv-1.0.0.ebuild
+++ b/media-tv/xmltv/xmltv-1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/XMLTV/xmltv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc x86 ~x86-linux"
 
 IUSE="ar ch-search eu-epgdata eu-xmltvse fi fi-sv fr
 huro is it it-dvb na-dd na-dtv na-tvmedia pt-vodafone tr