gentoo resync : 28.07.2021

14 files changed, 27 insertions, 21 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index e3491c51d358..074add0037c3 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 e9ea837f8f58..a95b5a70f6a6 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 749 BLAKE2B 77a63a6f8736f96903cf9984a7b2afcac1240c4c2aae4824faf3851dfb6359825d4e2756d96f0b9e1de8554edeee42d144c4090029c93588df2d21e11ab9ece8 SHA512 1004d7144d6c76b9a2d520c74e8a23397de7395f4268195130d0c231c6cbcb7ed4a6646b07a60a93e822dd1fee3e3a4def5126ed769759f96a65665b44b75fb7
+EBUILD dtv-scan-tables-0_p20210430.ebuild 748 BLAKE2B 39534b202b27d74c88dcb1c3fd6dfacd07812a5532b50d8c63432a7d8b5e930d02166aaf31b97938216d364ea6fa2045fd827df2231b2135794da1b33df19670 SHA512 8dbd372b68e7de50081c8967c19413ba5ede97dd06afbe9c67ae49157f995296b3aefc6e969065e2bcd9fdec69dea2ae5bb333cfb5fbcf76f0145093164ab0c8
 EBUILD dtv-scan-tables-9999.ebuild 749 BLAKE2B c8354f3eb9dacaef712d03310899fa9d3f1141f462631a71701c13effbb9266e0441ae2be60b1b6d63ecf344c2e0d7ef50226a5625d48d99e96c5826b76eaecb SHA512 71c288a544feb26a214896dd51a697b4fd93768f03d0e4801e4d66fc5a7d3d2344164ea2f5058eb863eb6cbd723f566ad5a1293a149bd835006daabdad1182ad
 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
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 55e947d46ecc..175a2ff8088f 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/dvbtune/Manifest b/media-tv/dvbtune/Manifest
index 616f572b6506..3d4cb194cdd8 100644
--- a/media-tv/dvbtune/Manifest
+++ b/media-tv/dvbtune/Manifest
@@ -1,5 +1,5 @@
-AUX dvbtune-0.5-r1-gentoo.diff 470 BLAKE2B dee9019ca01042746a5abe7c9ab16d732aed8a55d85adb5541e748e84acef3cb4b34ce11d23036dc152ce738082625185c271a255aa6949a807f87ccf02d50a9 SHA512 0cefd5b9673e115cc360d72b211ef806ee16797443c35a78ecdc188c2c08eb4d54af7a1ca72526e18bae13de61f0126f5bc1eddcd7b0c9b5ed92ea46ae0b701e
+AUX dvbtune-0.5-r1-gentoo.diff 470 BLAKE2B f8539f72cfc3e8ba3a299aa01717c87cd8f12f6c3619cde1f156870b2cbe3788c279b071f1c4fed349721aa958218ce380b79d1f8f0ac7438510b3711a5ffab6 SHA512 ca68cd368483414e8ecbe61c706ddf1abc8a24af1bfb3131645f21b24e930597617613ac25b5cc9d330da131229eee1426b023dcf5fe1dffdb44651b2f6b5a11
 AUX dvbtune-0.5-stdint.patch 251 BLAKE2B 200e2663edb6fae39638e40c0cbccd256054796d605b2b00faa97b27dc45a02c023fce949d4482511d73cd5631bd90c77ac67e71350c3a29bc03205460ecd88f SHA512 2f7408cd2f98276363465ea892294c165e61232cbcd4aaae6a3e4b325a48a02ebc2083646388079a47585f097dc7e09ea5b616610850f0e4b592226a79cc70f0
 DIST dvbtune-0.5.tar.gz 20601 BLAKE2B 6e788e44c0c228506599a6a32baf527050e09d0802692ece635bf5432a47cb81f738be49c0577ceb4597f9da7ced6607ea102a6d04dfcf991c24b5a1b3db7532 SHA512 0c6e8b8b4185b1b63638f0eff3e07b2c5e4b3bb9d95debb1625973cec2293315754487702ba9f7ed6bd6a0a518b09c8333d9ac4cd40b61f56c311c3d624fd365
