gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /media-tv
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
31 files changed, 693 insertions, 857 deletions
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 7c10397cd24b..1bef93c4b8f7 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 8ee97f0ed2e8..9ed27633d672 100644
--- a/media-tv/dtv-scan-tables/Manifest
+++ b/media-tv/dtv-scan-tables/Manifest
@@ -1,5 +1,6 @@
-AUX Makefile.patch 2012 BLAKE2B b9de2e1df4ada602cc824e16abe8bd3ed1c1855052c0ff24bddc86fd646b53e948d619ab9d878d015e009122b6eeddd7f1889f43909dd69f29273d3a175c481b SHA512 346e6d4ae239b223153408362f172d0af1a4aa63bbf6a1b65074d1e7827b03662332a5bc5966370a2bfec197c2f2df1e3d638187754a1dfcf7dc4bbda8476370
 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-9999.ebuild 864 BLAKE2B 33ba2e1e329559cc34a217216534ad80f25249ca5f47d45a86bb877ed5babe545465e5429ef5acf639d2bb092ab015cd6b80071b5e6da079df4f8b5cf4f52262 SHA512 56e57caf097145a0c2fce2acad42df479467f87f6842738b4943d8fb2f70ff603a71a3c5d43939ce00f82d9faaf4ecbe6f23637363be73831a18f8749fb2c3a1
