gentoo resync : 15.01.2020

8 files changed, 366 insertions, 14 deletions

diff --git a/media-plugins/vdr-epgsearch/Manifest b/media-plugins/vdr-epgsearch/Manifest
index 9f28b564e5cf..37630a14dec4 100644
--- a/media-plugins/vdr-epgsearch/Manifest
+++ b/media-plugins/vdr-epgsearch/Manifest
@@ -1,7 +1,14 @@
 AUX fix-manpage-generation.diff 1264 BLAKE2B 8b31a038bc0b7c3c77d4852a170981f5eba4bf690cd922d7a883d16a0ebd7a2be9df6e3b0716a78ecf6b7008d56bc3554564757ee84ec5bc56754773a6475f8d SHA512 c2d402b3830f16307ed44cd85e0d7c05b204b9b7556a754a84a13af1c7d794d976d7dc36a45d187d84be764c14f9193ca4d90b2771bcfdf715368ba32f176010
 AUX vdr-epgsearch-1.x.makefile.patch 1136 BLAKE2B 3b82bfc71e75d02739f02071afb9cdc7d6fc0c0f0d7169b8f02a360c2b493d829f141dd586ce7d7f9a854f4b76423191e3f1b7a8df29b0c42beb037ff9cf9729 SHA512 79114081c2cb17402c0e0a431204d7afbc161a90d911d0c389a90f047280ee17b8112b3f2e9d32295c1dd15ef86695935a54354211c9b28669ad925df8173b92
+AUX vdr-epgsearch-2.4.0_docsrc2man-no-gzip.patch 419 BLAKE2B 6958af0bf911d01b15c3b7e47593af4c8d692574996a20a7e90736eafe008582e2d66253a57948ba686a2d48858793b23d1d1721686d715831d2ba82f5154a58 SHA512 43fa2e191badcb80542454ecb4ce3c15fd28c77685839b33327d5e22f43bc641cfc3ee2b9fd1c49dcca4e95b6d9df35b42c84b8481a4b8fa53df105cc37e4618
+AUX vdr-epgsearch-2.4.0_fix-docs.patch 3108 BLAKE2B c1af335c69b746a31cb0b76ff6fbebe357ddf4e8605e5f664b48a2fde7714cfa8d81036b3d3bb804588d8cf0bb620bab512955a799b5f0c3985368d7de71b99c SHA512 0f163d1513ae3f9414affdfc502e1780b9b7ccafe889df543ef6f7e07370c098457560635551a3bded9ffc2a6cccfe6a3f5096a80a75888f72b8eb471a42f117
+AUX vdr-epgsearch-2.4.0_makefile.patch 1524 BLAKE2B 48ccd25c22e242d9c2f42c40afe621a15032a990c2da5fe7893554502249ee90ca2462338b153a0ef647831b83cd8be35c53655958ee67a23b68e4b0fb7869ae SHA512 2c67a764ffa98135495374905f771cbb3e20d2829a11abc1f8a061c6cc414a7bd9b1e2de05efcf01c47e2b09a2ccf8d42868555af603b3c146b7033c383645b5
 DIST vdr-epgsearch-1.0.1_p20141227.tar.gz 472802 BLAKE2B 9ffc067c2aff29e3d79b620edf88ff7aca64ad5d1de3aa32b19fbc1889673e2439a6d65b46e2f3ff5fd3d416ff24cbafd6d41f562b3775210f0234c6990f03ab SHA512 952d58f6f03d2804f97be14779faf37c3788b42d78a6460102e2f1c74f6a58d7d68639e7e95e40f27417ce3658c0d5bf856399b6e8e8c214ea143d2865507562
 DIST vdr-epgsearch-2.2.0.tgz 472502 BLAKE2B f98053d95a6fe56aff48bd3e86ae8a37166b3b8556fe3500c956901cb3f8d19c5792b157606d372392b7387c05a72f4d664881a27bbd5b9484640d8de73b8673 SHA512 c0fef60069addc3cca82535c22b7e1f73f01de7466bc6d0b837ba34df7a7dd0fe2cbf7e9b9bc36a523a75a3db18889a1ff9040fb2647c889ea74666067c3a1e4