-EBUILD dvbtune-0.5-r1.ebuild 675 BLAKE2B ae13ddfab80654e15243102e2a9bfcfa22943e8c546f609357818da96af768574168e5b3c43dc593ff6b59b423ac4318db5cee2613a85f7ffab0228b2d4ecb35 SHA512 9eb185efc3660f7a22959a5acad85301794b00d23f4142c3bb9f4160ffb0c9b268ffee18b4af9095644f2d989ee19a9ce19a3dd101c37dff35de199b3ee6befd
+EBUILD dvbtune-0.5-r1.ebuild 707 BLAKE2B 2d3a5879f4965beb30f1250d50c67f552c5bb923527f90432aed8fe49f1a207a979b322b5ed8b3943eaf5c5b915db1c2b99de43c998268c4ffcf01698c5e2925 SHA512 a14d3b47eb2a684a435d67728cbdbe1fbdc22182272047e69458c5df7895ddaf9e8e9cffc971bee07ca76eeeae993e014f19f4b313038950ca5c71ee1fd49e72
 MISC metadata.xml 245 BLAKE2B 93ecb07b44a63a38bcbad0ea9783d8ac97a77a78c66e78941b16086522c2e07acd645544eba5c9d1a8efa0f1cb418e558501bd7b64f6e74dcfd9081b8632368e SHA512 d07141fde891b0f88b4f91ea7b4e7da644ad57f74ac7a9f3d43af56c387a9d06e4b995e18756222c77f8ca6d8fc6d83081806b77c19ded68dbc6fb6845af18e5
diff --git a/media-tv/dvbtune/dvbtune-0.5-r1.ebuild b/media-tv/dvbtune/dvbtune-0.5-r1.ebuild
index ccd198855ffc..e4cb2c114c24 100644
--- a/media-tv/dvbtune/dvbtune-0.5-r1.ebuild
+++ b/media-tv/dvbtune/dvbtune-0.5-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit epatch
+inherit toolchain-funcs
 
 DESCRIPTION="simple tuning app for DVB cards"
 HOMEPAGE="https://sourceforge.net/projects/dvbtools"
@@ -18,9 +18,15 @@ RDEPEND="xml? ( dev-libs/libxml2 )"
 DEPEND="${RDEPEND}
 	virtual/linuxtv-dvb-headers"
 
