gentoo resync : 11.05.2021

24 files changed, 19 insertions, 347 deletions

diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 041c2076ba45..062e8ef805e9 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/gst-plugins-chromaprint/Manifest b/media-plugins/gst-plugins-chromaprint/Manifest
index c34db30a2bac..e7d31edc3eef 100644
--- a/media-plugins/gst-plugins-chromaprint/Manifest
+++ b/media-plugins/gst-plugins-chromaprint/Manifest
@@ -1,3 +1,3 @@
 DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04
-EBUILD gst-plugins-chromaprint-1.16.3.ebuild 382 BLAKE2B 95239f7ea4be6315aa895518172e7fcc657727d4ee6b29ec0b63736af4a7c39c6ab219abb9c586af8c49d2f9deee44e573a7b89de3f2146dc9b72cbfbe817a97 SHA512 76b0558bbef0cd1c92d535f79b71affc92ec1e03d31197471ece1318efee5b230e6b6946ed85d779dc7525574193755f5f24685d5dfccb3e5bdeb0ec1532953f
+EBUILD gst-plugins-chromaprint-1.16.3.ebuild 381 BLAKE2B 0eb06ba9415acf88f88bfa92f7692614c73307e8897a2a91b59db9a41ce19dcf1b4976ca37ca2e0b43d32f2fd7de9fc1c81c32960140c16bc1a82519037f2c5a SHA512 a1bfe32c19e4c0452b83a4c606257a35eb03566de2576c012d40eeba64452c78f232bef158054340a2707662c5d29abdd052237b4bc6695cf551b8f0bd87b667
 MISC metadata.xml 493 BLAKE2B 2a86d0343178b353fec290f550a1442e2e1492e1e5bfb3bbbbc24a9f18cad04c12c582f5fb3deb5c845dd7633c2b6d0c30566ff86c68bd60635c49d0b46a8058 SHA512 2eba41dd2cd60d1101e79a68553188fd8d6a43711de3121e7ce230c1b09e598d3123aa2b1e65a415af80182848cc0ea17433a39b34d6d6cbeb8aa3f8644eee4c