-EBUILD vdr-epgsearch-1.0.1_p20141227-r1.ebuild 2797 BLAKE2B d87687c1fb2bae15014a0e9ceff86a4e54266f512e7cd3672babf6b70d4fd095a808335e0c3abf8ab9eb8fedcf1f08f356a282784e00112a3f49248e0cb20fdc SHA512 bebb49a6fee3e85d5d58222618e9e4b3550058b0e370bccb6ed2a8ad90dccfbe849a9ed3cabae64e99b1b36eb60dda194372653103ab6ee910af24c816d1df83
-EBUILD vdr-epgsearch-2.2.0.ebuild 2244 BLAKE2B 215e3df5b53899c3d852d1330aa370e64b7306005446fd15cc4a42f079621c9a4aa8817c8cc18960d99b7096d7e88f9563da2491a701003bd593b989ee62746c SHA512 8d3b8b9970828de5dc835ac410c2be5c51121377f71bb88f07d910b38601035a341246347ba66d7a278417bc9608ec1d7644d0c997689d2d0af2b179212b7e4b
+DIST vdr-epgsearch-2.4.0.tgz 479041 BLAKE2B 1d0b87bca573c90d13fb07d39c2945be1451ac405739ba788482488994832d3fc053dd076d474cc4e78e9a6b3078952fac7e799945120ff220d58b7f2fc2f181 SHA512 4fec779edeee0b326624b6904b5e6b5f0c8243208938389787433638355436fe82899864d33f512c3a9e0feadde1f770d4ca562f06212f83f8d753a9a34700e4
+DIST vdr-epgsearch-2.4.0_p20191202.tar.gz 480101 BLAKE2B 800fcaab72dba1f4977dc3040ddfa856d3ad0051b04658c84891ce4836d30593be740cc6712a853093c0e02a9f3fe915cb6079b7dc2ba47509060e2fb5046474 SHA512 494562cd9b2c1cdc94a3a93ea5fcfd3f0e034156ab40d7ee332a2dfd5994cb6528744ae2391e3437860804604dca0b6fc1a387487b6fda12e19a8f79caac451c
+EBUILD vdr-epgsearch-1.0.1_p20141227-r1.ebuild 2798 BLAKE2B fd96f4eb16f7da3a850bf3fa942f830888c638931003d13e029584fdd061ebbf869bbf280cd83953349a2fb440b0920697438af0a799bbaca0301dc097c2114e SHA512 1e6c7a84c3d88e63e39c338c66d606175837930b94dfabe950619467c0af71863399c836ecc969d7ef3f0b3854e559f81314a99f6980627c4c5f749f25a4fa9c
+EBUILD vdr-epgsearch-2.2.0.ebuild 2301 BLAKE2B e6c05a1aba1a21dbc9da765a4636b1460d013c441c486909c5479220c2d60448d0a8548133dc56941607dece8ba79baabbec686f3ce15a0265f13a647e86f7c6 SHA512 88aec901cf1841c6aa244b6208e88cd1c2d07985ac2b74e72ee0d64dbd306ba9af3a600832670ea4c6970aa62f97affcfc592ccb7e3fc2695e5287ee8a446872
+EBUILD vdr-epgsearch-2.4.0.ebuild 2072 BLAKE2B e86eb9b0d6bcfe682570cc7f7ce68173750eeeb012c94236c6c4bba0bd4afdc8dee17bb5a433aaedf508a8943ee4590426a3b67f0e5ca6434eba24350ae90877 SHA512 29aa8705ca325baf4e37bc545c819da27c5a6324cbbeff37d89e2fec5e93926d8347e241e7625ca4b04bb18ac84f98f88311aaf84ebf0174940dd5c989174004
+EBUILD vdr-epgsearch-2.4.0_p20191202.ebuild 2457 BLAKE2B 0dc80b5509abfb08f8f5e9d6f11212f052b760623a6d14085f1a3541dc37b7663ee89fda3e4415c34fc37363da09aae6c1219cd2e6c12532ba475feedd85c1f2 SHA512 bcf992509c8f812dd45a513f098ff6a4299d8f7b73fbd6782be15f77cba9169e86e1c420fb8aee3fcdb4473e89c2b08d5ab89e04e0d48ba52a7fbe2729e7238b
 MISC metadata.xml 816 BLAKE2B 2a7a4b5223b30aaffd7e0300ceba04f69d411e1b4615e0fb8d1ff6afa65850f4558c065a1e3ca6a12c2526d2bf736cbc7b6aba8a9fc66b3dcef09dfa4b7ec3bc SHA512 ea3e5fac06c7e1a53b127d2ce10bbccbf97a80cadcd172100f39512772b0120f59ef9f538b779ebc6a8df6431000f1e4112a18a0300841a8e2c5065f4016b3cd
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_docsrc2man-no-gzip.patch b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_docsrc2man-no-gzip.patch
new file mode 100644
index 000000000000..591323f7860b
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_docsrc2man-no-gzip.patch
@@ -0,0 +1,12 @@
+Signed-off-by: Martin Dummer <martin.dummer@gmx.net> ( 2020 Jan 03 )
+--- vdr-plugin-epgsearch-2.4.0/docsrc2man.sh.orig	2018-04-16 21:49:48.000000000 +0200
++++ vdr-plugin-epgsearch-2.4.0/docsrc2man.sh	2019-03-14 12:46:58.515844269 +0100
+@@ -55,7 +55,7 @@
+ function man_gz () {
+ 	if [ $PRINT_DEPS -eq 0 ]; then
+ 		rm "$DOCSRC"/$1/*~ 2>/dev/null
+-		gzip -f man/$1/*.[0-9]
++# do nothing // gzip -f man/$1/*.[0-9]
+ 	fi
+ }
+ 
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_fix-docs.patch b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_fix-docs.patch
new file mode 100644
index 000000000000..ae6c6dc517e9
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_fix-docs.patch
@@ -0,0 +1,124 @@
+https://projects.vdr-developer.org/issues/2581
+Manpages with encoding will not created correct
+
+Reviewed-by: Martin Dummer <martin.dummer@gmx.net> (2020 Jan 03)
+--- a/doc-src/de/epgsearch.1.txt
++++ b/doc-src/de/epgsearch.1.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<epgsearch> - Suchtimer und Ersatz für VDR's Standard-Programm-Menü
+--- a/doc-src/de/epgsearch.conf.5.txt
++++ b/doc-src/de/epgsearch.conf.5.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<epgsearch.conf> - Die gespeicherten Suchtimer
+--- a/doc-src/de/epgsearchblacklists.conf.5.txt
++++ b/doc-src/de/epgsearchblacklists.conf.5.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<epgsearchblacklists.conf> - Die gespeicherten Auschlusslisten-Suchtimer
+--- a/doc-src/de/epgsearchcats.conf.5.txt
++++ b/doc-src/de/epgsearchcats.conf.5.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<epgsearchcats.conf> - Die Kategorien des erweiterten EPGs, sofern vorhanden.
+--- a/doc-src/de/epgsearchchangrps.conf.5.txt
++++ b/doc-src/de/epgsearchchangrps.conf.5.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<epgsearchchangrps.conf> - Liste der Kanalgruppen
+--- a/doc-src/de/epgsearchcmds.conf.5.txt
++++ b/doc-src/de/epgsearchcmds.conf.5.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<epgsearchcmds.conf> - EPG-Befehle
+--- a/doc-src/de/epgsearchdirs.conf.5.txt
++++ b/doc-src/de/epgsearchdirs.conf.5.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<epgsearchdirs.conf> - Liste von Aufnahmepfaden zur einfachen Auswahl
+--- a/doc-src/de/epgsearchmenu.conf.5.txt
++++ b/doc-src/de/epgsearchmenu.conf.5.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<epgsearchmenu.conf> - Konfiguration der Menüdarstellung
+--- a/doc-src/de/epgsearchswitchtimers.conf.5.txt
++++ b/doc-src/de/epgsearchswitchtimers.conf.5.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<epgsearchswitchtimer.conf> - Die gespeicherten Umschalttimer
+--- a/doc-src/de/epgsearchtemplates.conf.5.txt
++++ b/doc-src/de/epgsearchtemplates.conf.5.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<epgsearchtemplates.conf> - Die gespeicherten Suchtimer-Vorlagen
+--- a/doc-src/de/epgsearchuservars.conf.5.txt
++++ b/doc-src/de/epgsearchuservars.conf.5.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<epgsearchuservars.conf> - Die Uservariablen
+--- a/doc-src/de/noannounce.conf.5.txt
++++ b/doc-src/de/noannounce.conf.5.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<noannounce.conf> - Liste von Sendungen, die nicht mehr per OSD angekündigt
+--- a/doc-src/de/timersdone.conf.5.txt
++++ b/doc-src/de/timersdone.conf.5.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<timersdone.conf> - Liste von anstehenden Timern, die von Suchtimern erzeugt
+--- a/doc-src/en/epgsearch.conf.5.txt
++++ b/doc-src/en/epgsearch.conf.5.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<epgsearch.conf> - The searchtimers
+--- a/doc-src/en/epgsearchcats.conf.5.txt
++++ b/doc-src/en/epgsearchcats.conf.5.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<epgsearchcats.conf> - Configuration of the additional EPG information
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_makefile.patch b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_makefile.patch
new file mode 100644
index 000000000000..5ec9c69af412
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_makefile.patch
@@ -0,0 +1,42 @@
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> ( 25 Dec 2019 )
+diff -Naur vdr-plugin-epgsearch-2.4.0.orig/Makefile vdr-plugin-epgsearch-2.4.0/Makefile
+--- vdr-plugin-epgsearch-2.4.0.orig/Makefile	2019-12-25 18:48:32.748492713 +0100
++++ vdr-plugin-epgsearch-2.4.0/Makefile	2019-12-25 18:49:35.110492713 +0100
+@@ -281,9 +281,9 @@
+ $(DEPFILE_stmp):
+ 	./docsrc2man.sh
+ 	./docsrc2html.sh
+-	ln -sf ./doc/en/epgsearch.4.txt MANUAL
+-	ln -sf ./doc/en/epgsearch.1.txt README
+-	ln -sf ./doc/de/epgsearch.1.txt README.DE
++#	ln -sf ./doc/en/epgsearch.4.txt MANUAL
++#	ln -sf ./doc/en/epgsearch.1.txt README
++#	ln -sf ./doc/de/epgsearch.1.txt README.DE
+ 	@rm -f $(DEPFILE_stmp)
+ 	@date > $(DEPFILE_stmp)
+ 
+@@ -306,7 +306,7 @@
+ 	$(Q)install -D libvdr-$(PLUGIN4).so $(DESTDIR)$(LIBDIR)/libvdr-$(PLUGIN4).so.$(APIVERSION)
+ 
+ install-conf:
+-	mkdir -p $(DESTDIR)$(CONFDIR)/plugins/$(PLUGIN)/conf.d
++	mkdir -p $(DESTDIR)$(CONFDIR)/plugins/$(PLUGIN)
+ 	cp -n conf/* $(DESTDIR)$(CONFDIR)/plugins/$(PLUGIN)
+ 
+ install-doc:
+@@ -325,7 +325,7 @@
+ 	mkdir -p $(DESTDIR)$(BINDIR)
+ 	cp createcats $(DESTDIR)$(BINDIR)
+ 
+-install: install-lib install-i18n install-conf install-doc install-bin
++install: install-lib install-i18n install-conf install-bin
+ 
+ install-lib: install-$(PLUGIN) install-$(PLUGIN2) install-$(PLUGIN3) install-$(PLUGIN4)
+ 
+@@ -358,3 +358,6 @@
+ 	@-rm -rf doc html man
+ 	@-rm -f MANUAL README README.DE
+ 	@-rm -f $(DEPFILE_stmp) $(DEPFILE_DOC)
++
++# make detection in vdr-plugin-2.eclass for new Makefile handling happy
++# SOFILE
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227-r1.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227-r1.ebuild
index c79abd511d1d..0917f4f8da50 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227-r1.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,7 @@ case ${P#*_} in
 		;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+conflictcheckonly +epgsearchonly l10n_de pcre +quicksearch tre"
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0.ebuild
index 036df79eeb1e..0a8a30e973a4 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="VDR plugin: create timers from epg content based on saved search ex
 HOMEPAGE="https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git"
 SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-${VDRPLUGIN}.git/snapshot/vdr-plugin-${VDRPLUGIN}-${PV}.tar.gz -> ${P}.tgz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+conflictcheckonly +epgsearchonly pcre +quicksearch tre"
@@ -29,23 +29,23 @@ src_prepare() {
 	echo "# SOFILE" >> Makefile
 
 	# remove untranslated .po files
-	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po
+	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po || die
 
 	eapply "${FILESDIR}/vdr-epgsearch-1.x.makefile.patch"
 
-	use conflictcheckonly || sed -e "s:install-\$(PLUGIN3)::" -i Makefile
-	use epgsearchonly || sed -e "s:install-\$(PLUGIN2)::" -i Makefile
-	use quicksearch || sed -e "s:install-\$(PLUGIN4)::" -i Makefile
+	use conflictcheckonly || sed -e "s:install-\$(PLUGIN3)::" -i Makefile || die
+	use epgsearchonly || sed -e "s:install-\$(PLUGIN2)::" -i Makefile || die
+	use quicksearch || sed -e "s:install-\$(PLUGIN4)::" -i Makefile || die
 
 	vdr-plugin-2_src_prepare
 
 	fix_vdr_libsi_include conflictcheck.c
 
 	# install conf-file disabled
-	sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf
+	sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf || die
 
 	# Get rid of the broken symlinks
-	rm -f README{,.DE} MANUAL
+	rm -f README{,.DE} MANUAL || die
 }
 
 src_compile() {
@@ -76,9 +76,9 @@ src_install() {
 
 	nonfatal dodoc conf/*.templ HISTORY*
 
-	gunzip -f man/en/*.gz
+	gunzip -f man/en/*.gz || die
 	doman man/en/*.[0-9]
 
-	gunzip -f man/de/*.gz
+	gunzip -f man/de/*.gz || die
 	doman -i18n=de man/de/*.[0-9]
 }
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0.ebuild
new file mode 100644
index 000000000000..f3656d228f5a
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR plugin: create timers from epg content based on saved search expressions"
+HOMEPAGE="https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git"
+SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-${VDRPLUGIN}.git/snapshot/vdr-plugin-${VDRPLUGIN}-${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="conflictcheckonly epgsearchonly pcre quicksearch tre"
+
+DEPEND=">=media-video/vdr-2.4
+	pcre? ( dev-libs/libpcre )
+	tre? ( dev-libs/tre )"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="?? ( pcre tre )"
+
+S="${WORKDIR}/vdr-plugin-${VDRPLUGIN}-${PV}"
+
+src_prepare() {
+	# remove untranslated .po files
+	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po || die
+
+	eapply "${FILESDIR}/vdr-epgsearch-2.4.0_makefile.patch"
+
+	use conflictcheckonly || sed -e "s:install-\$(PLUGIN3)::" -i Makefile || die
+	use epgsearchonly || sed -e "s:install-\$(PLUGIN2)::" -i Makefile || die
+	use quicksearch || sed -e "s:install-\$(PLUGIN4)::" -i Makefile || die
+
+	vdr-plugin-2_src_prepare
+
+	fix_vdr_libsi_include conflictcheck.c
+
+	# install conf-file disabled
+	sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf || die
+
+	# Get rid of the broken symlinks
+	rm -f README{,.DE} || die
+}
+
+src_compile() {
+	BUILD_PARAMS="SENDMAIL=/usr/sbin/sendmail AUTOCONFIG=0"
+
+	if use pcre; then
+		BUILD_PARAMS+=" REGEXLIB=pcre"
+		einfo "Using pcre for regexp searches"
+	fi
+
+	if use tre; then
+		BUILD_PARAMS+=" REGEXLIB=tre"
+		einfo "Using tre for unlimited fuzzy searches"
+	fi
+
+	vdr-plugin-2_src_compile
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	diropts "-m755 -o vdr -g vdr"
+	insinto /etc/vdr/plugins/epgsearch
+	doins conf/epgsearchmenu.conf
+	doins conf/epgsearchconflmail.templ conf/epgsearchupdmail.templ
+
+	local DOCS=( conf/*.templ HISTORY* )
+	einstalldocs
+
+	gunzip -f man/en/*.gz || die
+	doman man/en/*.[0-9]
+
+	gunzip -f man/de/*.gz || die
+	doman -i18n=de man/de/*.[0-9]
+}
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20191202.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20191202.ebuild
new file mode 100644
index 000000000000..c2fc3ce4361f
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20191202.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR plugin: create timers from epg content based on saved search expressions"
+HOMEPAGE="http://winni.vdr-developer.org/epgsearch/index_eng.html"
+GIT_COMMIT_ID="602d66c55964998ce25c6c57b302949a9517f149"
+SRC_URI="http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-${GIT_COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="conflictcheckonly epgsearchonly pcre quicksearch tre"
+REQUIRED_USE="?? ( pcre tre )"
+
+DEPEND="
+	>=media-video/vdr-2.4
+	pcre? ( dev-libs/libpcre )
+	tre? ( dev-libs/tre )"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-apps/groff
+	dev-lang/perl"
+
+QA_FLAGS_IGNORED="
+	usr/lib/vdr/plugins/libvdr-.*
+	usr/lib64/vdr/plugins/libvdr-.*
+	usr/bin/createcats"
+S="${WORKDIR}/vdr-plugin-epgsearch-${GIT_COMMIT_ID}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.0_makefile.patch"
+	"${FILESDIR}/${PN}-2.4.0_docsrc2man-no-gzip.patch"
+	"${FILESDIR}/${PN}-2.4.0_fix-docs.patch"
+	)
+
+src_prepare() {
+	# remove untranslated .po files
+	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po \
+		|| die "cannot remove untranslated .po files"
+
+	use conflictcheckonly || sed -e "s:install-\$(PLUGIN3)::" -i Makefile || die "cannot modify Makefile"
+	use epgsearchonly || sed -e "s:install-\$(PLUGIN2)::" -i Makefile || die "cannot modify Makefile"
+	use quicksearch || sed -e "s:install-\$(PLUGIN4)::" -i Makefile || die "cannot modify Makefile"
+
+	vdr-plugin-2_src_prepare
+
+	fix_vdr_libsi_include conflictcheck.c
+
+	# install conf-file disabled
+	sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf || die "cannot modify epgsearchmenu.conf"
+
+	# Get rid of the broken symlink
+	rm README || die "cannot remove broken symlink"
+}
+
+src_compile() {
+	BUILD_PARAMS="SENDMAIL=/usr/bin/sendmail AUTOCONFIG=0"
+
+	if use pcre; then
+		BUILD_PARAMS+=" REGEXLIB=pcre"
+		einfo "Using pcre for regexp searches"
+	fi
+
+	if use tre; then
+		BUILD_PARAMS+=" REGEXLIB=tre"
+		einfo "Using tre for unlimited fuzzy searches"
+	fi
+
+	vdr-plugin-2_src_compile
+}
+
+src_install() {
+	local DOCS=( conf/*.templ HISTORY* README.Translators )
+	vdr-plugin-2_src_install
+
+	diropts -m 755 -o vdr -g vdr
+	insopts -m 644 -o vdr -g vdr
+	keepdir /etc/vdr/plugins/epgsearch
+	insinto /etc/vdr/plugins/epgsearch
+	doins conf/*
+
+	doman man/en/*
+	doman -i18n=de man/de/*
+}