+EBUILD dtv-scan-tables-0_p20190922.ebuild 741 BLAKE2B b930164b495b422178137fa20f0758e057e7bdb22aa8e812592a22f70bcb7ec30917dbfcacb833066c93baf38f7874974851dcdb4fb7580cf566865ac255e03e SHA512 c69be11fb400fb39a66e78802d8dd19ac8edd13a79efaea589d42af2c59900778ec35ddec2d8f5029f7c0a6559985018b9c290c57d150d37fb9a663720bb0548
+EBUILD dtv-scan-tables-9999.ebuild 741 BLAKE2B b930164b495b422178137fa20f0758e057e7bdb22aa8e812592a22f70bcb7ec30917dbfcacb833066c93baf38f7874974851dcdb4fb7580cf566865ac255e03e SHA512 c69be11fb400fb39a66e78802d8dd19ac8edd13a79efaea589d42af2c59900778ec35ddec2d8f5029f7c0a6559985018b9c290c57d150d37fb9a663720bb0548
 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
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
new file mode 100644
index 000000000000..73d9b36229da
--- /dev/null
+++ b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20190922.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV#9999} != ${PV} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.linuxtv.org/dtv-scan-tables.git"
+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"
+	S="${WORKDIR}/usr/share/dvb"
+fi
+
+DESCRIPTION="Digital TV scan tables in v3 and v5 format"
+HOMEPAGE="https://linuxtv.org/"
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+
+BDEPEND=">=media-tv/v4l-utils-1.4"
+
+DOCS=( README )
+
+src_compile() {
+	emake dvbv3 dvbv5
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" install install_v3
+	einstalldocs
+}
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 305e482a9150..73d9b36229da 100644
--- a/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild
+++ b/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild
@@ -7,7 +7,7 @@ if [[ ${PV#9999} != ${PV} ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.linuxtv.org/dtv-scan-tables.git"
 else
-	COMMIT="c1986d5148d8"
+	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"
 	S="${WORKDIR}/usr/share/dvb"
@@ -18,18 +18,10 @@ HOMEPAGE="https://linuxtv.org/"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 
-DEPEND=">=media-tv/v4l-utils-1.4"
+BDEPEND=">=media-tv/v4l-utils-1.4"
 
-PATCHES=( "${FILESDIR}"/Makefile.patch )
 DOCS=( README )
 
-src_prepare() {
-	default
-
-	# Conversion failure!
-	rm -v dvb-t/ke-Nairobi || die
-}
-
 src_compile() {
 	emake dvbv3 dvbv5
 }
diff --git a/media-tv/dtv-scan-tables/files/Makefile.patch b/media-tv/dtv-scan-tables/files/Makefile.patch
deleted file mode 100644
index 60c6cde17ef2..000000000000
--- a/media-tv/dtv-scan-tables/files/Makefile.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 17049393c60503d305787d06b7137227a99ed2af Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sat, 13 Jul 2019 16:23:23 +0100
-Subject: [PATCH] Improve Makefile to avoid "Argument list too long" error
-
-I wouldn't expect a foreach loop to be prone to this issue but it's
-not the right way to write a Makefile anyway.
-
-Note that conversion failures are now fatal and the dvb-t/ke-Nairobi
-file is failing to convert at the moment.
-
-Signed-off-by: James Le Cuirot <chewi@gentoo.org>
----
- Makefile | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 901dc9d..7cdb5bc 100644
---- a/Makefile
-+++ b/Makefile
-@@ -17,6 +17,8 @@ DVBV3DIRS = atsc dvb-c dvb-s dvb-t
- DVBV5DIRS = $(DVBV3DIRS) isdb-t
- 
- DVBV3CHANNELFILES = $(foreach dir,$(DVBV3DIRS),$(wildcard $(dir)/*))
-+DVBV3OUTPUTFILES = $(patsubst %,$(DVBV3OUTPUTDIR)/%,$(DVBV3CHANNELFILES))
-+DVBV5OUTPUTFILES = $(patsubst %,$(DVBV5OUTPUTDIR)/%,$(DVBV3CHANNELFILES))
- 
- DVBFORMATCONVERT_CHANNEL_DVBV5 = -ICHANNEL -ODVBV5
- DVBFORMATCONVERT_CHANNEL_DVBV3 = -IDVBV5 -OCHANNEL
-@@ -42,14 +44,16 @@ ifeq ($(DVBV3DIR),)
- DVBV3DIR = dvbv3
- endif
- 
--dvbv3:
--	@$(foreach var,$(DVBV3DIRS), $(MKDIR) $(DVBV3OUTPUTDIR)/$(var);)
--	@$(foreach var,$(DVBV3CHANNELFILES), $(DVBFORMATCONVERT) $(DVBFORMATCONVERT_CHANNEL_DVBV3) $(var) $(DVBV3OUTPUTDIR)/$(var);)
-+$(DVBV3OUTPUTFILES): $(DVBV3OUTPUTDIR)/%: %
-+	@$(MKDIR) "$(dir $@)"
-+	@$(DVBFORMATCONVERT) $(DVBFORMATCONVERT_CHANNEL_DVBV3) "$<" "$@"
- 
-+$(DVBV5OUTPUTFILES): $(DVBV5OUTPUTDIR)/%: $(DVBV3OUTPUTDIR)/%
-+	@$(MKDIR) "$(dir $@)"
-+	@$(DVBFORMATCONVERT) $(DVBFORMATCONVERT_CHANNEL_DVBV5) "$<" "$@"
- 
--dvbv5: $(DVBV3OUTPUTDIR)
--	@$(foreach var,$(DVBV3DIRS), $(MKDIR) $(DVBV5OUTPUTDIR)/$(var);)
--	@$(foreach var,$(DVBV3CHANNELFILES), $(DVBFORMATCONVERT) $(DVBFORMATCONVERT_CHANNEL_DVBV5) $(DVBV3OUTPUTDIR)/$(var) $(DVBV5OUTPUTDIR)/$(var);)
-+dvbv3: $(DVBV3OUTPUTFILES)
-+dvbv5: $(DVBV5OUTPUTFILES)
- 
- install:
- 	@mkdir -p $(DATADIR)/$(DVBV5DIR)
--- 
-2.21.0
-
diff --git a/media-tv/gentoo-vdr-scripts/Manifest b/media-tv/gentoo-vdr-scripts/Manifest
index 1d1d197e7eb9..498894084b52 100644
--- a/media-tv/gentoo-vdr-scripts/Manifest
+++ b/media-tv/gentoo-vdr-scripts/Manifest
@@ -1,15 +1,7 @@
-DIST gentoo-vdr-scripts-2.0.0.tar.bz2 37438 BLAKE2B b7662b188809d17bd08186eb44444811408cbbaf37dfadc52d75f3d2ecdc934f68cf60c4631b1e92425e0cc827d1901763dd0e90ef049d68f9c851a35beac735 SHA512 0214b390e1e4fe4f65ceb940a1d092f88fe5263eda3c97ebfa7d2925a772165af3a3c62bfc964e577e374ce723aefccb29082f8219fda918ad17f966ad8ad392
-DIST gentoo-vdr-scripts-2.5.tar.bz2 39893 BLAKE2B 5cfee26bd0187776169c5fd23e95681be2bfd4e983cb45c17c2479e29b270e241a898609ecc0619ca367d1c21bac11fd1b0f3f6a7d335b4bc38f36dd52fea802 SHA512 bed3db4e3c4f8195d5715d274a32485d067fa2e539ace417c2d73bac1294d46736754be589d5e18b77e0baa1b4d9cd7df5ff8a13db2850d92d2eb992f9b131a6
-DIST gentoo-vdr-scripts-2.7.2.tar.bz2 48584 BLAKE2B f2841f0d996f2db025d06d80b54c07fdbbcac6d131ff534447ad940ed5d7af6fb2fa14ca6280f9973e11fd2a7ae6019e0a118d01822829891eb11cd3ed66b272 SHA512 cb0297c7e78e4c110097d1c08a5f6642d8194d01dd47308f7a41c6d76f7b1675cc612d47a7725eb4f47a393086b034ca09703af0867ae02a36af4be12701f861
 DIST gentoo-vdr-scripts-2.7.3.tar.bz2 49156 BLAKE2B b5aaeb2cc704a2d43e05cb30cc6ea0d01f6f1b00dbfdf8a61d87cfc0360a86f2e7fb10daaeae7210eac46bca36ce72e4e928e1ce0752ffa3343fac83392b530b SHA512 9d00acaf77bbbf52f4a4d4b8284d94b9d191c354de52ea6f7bba0751be661feec4915cca20be3d24a0471efe4b3f24c5dcc025e3e8b0cc6b2c37f8843b91a520
 DIST gentoo-vdr-scripts-2.7.5.1.tar.bz2 49537 BLAKE2B a6f01cc7b30b8d289317cbebed21bd4790865ebcf2f9f1b81375a35332784d2f2603aabb852808cca764dbd748469f815dbd83b296d71249dd6a4fd2709a6e31 SHA512 5b8f91f73ee42e290966eb9ae95b020b0a2c16f9d2c4eb79766934b8fa2e6bf415db20325254c0c6058abb868b010eb4180acc3714c18b47a5be390ee3e928c9
-DIST gentoo-vdr-scripts-2.7.5.tar.bz2 49457 BLAKE2B 8c5bb9ee6369ee5b5e9b4bf392116b4f7b08d097b73b8790b4e2e6c1bc8ae9cc0f8f0eddf489af154e2ed5a964d7fce560e901a77f3886604c675dfc72550fc8 SHA512 b79460ae73c1914b0057d44469c0ac3e30feab3fc9fa91af618a0753f5061184110af6f2426d0638861e899fe7ef8ddc749bee631e95dbf52da9d32ae3ae7afe
-DIST gentoo-vdr-scripts-2.7.tar.bz2 46618 BLAKE2B 5677506d8e798ff5a9f1968f6d63baa93cf049b24674ed1be23f4a7d10aa67213c4c20cfa95e3b3091be851aa1ce87eb901df076a3a3b7635b5d897bb978fe45 SHA512 95db4d2632d07cc86394fbc2898050d47175f01cc60b61230ba5363c770ba6ad5c5935987ac6a1131bc575887633ed6c8f6242f7de225fc875d0871123665bc5
-EBUILD gentoo-vdr-scripts-2.0.0.ebuild 3517 BLAKE2B a7d83e5ee2898353527411d303279d4b8455a19ec0e6d746c25b366fce98954fdfe15cd92d90fba71f9229a4acfbaed4d6cdc1d27a713a3cc272acfb0d93931e SHA512 533acb3b4300bd28615147cbd9147abdfaf5b088ac9f4b0049db7a1cb40b68f5e55574412473ce1455531f07d978a71c2619c6aa7199a1aadd20044d777824a2
-EBUILD gentoo-vdr-scripts-2.5.ebuild 3707 BLAKE2B fa764e348933073cea91c3fd8dedbc5c55e7e7573975bd59df6d36c20741584651f1971d4741b77573401ac828bd09b836d9e8209075693bae191f43588cd360 SHA512 5a58a2cf32d8aecb0e0af42a29c876674028ed68a60247b3d0e9e922536d89821bfae121113c7b17bfa789d769d95f2c1d972ad6bb4e2012982fec30746c16af
-EBUILD gentoo-vdr-scripts-2.7.2.ebuild 3635 BLAKE2B 8c6aa71e4911a87eb0c42eba7b85b3caf3b9c9a563be80a1160959ed82148ec251f377b4311d48a4f64220c64f80020bb1e5a3a82dcadb311532bf1193cb9989 SHA512 ce90e054405fbea3197aa8304bee384172e67353863a6799af26f6ac2b678eed1ed9e6b0400e6c22f3ff635086041f50660ec83669869de34d2d9927a4af017b
-EBUILD gentoo-vdr-scripts-2.7.3.ebuild 3633 BLAKE2B 04c8d82eee76d7db739e885a78b4dd6208a2669260d84fecf4eb716b924793b5d1304121078d99db2643cfc8c09408af2e3d089852b88703ede344cbb94abbd7 SHA512 90532d380cb3e593fbec8a236731a626ed46dae40250c98472d43830ecf8ba2b718f42ff9748d9d956d80cfe1e46680d5d331fad59e5cbe8695c5e058201c017
-EBUILD gentoo-vdr-scripts-2.7.5.1.ebuild 3512 BLAKE2B b0e72718ffcc99a3c97ce4e54243e47992404d5df07ed56f1aee2c351cff5b7675e4d3aeca6f07658c6e29c4e7e13962ab49412e2f19359e36f7e5621c70750d SHA512 467442153b47078e3a3a15aff3de6dbfaf75e0f4852e964a10f42ad526bf1611b23861afd5aba74256b769f3fbfb9357574f71b3bc32971a973ae99f77d10a57
-EBUILD gentoo-vdr-scripts-2.7.5.ebuild 3505 BLAKE2B e669b4073cb0dc19be19b54f1300fe0a3a7c486beb2da453d0e424d6f405b86d5b9838e304893fb5d6520befefffb90b7767e2ca526c4cb66f3f6049aca4796b SHA512 8bb3d020026a5d44390c7772d1f9a074ee21f54daa9a7f2918b50112c0d96c57060bd7850be61951dd2073c4ee09e32d27cd1986e23146ec7f4d4301237a210c
-EBUILD gentoo-vdr-scripts-2.7.ebuild 3633 BLAKE2B 04c8d82eee76d7db739e885a78b4dd6208a2669260d84fecf4eb716b924793b5d1304121078d99db2643cfc8c09408af2e3d089852b88703ede344cbb94abbd7 SHA512 90532d380cb3e593fbec8a236731a626ed46dae40250c98472d43830ecf8ba2b718f42ff9748d9d956d80cfe1e46680d5d331fad59e5cbe8695c5e058201c017
+DIST gentoo-vdr-scripts-2.8.tar.bz2 49662 BLAKE2B 1a49d03441c991f6aa08cefc3b6d3a926a18ef7cb6c97bef886f922901f681ab95e9b60648d3930136148dafdf87f702d564e5a89fb6945ef9ed0cec1c2fbbaa SHA512 587bfc329efb92f1d9d9f87b3eb88ff9c74f92587d20c1489e67c861c769f9cb307bd6314aa88dc7d2a1400bc408033b913093b8f219fa59857638f2d062eecf
+EBUILD gentoo-vdr-scripts-2.7.3.ebuild 3667 BLAKE2B d424ade9018e652c8f10da7909950758146c544a1e9c514393d3538b772e3cbd6689e02ba91c0a84da5189354903db41dc6067ca2f3966f5cdf51d2789df9549 SHA512 d48efb3d75d25a15786942e6c1c30c90a31d1f11ad8c2911b6fe33702802a39878360308a9e351e21aa891ffb67781367c5b851eb348d73b83c6c36207214520
+EBUILD gentoo-vdr-scripts-2.7.5.1.ebuild 3546 BLAKE2B ac8e75c6839c65802be894b9db12e4945cd44664503f34ad4175c358c73871022a4ba978519921ce8b0161ef8211fcc06409119624d2c4d001faa3b84913349e SHA512 273fd9d1425e3fff0ea6b783d4bddd407dda669a328bdabcbe488118e228717c8c2fea9de63bd45158c0c7abadcc5152066a8e16727cfbb269350739146d0421
+EBUILD gentoo-vdr-scripts-2.8.ebuild 2382 BLAKE2B 608c0004beffd857fe01d31204ad0a48be735e2ed3cf644c6823468b4f5eef864a48b7c14a25a129bffe93903d70014f6d20f6599e0006419a75dcc8a7d424d9 SHA512 5ba4436020c2c7e5d2ea53b6c9afa0f820ab33847fb4d1ffdd8825be069d8a547e4059de5b6cad74ef48522430d24cd87096b4cfdb9a75f189c55677f9812c1c
 MISC metadata.xml 354 BLAKE2B 74ce746b4c49b338ad17df430f4aa1c11cad86684bf3c3003f2c2c2fc979435b53b5e30a997f009c53ea57d8441d09cc113b45ceaabc0a1d62f58e78ba73daae SHA512 9607950224075c12bcd9a43aef5cc3dd640cedee6689986713b10b2df1441a7694f8a527f03b66c15139dcaab917249ebd0899031432f545fe74a62aeabdce9d
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.0.0.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.0.0.ebuild
deleted file mode 100644
index 7dfa59508244..000000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.0.0.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user
-
-DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	https://dev.gentoo.org/~hd_brummy/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="nvram"
-
-RDEPEND="nvram? ( sys-power/nvram-wakeup )
-	app-admin/sudo
-	sys-process/wait_on_pid"
-
-VDR_HOME=/var/vdr
-
-pkg_setup() {
-	enewgroup vdr
-
-	# Add user vdr to these groups:
-	#   video - accessing dvb-devices
-	#   audio - playing sound when using software-devices
-	#   cdrom - playing dvds/audio-cds ...
-	enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom
-}
-
-src_prepare() {
-	# moved into own package
-	sed -e '/SUBDIRS =/s# bin # #' -i usr/Makefile
-	sed -e '/all:/s#compile##' -i Makefile
-}
-
-src_install() {
-	emake -s install DESTDIR="${D}" || die "make install failed"
-	dodoc README TODO ChangeLog README.grub2
-
-	# create necessary directories
-	diropts -ovdr -gvdr
-	keepdir "${VDR_HOME}"
-
-	local kd
-	for kd in shutdown-data merged-config-files dvd-images tmp; do
-		keepdir "${VDR_HOME}/${kd}"
-	done
-}
-
-pkg_preinst() {
-	local PLUGINS_NEW=0
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.plugins ]]; then
-		PLUGINS_NEW=$(grep -v '^#' "${ROOT}"/etc/conf.d/vdr.plugins |grep -v '^$'|wc -l)
-	fi
-	if [[ ${PLUGINS_NEW} > 0 ]]; then
-		cp "${ROOT}"/etc/conf.d/vdr.plugins "${D}"/etc/conf.d/vdr.plugins
-	else
-		einfo "Migrating PLUGINS setting from /etc/conf.d/vdr to /etc/conf.d/vdr.plugins"
-		local PLUGIN
-		for PLUGIN in $(source "${ROOT}"/etc/conf.d/vdr;echo $PLUGINS); do
-			echo ${PLUGIN} >> "${D}"/etc/conf.d/vdr.plugins
-		done
-	fi
-
-	has_version "<${CATEGORY}/${PN}-0.5.4"
-	previous_less_than_0_5_4=$?
-}
-
-VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
-
-pkg_postinst() {
-	if [[ $previous_less_than_0_5_4 = 0 ]] ; then
-		einfo "\nVDR use now default the --cachedir parameter to store the epg.file"
-		einfo "Please do not override this with the EPGFILE variable\n"
-
-		einfo "svdrp port 2001 support removed\n"
-
-		einfo "--rcu support removed, use media-plugin/vdr-rcu\n"
-	fi
-
-	elog "nvram wakeup is optional."
-	elog "To make use of it emerge sys-power/nvram-wakeup."
-	elog
-
-	elog "Plugins which should be used are now set via its"
-	elog "own config-file called /etc/conf.d/vdr.plugins"
-	elog "or enabled via the frontend eselect vdr-plugin."
-	elog
-
-	if [[ -f "${ROOT}/etc/init.d/dvbsplash" ]]; then
-		ewarn
-		ewarn "You have dvbsplash installed!"
-		ewarn "/etc/init.d/dvbsplash will now be deleted"
-		ewarn "as it causes difficult to debug problems."
-		ewarn
-		rm "${ROOT}/etc/init.d/dvbsplash"
-	fi
-
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
-		grep -q ^DVDSWITCH_BURNSPEED= "${ROOT}"/etc/conf.d/vdr.dvdswitch
-	then
-		ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch"
-		ewarn "This no longer has any effect, please use"
-		ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd"
-	fi
-}
-
-pkg_config() {
-	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${ROOT}"/etc/sudoers; then
-
-		einfo "Removing depricated entry from /etc/sudoers:"
-		einfo "-  ${VDRSUDOENTRY}"
-
-		cd "${T}"
-		cat >sudoedit-vdr.sh <<-SUDOEDITOR
-			#!/bin/bash
-			sed -i \${1} -e '/\/usr\/share\/vdr\/bin\/vdrshutdown-really.sh *$/d'
-
-		SUDOEDITOR
-		chmod a+x sudoedit-vdr.sh
-
-		VISUAL="${T}"/sudoedit-vdr.sh visudo -f "${ROOT}"/etc/sudoers || die "visudo failed"
-
-		einfo "Edited /etc/sudoers"
-	fi
-}
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.5.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.5.ebuild
deleted file mode 100644
index 9e6b28936a4c..000000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.5.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	https://dev.gentoo.org/~hd_brummy/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="nvram"
-
-RDEPEND="nvram? ( sys-power/nvram-wakeup )
-	app-admin/sudo
-	sys-process/wait_on_pid"
-
-VDR_HOME=/var/vdr
-
-pkg_setup() {
-	enewgroup vdr
-
-	# Add user vdr to these groups:
-	#   video - accessing dvb-devices
-	#   audio - playing sound when using software-devices
-	#   cdrom - playing dvds/audio-cds ...
-	enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom
-}
-
-src_prepare() {
-	# moved into own package
-	sed -e '/SUBDIRS =/s# bin # #' -i usr/Makefile
-	sed -e '/all:/s#compile##' -i Makefile
-}
-
-src_install() {
-	emake -s install DESTDIR="${D}" || die "make install failed"
-	dodoc README TODO ChangeLog README.grub2 README.shutdown README.shutdown-jobs README.systemd README.vdrcaps
-
-	# create necessary directories
-	diropts -ovdr -gvdr
-	keepdir "${VDR_HOME}"
-
-	local kd
-	for kd in shutdown-data merged-config-files dvd-images tmp; do
-		keepdir "${VDR_HOME}/${kd}"
-	done
-}
-
-pkg_preinst() {
-	local PLUGINS_NEW=0
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.plugins ]]; then
-		PLUGINS_NEW=$(grep -v '^#' "${ROOT}"/etc/conf.d/vdr.plugins |grep -v '^$'|wc -l)
-	fi
-	if [[ ${PLUGINS_NEW} > 0 ]]; then
-		cp "${ROOT}"/etc/conf.d/vdr.plugins "${D}"/etc/conf.d/vdr.plugins
-	else
-		einfo "Migrating PLUGINS setting from /etc/conf.d/vdr to /etc/conf.d/vdr.plugins"
-		local PLUGIN
-		for PLUGIN in $(source "${ROOT}"/etc/conf.d/vdr;echo $PLUGINS); do
-			echo ${PLUGIN} >> "${D}"/etc/conf.d/vdr.plugins
-		done
-	fi
-
-	has_version "<${CATEGORY}/${PN}-0.5.4"
-	previous_less_than_0_5_4=$?
-}
-
-VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
-
-pkg_postinst() {
-	if [[ $previous_less_than_0_5_4 = 0 ]] ; then
-		einfo "\nVDR use now default the --cachedir parameter to store the epg.file"
-		einfo "Please do not override this with the EPGFILE variable\n"
-
-		einfo "svdrp port 2001 support removed\n"
-
-		einfo "--rcu support removed, use media-plugin/vdr-rcu\n"
-	fi
-
-	elog "nvram wakeup is optional."
-	elog "To make use of it emerge sys-power/nvram-wakeup."
-	elog
-
-	elog "Plugins which should be used are now set via its"
-	elog "own config-file called /etc/conf.d/vdr.plugins"
-	elog "or enabled via the frontend eselect vdr-plugin."
-	elog
-
-	if [[ -f "${ROOT}/etc/init.d/dvbsplash" ]]; then
-		ewarn
-		ewarn "You have dvbsplash installed!"
-		ewarn "/etc/init.d/dvbsplash will now be deleted"
-		ewarn "as it causes difficult to debug problems."
-		ewarn
-		rm "${ROOT}/etc/init.d/dvbsplash"
-	fi
-
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
-		grep -q ^DVDSWITCH_BURNSPEED= "${ROOT}"/etc/conf.d/vdr.dvdswitch
-	then
-		ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch"
-		ewarn "This no longer has any effect, please use"
-		ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd"
-	fi
-
-	einfo "systemd is now supported by gentoo-vdr-scripts"
-	einfo "Please read for detailed info on this vdr's README.systemd"
-}
-
-pkg_config() {
-	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${ROOT}"/etc/sudoers; then
-
-		einfo "Removing depricated entry from /etc/sudoers:"
-		einfo "-  ${VDRSUDOENTRY}"
-
-		cd "${T}"
-		cat >sudoedit-vdr.sh <<-SUDOEDITOR
-			#!/bin/bash
-			sed -i \${1} -e '/\/usr\/share\/vdr\/bin\/vdrshutdown-really.sh *$/d'
-
-		SUDOEDITOR
-		chmod a+x sudoedit-vdr.sh
-
-		VISUAL="${T}"/sudoedit-vdr.sh visudo -f "${ROOT}"/etc/sudoers || die "visudo failed"
-
-		einfo "Edited /etc/sudoers"
-	fi
-}
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.2.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.2.ebuild
deleted file mode 100644
index 80c34f17a1c9..000000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	https://dev.gentoo.org/~hd_brummy/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="nvram"
-
-RDEPEND="nvram? ( sys-power/nvram-wakeup )
-	app-admin/sudo
-	sys-process/wait_on_pid"
-
-VDR_HOME=/var/vdr
-
-pkg_setup() {
-	enewgroup vdr
-
-	# Add user vdr to these groups:
-	#   video - accessing dvb-devices
-	#   audio - playing sound when using software-devices
-	#   cdrom - playing dvds/audio-cds ...
-	enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom
-}
-
-src_prepare() {
-	# moved into own package
-	sed -e '/SUBDIRS =/s# bin # #' -i usr/Makefile
-	sed -e '/all:/s#compile##' -i Makefile
-}
-
-src_install() {
-	default
-	dodoc README* TODO ChangeLog
-
-	# create necessary directories
-	diropts -ovdr -gvdr
-	keepdir "${VDR_HOME}"
-
-	local kd
-	for kd in shutdown-data merged-config-files dvd-images; do
-		keepdir "${VDR_HOME}/${kd}"
-	done
-}
-
-pkg_preinst() {
-	local PLUGINS_NEW=0
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.plugins ]]; then
-		PLUGINS_NEW=$(grep -v '^#' "${ROOT}"/etc/conf.d/vdr.plugins |grep -v '^$'|wc -l)
-	fi
-	if [[ ${PLUGINS_NEW} > 0 ]]; then
-		cp "${ROOT}"/etc/conf.d/vdr.plugins "${D}"/etc/conf.d/vdr.plugins
-	else
-		einfo "Migrating PLUGINS setting from /etc/conf.d/vdr to /etc/conf.d/vdr.plugins"
-		local PLUGIN
-		for PLUGIN in $(source "${ROOT}"/etc/conf.d/vdr;echo $PLUGINS); do
-			echo ${PLUGIN} >> "${D}"/etc/conf.d/vdr.plugins
-		done
-	fi
-
-	has_version "<${CATEGORY}/${PN}-0.5.4"
-	previous_less_than_0_5_4=$?
-
-	has_version "<${CATEGORY}/${PN}-2.6"
-	previous_less_than_2_6=$?
-}
-
-VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
-
-pkg_postinst() {
-	if [[ $previous_less_than_0_5_4 = 0 ]] ; then
-		elog "\nVDR use now default the --cachedir parameter to store the epg.file"
-		elog "Please do not override this with the EPGFILE variable\n"
-
-		elog "svdrp port 2001 support removed\n"
-
-		elog "--rcu support removed, use media-plugin/vdr-rcu\n"
-	fi
-
-	if [[ $previous_less_than_2_6 = 0 ]]; then
-		elog "${CATEGORY}/${PN} supports now a init script"
-		elog "to start a X server"
-		elog "Please refer for detailed info to"
-		elog "${CATGORY}/${PN} README.x11-setup\n"
-	fi
-
-	if use nvram; then
-		elog "nvram wakeup is optional."
-		elog "To make use of it emerge sys-power/nvram-wakeup.\n"
-	fi
-
-	elog "Plugins which should be used are now set via its"
-	elog "own config-file called /etc/conf.d/vdr.plugins"
-	elog "or enabled via the frontend eselect vdr-plugin.\n"
-
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
-		grep -q ^DVDSWITCH_BURNSPEED= "${ROOT}"/etc/conf.d/vdr.dvdswitch
-	then
-		ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch"
-		ewarn "This no longer has any effect, please use"
-		ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd"
-	fi
-
-	elog "systemd is supported by ${CATEGORY}/${PN}"
-	elog "Please read for detailed info on this"
-	elog "${CATEGORY}/${PN} README.systemd"
-}
-
-pkg_config() {
-	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${ROOT}"/etc/sudoers; then
-
-		einfo "Removing depricated entry from /etc/sudoers:"
-		einfo "-  ${VDRSUDOENTRY}"
-
-		cd "${T}"
-		cat >sudoedit-vdr.sh <<-SUDOEDITOR
-			#!/bin/bash
-			sed -i \${1} -e '/\/usr\/share\/vdr\/bin\/vdrshutdown-really.sh *$/d'
-
-		SUDOEDITOR
-		chmod a+x sudoedit-vdr.sh
-
-		VISUAL="${T}"/sudoedit-vdr.sh visudo -f "${ROOT}"/etc/sudoers || die "visudo failed"
-
-		einfo "Edited /etc/sudoers"
-	fi
-}
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.3.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.3.ebuild
index 50266d56682e..e46f969af355 100644
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.3.ebuild
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils user
 
 DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-vdr-scripts.git/about/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2
 	https://dev.gentoo.org/~hd_brummy/distfiles/${P}.tar.bz2"
 
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.5.1.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.5.1.ebuild
index 557ea20e5750..ef0ad7526045 100644
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.5.1.ebuild
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit user
 
 DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-vdr-scripts.git/about/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2
 	https://dev.gentoo.org/~hd_brummy/distfiles/${P}.tar.bz2"
 
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.5.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.5.ebuild
deleted file mode 100644
index 6fdabc3dcf24..000000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.5.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	https://dev.gentoo.org/~hd_brummy/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="nvram"
-
-RDEPEND="nvram? ( sys-power/nvram-wakeup )
-	app-admin/sudo
-	sys-process/wait_on_pid"
-
-VDR_HOME=/var/vdr
-
-pkg_setup() {
-	enewgroup vdr
-
-	# Add user vdr to these groups:
-	#   video - accessing dvb-devices
-	#   audio - playing sound when using software-devices
-	#   cdrom - playing dvds/audio-cds ...
-	enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom
-}
-
-src_install() {
-	local DOCS=( README* TODO ChangeLog )
-
-	default
-
-	# create necessary directories
-	diropts -ovdr -gvdr
-	keepdir "${VDR_HOME}"
-
-	local kd
-	for kd in shutdown-data merged-config-files dvd-images; do
-		keepdir "${VDR_HOME}/${kd}"
-	done
-}
-
-pkg_preinst() {
-	local PLUGINS_NEW=0
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.plugins ]]; then
-		PLUGINS_NEW=$(grep -v '^#' "${ROOT}"/etc/conf.d/vdr.plugins |grep -v '^$'|wc -l)
-	fi
-	if [[ ${PLUGINS_NEW} > 0 ]]; then
-		cp "${ROOT}"/etc/conf.d/vdr.plugins "${D}"/etc/conf.d/vdr.plugins
-	else
-		einfo "Migrating PLUGINS setting from /etc/conf.d/vdr to /etc/conf.d/vdr.plugins"
-		local PLUGIN
-		for PLUGIN in $(source "${ROOT}"/etc/conf.d/vdr;echo $PLUGINS); do
-			echo ${PLUGIN} >> "${D}"/etc/conf.d/vdr.plugins
-		done
-	fi
-
-	has_version "<${CATEGORY}/${PN}-0.5.4"
-	previous_less_than_0_5_4=$?
-
-	has_version "<${CATEGORY}/${PN}-2.6"
-	previous_less_than_2_6=$?
-}
-
-VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
-
-pkg_postinst() {
-	if [[ $previous_less_than_0_5_4 = 0 ]] ; then
-		elog "\nVDR use now default the --cachedir parameter to store the epg.file"
-		elog "Please do not override this with the EPGFILE variable\n"
-
-		elog "svdrp port 2001 support removed\n"
-
-		elog "--rcu support removed, use media-plugin/vdr-rcu\n"
-	fi
-
-	if [[ $previous_less_than_2_6 = 0 ]]; then
-		elog "${CATEGORY}/${PN} supports now a init script"
-		elog "to start a X server"
-		elog "Please refer for detailed info to"
-		elog "${CATGORY}/${PN} README.x11-setup\n"
-	fi
-
-	if use nvram; then
-		elog "nvram wakeup is optional."
-		elog "To make use of it emerge sys-power/nvram-wakeup.\n"
-	fi
-
-	elog "Plugins which should be used are now set via its"
-	elog "own config-file called /etc/conf.d/vdr.plugins"
-	elog "or enabled via the frontend eselect vdr-plugin.\n"
-
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
-		grep -q ^DVDSWITCH_BURNSPEED= "${ROOT}"/etc/conf.d/vdr.dvdswitch
-	then
-		ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch"
-		ewarn "This no longer has any effect, please use"
-		ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd"
-	fi
-
-	elog "systemd is supported by ${CATEGORY}/${PN}"
-	elog "Please read for detailed info on this"
-	elog "${CATEGORY}/${PN} README.systemd"
-}
-
-pkg_config() {
-	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${ROOT}"/etc/sudoers; then
-
-		einfo "Removing depricated entry from /etc/sudoers:"
-		einfo "-  ${VDRSUDOENTRY}"
-
-		cd "${T}"
-		cat >sudoedit-vdr.sh <<-SUDOEDITOR
-			#!/bin/bash
-			sed -i \${1} -e '/\/usr\/share\/vdr\/bin\/vdrshutdown-really.sh *$/d'
-
-		SUDOEDITOR
-		chmod a+x sudoedit-vdr.sh
-
-		VISUAL="${T}"/sudoedit-vdr.sh visudo -f "${ROOT}"/etc/sudoers || die "visudo failed"
-
-		einfo "Edited /etc/sudoers"
-	fi
-}
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.ebuild
deleted file mode 100644
index 50266d56682e..000000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	https://dev.gentoo.org/~hd_brummy/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="nvram"
-
-RDEPEND="nvram? ( sys-power/nvram-wakeup )
-	app-admin/sudo
-	sys-process/wait_on_pid"
-
-VDR_HOME=/var/vdr
-
-pkg_setup() {
-	enewgroup vdr
-
-	# Add user vdr to these groups:
-	#   video - accessing dvb-devices
-	#   audio - playing sound when using software-devices
-	#   cdrom - playing dvds/audio-cds ...
-	enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom
-}
-
-src_prepare() {
-	# moved into own package
-	sed -e '/SUBDIRS =/s# bin # #' -i usr/Makefile
-	sed -e '/all:/s#compile##' -i Makefile
-}
-
-src_install() {
-	default
-	dodoc README* TODO ChangeLog
-
-	# create necessary directories
-	diropts -ovdr -gvdr
-	keepdir "${VDR_HOME}"
-
-	local kd
-	for kd in shutdown-data merged-config-files dvd-images; do
-		keepdir "${VDR_HOME}/${kd}"
-	done
-}
-
-pkg_preinst() {
-	local PLUGINS_NEW=0
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.plugins ]]; then
-		PLUGINS_NEW=$(grep -v '^#' "${ROOT}"/etc/conf.d/vdr.plugins |grep -v '^$'|wc -l)
-	fi
-	if [[ ${PLUGINS_NEW} > 0 ]]; then
-		cp "${ROOT}"/etc/conf.d/vdr.plugins "${D}"/etc/conf.d/vdr.plugins
-	else
-		einfo "Migrating PLUGINS setting from /etc/conf.d/vdr to /etc/conf.d/vdr.plugins"
-		local PLUGIN
-		for PLUGIN in $(source "${ROOT}"/etc/conf.d/vdr;echo $PLUGINS); do
-			echo ${PLUGIN} >> "${D}"/etc/conf.d/vdr.plugins
-		done
-	fi
-
-	has_version "<${CATEGORY}/${PN}-0.5.4"
-	previous_less_than_0_5_4=$?
-
-	has_version "<${CATEGORY}/${PN}-2.6"
-	previous_less_than_2_6=$?
-}
-
-VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
-
-pkg_postinst() {
-	if [[ $previous_less_than_0_5_4 = 0 ]] ; then
-		elog "\nVDR use now default the --cachedir parameter to store the epg.file"
-		elog "Please do not override this with the EPGFILE variable\n"
-
-		elog "svdrp port 2001 support removed\n"
-
-		elog "--rcu support removed, use media-plugin/vdr-rcu\n"
-	fi
-
-	if [[ $previous_less_than_2_6 = 0 ]]; then
-		elog "${CATEGORY}/${PN} supports now a init script"
-		elog "to start a X server"
-		elog "Please refer for detailed info to"
-		elog "${CATGORY}/${PN} README.x11-setup\n"
-	fi
-
-	if use nvram; then
-		elog "nvram wakeup is optional."
-		elog "To make use of it emerge sys-power/nvram-wakeup.\n"
-	fi
-
-	elog "Plugins which should be used are now set via its"
-	elog "own config-file called /etc/conf.d/vdr.plugins"
-	elog "or enabled via the frontend eselect vdr-plugin.\n"
-
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
-		grep -q ^DVDSWITCH_BURNSPEED= "${ROOT}"/etc/conf.d/vdr.dvdswitch
-	then
-		ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch"
-		ewarn "This no longer has any effect, please use"
-		ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd"
-	fi
-
-	elog "systemd is supported by ${CATEGORY}/${PN}"
-	elog "Please read for detailed info on this"
-	elog "${CATEGORY}/${PN} README.systemd"
-}
-
-pkg_config() {
-	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${ROOT}"/etc/sudoers; then
-
-		einfo "Removing depricated entry from /etc/sudoers:"
-		einfo "-  ${VDRSUDOENTRY}"
-
-		cd "${T}"
-		cat >sudoedit-vdr.sh <<-SUDOEDITOR
-			#!/bin/bash
-			sed -i \${1} -e '/\/usr\/share\/vdr\/bin\/vdrshutdown-really.sh *$/d'
-
-		SUDOEDITOR
-		chmod a+x sudoedit-vdr.sh
-
-		VISUAL="${T}"/sudoedit-vdr.sh visudo -f "${ROOT}"/etc/sudoers || die "visudo failed"
-
-		einfo "Edited /etc/sudoers"
-	fi
-}
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.8.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.8.ebuild
new file mode 100644
index 000000000000..ec0010a562c0
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.8.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user
+
+GVS_VERSION="3ef03483b825a032d2618c2f3fb61865b0fc2f1e"
+
+DESCRIPTION="Scripts necessary for use of VDR as a set-top-box"
+HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-vdr-scripts.git/about/"
+SRC_URI="https://gitweb.gentoo.org/proj/gentoo-vdr-scripts.git/snapshot/gentoo-vdr-scripts-${GVS_VERSION}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="app-admin/sudo
+	sys-process/wait_on_pid"
+
+S="${WORKDIR}/${PN}-${GVS_VERSION}"
+
+VDR_HOME=/var/vdr
+
+pkg_setup() {
+	enewgroup vdr
+
+	# Add user vdr to these groups:
+	#   video - accessing dvb-devices
+	#   audio - playing sound when using software-devices
+	#   cdrom - playing dvds/audio-cds ...
+	enewuser vdr -1 -1 "${VDR_HOME}" vdr,video,audio,cdrom
+}
+
+src_install() {
+	default
+
+	# create necessary directories
+	diropts -ovdr -gvdr
+	keepdir "${VDR_HOME}"
+
+	keepdir "${VDR_HOME}/shutdown-data"
+	keepdir "${VDR_HOME}/merged-config-files"
+	keepdir "${VDR_HOME}/dvd-images"
+}
+
+VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
+
+pkg_postinst() {
+	elog "${CATEGORY}/${PN} supports an init script"
+	elog "to start a X server"
+	elog "Please refer for detailed info to"
+	elog "/usr/share/doc/${PF}/ README.x11-setup\n"
+
+	elog "systemd is supported by ${CATEGORY}/${PN}"
+	elog "This are described in the README.systemd file"
+	elog "in /usr/share/doc/${PF}/\n"
+
+	einfo "nvram wakeup is supported optional."
+	einfo "To make use of it emerge sys-power/nvram-wakeup.\n"
+
+	elog "Plugins which should be used are set via"
+	elog "the config-file called /etc/conf.d/vdr.plugins"
+	elog "or enabled them via the frontend eselect vdr-plugin.\n"
+
+	if [[ -f "${EROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
+		grep -q ^DVDSWITCH_BURNSPEED= "${EROOT}"/etc/conf.d/vdr.dvdswitch
+	then
+		ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch"
+		ewarn "This no longer has any effect, please use"
+		ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd"
+	fi
+
+	# backup routine for old /etc/sudoers entry
+	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${EROOT}"/etc/sudoers; then
+		ewarn "Please remove depricated entry from /etc/sudoers:"
+		ewarn "${VDRSUDOENTRY}"
+		ewarn "sudoers handling is supported by:"
+		ewarn "/etc/sudoers.d/vdr"
+	fi
+}
diff --git a/media-tv/ivtv-utils/Manifest b/media-tv/ivtv-utils/Manifest
index 8ed625194f92..e60f93557b17 100644
--- a/media-tv/ivtv-utils/Manifest
+++ b/media-tv/ivtv-utils/Manifest
@@ -1,5 +1,5 @@
-AUX ivtv-utils-1.4.0-gentoo.patch 2488 BLAKE2B 348f93c26a97e6f781e5258097cc72c319fcf56b7782dd247b798e86d5c92bbe4044f0759b431d92d9139f725b0324275759affba2cdbb24ad74270fac808339 SHA512 552b98643cef842087a47a6bd88a64d8943770356e8d6860a4c40ab43bd4cc550dd452e783d134cf14ee6e2dd22722257fbebf4b6103c7fee3d678f1ceab09f5
-AUX ivtv-utils-1.4.1-overflow.patch 1762 BLAKE2B 260b519153d319062751fe0d597732b043c943e121c6a7bde3ca69841b83c15dfbccc00654bb9a106a457634fe8a2cd177fce0311e94b9d6af0162df94b47812 SHA512 775acf1bc8b13e811a4aad1d9f7ab3051634e8a7d521a1a594e06262cb9a0d782d55b37bdc93618390253403b5ed98af5756d24522a5f61489401f4ffc71903e
+AUX ivtv-utils-1.4.0-gentoo.patch 2423 BLAKE2B cf0cb7fb1ea7c0d9cd62b6d2fce3e342b45b835b1d27708f431fcc371e5f7763d4fcc3809d3e775a6d6a9b08077825ea5786f948c480e72931e2e7db2339abb0 SHA512 1737dc876704775dbcd361af38dce65711215a25c3e7b5c0f4f447518d9752b3488df308ef82693ce2c7471600527d49c374209bee02e1686575d15cf3ac06cd
+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 901 BLAKE2B ab0c3e482dc27fd84b981e1c74067102bb8958cffdaf641be0df42ae2bc129d5d9f22a2a074867323d8a311a6ae71977ae6872c6b7151588bd65182e77556b55 SHA512 de39ffc9d653bace3d8885159ad902f1c726dcc37d430c03a3bf83c53aa93ab6de5ac7e554eae1aaec8271e246240e778678ce91b66098bd5bc548135d5a565f
+EBUILD ivtv-utils-1.4.1.ebuild 869 BLAKE2B 7d163c5e7a93c37320e7a6bd870e9077b3ad55df0fd968288b10e54bae249e1c96a51795854b721baf0e41ab10dfd8020ccdad5dd582bcc09e5a3f92be5409c7 SHA512 81d1f135939dc1c590cb15c9fcc585ea396efa6bf57604a7cd5912306e898746731e99ebddf563aa47cf6ad37e3e72407a770656f5fad90e7e73b68704194677
 MISC metadata.xml 302 BLAKE2B 98fc025993a88c607187f0b8e9fe7295800fce7a4d0db4378118175be7dd9af2131130e5872b79faf415dd404d635c72524395927e8f5c4e7184d24e75e97937 SHA512 fd8133b38c4139c841e83a26e24cb2695a6f711b0f9a5495d8f9363d9ae32bc26d03e7e1b5a708d549fbe72452af853c5b326b1a2d27cd5dc630bda8a6fed9a2
diff --git a/media-tv/ivtv-utils/files/ivtv-utils-1.4.0-gentoo.patch b/media-tv/ivtv-utils/files/ivtv-utils-1.4.0-gentoo.patch
index 4b75d177e391..5c03e6e737ee 100644
--- a/media-tv/ivtv-utils/files/ivtv-utils-1.4.0-gentoo.patch
+++ b/media-tv/ivtv-utils/files/ivtv-utils-1.4.0-gentoo.patch
@@ -10,8 +10,8 @@ https://bugs.gentoo.org/show_bug.cgi?id=321303
 
 Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
 
---- test/Makefile
-+++ test/Makefile
+--- a/test/Makefile
++++ b/test/Makefile
 @@ -7,13 +7,13 @@
  	ivtv-osd-dma-test ivtv-fb-colormap-test \
  	ivtv-fb-16-bit-test ps-analyzer
@@ -30,8 +30,8 @@ Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
 
  clean: 
  	rm -f *.o $(EXES)
---- utils/Makefile.orig	2010-05-24 15:35:11.321677941 +0000
-+++ utils/Makefile	2010-05-24 15:35:15.595615306 +0000
+--- a/utils/Makefile
++++ b/utils/Makefile
 @@ -9,41 +9,39 @@
  X86_EXES := ivtvplay ivtv-mpegindex #ivtv-encoder
  endif
@@ -86,8 +86,8 @@ Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
  	install -d $(DESTDIR)/$(BINDIR)
  	install -m 0755 $(BIN) $(DESTDIR)/$(BINDIR)
  
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -1,6 +1,6 @@
  all clean install:
 -	make -C utils $@
diff --git a/media-tv/ivtv-utils/files/ivtv-utils-1.4.1-overflow.patch b/media-tv/ivtv-utils/files/ivtv-utils-1.4.1-overflow.patch
index 1c2a66159639..24f24d41acaa 100644
--- a/media-tv/ivtv-utils/files/ivtv-utils-1.4.1-overflow.patch
+++ b/media-tv/ivtv-utils/files/ivtv-utils-1.4.1-overflow.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/339405
 
---- utils/cx25840ctl/cx25840ctl.c
-+++ utils/cx25840ctl/cx25840ctl.c
+--- a/utils/cx25840ctl/cx25840ctl.c
++++ b/utils/cx25840ctl/cx25840ctl.c
 @@ -57,7 +57,7 @@
  		return 0;
  	}
@@ -20,8 +20,8 @@ http://bugs.gentoo.org/339405
  	if ((fp = fopen(sysfile, "r")) != NULL)
  	{
  		fgets(name, sizeof(name), fp);
---- utils/ivtv-ctl.c
-+++ utils/ivtv-ctl.c
+--- a/utils/ivtv-ctl.c
++++ b/utils/ivtv-ctl.c
 @@ -358,7 +358,7 @@
  	__u32 reset = 0;
  	int new_debug_level, gdebug_level;
@@ -49,8 +49,8 @@ http://bugs.gentoo.org/339405
  		if (dowrite(buf, "/sys/module/ivtv/parameters/debug") == 0) {
  			printf(" set debug level: ");
  			print_debug_mask(new_debug_level);
---- utils/v4l2-ctl.cpp
-+++ utils/v4l2-ctl.cpp
+--- a/utils/v4l2-ctl.cpp
++++ b/utils/v4l2-ctl.cpp
 @@ -416,7 +416,7 @@
  {
  	char buf[10];
diff --git a/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild b/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild
index 14f05778ee08..637e4c6bad13 100644
--- a/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild
+++ b/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="IVTV utilities for Hauppauge PVR PCI cards"
 HOMEPAGE="http://www.ivtvdriver.org/"
@@ -20,24 +21,22 @@ RDEPEND="${DEPEND}
 		dev-perl/Video-Frequencies
 		dev-perl/Video-ivtv
 		dev-perl/Config-IniFiles
-		virtual/perl-Getopt-Long
 		dev-perl/Tk
-		)"
+		virtual/perl-Getopt-Long
+	)"
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.4.0-gentoo.patch \
-		"${FILESDIR}"/${PN}-1.4.1-overflow.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0-gentoo.patch
+	"${FILESDIR}"/${PN}-1.4.1-overflow.patch
+)
 
-src_compile() {
+src_configure() {
 	tc-export CC CXX
-	emake
 }
 
 src_install() {
 	emake DESTDIR="${D}" PREFIX="/usr" install
-	dodoc ChangeLog README doc/*
+	dodoc -r ChangeLog README doc/.
 
 	if use perl; then
 		dobin utils/perl/*.pl
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 757242a9886f..dd76610fc1b2 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,11 +1,14 @@
+AUX kodi-18.5-cassert.patch 1402 BLAKE2B 02f2b63856cf1fd75749d78a0f9cf37cac55b20fc22302846011781c56e8902312a10e71c3e1b21f44aaa362efba2acefb73c5ae68643b569c541508f44d97bd SHA512 fbaa126dd647559749944c09e5424a76dccdaa5d8dc6299a52cb6215f20af29f3cf8d0596280f335e8a9be1ffe556fa47b33c9d28b22c2b47f51d738219aeb8c
 DIST ffmpeg-kodi-4.0.3-Leia-18.2.tar.gz 12426917 BLAKE2B 83da9511d7b4ef6a8c813561a061c4fe86712e4424c30c9005500751c6c79f4232910caaf13cd34d2db1867f592b042dd291d6c32a77f80107ce87a3a7db1760 SHA512 b4d4bf16f05b953ba81769446c8fd90246e1919b9ef671fb212008151c83d8445e4123ad37c352aa6243074962832e817749d2de318eb721d5bb5d655fd77ab2
 DIST ffmpeg-kodi-4.0.4-Leia-18.4.tar.gz 12430413 BLAKE2B 6de6fde2c16264f851466b46f87c23c34e7d503203f69d47342d46034f153860190d196da51221f866315405c8a33325b2160283333256ee5d5e293336afae99 SHA512 c6dd75dbff7119adeeda246cfb640b5e8d3b4c242ef83e5ba070207b60f0c715c3fe3cb328d87687b70a133f122a03aba990f0e95f3aac7d5dbcee25bec59078
 DIST kodi-18.3.tar.gz 51013397 BLAKE2B cce29d481397dddd3c942f83a034bc6d73eafc1be2a50436e1e5611ccf04c27e6110c4b4f99f7f7d1cf8da3e2550209c8bee3db6e98136b8fa9738c4b1fc7e43 SHA512 4e898e28238dcbc67e106c5a0ef88bd6a82f8c0ad00e77e3ddbe2da6181b37d9ca1ba6bda57206223cfa119c5291edb4410d3e773d97b5ab67660e49929437ec
 DIST kodi-18.4.tar.gz 51027569 BLAKE2B 47e3377abb4a1e5a3c26b1519f45ab9347127467594841ac689b857a3f4163731951d4e1e4960bce5c2af4fa224acf4a3887f42bdc41a603bba4979d3bcbcda8 SHA512 ae08fc29d20387d9352dc1ae4a89da19962a279b89705ff8f7869377281589d44a685cebaa8509d3252ae79215dcdaadb72e9fa752e6d2bce59974bc23276aad
+DIST kodi-18.5.tar.gz 51025415 BLAKE2B c439790a85466d50875cd63ccdc6fee1b16c5ee67d9a3371b1a006292f642e59c6321cb63f698e1a43bc7be45209dbf993028b1184722f7b51dbe6fef6a292ba SHA512 6fe70d8ee5b6ffd3d43b89487554e41eed8dbf95bb017b82578b547ec248ae94f4dda298f0d85c5896019f7032eba4e1e2494c8140dde9c9b9cb21802acfd029
 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.3-r1.ebuild 9618 BLAKE2B 59340db94ac20b444d0bd7a58510ad9efd2de979845294a78c5393e6ac8ac59b96e9f4fc092099a1c2328f5ccd135c984af8eb765c44835ff355ed8b29c2407c SHA512 fddb89222a47a985336497053955a02264b176b47b194379c3fd185f609bf6ba9cffc4c2cf2407057f54f09642770dcf870b1494a4dcbcaea15ff22069e19fe2
-EBUILD kodi-18.4.ebuild 9450 BLAKE2B dabb70d62515981b145ea11b81308a2fad942f414f5194a1e7bd100189ebcee9846cb47148ef71a8e08f9cee7604c6998df206b8f8ca37225557b2f7dd7beb8f SHA512 ee5adea0fe5fb3fa2378e09526584dcdae41d7ca3c3964329ad0b26fdfb6beb86b658edd76b888485d7c3eca5fc5d32a365c3880f2d9d727c495535a9431893c
-EBUILD kodi-9999.ebuild 8879 BLAKE2B 352389fe5f92367359e7b848c2baacd2cceaf8aa9c6c78031e05e91c0bfa7d67c829b32585980133a77d8124e77b799b178746bb02c5699bbb6f728f6126ce4f SHA512 5b12d47a6ddd77da245d5e412b7ef6ebea3d8632a42c26dc57b3e38eece2d3daec7a9d71617c509584d404bf9da38b1073326c09297766a21a3279e63cba2426
+EBUILD kodi-18.3-r1.ebuild 9645 BLAKE2B 9102f2003a7ab09a9d46bf516a103b7376ac6030f6ed34e839792b02807f5d08bd0009136d68a1e622c4e582d5b0aab13cbd02328b77382a896fb2a26ec93dfc SHA512 a68d9e579747b3aae539807f7753f0f1d65161d34b1d574c793745739e5f38487abca33b93d1964aa9cb52bb06f6f9751281a970ef9f00c078313de45118fe03
+EBUILD kodi-18.4.ebuild 9529 BLAKE2B 1320de2aab6b549a7d8558dac07c84ae0af973235ccc57116750fa167c9dd8b6a19f0307c3815fca8b8622605bb12a988b669f906ebf0ea843f0939553e25348 SHA512 86602e065566c58f69b27cfe73bb5bbe3fd7c4d1f7de94a38982970e5217d8c7bc126590dd2a0119f59f81f508d62c41d392016e084c23d9f533fd41974eb2ca
+EBUILD kodi-18.5.ebuild 9484 BLAKE2B 37355976d09a2f57e41f4f267910fe96497170ebc4db273dfad02f0f2b525de684ae375627ee3fad901cdf7195048828020de4c2ad6ca580f03cc212dea6d11c SHA512 4034009ebe07284897f9cd86ccf71b396b720286d34b5500ebe1496381a1b1589c72d670eeac29cdf0951bcb719aa966db4532fe962308447b4a6bf0f84e2e93
+EBUILD kodi-9999.ebuild 8919 BLAKE2B 6146c4c39a8964700b9654b4b6762611819f70f3cdb821a3ccaddc8a511d7f05fd9c40aaf7451cd1bb930b7c0b44754cfd674f3d54b8c97739a8bee294ccac39 SHA512 66da8f35dbeef47e494123302a6da65cfa14a160cffd9eb88e78bb053a5d5a138620469e132c4576c49f676cb5d0120a46439c893332295464901399628edb46
 MISC metadata.xml 1720 BLAKE2B 3158b87065286649496de2edf821c37042cafe7e729f7ba31c571ade72cf8f9fbce218485ac721ad896fa5ef751becfd2f3b4ce1645e97b4db673ec879884834 SHA512 f8d52358276ad8c2eb23632451f025ac45f799fa392bd59fcfd4417d9e9e76cf9ce066ac50cd8ee563319d7f2248b28c45fee3059a4e069ebb862e41d230b1da
diff --git a/media-tv/kodi/files/kodi-18.5-cassert.patch b/media-tv/kodi/files/kodi-18.5-cassert.patch
new file mode 100644
index 000000000000..9558baa9e18c
--- /dev/null
+++ b/media-tv/kodi/files/kodi-18.5-cassert.patch
@@ -0,0 +1,42 @@
+https://github.com/xbmc/xbmc/pull/17000
+
+From bbfc36f06c191d3bdea19cacc498afb86bd25404 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Thu, 5 Dec 2019 14:49:50 -0500
+Subject: [PATCH] Add missing cassert includes
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Without these includes, ‘assert’ was not declared in this scope errors
+occur.
+---
+ xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp | 1 +
+ xbmc/windowing/GraphicContext.cpp                  | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp
+index 1303d894478c..aa85d95b3234 100644
+--- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp
++++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp
+@@ -31,6 +31,7 @@
+ #include "utils/Variant.h"
+ #include "utils/log.h"
+ 
++#include <cassert>
+ #include <utility>
+ 
+ #define SETTING_PROFILE_NAME          "profile.name"
+diff --git a/xbmc/windowing/GraphicContext.cpp b/xbmc/windowing/GraphicContext.cpp
+index b47bafba57dc..75b333ea6daa 100644
+--- a/xbmc/windowing/GraphicContext.cpp
++++ b/xbmc/windowing/GraphicContext.cpp
+@@ -25,6 +25,8 @@
+ #include "settings/lib/Setting.h"
+ #include "utils/log.h"
+ 
++#include <cassert>
++
+ using namespace KODI::MESSAGING;
+ 
+ CGraphicContext::CGraphicContext(void) = default;
diff --git a/media-tv/kodi/kodi-18.3-r1.ebuild b/media-tv/kodi/kodi-18.3-r1.ebuild
index 166f22eaccba..477b728c91b2 100644
--- a/media-tv/kodi/kodi-18.3-r1.ebuild
+++ b/media-tv/kodi/kodi-18.3-r1.ebuild
@@ -42,6 +42,7 @@ SLOT="0"
 # it is _required_ for USB support. Otherwise they'll disable udev and
 # that's going to be worse.
 IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	|| ( gles opengl )
diff --git a/media-tv/kodi/kodi-18.4.ebuild b/media-tv/kodi/kodi-18.4.ebuild
index 88ebd8f9b020..d0bde5b7f3d5 100644
--- a/media-tv/kodi/kodi-18.4.ebuild
+++ b/media-tv/kodi/kodi-18.4.ebuild
@@ -14,6 +14,9 @@ SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -
 	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
 	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
+PATCHES=(
+	"${FILESDIR}/${PN}-18.5-cassert.patch"
+)
 
 if [[ ${PV} == *9999 ]] ; then
 	PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
@@ -42,6 +45,7 @@ SLOT="0"
 # it is _required_ for USB support. Otherwise they'll disable udev and
 # that's going to be worse.
 IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	|| ( gles opengl )
diff --git a/media-tv/kodi/kodi-18.5.ebuild b/media-tv/kodi/kodi-18.5.ebuild
new file mode 100644
index 000000000000..f8dc1e170749
--- /dev/null
+++ b/media-tv/kodi/kodi-18.5.ebuild
@@ -0,0 +1,320 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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.0.4"
+CODENAME="Leia"
+FFMPEG_KODI_VERSION="18.4"
+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
+	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
+	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
+PATCHES=(
+	"${FILESDIR}/${P}-cassert.patch"
+)
+
+if [[ ${PV} == *9999 ]] ; then
+	PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
+	inherit git-r3
+else
+	PYTHON_COMPAT=( python2_7 )
+	MY_PV=${PV/_p/_r}
+	MY_PV=${MY_PV/_alpha/a}
+	MY_PV=${MY_PV/_beta/b}
+	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 ~x86"
+	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
+fi
+
+inherit autotools cmake-utils desktop linux-info pax-utils python-single-r1 xdg
+
+DESCRIPTION="A free and open source media-player and entertainment hub"
+HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+# use flag is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( gles opengl )
+	^^ ( gbm raspberry-pi wayland X )
+	?? ( mariadb mysql )
+	udev? ( !libusb )
+	udisks? ( dbus )
+	upower? ( dbus )
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	airplay? (
+		>=app-pda/libplist-2.0.0
+		net-libs/shairplay
+	)
+	alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
+	bluetooth? ( net-wireless/bluez )
+	bluray? ( >=media-libs/libbluray-1.0.2 )
+	caps? ( sys-libs/libcap )
+	dbus? ( sys-apps/dbus )
+	dev-db/sqlite
+	dev-libs/expat
+	dev-libs/flatbuffers
+	>=dev-libs/fribidi-0.19.7
+	cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
+	dev-libs/libpcre[cxx]
+	>=dev-libs/libinput-1.10.5
+	>=dev-libs/libxml2-2.9.4
+	>=dev-libs/lzo-2.04
+	dev-libs/tinyxml[stl]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_USEDEP}]' 'python3*')
+	>=dev-libs/libcdio-0.94
+	>=dev-libs/libfmt-3.0.1
+	dev-libs/libfstrcmp
+	gbm? (	media-libs/mesa[gbm] )
+	gles? (
+		!raspberry-pi? ( media-libs/mesa[gles2] )
+	)
+	lcms? ( media-libs/lcms:2 )
+	libusb? ( virtual/libusb:1 )
+	virtual/ttf-fonts
+	media-fonts/roboto
+	>=media-libs/fontconfig-2.12.4
+	>=media-libs/freetype-2.8
+	>=media-libs/libass-0.13.4
+	!raspberry-pi? ( media-libs/mesa[egl,X(+)] )
+	>=media-libs/taglib-1.11.1
+	system-ffmpeg? (
+		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc]
+		libressl? ( media-video/ffmpeg[libressl,-openssl] )
+		!libressl? ( media-video/ffmpeg[-libressl,openssl] )
+	)
+	mysql? ( dev-db/mysql-connector-c:= )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	>=net-misc/curl-7.56.1[http2]
+	nfs? ( >=net-fs/libnfs-2.0.0:= )
+	opengl? ( media-libs/glu )
+	!libressl? ( >=dev-libs/openssl-1.0.2l:0= )
+	libressl? ( dev-libs/libressl:0= )
+	raspberry-pi? (
+		|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] )
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
+	>=sys-libs/zlib-1.2.11
+	udev? ( virtual/udev )
+	vaapi? (
+		x11-libs/libva:=
+		opengl? ( x11-libs/libva[opengl] )
+		system-ffmpeg? ( media-video/ffmpeg[vaapi] )
+		vdpau? ( x11-libs/libva[vdpau] )
+		wayland? ( x11-libs/libva[wayland] )
+		X? ( x11-libs/libva[X] )
+	)
+	virtual/libiconv
+	vdpau? (
+		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
+		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
+	)
+	wayland? (
+		>=dev-cpp/waylandpp-0.2.3:=
+		media-libs/mesa[wayland]
+		>=dev-libs/wayland-protocols-1.7
+	)
+	webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		system-ffmpeg? ( media-video/ffmpeg[X] )
+	)
+	x11-libs/libdrm
+	>=x11-libs/libxkbcommon-0.4.1
+	xslt? ( dev-libs/libxslt )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+RDEPEND="${COMMON_DEPEND}
+	lirc? ( app-misc/lirc )
+	!media-tv/xbmc
+	udisks? ( sys-fs/udisks:2 )
+	upower? ( sys-power/upower )
+"
+DEPEND="${COMMON_DEPEND}
+	app-arch/bzip2
+	app-arch/xz-utils
+	dev-lang/swig
+	dev-libs/crossguid
+	dev-libs/rapidjson
+	dev-util/cmake
+	dev-util/gperf
+	media-libs/giflib
+	>=media-libs/libjpeg-turbo-1.5.1:=
+	>=media-libs/libpng-1.6.26:0=
+	test? ( dev-cpp/gtest )
+	virtual/pkgconfig
+	virtual/jre
+	x86? ( dev-lang/nasm )
+"
+
+CONFIG_CHECK="~IP_MULTICAST"
+ERROR_IP_MULTICAST="
+In some cases Kodi needs to access multicast addresses.
+Please consider enabling IP_MULTICAST under Networking options.
+"
+
+pkg_setup() {
+	check_extra_config
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]] ; then
+		if python_is_python3; then
+			EGIT_BRANCH="feature_python3"
+			ewarn "Using the experimental Python 3 branch!"
+			ewarn "See https://kodi.wiki/view/Migration_to_Python_3 for more information."
+			ewarn "To use the non-experimental Python 2 version:"
+			ewarn "echo '~${CATEGORY}/${P} PYTHON_TARGETS: -* python2_7 PYTHON_SINGLE_TARGET: -* python2_7' >> /etc/portage/package.use"
+			ewarn "then re-merge using: emerge -a =${CATEGORY}/${PF}"
+		fi
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# avoid long delays when powerkit isn't running #348580
+	sed -i \
+		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+		xbmc/platform/linux/*.cpp || die
+
+	# Prepare tools and libs witch are configured with autotools during compile time
+	AUTOTOOLS_DIRS=(
+		"${S}"/lib/cpluff
+		"${S}"/tools/depends/native/TexturePacker/src
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src
+	)
+
+	local d
+	for d in "${AUTOTOOLS_DIRS[@]}" ; do
+		pushd ${d} >/dev/null || die
+		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
+		popd >/dev/null || die
+	done
+	elibtoolize
+
+	# Prevent autoreconf rerun
+	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
+		"${S}"/cmake/modules/FindCpluff.cmake \
+		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
+		|| die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_AIRTUNES=$(usex airplay)
+		-DENABLE_AVAHI=$(usex zeroconf)
+		-DENABLE_BLUETOOTH=$(usex bluetooth)
+		-DENABLE_BLURAY=$(usex bluray)
+		-DENABLE_CCACHE=OFF
+		-DENABLE_CEC=$(usex cec)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_DVDCSS=$(usex css)
+		-DENABLE_INTERNAL_CROSSGUID=OFF
+		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
+		-DENABLE_INTERNAL_FSTRCMP=OFF
+		-DENABLE_CAP=$(usex caps)
+		-DENABLE_LCMS2=$(usex lcms)
+		-DENABLE_LIRCCLIENT=$(usex lirc)
+		-DENABLE_MARIADBCLIENT=$(usex mariadb)
+		-DENABLE_MICROHTTPD=$(usex webserver)
+		-DENABLE_MYSQLCLIENT=$(usex mysql)
+		-DENABLE_NFS=$(usex nfs)
+		-DENABLE_OPENGLES=$(usex gles)
+		-DENABLE_OPENGL=$(usex opengl)
+		-DENABLE_OPTICAL=$(usex dvd)
+		-DENABLE_PLIST=$(usex airplay)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_SMBCLIENT=$(usex samba)
+		-DENABLE_UDEV=$(usex udev)
+		-DENABLE_UPNP=$(usex upnp)
+		-DENABLE_VAAPI=$(usex vaapi)
+		-DENABLE_VDPAU=$(usex vdpau)
+		-DENABLE_XSLT=$(usex xslt)
+		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
+		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
+		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
+	)
+
+	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
+
+	if use system-ffmpeg; then
+		mycmakeargs+=( -DWITH_FFMPEG="yes" )
+	else
+		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
+	fi
+
+	if use gbm; then
+		mycmakeargs+=(
+			-DCORE_PLATFORM_NAME="gbm"
+			-DGBM_RENDER_SYSTEM="$(usex opengl gl gles)"
+		)
+	fi
+
+	if use wayland; then
+		mycmakeargs+=(
+			-DCORE_PLATFORM_NAME="wayland"
+			-DWAYLAND_RENDER_SYSTEM="$(usex opengl gl gles)"
+		)
+	fi
+
+	if use raspberry-pi; then
+		mycmakeargs+=( -DCORE_PLATFORM_NAME="rbpi" )
+	fi
+
+	if use X; then
+		mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile all
+}
+
+src_test() {
+	cmake-utils_src_make check
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
+
+	newicon media/icon48x48.png kodi.png
+
+	rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
+		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
+
+	python_domodule tools/EventClients/lib/python/xbmcclient.py
+	python_newscript "tools/EventClients/Clients/KodiSend/kodi-send.py" kodi-send
+}
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index a5e56b7f2175..c3c40213e110 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -10,12 +10,11 @@ LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
 FFMPEG_VERSION="4.0.4"
 CODENAME="Leia"
 FFMPEG_KODI_VERSION="18.4"
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
 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
 	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
 	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
-
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
 	inherit git-r3
@@ -50,6 +49,7 @@ REQUIRED_USE="
 	udisks? ( dbus )
 	upower? ( dbus )
 "
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	airplay? (
@@ -229,7 +229,6 @@ src_configure() {
 		-DENABLE_LCMS2=$(usex lcms)
 		-DENABLE_LIRCCLIENT=$(usex lirc)
 		-DENABLE_MARIADBCLIENT=$(usex mariadb)
-		-DENABLE_MYSQLCLIENT=$(usex mysql)
 		-DENABLE_MICROHTTPD=$(usex webserver)
 		-DENABLE_MYSQLCLIENT=$(usex mysql)
 		-DENABLE_NFS=$(usex nfs)
@@ -276,7 +275,10 @@ src_configure() {
 	fi
 
 	if use X; then
-		mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
+		mycmakeargs+=(
+			-DCORE_PLATFORM_NAME="x11"
+			-DX11_RENDER_SYSTEM="$(usex opengl gl gles)"
+		)
 	fi
 
 	cmake-utils_src_configure
@@ -293,11 +295,11 @@ src_test() {
 src_install() {
 	cmake-utils_src_install
 
-	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
+	pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
 
 	newicon media/icon48x48.png kodi.png
 
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+	rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
 	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
 		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
 
diff --git a/media-tv/plex-media-server/Manifest b/media-tv/plex-media-server/Manifest
index 642ca17d7736..e79ba761089d 100644
--- a/media-tv/plex-media-server/Manifest
+++ b/media-tv/plex-media-server/Manifest
@@ -2,12 +2,15 @@ AUX conf.d/plex-media-server 216 BLAKE2B 094d0f6f7cdfa696ae47d7879c7459be5755dfe
 AUX init.d/plex-media-server 413 BLAKE2B f60fe9f653c591cddaf77a0ebcb47218681a63235e82bc016c7d2ee9180df7f6ff24f3784216ea370bdc2d493531492f196200b6ec56ff8b303e69adaa0f108d SHA512 aeb873a00081f20abd27cc76d395908ae0643bd8aa665557adafef2ed97edbe93c18b55818b49227746f9c3ce4b7a81ceb9132f07d8d873bc7b5a932b944a402
 AUX systemd/plex-media-server.service 159 BLAKE2B d4988890f6424e0b9160e90df0125fbcb32e86443c5b869f66ac6e28c3701fdaa3dd819823edd0c8675792bf4e24e7fcf3bb8894e55539ad8fc5eb9ac9a550fc SHA512 9066840efa43b127dd0d4b26ea0552894db97bf48f89003258095986e7d4728e05bee2f49de856777ed3d0b5ec41654c14505bc9867b227b754aeecd0529abd6
 AUX virtualenv_start_pms.patch 839 BLAKE2B 20d6a53b40a2c714153bc7f04c2bbad568b75197cd450cb52129cc3718fad1db09f9fe2a92e8608e1e95b710e0b4af58a373650ab4017438b63fe61132f13d75 SHA512 55fb8f3234942d10c0d6d1820fbab48b8a9f26f069031946dae551cde8b7d18d61ef36ec994719d2519687dc75e5ec27205702395a8af112bda720b7a62072aa
+AUX virtualenv_start_pms_2019.patch 430 BLAKE2B 397f059ab4a401bb92dc71a763a3c2ce385bcb0d3fc001629b5b9c2a740b862c086bb9d62592897e39e9fa8849671a2b961b8653de27d8c80e66c4b749a34982 SHA512 e6611cf2831701dabba08c4e9cdb8a8689da4cabcc720d4236b8c193ef7bd97e68451c82573f062cd0fdfd8d758cb0f4b7be5f09514b5e08313001e4ad68489b
 DIST plexmediaserver_1.11.3.4803-c40bba82e_amd64.deb 108830880 BLAKE2B 7ed912756b8bdedb695c4cbf99d0565da53904814cedb8e026614b8db9bb638cbd437f35e05915d6d22221c87ecf1136ea9ae08797bca2ebbe4f2e0a861b4841 SHA512 0bda324e733b1e86e8dba7c10f6bab3e9dad5463113c5998059492bd7d4a49e105068d1d9313c9405d7a3c85c99e6528be6c0f1c9f52db115a1da1545a9485b5
 DIST plexmediaserver_1.12.3.4973-215c28d86_amd64.deb 109277946 BLAKE2B 6a868943c77a1355dd0a4dbe88323b937d827dbfe84e729cf1f5c5c7d4a7d44e9af7e69121a7e3cf9f5d60786c9877bd3e303d9d5d301c86f08984afb1062730 SHA512 1befe9196926bf4cabd1f9c746e958efc72392479a844f8c3d9161282618fe28e29dbb9c12ddccf5db5b852ae58cd43dc0d988f00732431e16106021c8618347
 DIST plexmediaserver_1.13.2.5154-fd05be322_amd64.deb 111093662 BLAKE2B 26b1161107a8f9223f7065ff4119a32470c06794a159a42181b9278107a6d14f9fbb582e515223aaa659e9007d9b18299cd65b2a068e1d7dd934d52552a44cd1 SHA512 548c033272d56f6c54ab073536327b285fdbda3192c203a3ea3ff2b6c7afbc79ba7d56d7251f623ca1e09db572c92000d7baa7a8a555d853d85fdb9d1dfb8479
 DIST plexmediaserver_1.14.1.5488-cc260c476_amd64.deb 105175642 BLAKE2B 59f7cc130115ae2179bcf0ddf5ef4583886c11447c423ada2b1da62f83c3840c89aa2b6d9c56e3a358d1da03bc9a6bd340cae7fee1b6da102e9bc785de4f8e27 SHA512 48f25ac27a8dc5d1a4ae74a04793994bb21431ed3069a9808373e0c5a424fd53f577d0912e1e46a155133b094bdafb7edeb5b6c9ef428a08e07e24e055267e86
+DIST plexmediaserver_1.16.4.1469-6d5612c2f_amd64.deb 74427444 BLAKE2B f90973aaadaf8e11fbcaa0aaa817a11b62049b1eaa22c04daf65d4fc21e73eb90d982e3faa66b482fdb4e7b53467246e20845c432920718334c5419c760e85bd SHA512 0753e82d4cd2c5a35f8f62329c3013eff297edd1bf9afcfd1444c3f3f85d33b3aec4a553c70931182d3a45df44dd26ce10ddbee9b59755914c988f0edbe5aa70
 EBUILD plex-media-server-1.11.3.ebuild 4677 BLAKE2B a383ba8725a3b464d4f26df41db9823b6f63d704d7071723a92d03e07b3e40619afefeb64991e4a9051a47c0d2943416aa3da906cccd9033fbb8d91d29a1fab0 SHA512 b2b97885dc31e520aac8278df291c03c81169931940ec65aa5197957dee2bffb18ac32e11c1e049b14a196a9b5c096f210b439efd7800e9cac8d7e3743193682
 EBUILD plex-media-server-1.12.3.ebuild 4737 BLAKE2B a08d70d804e55777bdda1b67ed3438cb94013f93c2020a1c175c4839c0dc3d6f2727045be262a8ff01225666d006899dd11817f9d2309ea6b788744c8ee1c4de SHA512 18e182da95d918349f59bec88f860442dd4bef8778abbde77db8d7cd88db9c83dfb6f654afff9554101880a87542e7309f2e3411a70e159990e1417d86f97af3
 EBUILD plex-media-server-1.13.2-r1.ebuild 5111 BLAKE2B a695cebc1611c173f517c3618efd7733eaadc365d8a9d9519321d55fa0e34cf3101ecc630baf5614387cd3216d1aaf8d2eb76ccc904845d64918a4dde0ea4096 SHA512 9b31ceffb0f1de25250d865e11543851a08f53ba2568f2108bc98b069d295d97ea300baae50a5f9ce2a63aa36242f0162896dfdd6e9b9a428f0effe4a5de4348
 EBUILD plex-media-server-1.14.1.ebuild 5107 BLAKE2B 045768a008b2c7a20ec999bb7a04703aa86020c17cd7038255476793e5633873a239edff0580770d3b8d7d644dec336edae9380af5ae18c0949f8d87f636647a SHA512 a66db8f7a13c4d45b94f4c2f1f29d61c22eabcaf035d00226c860fcb44aba68d709cb9304ca85e0fc530cffe870668c7acba57fc11ea7ce483fbebef21d04802
-MISC metadata.xml 245 BLAKE2B 94154a8bdd62b19999d65d599876471c8e44c02209c12a20d75667a21eb873ad59b42d27536d54ff1274d57bad9d73d81eaacea36b8b02e01b40b9eb5e6c82d4 SHA512 c3c7907e50537dd94fdcec1da306eee2f050e5a456d369cd3df8c9bf36c810d811fe547418a8025e533916eb52a742d9feafae647b2957820d99ed962dad302e
+EBUILD plex-media-server-1.16.4.ebuild 4067 BLAKE2B bfc37ad99b0bada0e859a83c23a906944209d7c6b38da471f79802dca89716a274513ce85e84f4fd2a083b723733a9191262755356dd30429f5dc47307699685 SHA512 cfd87eba01fc50238bdcd94ca01d74e74281b58f9d4f71d6bd1e8e97189ab7a6077bb1640f5f23cb62febc27701d2c332da2bc4460af595fd74d93f0032b3d13
+MISC metadata.xml 367 BLAKE2B 0d52124daec02b05aa2c729fcc943a29b74d871de0dccf8cafb9947908a4eea58b2d893a454cb76230d1a24eecdd4b9ef752c40d52961488bd5722dfba57f2c8 SHA512 9feb86f493b8ba2cf3a3bf8c146e55bbd7701e58bf62ab576a71fecdac0ad0522bfe45650d84f6b0ec94be2fbf07c6db143cce5c69e80a32101084e372e86eb0
diff --git a/media-tv/plex-media-server/files/virtualenv_start_pms_2019.patch b/media-tv/plex-media-server/files/virtualenv_start_pms_2019.patch
new file mode 100644
index 000000000000..c68178bcb1c5
--- /dev/null
+++ b/media-tv/plex-media-server/files/virtualenv_start_pms_2019.patch
@@ -0,0 +1,12 @@
+--- a/usr/sbin/start_pms	2019-08-08 01:07:58.239646635 +0200
++++ b/usr/sbin/start_pms	2019-08-08 01:09:39.828649755 +0200
+@@ -20,6 +20,9 @@
+ 
+ test -f /etc/default/plexmediaserver && . /etc/default/plexmediaserver
+ 
++# Activate python virtualenv
++. "${PLEX_MEDIA_SERVER_HOME}"/Resources/Python/bin/activate
++
+ if [ ! -d "$PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR" ]
+ then
+   mkdir -p "$PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR"
diff --git a/media-tv/plex-media-server/metadata.xml b/media-tv/plex-media-server/metadata.xml
index 1a06e96ebdc7..8815e575c0e3 100644
--- a/media-tv/plex-media-server/metadata.xml
+++ b/media-tv/plex-media-server/metadata.xml
@@ -2,7 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>chainsaw@gentoo.org</email>
-		<name>Tony Vroon</name>
+		<email>ss23@ss23.geek.nz</email>
+		<name>Stephen Shkardoon</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/media-tv/plex-media-server/plex-media-server-1.16.4.ebuild b/media-tv/plex-media-server/plex-media-server-1.16.4.ebuild
new file mode 100644
index 000000000000..1fa5d4363cc5
--- /dev/null
+++ b/media-tv/plex-media-server/plex-media-server-1.16.4.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils systemd unpacker pax-utils python-single-r1
+
+MINOR_VERSION="1469-6d5612c2f"
+
+_APPNAME="plexmediaserver"
+_USERNAME="plex"
+_SHORTNAME="${_USERNAME}"
+_FULL_VERSION="${PV}.${MINOR_VERSION}"
+
+URI="https://downloads.plex.tv/plex-media-server-new"
+
+DESCRIPTION="A free media library that is intended for use with a plex client"
+HOMEPAGE="https://www.plex.tv/"
+SRC_URI="amd64? ( ${URI}/${_FULL_VERSION}/debian/plexmediaserver_${_FULL_VERSION}_amd64.deb )"
+SLOT="0"
+LICENSE="Plex"
+RESTRICT="bindist strip"
+KEYWORDS="-* ~amd64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="dev-python/virtualenv[${PYTHON_USEDEP}]"
+
+RDEPEND="
+	net-dns/avahi
+	acct-user/plex
+	acct-group/plex
+	${PYTHON_DEPS}"
+
+QA_PREBUILT="*"
+QA_MULTILIB_PATHS=(
+	"usr/lib/${_APPNAME}/.*"
+	"usr/lib/${_APPNAME}/Resources/Python/lib/python2.7/.*"
+)
+
+BINS_TO_PAX_MARK=( "${ED}/usr/lib/plexmediaserver/Plex Script Host" )
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}/virtualenv_start_pms_2019.patch" )
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_install() {
+	# Move the config to the correct place
+	local config_vanilla="/etc/default/plexmediaserver"
+	local config_path="/etc/${_SHORTNAME}"
+	dodir "${config_path}"
+	insinto "${config_path}"
+	doins "${config_vanilla#/}"
+	sed -e "s#${config_vanilla}#${config_path}/${_APPNAME}#g" -i "${S}"/usr/sbin/start_pms || die
+
+	# Remove Debian specific files
+	rm -r "usr/share/doc" || die
+
+	# Fix QA warning about .desktop file.
+	sed -i 's|Audio;Music;Video;Player;Media;|AudioVideo;Music;Player;|g' \
+		usr/share/applications/plexmediaserver.desktop || die
+
+	# Copy main files over to image and preserve permissions so it is portable
+	cp -rp usr/ "${ED}"/ || die
+
+	# Make sure the logging directory is created
+	local logging_dir="/var/log/pms"
+	dodir "${logging_dir}"
+	fowners "${_USERNAME}":"${_USERNAME}" "${logging_dir}"
+	keepdir "${logging_dir}"
+
+	# Create default library folder with correct permissions
+	local default_library_dir="/var/lib/${_APPNAME}"
+	dodir "${default_library_dir}"
+	fowners "${_USERNAME}":"${_USERNAME}" "${default_library_dir}"
+	keepdir "${default_library_dir}"
+
+	# Install the OpenRC init/conf files
+	doinitd "${FILESDIR}/init.d/${PN}"
+	doconfd "${FILESDIR}/conf.d/${PN}"
+
+	# Mask Plex libraries so that revdep-rebuild doesn't try to rebuild them.
+	# Plex has its own precompiled libraries.
+	_mask_plex_libraries_revdep
+
+	# Install systemd service file
+	systemd_newunit "${FILESDIR}/systemd/${PN}.service" "${PN}.service"
+
+	# Add pax markings to some binaries so that they work on hardened setup
+	for f in "${BINS_TO_PAX_MARK[@]}"; do
+		pax-mark m "${f}"
+	done
+
+	einfo "Configuring virtualenv"
+	virtualenv -v --no-pip --no-setuptools --no-wheel "${ED}"/usr/lib/plexmediaserver/Resources/Python || die
+	pushd "${ED}"/usr/lib/plexmediaserver/Resources/Python &>/dev/null || die
+	find . -type f -exec sed -i -e "s#${D}##g" {} + || die
+	popd &>/dev/null || die
+}
+
+pkg_postinst() {
+	elog "Plex Media Server is now installed. Please check the configuration"
+	elog "file in /etc/${_SHORTNAME}/${_APPNAME}"
+	elog "to verify the default settings."
+	elog "To start the Plex Server, run 'rc-config start plex-media-server',"
+	elog "you will then be able to access your library at"
+	elog "http://<ip>:32400/web/"
+}
+
+# Adds the precompiled plex libraries to the revdep-rebuild's mask list
+# so it doesn't try to rebuild libraries that can't be rebuilt.
+_mask_plex_libraries_revdep() {
+	dodir /etc/revdep-rebuild/
+
+	# Bug: 659702. The upstream plex binary installs its precompiled package to /usr/lib.
+	# Due to profile 17.1 splitting /usr/lib and /usr/lib64, we can no longer rely
+	# on the implicit symlink automatically satisfying our revdep requirement when we use $(get_libdir).
+	# Thus we will match upstream's directory automatically. If upstream switches their location,
+	# then so should we.
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/usr/lib/plexmediaserver\"" > "${ED}"/etc/revdep-rebuild/80plexmediaserver
+}
diff --git a/media-tv/v4l-dvb-saa716x/Manifest b/media-tv/v4l-dvb-saa716x/Manifest
index a1656ec02085..b5ccbe2a54f9 100644
--- a/media-tv/v4l-dvb-saa716x/Manifest
+++ b/media-tv/v4l-dvb-saa716x/Manifest
@@ -12,7 +12,6 @@ AUX v4l-dvb-saa716x-4.6.0-fix-compile.patch 692 BLAKE2B f3dd9279abafc087f38233f8
 AUX v4l-dvb-saa716x-4.9-fix-warnings.patch 6368 BLAKE2B 178bb6bf0c391ce3c2a9e2a69c2b1938ebb6137891eab2d18e3bda42547efbfdea98677a4175bb610b21a45c4b3d543166791b517b8d116ea1361b645d612170 SHA512 e697a87b14727d8877ecc78622050bb9d8e5b0d964796c5c3275a8d72359712ec85a578e2189a102b23eedcdb17381533de9641a22103982ad5b0c9702e77901
 AUX v4l-dvb-saa716x-Makefilepatch-2.diff 562 BLAKE2B 77adb5d5c67e14dddfce8462a98d565bc092b4e2f4dc48016602dfe0f1fa98d87e2c1317c0c3db1d1d1de8b91076e84cdd50d5b86350c060400fc2dd7ae9e5c1 SHA512 e0ff1c5a79f7b02323eff281bf6dc6ebb7a8fe7a43eb83ebd4a7379468924d3992790899bfabbbf2ee411cda6366ad6a677d8ad004a306e14b55d891f6f69dc0
 DIST v4l-dvb-saa716x-0.0.1_p20160322.tar.gz 5028181 BLAKE2B 6d0917e7c72a7c77ff376b1bb1e55a36421568cc7b9221f4724c9e24a9bb6334c201d99f48c92965365ada2cd085b22ca9758e55ca621deb5eb65de3ef3e9a38 SHA512 94a41467688a0363586c654102e35366071218432042bc324d041298ad4812139201f8df17eadb37ebb9baf2b097447fc0859270bcc4e8e0c73b17e0b8045343
-EBUILD v4l-dvb-saa716x-0.0.1_p20170225-r1.ebuild 2360 BLAKE2B c125d676eebbebc4023c926adf261a5b065f228a3f306b785145df8f0d24feec6927f5b35380ebee114f30ada010d99f07c1a5d33db958b648a80ae8e5543bd8 SHA512 31ee224bae08d6305c8f540b6bf87cda3680f26dbb05446436ede1753cb0acc53cd0448f1784ae889ba0c126f9e2994010b434a1ae7778bdc3098fbffe7ce285
-EBUILD v4l-dvb-saa716x-0.0.1_p20170225-r2.ebuild 2446 BLAKE2B e25bbb28e6ae8e7968e237e2cdd63fb6741986e1283e9f603d711d7b83ae31c51b65b1c623236090d4432aa312ebb381d77ca7020076cffe660363a583569c5d SHA512 ac919de8e2c04ca11b9b91535c5b43beaf084cccb69910dfa84dacd4ef4a04e8d25efb536d5f154a3d73d3575e2135c892d7721faf4e678f10423c2b88cfeffe
+EBUILD v4l-dvb-saa716x-0.0.1_p20170225-r2.ebuild 2491 BLAKE2B bf732e3c2a4282c4f5bfe2c4641a6605bf741acb64c837ad886bb0cd6f7655813e139643b27ebc74ef791a87e3b8d7e78a148170b899ce1f7ccd4fefabfd5997 SHA512 db832331826b7426cd0f2ce251ea48bebd87ef5b271a99ca708b3db8f5d71ae440f212a7091f698f9994df666d0a950346c449047b788509bb1558132be58b89
 EBUILD v4l-dvb-saa716x-0.0.1_p20170225.ebuild 2017 BLAKE2B 77b4e83a6e100fc1a07c447682defdf0e8860594e5ae344a450ef878f787a12ab3262b8e3dd96aeccc888f4c4f7ac52999c84dc1d23636202b94ec2faeacb88e SHA512 5dd9acd0e0300de379ef7f8ed21a9e5b81ae2f8f2dcd93d909aea6385ec868a26eed82fd7ee648b655e3d947ba62b302eb5e8639ad1512c281921c9e1a1aa9c8
 MISC metadata.xml 522 BLAKE2B 4fac71b04452341c84053cf601897155086cbe2d50bd0f04287ecae47ab06fb6b613197296ded88ebc8ac50230caa9d343449172eb73847d5ea763141bb6e3ba SHA512 651ce09fe8afac13810b4733051ccd326e8a468fae099c2a600fab0afac1071b2bba26837122fad5db235ddad25c80d56825d11b47e03eac8b0ca30dab1b3a61
diff --git a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r1.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r1.ebuild
deleted file mode 100644
index d44065e9ba23..000000000000
--- a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info linux-mod
-
-DESCRIPTION="driver for saa716x based dvb cards like TT S2-6400 or Skystar 2 eXpress HD"
-HOMEPAGE="https://bitbucket.org/powARman/v4l-dvb-saa716x/overview"
-
-HG_REVISION="3b9fce66666a"
-HG_REVISION_DATE="20160322"
-
-SRC_URI="https://bitbucket.org/powARman/v4l-dvb-saa716x/get/${HG_REVISION}.tar.gz
--> v4l-dvb-saa716x-0.0.1_p${HG_REVISION_DATE}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="+firmware"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	firmware? ( sys-firmware/tt-s2-6400-firmware )"
-
-S="${WORKDIR}/powARman-v4l-dvb-saa716x-${HG_REVISION}"
-
-BUILD_TARGETS="modules"
-MODULE_NAMES="saa716x_ff(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
-	saa716x_core(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
-	saa716x_budget(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
-	saa716x_hybrid(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)"
-
-CONFIG_CHECK="~DVB_CORE ~DVB_STV6110x ~DVB_STV090x"
-
-src_prepare() {
-	default
-
-	eapply -p0 "${FILESDIR}/OSD_RAW_CMD_patch_2.diff"
-	eapply "${FILESDIR}/v4l-dvb-saa716x-Makefilepatch-2.diff"
-	kernel_is ge 3 19 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-3.19-set_gpio.patch"
-	kernel_is ge 4 2 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.2-fix-compile.patch"
-	kernel_is ge 4 5 2 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.5.2-fix-compile.patch"
-	kernel_is ge 4 6 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.6.0-fix-compile.patch"
-	kernel_is ge 4 9 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.9-fix-warnings.patch"
-	kernel_is ge 4 10 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.10-fix-compile.patch"
-	kernel_is ge 4 14 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.14.0-fix-compile.patch"
-	kernel_is ge 4 15 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.15-fix-autorepeat.patch"
-	kernel_is ge 4 15 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.15-fix-timers.patch"
-	kernel_is ge 4 16 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.16-fix-compile.patch"
-}
-
-src_compile() {
-	BUILD_PARAMS="SUBDIRS=${S}/linux/drivers/media/common/saa716x \
-	CONFIG_SAA716X_CORE=m CONFIG_DVB_SAA716X_FF=m CONFIG_DVB_SAA716X_BUDGET=m \
-	CONFIG_DVB_SAA716X_HYBRID=m"
-	addpredict "${EROOT%/}"/usr/src/linux/
-	linux-mod_src_compile
-}
diff --git a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r2.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r2.ebuild
index 66babc6091c0..4688975810c6 100644
--- a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r2.ebuild
+++ b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018 Gentoo Authors
+# Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,12 +26,13 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}/powARman-v4l-dvb-saa716x-${HG_REVISION}"
 
 BUILD_TARGETS="modules"
-MODULE_NAMES="saa716x_ff(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
-	saa716x_core(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
-	saa716x_budget(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
-	saa716x_hybrid(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)"
+MODULE_NAMES="
+	saa716x_ff(misc:${EROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_core(misc:${EROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_budget(misc:${EROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_hybrid(misc:${EROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)"
 
-CONFIG_CHECK="~DVB_CORE ~DVB_STV6110x ~DVB_STV090x"
+CONFIG_CHECK="DVB_CORE DVB_STV6110x DVB_STV090x"
 
 src_prepare() {
 	default
@@ -52,9 +53,9 @@ src_prepare() {
 }
 
 src_compile() {
-	BUILD_PARAMS="SUBDIRS=${S}/linux/drivers/media/common/saa716x \
-	CONFIG_SAA716X_CORE=m CONFIG_DVB_SAA716X_FF=m CONFIG_DVB_SAA716X_BUDGET=m \
-	CONFIG_DVB_SAA716X_HYBRID=m"
-	addpredict "${EROOT%/}"/usr/src/linux/
+	kernel_is le 5 0 && BUILD_PARAMS="SUBDIRS" || BUILD_PARAMS="M"
+	BUILD_PARAMS+="=${S}/linux/drivers/media/common/saa716x CONFIG_SAA716X_CORE=m \
+		CONFIG_DVB_SAA716X_FF=m CONFIG_DVB_SAA716X_BUDGET=m CONFIG_DVB_SAA716X_HYBRID=m"
+	addpredict "${EROOT}"/usr/src/linux/
 	linux-mod_src_compile
 }
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /media-tv
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)