diff --git a/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.16.3.ebuild b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.16.3.ebuild
index 53cb4ed7a4f7..c51c0c04279b 100644
--- a/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.16.3.ebuild
+++ b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.16.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Calculate Chromaprint fingerprint from audio files for GStreamer"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="media-libs/chromaprint[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/kodi-inputstream-ffmpegdirect/Manifest b/media-plugins/kodi-inputstream-ffmpegdirect/Manifest
index 07f3cd7dabf1..51c8fb55eba9 100644
--- a/media-plugins/kodi-inputstream-ffmpegdirect/Manifest
+++ b/media-plugins/kodi-inputstream-ffmpegdirect/Manifest
@@ -1,4 +1,4 @@
-DIST kodi-inputstream-ffmpegdirect-1.21.2.tar.gz 251804 BLAKE2B ea175882fd88f59655aad795d1bf17f6ab7b1d7c87a6d7709c9ee0b7a060feff6af2cbf26011d704bd245acf698e05fbde99cf16bb6dc2f68e22ca5359146a1d SHA512 fff88a6432bc2fc921faa8d5c5991fddbe5fedc3cd61041422a955d6d39a742f00a7dc9452ae2a3e3f4c5c9c566e9c9caf76ac7e84f99bb515d33c6a6ebc5b04
-EBUILD kodi-inputstream-ffmpegdirect-1.21.2.ebuild 949 BLAKE2B b3455c47c5ba05ceed17ec36b9ad7dd2945e5f8a1eb1e3483081ad85ae118ccc8dd6a124eb3676aceb993a24e4191b1cd4361c4d51086f8ad683f9d8c7158498 SHA512 b4dc908c9c95f9ac46ca1d3637fb9243d50654d99e8d08d36ee05431902f4011efe909ef339a43aa542250e73e91568de8c38230869d9ee9ed0d5b033bcda0ff
+DIST kodi-inputstream-ffmpegdirect-1.21.3.tar.gz 251832 BLAKE2B cbaa585a3c03afece8fec690f6a7677c9c80ec08130f987633f6327eefba577167fddc89fbae33bc3d3965a41e5f30d3b691625059e620f36a85ebf7155d7011 SHA512 19c70665b518c9e1231cc0f955ede3669c2b6b2e136a2082a49f52a9aa0b4cc93621f467613309c0d9091f13505b451c13ec4722fcbde2c70bb847fb881da9df
+EBUILD kodi-inputstream-ffmpegdirect-1.21.3.ebuild 949 BLAKE2B b3455c47c5ba05ceed17ec36b9ad7dd2945e5f8a1eb1e3483081ad85ae118ccc8dd6a124eb3676aceb993a24e4191b1cd4361c4d51086f8ad683f9d8c7158498 SHA512 b4dc908c9c95f9ac46ca1d3637fb9243d50654d99e8d08d36ee05431902f4011efe909ef339a43aa542250e73e91568de8c38230869d9ee9ed0d5b033bcda0ff
 EBUILD kodi-inputstream-ffmpegdirect-9999.ebuild 949 BLAKE2B b3455c47c5ba05ceed17ec36b9ad7dd2945e5f8a1eb1e3483081ad85ae118ccc8dd6a124eb3676aceb993a24e4191b1cd4361c4d51086f8ad683f9d8c7158498 SHA512 b4dc908c9c95f9ac46ca1d3637fb9243d50654d99e8d08d36ee05431902f4011efe909ef339a43aa542250e73e91568de8c38230869d9ee9ed0d5b033bcda0ff
 MISC metadata.xml 504 BLAKE2B c76c1e4a42638c9bdefd5c505de0a5fe31994d7a25ec2ee7e35af14c5c5ad4ad393a3d70e14275cd89a1286d2afcc32b26b659ba64569182a5902c521aef54bf SHA512 93585dda17a5955936376ae86c2f0efd32a9c67d9451321dcb2face19279f47e1190482bc0178524a812fb5647fd7adf97df1b942d289d52788361ef9e6c3e2c
diff --git a/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-1.21.2.ebuild b/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-1.21.3.ebuild
index cd932215b4d6..cd932215b4d6 100644
--- a/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-1.21.2.ebuild
+++ b/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-1.21.3.ebuild
diff --git a/media-plugins/kodi-pvr-iptvsimple/Manifest b/media-plugins/kodi-pvr-iptvsimple/Manifest
index adc7181d1718..6bde249f01fd 100644
--- a/media-plugins/kodi-pvr-iptvsimple/Manifest
+++ b/media-plugins/kodi-pvr-iptvsimple/Manifest
@@ -1,4 +1,4 @@
-DIST kodi-pvr-iptvsimple-7.6.2.tar.gz 191967 BLAKE2B 5fe341b1855d41c1e7264240a9c73ebfd6d8cd6a1f9e1b118389829d1fd353e5b07bc5d131bd0cf446715fcc967d5c1de01a07d60e5b65853a8878f44b49616d SHA512 052f700898e487b72b3fa1268edbd8f84fda9f527a953dbf45c2c35331504ec101b11f82dd3ba4991260074e7e93f3fe50ac41430c0f0977d34255694acfd3ab
-EBUILD kodi-pvr-iptvsimple-7.6.2.ebuild 776 BLAKE2B 3f732410c2799908207212bcc3db44a769c448e56d02d9ef965fca8e9fec915e467e4ed29a9402ef85feca32d9c9632646bef71766738f368ce3d6dbd7c8c88f SHA512 80c6d16b413c8d87cb15eca37e5d9f6a7d211f72f50e4c7ecfbab1e66c293bacc89550cbdc5c510776bf5c2669b6d9900d0e09174fba2df5bbdbccab912a0ad9
+DIST kodi-pvr-iptvsimple-7.6.4.tar.gz 192229 BLAKE2B 525e9534bc1e1f9db2f16b86f50b01373921e6633d59673c6b34e82044324786e4451900ad7b45dcaedd0722c9d090f57881bc561896feeeedaf3caf4169ad1a SHA512 b69d056665be86337d748f0ef6664d43b546d83b1e1e8d3185c50c9342d367dc87b7b291823f0d50d27039d70f59d0903c42bd05c8f171e4e965d32a4f79bdad
+EBUILD kodi-pvr-iptvsimple-7.6.4.ebuild 776 BLAKE2B 3f732410c2799908207212bcc3db44a769c448e56d02d9ef965fca8e9fec915e467e4ed29a9402ef85feca32d9c9632646bef71766738f368ce3d6dbd7c8c88f SHA512 80c6d16b413c8d87cb15eca37e5d9f6a7d211f72f50e4c7ecfbab1e66c293bacc89550cbdc5c510776bf5c2669b6d9900d0e09174fba2df5bbdbccab912a0ad9
 EBUILD kodi-pvr-iptvsimple-9999.ebuild 777 BLAKE2B 1f18d43d3ce74c2dffbba99b6ad31c572d5fc5235409ddfb864abc8b2dcb3e5c1b584d7c58fd34b6aee45503198361c5b0b1d90b3946be18ac7cc9429330c214 SHA512 98b61705920ca7daf65b16c5c38e10f7e0a832e2b91c8eee0a513f2f459591ddfdd59a4146eca101630a7ccf863218c8d5e593a4704ffa70eccb4c7133679328
 MISC metadata.xml 366 BLAKE2B 7e2c022e027a3c4d0c1f5d5aa889b390fa079d8c71b16ea773403b9bbce28c7dae01d370d741575255b20dd4b7cf1b9d3f58161ac271c8829ed26d65920f5876 SHA512 379194149299ccced43f0c2054ef9fd8c049e4d9397c062ece4dd2e517f1f10a670cf53626daf7f53261981ac346c38e7aed9ae0710527843051a2d861c7f655
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.2.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.4.ebuild
index 36d5b715c65a..36d5b715c65a 100644
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.2.ebuild
+++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.4.ebuild
diff --git a/media-plugins/kodi-pvr-nextpvr/Manifest b/media-plugins/kodi-pvr-nextpvr/Manifest
index 90d5bf8fda16..789dbe61c9aa 100644
--- a/media-plugins/kodi-pvr-nextpvr/Manifest
+++ b/media-plugins/kodi-pvr-nextpvr/Manifest
@@ -1,4 +1,4 @@
-DIST kodi-pvr-nextpvr-8.2.2.tar.gz 150133 BLAKE2B f1b320f407d84e4a03a4a0647c59ca6c0b984b4d23126966e7f97aef693b2b2689f4fe216929e054607cf04ec5e4ab00e96bcac4e5ad85b864af37cfc0ffcdfc SHA512 182728189279f4607219cc0d8da1534d271e3771f307ecb3e19c98c1421870ea69f541e7bcbd1a562e81667f32654d977f79fc01e6f3fb88e174f41af8c2fe0a
-EBUILD kodi-pvr-nextpvr-8.2.2.ebuild 668 BLAKE2B b37563bb5faa6c67c518869eb57534793b0dcdc8c9e9a87015fa900134b73c589a8c1256a9eaca5c98ffa2e73713f41931ab674ce4a9e108929f2a3edde8b61c SHA512 5870d672c0d7f2edc34078f5b7372e2beac1cda9b2e54d347e615209f6f0b600da4c2031931e1c881d8081a756a70e2b404ff35a575756ce7e873e0e55f82102
+DIST kodi-pvr-nextpvr-8.2.3.tar.gz 150375 BLAKE2B 56493c4f7cb1a42c5b792934ffe5495b8c8083fb12a262a96f47fcadab53a1acbb3c614bb3c507980860bf2cc0c54be374207bdeaf9bb6478991c299c960081a SHA512 6a0bc9e170726246fb46e6fee6c829c36afd570be98ae53901da7fd8a72c319887d8a179dc9b227b8ef0b1628767b7257ef650bc127598d1e1337328c2aa4842
+EBUILD kodi-pvr-nextpvr-8.2.3.ebuild 668 BLAKE2B b37563bb5faa6c67c518869eb57534793b0dcdc8c9e9a87015fa900134b73c589a8c1256a9eaca5c98ffa2e73713f41931ab674ce4a9e108929f2a3edde8b61c SHA512 5870d672c0d7f2edc34078f5b7372e2beac1cda9b2e54d347e615209f6f0b600da4c2031931e1c881d8081a756a70e2b404ff35a575756ce7e873e0e55f82102
 EBUILD kodi-pvr-nextpvr-9999.ebuild 669 BLAKE2B 2df674d0426fa7f3195e7ec54e507955811e2dd2d0d0ed70d2d7d61b43e466b15fa0a5539905f88b07159a3eb220e205c95daca2f42b0ed386ca4e2899f083cb SHA512 e25dda696230ab5f661277943e9265c4efb37091beabce465460893765f4758b6f5a72f88e9697c9bdfe6014f0638599db1c59226b9672dc387d9da1734992e1
 MISC metadata.xml 363 BLAKE2B 360045b62c00991268efd908e4d47cd2468232ce63afb72b10528ffaf853f5d467d4930415a0fc56360d9a7290a4e2a17225ac40b19f3d92998cfee0f47fafa9 SHA512 db285760307fda62a5e608534a3a5e531ff9a1efb6893450144f5d295b1e66b494f4daaabe41ffaf53da803f5be8ca9dd55dec7a5aa5bd118c37bd93ec2c9b9a
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.2.2.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.2.3.ebuild
index f1d5484de0ab..f1d5484de0ab 100644
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.2.2.ebuild
+++ b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.2.3.ebuild
diff --git a/media-plugins/vdr-dvbhddevice/Manifest b/media-plugins/vdr-dvbhddevice/Manifest
index 3ee008a2c9b6..aaaa43c8fd0a 100644
--- a/media-plugins/vdr-dvbhddevice/Manifest
+++ b/media-plugins/vdr-dvbhddevice/Manifest
@@ -3,5 +3,5 @@ AUX define_AUDIO_GET_PTS.patch 360 BLAKE2B 59b15a5667e71df36ffca863dbcc5952ee9cc
 DIST dvbhddevice-2.1.3_p20140115.tar.gz 40424 BLAKE2B 99d5fece7557c7c9f2b0174c9b1f01ac7628f0f0b6aa954f3e829de4653e10cbed6d0516b966f69737aff9ffafd224b3558bd868e972b64ab60c965ba569555a SHA512 29729325affec5e1330cf361a0c82ee5ef9f48f9a6a5032881b331a6451c05c8d99831c43e3eb08129053a7549dd4cd73a5e0afc6fe04d35956c8fecad48d2f4
 DIST vdr-dvbhddevice-2.2.0_p20180420.tar.bz2 37812 BLAKE2B 3a5e88f2dd6e94934fcc563cf8606ffb723126976a5effeac8f9e7c52bf12b0c16076987469ecc7f248792f99fc8e3d340242a287c5e9494eb594276afa4f591 SHA512 d04e836a70241594eed4c92ab4c9411f54b8f0e37745ab5a19955895fc5a9cc3e6c5408ad910630481523debf75ebee362a83d8ba73b309a42e73cdec3fe136e
 EBUILD vdr-dvbhddevice-2.1.3_p20140115.ebuild 842 BLAKE2B c487d9dc3d33893c57612bb0b0e29e0a2c3863675f4f0b2c45a1b62df449e07ecf7ad66a4f90febd8437ce6a822a396ad4aa6b8835aaa5bb38cea07edac5412b SHA512 ecda86c62b7f9049222f8714ce3e4d159e7d94cdb6ddf98669172c5ee2458d3c9245efd4127044d7feeb0b9de6da5251c7d98584c603f457c3cba12df4e0b8e6
-EBUILD vdr-dvbhddevice-2.2.0_p20180420-r1.ebuild 984 BLAKE2B b08658b4d128b427ca230e7853b1636ac19b120e50ee8438fece56fea2437a95ee1af65b5d059f3c4be48e8cefa381b50ac6f7fdef3e6ae5733c197a21b35369 SHA512 1bff1e9c0f08c271270bbca90b8bb39c2779b55aab11d014400e3716cd81433fe6ab0cd8d50633f70b9ab7730fb9a449c92b2e0e75b6f1b6f2e942308b55dad0
+EBUILD vdr-dvbhddevice-2.2.0_p20180420-r1.ebuild 987 BLAKE2B 6805845bc31d546f9ee7b3a13432fa17be0864c69b68bdb88b818aff558257bc6e887bb0d047190035c0e73eb41c382e3e9fa07090bec05698b2ad3793702d9a SHA512 29e7ef032e72123c2652e93a8571de3789a401ff97a8eba660a0e4df871d9891cf0765e7b530178b8e83d96574f1043f49de2f872795bc6916ee01a3d709a96e
 MISC metadata.xml 595 BLAKE2B d550a0ebbd3c4568def20da19be41a50cb73958c86366e5d441446e8a2a014ac3c574c41da973348b60b9b7278a7fd5e40c1c9eefbc0c4ef9afb77d6f2987e23 SHA512 e1c8bd64ee98248b93a6c94ccb1fe308fe2642d2d5bbbcaef0595177316ac8bf50a8b09c0ff05479d98dec66dcbe031050387ea1819fc5380c7ac31fefca1e4c
diff --git a/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.2.0_p20180420-r1.ebuild b/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.2.0_p20180420-r1.ebuild
index a09c42eaa3b1..a65778d443a2 100644
--- a/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.2.0_p20180420-r1.ebuild
+++ b/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.2.0_p20180420-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://bitbucket.org/powARman/dvbhddevice/get/${REVISION}.tar.bz2 ->
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=media-video/vdr-2.0.0"
 RDEPEND="${DEPEND}"
diff --git a/media-plugins/vdr-epgsearch/Manifest b/media-plugins/vdr-epgsearch/Manifest
index a5fe4452a068..b769c40c2f0e 100644
--- a/media-plugins/vdr-epgsearch/Manifest
+++ b/media-plugins/vdr-epgsearch/Manifest
@@ -5,5 +5,5 @@ AUX vdr-epgsearch-2.4.0_p20200402_clang.patch 1186 BLAKE2B 85dc9f066a907635c6335
 DIST vdr-epgsearch-2.2.0.tgz 472502 BLAKE2B f98053d95a6fe56aff48bd3e86ae8a37166b3b8556fe3500c956901cb3f8d19c5792b157606d372392b7387c05a72f4d664881a27bbd5b9484640d8de73b8673 SHA512 c0fef60069addc3cca82535c22b7e1f73f01de7466bc6d0b837ba34df7a7dd0fe2cbf7e9b9bc36a523a75a3db18889a1ff9040fb2647c889ea74666067c3a1e4
 DIST vdr-epgsearch-2.4.0_p20200402.tar.gz 479998 BLAKE2B 04e83bd2361743669baba7b10a27fab91f22115b81fe69e9252cc5ecd94fb0fda55d8b6ce3fcaeb08e779f07d46d26e37026d1732d6b38c03385c659eacd5ab0 SHA512 586b369a25c32bbf2d33e68997e7298ad7fda50ac78da5321c848a74d91753a51e6f47d70ef6893ca980bfa2c9f167defd611464729ca4ebf704247e8e37a065
 EBUILD vdr-epgsearch-2.2.0.ebuild 2304 BLAKE2B f5c4f3fbe477295ebb203d7edefcda859af50f76ed7ec7e18e814661e9c8cd037bf961f6f10874d1d59952e2ec34dc5f6cffcdd96c0227adef6c7c643a5a4c75 SHA512 e6ffcc191385616ba709499b80a9c54d9041648c3a2ea02c95cec877f84e0d949c47f5d9aa2d19e8b52a12387edf4b0f38f54ae9f10a6be2b1b2b1b1f14bf7ee
-EBUILD vdr-epgsearch-2.4.0_p20200402-r1.ebuild 2492 BLAKE2B 53afeefc9248ae9318c8fd48d67238d3df33cd938cc0f42dbf9b8477681903eedc043bb53fb079e473ef0f47bcb22825c1434edee2660c458739ee90029c5463 SHA512 3ec9992c40baef8f9a0e20a9591752c65b6f724428cef2d441d966f9dcc8bb4f88eb8f52a2b0c54385e1bb3a38e18f0ccb861e6bb500fd76395b6270b329341c
+EBUILD vdr-epgsearch-2.4.0_p20200402-r1.ebuild 2490 BLAKE2B d80bcfba86e4c19d3d6f1267d4b40b122faeccc59c7a5591488f2ea441f334df61a6496819997cad1fbfc92d6ba5fdce8595a46415942b10e67b3c1d409f594d SHA512 4cfe6ff1ba86a8bacbd3ec249815c4bc105046aa35b8d1befd9d6e8a9764527b7fb6c743c110c51f56132391371e83fb0b8486997d7973b4a43ce0e9bc5c34da
 MISC metadata.xml 846 BLAKE2B dc6acabb12fac7762e08746152b6c532f58a52f8a991261dd481b93a097218427e10c04a8f37488f796a8af9ca89f6caea45c7b842ea29a33a371ee401324fbc SHA512 ead246cb97042112c9ea8a979384060773f5369c3c78fd083da14271a7531202ba1bf32f3dff656ebb4ac9e06ec692dbf5e6ed0de9320d21458505452fdee375
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20200402-r1.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20200402-r1.ebuild
index cf3297423806..042aa1670c62 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20200402-r1.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20200402-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapsho
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="conflictcheckonly epgsearchonly pcre quicksearch tre"
 REQUIRED_USE="?? ( pcre tre )"
 
diff --git a/media-plugins/vdr-femon/Manifest b/media-plugins/vdr-femon/Manifest
index 1e49fd34dc80..9215019f5d7d 100644
--- a/media-plugins/vdr-femon/Manifest
+++ b/media-plugins/vdr-femon/Manifest
@@ -3,5 +3,5 @@ DIST vdr-femon-2.0.4.tgz 83985 BLAKE2B c83d5d6f173d5f98ee8ba874c2ed1743a659a19ba
 DIST vdr-femon-2.4.0.tar.gz 81485 BLAKE2B cd1644201b1da1d2b81c8d4d25c6d6bc84132fd750d778073317a026f5293afa17725ce48d14a781130a6b6c9ff742ba3d2c19a8f77887b9071d891bd271d95b SHA512 0c79f8d3427b7a2421393530a0c69e77e6841f9751dc70a7a8c970726d826bb2ab329f6375c38274d455ca33bacd2e18d65a3943ea52d1c562f0e8aa87f99f27
 EBUILD vdr-femon-2.0.4-r1.ebuild 581 BLAKE2B 210c36903ca7b8c214c90e61aca1aa67b7194ffb293ea026a269db13a62e26b9f83f7e99e985f3253af607c337c4bfa37ffabb215bd0ea072d931fc563ebfefe SHA512 fc2d85d70f1fbdbfa64dd2b2869a24f3c0dacb38e08c868e8dea4aa0128a32c04c9bd823984b441f05a1a1619759d9fccb4531afa0563874521e10f23d8e1909
 EBUILD vdr-femon-2.0.4.ebuild 451 BLAKE2B 55c34305354512ae731f51a58d22214c45fb90dec58e3b53a5d9b38a78ed80da9c828cdf7f26e35612d1cc17467d7bea8116502499cf935410a8ff227714d7e0 SHA512 26ea26b9e0b09aefce138657145c3d865463c4576a10d115507a7ab7ebc7f1d5829fea666c6fa14b6d57bd94ba022ea59d070071de2af60225b72508f78994a9
-EBUILD vdr-femon-2.4.0.ebuild 586 BLAKE2B 5ad2592e578ce0b1398783872bc21e4f32173a5c515c890eaa2319f9ef8911f203c5e77c98030dbb0525e22a049f84a8aabe7621c942120cc163d971339d14fb SHA512 884bfcffbfea845e56acc25c61cacf4af09f9dd47c9efa368d66d82b9e08cba1182bf5989d84a11c522e8509dbcf0eb8540f508f298f5bd89c4340cc53e5c78f
+EBUILD vdr-femon-2.4.0.ebuild 584 BLAKE2B addf764af876b354391088d58c42d93b2c712b66ebab1abb314ec8e5f4d8c4a0ee966fc143cc5141ea72a3fbf25100c892a1309a01091cd396f78afd5c4aa824 SHA512 18fcda14ab3c5715bb67c9cfa893fe01e71d40e3dec192efd357c4af5f72aa42aa05e135fbfb0abe27e94cdceccdfa61560af3f7b496987dbcf08e9c1bd3cbbf
 MISC metadata.xml 596 BLAKE2B 62dab1fcbfede1db3b085e189cd67f68b63691a2f1bca9c6e564dd72b3daa36133ada29cec2e03e695d64a6789026c0bca28712381dbb53297ffa275219482eb SHA512 a8f7b4269769153b5fa09e51b538df39c7ee9d1b3ac217d1c320e44f63cfb943a9097f9eaa7afaa78d13774143df19f4ab8203f50497a068149899e5832ccf5e
diff --git a/media-plugins/vdr-femon/vdr-femon-2.4.0.ebuild b/media-plugins/vdr-femon/vdr-femon-2.4.0.ebuild
index 3e85e24da1c6..5054eafc9775 100644
--- a/media-plugins/vdr-femon/vdr-femon-2.4.0.ebuild
+++ b/media-plugins/vdr-femon/vdr-femon-2.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rofafor/vdr-plugin-femon/archive/v${PV}.tar.gz -> ${
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 DEPEND=">=media-video/vdr-2.4.0"
 RDEPEND="${DEPEND}"
diff --git a/media-plugins/vdr-live/Manifest b/media-plugins/vdr-live/Manifest
index 801da0637acb..cf26ffeb0a9e 100644
--- a/media-plugins/vdr-live/Manifest
+++ b/media-plugins/vdr-live/Manifest
@@ -1,12 +1,5 @@
-AUX confd-0.2 467 BLAKE2B e827ae5ec7cdeb9211574f4402885aa487ba969e6ecf74f4c6e807b1eae78aa85fea236e682a83e9643c2154ed827ace4e9651dfa8332f918ae0f4eacd0d4854 SHA512 bea6f86cb590199def38df9ff4f462c6e0462d0623c5fdb6b416cffb49b9966ccbd7f364a52bfe702e1c638f3a97873e0ac019d246d3c84b88c58060ab004c51
 AUX confd-2.3 594 BLAKE2B e4e342ce5e7379d0a84ce67644a4011c2978140488f9f1a71c135bb769c8547d6362481526d7f51509e00250a10bb9e4d4a03fee64fa97db1819c5b45243a9db SHA512 d2fa96fdbe1a00fa9f1181b36fa43f2fd2f28a1d270671b8f6c422fc8309b625dc64b8425551d9ef9db2b0929d748555bfdca16349126f78f439c4fe366969e0
-AUX rc-addon-0.2.sh 489 BLAKE2B 770e03cb0dd21a66589a1838f19785d22378ea5fa6c9206c6ad0d0ec9a5bb86089d6b157758fa7d3d43532e2ffbe81853bdc62f0ecd51ec68940d1486d7b707b SHA512 f42c6e6e03ba33e15c02fc3b42faa15b822d78944c4e29432c230fbc75e636cac6ce64efbed0521965a4fc4054a1a9c9ced0e25a5e8b44fd16332dc5c5269ff2
 AUX rc-addon-2.3.sh 619 BLAKE2B a6d994ef6476f17ba558a778ce13a4a72d6c513d10cd2ce43dee8a7ea598682bbd83e27759f1e53644b7f4046274559cf5cc9614775c5d1b05934819b6262604 SHA512 c07a13a91f6f0d2f5ad990545875adac161a61d944053c19cf43e1252c18e9e98127cafc704d5a729dcbc887576f83ce78413deac8c35fad5962f1e769c36b93
-AUX vdr-live-0.3.0_p20130504_vdr-2.1.2.diff 2722 BLAKE2B 021d4470ec84e7912b57b79a706c977ddb1b5ce67880dbdcf0b4bbc5cce7ad3646d05e89d2b31791f91a4af137e8a3e5995ff79580a8db7d5347b7c5a69ceaf1 SHA512 813e17202fb9dd921e38492127ad8518fc4aa2f6240ce9284990bf3e0a40c04b3b56efcaf667ce5f4aedf9b6e76422e2bb73c3218d124f3d8452b3b7979ba0b2
-DIST vdr-live-0.3.0_p20130504.tar.bz2 6348021 BLAKE2B 64567a037dd283d005727b993053609e7c46784de67bcbd9afb4f68edd03cec494e6eca6c497ac578928de92c1d21b2519867c014cfd11ace79e957fc5d487d1 SHA512 7a238a4567f90448b7813366dbdb5112ab98079fd5a2c9d59d09273853fd62ad520ca9ad373704a8888eb7c25119772421fe998d87069647c40d6d2d869e09c1
-DIST vdr-live-2.3.1.tar.bz2 703327 BLAKE2B 70724894a4abf2f94d682602d722b3d015cefefa7c9daf2dae35fc84bff1d950539c916d6d97e39565e87e8e7d841277ad14e137238026b25f73b1b288fa18f5 SHA512 f943c2aa477ca943b2015eb0b49a650e5c9e5cc124549b68d36b56a0ae6344a8d32ac3c4f213ab3cb91794ae569d3ed14a84168f45bf395e90536992078bce41
 DIST vdr-live-3.0.6.tar.gz 737583 BLAKE2B e9fd7f95df7c3fcd11e9e63131c948c1d318e2bb0c5cbc2fab950abc2889df8ca8a33b71f5394b3c22c45f81ee1faf1bf71ca889ae64173be8965db6f6fbd8ac SHA512 f60cd14c3a02eeb571ffc181dabd83dd0af0595d378ed34bc9cee1d54b560d74027c758d3b4d69541a71dc6f94b5f64e3972fc51aeb5a9d688be7656636bcf98
-EBUILD vdr-live-0.3.0_p20130504-r1.ebuild 2486 BLAKE2B eaf2d48c9dd475f34862e7094a4e2af307359760d69688a521c7ca0eeddebb3a4aab01dd2a00026af01e20aa1b1d8bc6bd0d34efd667110e3093418dd4a05fcc SHA512 88d5f9146373fca41978bc0c62d92f7837629c4b4f7970c987a4b56b9a9ae9ad7c5bf52ce42fbe9fb94387a0794fd9144dc87e1f5cc9cd663fa2932b74b311e1
-EBUILD vdr-live-2.3.1.ebuild 2352 BLAKE2B 6460630ff44ad6a8116fe26f0248d3092b321c9f5ab1376d230ba6fdd21713d1568844b69b84cbf4fa77cb49159eb9354bc6b9f096c4f5fae00d329dc4d9da88 SHA512 2b36ef5c6aea1c43a9a6cf5a69daac89c39e394b59520f0620268691b186c6c574e84325b2bdd6acc45cc33fa0fccfa11522dec66703072040221feceb8b66a8
-EBUILD vdr-live-3.0.6.ebuild 2128 BLAKE2B f8ee7b7c7cc4eeca76dfcc91e5dbddf25083089fd2e23792204edc3d784720912454bf250d43665745c43bb3fd6137723ef1f319b931f880ae21a9decdc8d8ba SHA512 66afe84bf4b350b456dda35e5101059aba3d14c3210a5ab138731ec7e8372735bbf7cb1cd02a158878f957d41880a515a1a0c2f227b5a24bef26e87256399ce6
+EBUILD vdr-live-3.0.6.ebuild 2127 BLAKE2B 764eeb71dfd4ca21bad3ce08ca24b36e6232eef77d547d655282daf550c2e9e7907673445ef616c1a5f87373e0634b3880cb17572cedbc7c6205fb30f5235d7e SHA512 0595d1c8ffd7ec5ab53495b7b4367f0846e14a0895f329c2214847726721d0153b61ae01729b07a216934ea28c6838a52f23a9a00269dab0488bc732b2f84702
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-live/files/confd-0.2 b/media-plugins/vdr-live/files/confd-0.2
deleted file mode 100644
index bbbbcb5e9d42..000000000000
--- a/media-plugins/vdr-live/files/confd-0.2
+++ /dev/null
@@ -1,23 +0,0 @@
-# configuration of media-plugins/vdr-live
-
-# for people who want more secure
-# with ssl access.
-#	on usage, you have to install vdr-live
-#	with USE="ssl"
-#
-#	SSL ADDRESS -->  https://<your-ip>:8443/
-#
-#	allowed values: yes no
-#	default: no
-#LIVE_USE_SSL="yes"
-
-# default given portnumber
-# only changes needed on problems
-#
-#LIVE_PORT="8008"
-#LIVE_SSL_PORT="8443"
-
-# bind to these IP addresses
-# default, your IP will automaticly detected
-#
-LIVE_BIND_IPS="127.0.0.1"
diff --git a/media-plugins/vdr-live/files/rc-addon-0.2.sh b/media-plugins/vdr-live/files/rc-addon-0.2.sh
deleted file mode 100644
index 54d37d795ea2..000000000000
--- a/media-plugins/vdr-live/files/rc-addon-0.2.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# zzam@g.o
-# hd_brummy@g.o
-
-
-plugin_pre_vdr_start() {
-	if [ "${LIVE_USE_SSL:=no}" = "yes" ]; then
-		if [ -n "${LIVE_SSL_PORT}" ]; then
-			add_plugin_param "-s ${LIVE_SSL_PORT}"
-		fi
-
-		add_plugin_param "--cert=/etc/vdr/plugins/live/live.pem"
-		add_plugin_param "--key=/etc/vdr/plugins/live/live-key.pem"
-
-	else
-		if [ -n "${LIVE_PORT}" ]; then
-			add_plugin_param "-p ${LIVE_PORT}"
-		fi
-	fi
-
-	local ip
-	for ip in ${LIVE_BIND_IPS:=`hostname -i`}; do
-		add_plugin_param "-i ${ip}"
-	done
-}
diff --git a/media-plugins/vdr-live/files/vdr-live-0.3.0_p20130504_vdr-2.1.2.diff b/media-plugins/vdr-live/files/vdr-live-0.3.0_p20130504_vdr-2.1.2.diff
deleted file mode 100644
index 1346c9be611d..000000000000
--- a/media-plugins/vdr-live/files/vdr-live-0.3.0_p20130504_vdr-2.1.2.diff
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -Naur vdr-live-0.3.0_p20130504.orig/pages/recordings.ecpp vdr-live-0.3.0_p20130504/pages/recordings.ecpp
---- vdr-live-0.3.0_p20130504.orig/pages/recordings.ecpp	2013-10-23 03:28:13.746493449 +0200
-+++ vdr-live-0.3.0_p20130504/pages/recordings.ecpp	2013-10-23 03:29:48.779832793 +0200
-@@ -79,7 +79,11 @@
- deletions.clear();
- 
- int FreeMB, UsedMB;
-+#if APIVERSNUM > 20101
-+int Percent = cVideoDirectory::VideoDiskSpace(&FreeMB, &UsedMB);
-+#else
- int Percent = VideoDiskSpace(&FreeMB, &UsedMB);
-+#endif
- int Minutes = int(double(FreeMB) / MB_PER_MINUTE);
- int Hours = Minutes / 60;
- Minutes %= 60;
-diff -Naur vdr-live-0.3.0_p20130504.orig/recman.cpp vdr-live-0.3.0_p20130504/recman.cpp
---- vdr-live-0.3.0_p20130504.orig/recman.cpp	2013-10-23 03:28:13.756493450 +0200
-+++ vdr-live-0.3.0_p20130504/recman.cpp	2013-10-23 03:31:25.813172263 +0200
-@@ -112,7 +112,11 @@
- 		if (found == string::npos)
- 			return false;
- 
-+#if APIVERSNUM > 20101
-+		string newname = string(cVideoDirectory::Name()) + "/" + name + oldname.substr(found);
-+#else
- 		string newname = string(VideoDirectory) + "/" + name + oldname.substr(found);
-+#endif
- 
- 		if (!MoveDirectory(oldname.c_str(), newname.c_str(), copy)) {
- 			esyslog("[LIVE]: renaming failed from '%s' to '%s'", oldname.c_str(), newname.c_str());
-diff -Naur vdr-live-0.3.0_p20130504.orig/tools.cpp vdr-live-0.3.0_p20130504/tools.cpp
---- vdr-live-0.3.0_p20130504.orig/tools.cpp	2013-10-23 03:28:13.799826786 +0200
-+++ vdr-live-0.3.0_p20130504/tools.cpp	2013-10-23 03:34:29.146517191 +0200
-@@ -365,7 +365,11 @@
- 			stat(source.c_str(), &st1);
- 			stat(target.c_str(),&st2);
- 			if (!copy && (st1.st_dev == st2.st_dev)) {
-+#if APIVERSNUM > 20101
-+				if (!cVideoDirectory::RenameVideoFile(source.c_str(), target.c_str())) {
-+#else
- 				if (!RenameVideoFile(source.c_str(), target.c_str())) {
-+#endif
- 					esyslog("[LIVE]: rename failed from %s to %s", source.c_str(), target.c_str());
- 					return false;
- 				}
-@@ -461,7 +465,11 @@
- 						size_t found = source.find_last_of(delim);
- 						if (found != std::string::npos) {
- 							source = source.substr(0, found);
-+#if APIVERSNUM > 20101
-+							while (source != cVideoDirectory::Name()) {
-+#else
- 							while (source != VideoDirectory) {
-+#endif
- 								found = source.find_last_of(delim);
- 								if (found == std::string::npos)
- 									break;
-@@ -478,7 +486,11 @@
- 					size_t found = target.find_last_of(delim);
- 					if (found != std::string::npos) {
- 						target = target.substr(0, found);
-+#if APIVERSNUM > 20101
-+						while (target != cVideoDirectory::Name()) {
-+#else
- 						while (target != VideoDirectory) {
-+#endif
- 							found = target.find_last_of(delim);
- 							if (found == std::string::npos)
- 								break;
diff --git a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild b/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild
deleted file mode 100644
index 3d0c535fa2fd..000000000000
--- a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic vdr-plugin-2 ssl-cert
-
-DESCRIPTION="VDR Plugin: Web Access To Settings"
-HOMEPAGE="http://live.vdr-developer.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-		https://dev.gentoo.org/~hd_brummy/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2 RSA"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pcre ssl"
-
-DEPEND="media-video/vdr
-	>=dev-libs/tntnet-2.2.1[ssl=]
-	>=dev-libs/cxxtools-2.2.1
-	pcre? ( >=dev-libs/libpcre-8.12[cxx] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}"
-
-VDR_CONFD_FILE="${FILESDIR}/confd-0.2"
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.2.sh"
-
-KEEP_I18NOBJECT="yes"
-
-make_live_cert() {
-	# TODO: still true?
-	# ssl-cert eclass creates a "invalid" cert, create our own one
-	local base=$(get_base 1)
-	local keydir="/etc/vdr/plugins/live"
-
-	SSL_ORGANIZATION="${SSL_ORGANIZATION:-VDR Plugin Live}"
-	SSL_COMMONNAME="${SSL_COMMONNAME:-`hostname -f`}"
-
-	echo
-	gen_cnf || return 1
-	echo
-	gen_key 1 || return 1
-	gen_csr 1 || return 1
-	gen_crt 1 || return 1
-	echo
-
-	install -d "${ROOT}${keydir}"
-	install -m0400 "${base}.key" "${ROOT}${keydir}/live-key.pem"
-	install -m0444 "${base}.crt" "${ROOT}${keydir}/live.pem"
-	chown vdr:vdr "${ROOT}"/etc/vdr/plugins/live/live{,-key}.pem
-}
-
-src_configure() {
-	# tmp. disabled gcc -std=c++11, due massiv compile errors
-	filter-flags -std=c++11
-}
-
-src_prepare() {
-	# remove untranslated language files
-	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nl_NL,nn_NO,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po
-
-	vdr-plugin-2_src_prepare
-
-	epatch "${FILESDIR}/${P}_vdr-2.1.2.diff"
-
-	if ! use pcre; then
-		sed -i "s:^HAVE_LIBPCRECPP:#HAVE_LIBPCRECPP:" Makefile || die
-	fi
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	insinto /usr/share/vdr/plugins/live
-	doins -r live/*
-
-	fowners -R vdr:vdr /usr/share/vdr/plugins/live
-}
-
-pkg_postinst() {
-	vdr-plugin-2_pkg_postinst
-
-	elog "To be able to use all functions of vdr-live"
-	elog "you should emerge and enable"
-	elog "media-plugins/vdr-epgsearch to search the EPG,"
-	elog "media-plugins/vdr-streamdev for Live-TV streaming"
-
-	elog "The default username/password is:"
-	elog "\tadmin:live"
-
-	if use ssl ; then
-		if [[ -f ${ROOT}/etc/vdr/plugins/live/live.pem ]]; then
-			einfo "found an existing SSL cert, to create a new SSL cert, run:\n"
-			einfo "emerge --config ${PN}"
-		else
-			einfo "No SSL cert found, creating a default one now"
-			make_live_cert
-		fi
-	fi
-}
-
-pkg_config() {
-	make_live_cert
-}
diff --git a/media-plugins/vdr-live/vdr-live-2.3.1.ebuild b/media-plugins/vdr-live/vdr-live-2.3.1.ebuild
deleted file mode 100644
index 965fe62f8ffa..000000000000
--- a/media-plugins/vdr-live/vdr-live-2.3.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vdr-plugin-2 ssl-cert
-
-MY_P="release_2-3-1"
-
-DESCRIPTION="VDR Plugin: Web Access To Settings"
-HOMEPAGE="http://live.vdr-developer.org"
-SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-live.git/snapshot/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2 RSA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pcre ssl"
-
-DEPEND="media-video/vdr
-	>=dev-libs/tntnet-2.2.1[ssl=]
-	>=dev-libs/cxxtools-2.2.1
-	pcre? ( >=dev-libs/libpcre-8.12[cxx] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-VDR_CONFD_FILE="${FILESDIR}/confd-2.3"
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon-2.3.sh"
-
-KEEP_I18NOBJECT="yes"
-
-make_live_cert() {
-	# TODO: still true?
-	# ssl-cert eclass creates a "invalid" cert, create our own one
-	local base=$(get_base 1)
-	local keydir="/etc/vdr/plugins/live"
-
-	SSL_ORGANIZATION="${SSL_ORGANIZATION:-VDR Plugin Live}"
-	SSL_COMMONNAME="${SSL_COMMONNAME:-`hostname -f`}"
-
-	echo
-	gen_cnf || return 1
-	echo
-	gen_key 1 || return 1
-	gen_csr 1 || return 1
-	gen_crt 1 || return 1
-	echo
-
-	install -d "${ROOT}${keydir}"
-	install -m0400 "${base}.key" "${ROOT}${keydir}/live-key.pem"
-	install -m0444 "${base}.crt" "${ROOT}${keydir}/live.pem"
-	chown vdr:vdr "${ROOT}"/etc/vdr/plugins/live/live{,-key}.pem
-}
-
-src_prepare() {
-	# remove untranslated language files
-	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nl_NL,nn_NO,pt_PT,ro_RO,sl_SI,tr_TR}.po
-
-	vdr-plugin-2_src_prepare
-
-	if ! use pcre; then
-		sed -i "s:^HAVE_LIBPCRECPP:#HAVE_LIBPCRECPP:" Makefile || die
-	fi
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	insinto /usr/share/vdr/plugins/live
-	doins -r live/*
-
-	fowners -R vdr:vdr /usr/share/vdr/plugins/live
-}
-
-pkg_postinst() {
-	vdr-plugin-2_pkg_postinst
-
-	elog "To be able to use all functions of vdr-live"
-	elog "you should emerge and enable"
-	elog "media-plugins/vdr-epgsearch to search the EPG,"
-	elog "media-plugins/vdr-streamdev for Live-TV streaming"
-
-	elog "The default username/password is:"
-	elog "\tadmin:live"
-
-	if use ssl ; then
-		if [[ -f ${ROOT}/etc/vdr/plugins/live/live.pem ]]; then
-			einfo "found an existing SSL cert, to create a new SSL cert, run:\n"
-			einfo "emerge --config ${PN}"
-		else
-			einfo "No SSL cert found, creating a default one now"
-			make_live_cert
-		fi
-	fi
-}
-
-pkg_config() {
-	make_live_cert
-}
diff --git a/media-plugins/vdr-live/vdr-live-3.0.6.ebuild b/media-plugins/vdr-live/vdr-live-3.0.6.ebuild
index 969344c6ee70..ba9c107d430f 100644
--- a/media-plugins/vdr-live/vdr-live-3.0.6.ebuild
+++ b/media-plugins/vdr-live/vdr-live-3.0.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/MarkusEh/vdr-plugin-live/archive/${MY_P}.tar.gz -> $
 
 LICENSE="Apache-2.0 GPL-2+ RSA"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="pcre ssl"
 
 DEPEND="media-video/vdr
diff --git a/media-plugins/vdr-osdteletext/Manifest b/media-plugins/vdr-osdteletext/Manifest
index 600c31c4dca7..590532f1e661 100644
--- a/media-plugins/vdr-osdteletext/Manifest
+++ b/media-plugins/vdr-osdteletext/Manifest
@@ -7,6 +7,6 @@ DIST vdr-osdteletext-0.9.7.tgz 101400 BLAKE2B 52cabda446701ce4898705487e47e5ca51
 DIST vdr-osdteletext-0.9.8.tar.gz 100954 BLAKE2B def803093a3726a7c9b1905e04e5790ad3959d8d66664ccc3b0147cf4ed5ff37389525cbc1504fed7e8da782c5c9e58128e35c6adaa1f4ab04ad15cc3e2ae8ba SHA512 48196382fba247ac3d0140d028e23a3474e9a3b440c33b7a27e6127abfa949b1a7ab6748416d3430b68a80830bfbff1831de9d7e902ff9701b9dfd2d873a1f58
 DIST vdr-osdteletext-1.1.1.tar.gz 111113 BLAKE2B 5f9f44ad0615877896a9080f1b32fe4e2c6cd1916dcf6ad50c32bc22ac0cec22f44339ad2d4df7ac3135c1533bde039d0497bc5d7dc365c8b869900d8a9191db SHA512 a4f7e5bd8845917868dcb2041dbb679884595611db796cf5a58d05e41a96efcf47f3fbb92314c58f1f3d9af656d6ab5ef985f3867ea8bd45dd1c0c6e7c745a3a
 EBUILD vdr-osdteletext-0.9.7.ebuild 1206 BLAKE2B 26d9c561a70002d6531181fc039203d8f7292fd23966f42f1d4080948d04c168d3c91df83454473ff13e8179a3c6ae21b8988cebd633723280a2635f9d119e51 SHA512 6b06ee1321f69fadb3eb9a1fd3af39c7942f85f35ce19ccac8ffb0aa45e9353a608d0f4fa4acdc75e367e5341262a4f9e13922d6a027b9f62b1b9a9d0a6e2644
-EBUILD vdr-osdteletext-0.9.8.ebuild 1234 BLAKE2B 65693a600e0378b9adccdde33aa8aa2dde04f8f7147af8d63189a9ef53f7356ef2d0270e0b33f112328fb9750e66fdedae4fe6b42ad993685a989434eb677b28 SHA512 cde3e9da20239555bce2bea3af95915e791e853afe94c367fad8b38abeae393eb56c943edaa170b0c549a08ec5b1b058ec58c0c03cccf23ec4a3a0057007e865
+EBUILD vdr-osdteletext-0.9.8.ebuild 1232 BLAKE2B dc12f1752e8e66001fe7c5a2d7605b37983f121f5fd50218a268ee807c3b0ced95b2c0e63112a56bc6d191dbe1940d6ad806b1da45607f845317a482684c210f SHA512 9de8ac1f54cb0cce110094e658b8a21bb8d5ef6e76d5930059659743da942afc75b0e0538e0c2f954927ca140db8f36a07e0d8e092b3c8d7294149b7b6ce3401
 EBUILD vdr-osdteletext-1.1.1.ebuild 1234 BLAKE2B 65693a600e0378b9adccdde33aa8aa2dde04f8f7147af8d63189a9ef53f7356ef2d0270e0b33f112328fb9750e66fdedae4fe6b42ad993685a989434eb677b28 SHA512 cde3e9da20239555bce2bea3af95915e791e853afe94c367fad8b38abeae393eb56c943edaa170b0c549a08ec5b1b058ec58c0c03cccf23ec4a3a0057007e865
 MISC metadata.xml 507 BLAKE2B 92d909221ef2246c9e2153e30d3c7403ae620d244251c3979c0705f8c22692a9f5b8d8185bef273a4ea12b444ba7979b4fbbe7770e7dcb2e9e33c65533aeaaaa SHA512 6b476aba4692e2731884d7187efefda306824f7c3b3005f8d570131a06d6fc537200746a2bbc9ae3506c2730cf8505435ebcd9b013a7340f33271542a62aea44
diff --git a/media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.8.ebuild b/media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.8.ebuild
index 58ca915916a6..ca437a9ac7bd 100644
--- a/media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.8.ebuild
+++ b/media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/vdr-projects/vdr-plugin-osdteletext/archive/v${PV}.t
 
 LICENSE="GPL-2+ public-domain" #teletext2.ttf, not copyrightable
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="media-video/vdr"
 RDEPEND="${DEPEND}"