+PATCHES=(
+	"${FILESDIR}"/${PF}-gentoo.diff
+	"${FILESDIR}"/${PN}-0.5-stdint.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PF}-gentoo.diff
-	epatch "${FILESDIR}"/${PN}-0.5-stdint.patch
+	default
+
+	tc-export CC
 }
 
 src_compile() {
diff --git a/media-tv/dvbtune/files/dvbtune-0.5-r1-gentoo.diff b/media-tv/dvbtune/files/dvbtune-0.5-r1-gentoo.diff
index a615317eb1de..f1e097fd6d1b 100644
--- a/media-tv/dvbtune/files/dvbtune-0.5-r1-gentoo.diff
+++ b/media-tv/dvbtune/files/dvbtune-0.5-r1-gentoo.diff
@@ -1,11 +1,11 @@
 --- dvbtune-0.5/Makefile.orig	2006-01-06 13:01:11.973196250 +0100
 +++ dvbtune-0.5/Makefile	2006-01-06 13:01:46.667364500 +0100
-@@ -1,5 +1,6 @@
+@@ -1,5 +1,5 @@
  INCS=-I /usr/include/libxml2
 -CFLAGS= -Wall $(INCS)
+-CC=gcc
 +CFLAGS ?= -Wall
 +CFLAGS += $(INCS)
- CC=gcc
  all: dvbtune
  
 @@ -33,7 +33,7 @@
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index b167debf12df..d691a252d817 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -7,7 +7,7 @@ DIST kodi-19.1.tar.gz 52323919 BLAKE2B 6aa82632d2d70e5f84340c572b586e903e7dbc50c
 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-19.0.ebuild 10826 BLAKE2B a01747c2e2dea401db8d4bce2e56e99a50649e8a8569bf312313ae87c16118ff6e87f099ee3b58e2a43eb00d6e85f2de8a16746b7612e3982814a9a36f30cc2e SHA512 30778f1f101c9a2394228018d37a49e9df673a1a45f87451509d01640120468a64921e783027dc56cce9e82c88b66cbfdba461d585867f8778134a6519d809ac
+EBUILD kodi-19.0.ebuild 10825 BLAKE2B 2db7069c7227e410f68f6a6515b7cdf760cf0bfd1280d3090364ba4eeafdb1dcf592630c6e3982a5127cfdfa3c7d903fedec882ab9e4c293f00d5cf1ae2ea64d SHA512 695846caa55e872fc57eed1cb3164cd215bdf7abf712d2b1458bcd2caf26ab487b5b45590d0edc7a791783f64b0a9f1fd0cf945b5fc572fcb46a283290ae38b2
 EBUILD kodi-19.1.ebuild 10849 BLAKE2B e495f6d993b1eac98b46474796c8853af7e5f2a2c6d9dd9507192d0e6f2f23df7535e29a85f495f1f2aab21b6c51912510ea79da3145eacc3769820870b60875 SHA512 7bb755853d435c92309cf5ec173aa441a2b01e0fb72b362633f66d4033a61780d7eac5429f0a832239e1bfe6bcf267025b6f98ad974f24c7a8b37532d0788241
 EBUILD kodi-19.9999.ebuild 10804 BLAKE2B d77a7bb3afad0c675a17def818d899b3e8f81d4c0f94fb0d45dd0c90bb5152febe6efc645d39e4441a6facef3b381883cee2e549c2339f05849391cbfa49cd52 SHA512 9a640b98b70c05cc62d63619d05714b05526f049653dbe5daa5ca9d0015ca04eaff4207bf1c8c837a9938df075536a53027960c5865bf2cc3763ef010b115519
 EBUILD kodi-9999.ebuild 10881 BLAKE2B ac81af72568656ec7cfb9fa37479dea50b9f453301364798a57e8c2e34f3c1cc8ebdedb0218b5d600a8d90f015250f3ab23cef58c53305508afc370f94485609 SHA512 eb3138cb3263949b535d280c11df07ab975cae88832c089a33e329f002d4fa2204719d1aecadea2244e24581ae5e35087f58b23314b3ad3407a44dd104aab5ef
diff --git a/media-tv/kodi/kodi-19.0.ebuild b/media-tv/kodi/kodi-19.0.ebuild
index b1dc70eadc94..6a4031a28f17 100644
--- a/media-tv/kodi/kodi-19.0.ebuild
+++ b/media-tv/kodi/kodi-19.0.ebuild
@@ -26,7 +26,7 @@ else
 	MY_PV=${MY_PV/_rc/RC}
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm arm64 x86"
+	KEYWORDS="amd64 ~arm arm64 x86"
 	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
 fi
 
diff --git a/media-tv/plex-media-server/Manifest b/media-tv/plex-media-server/Manifest
index 680c72b79c94..8da3b9ea34b6 100644
--- a/media-tv/plex-media-server/Manifest
+++ b/media-tv/plex-media-server/Manifest
@@ -4,10 +4,10 @@ AUX plex-media-server.conf.d 216 BLAKE2B 094d0f6f7cdfa696ae47d7879c7459be5755dfe
 AUX plex-media-server.init.d 380 BLAKE2B 03d5737128390c13d914a94e8d861cf24abed92b2a5c672e72cd7dad8ed9a71ba7bccc28f06acaf5920be7d0b809746b6a8f4daffef4594830cf8ad5f071a2f5 SHA512 44ddd5a046851f77f550ff9f0bf158a3bce465101b5fdbd31b68ed64dc6c8e823f70c05b833f97101b4608256422ff4aa026114fac17f9e6e3670602ed9ef816
 AUX plexmediaserver 89 BLAKE2B c7866fce849e6ce2a15ec5a1550146072aa62d278ee47bf2ca70327babf5877750c0749d879e51bacc05ddd242d8a46c808665b9f299cee999dfa2d243ced073 SHA512 798a1736133339865aa1ffc6074720e84b28f3e3298c044019ec4959ba724f7a96dcbfcac29f1f39252cadb2a863a500423027970e5f2699e806bc4d532d9974
 AUX start_pms 1768 BLAKE2B c111f268535f03f1763c9a2f16ccc4a317f9540721a1c89e33306d6ad6d6ee34673d6a13326923c2fa399d1a3f7ad3e26c89d097de8f977a9ad7973c99dff811 SHA512 8c672a9de6f20c968869fb2bd643bdfe6d3e7ca6d89dfddfd5d7a4bc425a34e1b30ba711a0f0afd79df428df4151a59f18880cff7e0ef12df146421f299858c5
-DIST plexmediaserver_1.23.4.4805-186bae04e_amd64.deb 81419308 BLAKE2B df205474d640a6e6403e8c33f507a52bf2b1f5fd5352285e71357e0640a3e1ab644b0ed8e7ce2d01c30a4a657fab9601e4bf169bb520567550b0b182b988a1f3 SHA512 6e8febdfe7d3dbd7d00c76b5f8e10a72ec6fe5744602101adca4ea127147b6a0681f5207f1805b621bd9107ae0b15f8286b2e9e0ed96838378f29d888af52fd8
-DIST plexmediaserver_1.23.4.4805-186bae04e_i386.deb 74764294 BLAKE2B c4f1b978acd84d30d1685065e7eab7a87dec5c03d448c9d2ef378c57ed4f2dc9067379279cd97815e58a86690406fc8646be2f9bbdd552288782c14750ee1799 SHA512 55ed319e0a5e2290157cc800967ae26f80dcfa3c8476c0fb770a13069096ef8d88d9dd24cd8b7619828e5f2f17ac2ab2ca4ac0c748843e9af61866d4c60a45fd
 DIST plexmediaserver_1.23.5.4841-549599676_amd64.deb 81750100 BLAKE2B 2b8e110c6e4728607b9cdb033da97e71a124e19a0e05a14ef5053195a23d621efb4a7774a332899aaef471fd7bdc5ee88e958affdc11e268c907cfc0d845d830 SHA512 3c3ef651e512405f57ec8c794955937a9b571d5251efe66024dbccd982eeacf5417562037d9b970fdb9ac9f68fc3963b525537b9d42dc3d673b109a6ef18e370
 DIST plexmediaserver_1.23.5.4841-549599676_i386.deb 75095044 BLAKE2B 724a8f0c9d29c591759de8b2208ddcf1f6ec81aee0535939f95a11b2927c1c47545eb85de26ee41dd0e9ca021eeda00bde45fb6efe8bfc6c11e021f2fdd86eff SHA512 29ce137e93223b83960ac439314aec1f4c4ad78d392f48376faa3912023f4fd866005b14380b91eeacb1a3673f8b8ea464cd9ceff3ece2592190c32d24c9c8e8
-EBUILD plex-media-server-1.23.4.4805.ebuild 1897 BLAKE2B 63ce0a48bf86ba1d5f4872ec3185d16eaa99253947e658fc82d9124eae6622592330409e8efc1a447088ce8e1b3d527022e4dca59f66e6348fc69c1912039553 SHA512 af3741ea319bf7f2cf2e661f1c8f435ae667dcd09a5f2967bd28b2a46c1d29cf73d05ccf4c66a6180379889572fcb2bba3e66a1b868f788f8ee44b3a392c41ac
+DIST plexmediaserver_1.23.5.4862-0f739d462_amd64.deb 81567672 BLAKE2B af6df77cef72901a7483d25bc957d4f0d9bdf9ea3bd0f6822c31c1f2ba3e896b83d86892532da3335a361c3ee660321a70fdf2a532fdca3705e6d4e9c66493c7 SHA512 0e89067946aa77ef5df8b28618396171a1caac051a6109437edc71ed509fcc73bc175f084616f8abf73a4495eb624bad2b39c1c50eaa7bca1859bf3b57f691b6
+DIST plexmediaserver_1.23.5.4862-0f739d462_i386.deb 74930234 BLAKE2B 36c5b62317ee55bb585dd98f488f29191d9203f07d983936c4c7ed7c85dac5c6bd9cdf635658ebe6518e2d975391652b02253a569388252de74517e2f7c34bf5 SHA512 1f6284e22fc1de9f8e3ab6f6d9ec40d9cebac9e9babf1f25741f6b8c72d376a2479b894a5fd3bfd85db7b3d47314ab178ccc34bcbf021393d03059463cad9e58
 EBUILD plex-media-server-1.23.5.4841.ebuild 1897 BLAKE2B 7b06fd697dde210dee0e11d41517e05eb93ebd540a90b058e35105586c2b643d68e1b9b20fc7a38b6601493c8f056298e0d70c31a85fff110ae4237782ee74bd SHA512 b0c71fc246653aa7ad99ced412cb8a6683b00bb9e00f3ad8ce8999680048bc3c2b8834561443433f785fe332c5e71152627d6d626493829666a855fccd4f942b
+EBUILD plex-media-server-1.23.5.4862.ebuild 1897 BLAKE2B 2e54cc1e1622fb15414f94cc9af77f86ddffc6695f284ab528b8d938d64aeac89cb8289dcf2da1f9383db824129e68b0ec88d6375e8c89467f6c47344b07f52a SHA512 0337e16954efcb077fc3d2c019ea2791163398c4a064d2b9e25fa138df6cacbafc8d2d3f6e675f92ec50429cf7f5e6a3b9072a52ff45d7b716e49d6b71707230
 MISC metadata.xml 597 BLAKE2B ccb49cc2f1115157ace237440b8c59e4466eb96a4f3c274c13e275fa6564b5bb0506bc3e3d9bdee4d2385d151e1f1bf9e3e3b70c7e0400d884aa1fcb3f0a1522 SHA512 d33bfd6ff84128622666b9452b975879840b3b6d24e555536cb8daf98f41411000ea26754df7fb31a639749c9f9b4aca64ed7524fb48d918a74d30a003a19d04
diff --git a/media-tv/plex-media-server/plex-media-server-1.23.4.4805.ebuild b/media-tv/plex-media-server/plex-media-server-1.23.5.4862.ebuild
index 6a97c242b504..84b42f10133d 100644
--- a/media-tv/plex-media-server/plex-media-server-1.23.4.4805.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.23.5.4862.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit readme.gentoo-r1 systemd unpacker
 
-MY_PV="${PV}-186bae04e"
+MY_PV="${PV}-0f739d462"
 MY_URI="https://downloads.plex.tv/plex-media-server-new"
 
 DESCRIPTION="Free media library that is intended for use with a plex client"
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index f885b7fe4f7f..0b09cda370cc 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 3533 BLAKE2B 18fb2925ccf6793716bb6277133408c96e3cb5cd4183f0b8371eb9ab7d76210b8de9308ba9a1134d123774043ac67bdb0709e02aaba05856960b7a6a628e5251 SHA512 7ab0c624c8fec48ef1be809a692f9b29d0d5fd9bce70ee43bd4722777875752afef76e79edf2bf6695ab7e7a5b5dfb275dd680a6498cba96d58311e68ab84fae
+EBUILD tvheadend-4.2.8-r2.ebuild 3532 BLAKE2B c3d40f247309ffcbfd32549ae21fc48dceba715b3f0daf7990d3d14d545855eca2d7119fb93799ecf11e925ce9a29e4cf9cda1f97f5a260d480269f92bfd1627 SHA512 66a3f2de71fddb881be41cb65c8cdd00dac223bc6aa04cdc61d5c336058d818e708481758d2a7999f334a1ec1ef60fe28af83f9e4964be6e81c422b5d3ac95a9
 EBUILD tvheadend-9999.ebuild 4135 BLAKE2B 07f636e118cabae70d477bb09f979932af0ad7769eeaf354801ffbac18951be1387e39beedec3c7631f37bc594120fc8fca878a97ab73e59ecd526c3251056bf SHA512 473f5418b410cd2282596c56e72e47d195a0ce33826a4a025619506bfa3d272bb6edf6c33a149f40fe23045d4d23d574d7863ac4f3a14ce18c0b50efd1b7289d
 MISC metadata.xml 1445 BLAKE2B f71dc280d5fce7c0945939bcaf75d0d7f294aea6055c956b04e9e439199c2a6c107c800be6d18a0c58d154bdf7cdd0cd7d874e5cde5fc93f9b24160f536d21d8 SHA512 e26b94f14a619051e637b018d0f47ce86381821dd5207ba5b34429e0c0f83c55bfa9c37871e722af85719cf3e06322703d4709cbbd771b8f092efb8e85cb5b72
diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
index f78d37d3f769..6a3050a9e5ac 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/xmltv/Manifest b/media-tv/xmltv/Manifest
index 00f3245171d5..25d6e1a244f5 100644
--- a/media-tv/xmltv/Manifest
+++ b/media-tv/xmltv/Manifest
@@ -1,5 +1,5 @@
 DIST xmltv-0.5.70.tar.bz2 1274164 BLAKE2B 4a6cbf6bc2f8f113a91fc579afbfc69fc04aec020d386182f6fd78f9f8c18821d0dc09077cccb1ad30e6f0583f958210fbf717d356f1e47dcf785e5a85864dc4 SHA512 36dd497dc20d296ca984ad0a1ca19f471c97cac7bfe7c5d4baeaae7faea565c36103bea10e7a7ae813c1cfc35c7ac376299edd2bf01c4c5da981cb5cca13317c
 DIST xmltv-0.6.1.tar.gz 838051 BLAKE2B d4011ee31b56096ae275647e0cbd85b11c2edbc3d150208aa619900c9741ac3bed2a1255d778622883b3d24a32ce3b803f5719fdd2273549bafa31ebdcb1a887 SHA512 137dad875c6f7f77fb986b4662b411766424676df0a2422f3dc123c8cec4e1dff123ea68577add65c0e5bcf2d0bdf89d7fba0ed423502ec27e2aa82ec6b10bc2
 EBUILD xmltv-0.5.70.ebuild 5265 BLAKE2B d348aea253e6d6a9f9f23d462e5bfba6f0ab9bd0f71b41832583f87d6e81e3a3d655ebb3853a0dee48ab52d11967911870e22e81a9fdeede15cdfc37f82c91d9 SHA512 d3504aaa69166138922e3a955cf1e549739a4667fb680c34bc523f3e0958a37ec76e3d6bd28cea0be93eb253d16fed904af148680e189c55850d3c033f7b99bc
-EBUILD xmltv-0.6.1.ebuild 5931 BLAKE2B a1db08d09698f7f735f9041676101b7910b5861205be317fe0271218bf791e1195625456e9cfd920f5c86873bc886f58cf827cd2abd4d2817af917e56ee8f67e SHA512 3f7c0700591f99fbbbf338354d8657ea1ce71e27ced12848c2c6a5edc2b310bc3e7c1d7ba89d7e40042e396df65c4f7f85ffaa3bca32a8cafe07e35077e4e9df
+EBUILD xmltv-0.6.1.ebuild 5930 BLAKE2B eabe355301e78b16131bd9d7d1130c616074672cbf05f4c4d2649d5bd1bd455a788186e1d522f9b3144adf47001232602a21af1fe11cb177d7869d96fe4f7203 SHA512 c48c1758d9f590d6fd248958c6d597998fe6ab1ca49d7e45d9fa7773f326013100996887f92ce2adb5f77a0022dd04c8b33cff6bd31095264bf8dfbccd9b3350
 MISC metadata.xml 2715 BLAKE2B 217df2efea127bf288238afaffc6ce3ba08db1afeafbc84f01625b373bd09cb002f96c47d44d1f6c434ee60a200e262b913b561e0a81376dbd1a777bbe32f090 SHA512 6ae132d5075564c7d32d2230e0b6a029723266507ec9db2b7c756986421753f8ee8519fd0cf0b754250842563a91dc28d284a82ffc930c04c64d141b8e0fedf5
diff --git a/media-tv/xmltv/xmltv-0.6.1.ebuild b/media-tv/xmltv/xmltv-0.6.1.ebuild
index 25f9e877836c..f8d94fe30e2a 100644
--- a/media-tv/xmltv/xmltv-0.6.1.ebuild
+++ b/media-tv/xmltv/xmltv-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 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