gentoo resync : 03.03.2021

13 files changed, 340 insertions, 370 deletions

diff --git a/media-plugins/vdr-epgsearch/Manifest b/media-plugins/vdr-epgsearch/Manifest
index 37630a14dec4..8ac795ccfa8d 100644
--- a/media-plugins/vdr-epgsearch/Manifest
+++ b/media-plugins/vdr-epgsearch/Manifest
@@ -1,14 +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.2.0_clang.patch 1444 BLAKE2B 98975d5c6d7af0c95e80f1727b63c626d98e259196d34e437df7729c09d3c6b93577f2ad83d274fc0e7f3cff1536e02963761e269c6ec571840a4c94233f9397 SHA512 e80ba4bda72055c853a40d6fe75a47bd1b644978dbb9dcc120960a3401fe8dcb0f35785e90fd2572766d0237ae75a2ffd24d7566175924648d2c43ad69b53d58
+AUX vdr-epgsearch-2.2.0_docsrc2man-no-gzip.patch 227 BLAKE2B a58d969bebd51efcdc295be198ed5085729a2cde1fdef5f884df4130c2d1e1baeec1c8234006ff9e1fa3213ec14c40c16321f33552afe8b19e914fa37f84565c SHA512 c9697215501e9f63b48a2c46c17e6d3b93325633e1fc525fc48f825ed7fbb81f1147f2a29d8b506042fdfdcb906dbc041d2a14f595f82628b2ee3f8935ae03be
+AUX vdr-epgsearch-2.2.0_makefile.patch 1413 BLAKE2B 1f468c312089d1bdd10bab197edd4eb68f3082b36cd1ac345d2bda54132343ca8f93436f15b37d5d1dde4cfde6a7f0c6c7393bd37bd0ed9b2700bd8c4792896b SHA512 7d4fe92315e8a64c3a68b345f18af980d4d548cb558ffa2481d95069681df1c67a8d47047ecc4f23253d6727aaad847dd85d47cfac6a2048e97b14dc9ec32274
 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
+AUX vdr-epgsearch-2.4.0_p20200402_clang.patch 1186 BLAKE2B 85dc9f066a907635c6335e671fff1741c0cec1816f7b35ee5103f4d97b021f499ddd3d27a67f3b97783e464bb64b4c54932bfc48309e38d6715207faf5228995 SHA512 fb87ae50b7997fa3e429448f47f15190e11dd6da215b16582b8a8689c1b039295f61998b4d7116b97a1d5090ea2edb36d8ae6eec3e6328fb384feaccf399100c
 DIST vdr-epgsearch-2.2.0.tgz 472502 BLAKE2B f98053d95a6fe56aff48bd3e86ae8a37166b3b8556fe3500c956901cb3f8d19c5792b157606d372392b7387c05a72f4d664881a27bbd5b9484640d8de73b8673 SHA512 c0fef60069addc3cca82535c22b7e1f73f01de7466bc6d0b837ba34df7a7dd0fe2cbf7e9b9bc36a523a75a3db18889a1ff9040fb2647c889ea74666067c3a1e4
-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
+DIST vdr-epgsearch-2.4.0_p20200402.tar.gz 479998 BLAKE2B 04e83bd2361743669baba7b10a27fab91f22115b81fe69e9252cc5ecd94fb0fda55d8b6ce3fcaeb08e779f07d46d26e37026d1732d6b38c03385c659eacd5ab0 SHA512 586b369a25c32bbf2d33e68997e7298ad7fda50ac78da5321c848a74d91753a51e6f47d70ef6893ca980bfa2c9f167defd611464729ca4ebf704247e8e37a065
+EBUILD vdr-epgsearch-2.2.0-r1.ebuild 2405 BLAKE2B cd48805ac512e1e493eebb8743d45af92addf2c58362672b054d5af56518c7fd1b8738c935943aa613e85a78bf19cf7cc4044cbf082e10ba40c0a53e2c3cd17d SHA512 834614271358f7753eaa2b66665e0af0f19c7b33ca52797982c18dc08a2a5268f1c301f29f36d41368855254843d2ee4e063eeee9d0fb13452f434228b27d036
+EBUILD vdr-epgsearch-2.2.0.ebuild 2304 BLAKE2B f5c4f3fbe477295ebb203d7edefcda859af50f76ed7ec7e18e814661e9c8cd037bf961f6f10874d1d59952e2ec34dc5f6cffcdd96c0227adef6c7c643a5a4c75 SHA512 e6ffcc191385616ba709499b80a9c54d9041648c3a2ea02c95cec877f84e0d949c47f5d9aa2d19e8b52a12387edf4b0f38f54ae9f10a6be2b1b2b1b1f14bf7ee
+EBUILD vdr-epgsearch-2.4.0_p20200402-r1.ebuild 2492 BLAKE2B 53afeefc9248ae9318c8fd48d67238d3df33cd938cc0f42dbf9b8477681903eedc043bb53fb079e473ef0f47bcb22825c1434edee2660c458739ee90029c5463 SHA512 3ec9992c40baef8f9a0e20a9591752c65b6f724428cef2d441d966f9dcc8bb4f88eb8f52a2b0c54385e1bb3a38e18f0ccb861e6bb500fd76395b6270b329341c
+EBUILD vdr-epgsearch-2.4.0_p20200402.ebuild 2485 BLAKE2B fd7865a31511456cb24fb5f06b436a2e45669a9589aca5ef2311a4c08842972e7ac37df0ef775aca5dd0d531ad3c9f64294ecbec49bbd85d21d6e9142f57c456 SHA512 08edfb1c53eb798f9e233c615ecf293ad21ea267a2194e691fb5d121099fa3a79eb773439384f8e3ab71c528a8e48c5007133be8e95ee9244ffe74d2bc64f99c
 MISC metadata.xml 816 BLAKE2B 2a7a4b5223b30aaffd7e0300ceba04f69d411e1b4615e0fb8d1ff6afa65850f4558c065a1e3ca6a12c2526d2bf736cbc7b6aba8a9fc66b3dcef09dfa4b7ec3bc SHA512 ea3e5fac06c7e1a53b127d2ce10bbccbf97a80cadcd172100f39512772b0120f59ef9f538b779ebc6a8df6431000f1e4112a18a0300841a8e2c5065f4016b3cd
diff --git a/media-plugins/vdr-epgsearch/files/fix-manpage-generation.diff b/media-plugins/vdr-epgsearch/files/fix-manpage-generation.diff
deleted file mode 100644
index 9e1047c8c001..000000000000
--- a/media-plugins/vdr-epgsearch/files/fix-manpage-generation.diff
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/docsrc2man.sh	2018-04-25 23:19:05.623375324 +0200
-+++ b/docsrc2man.sh	2018-04-25 23:19:35.519934631 +0200
-@@ -37,23 +37,6 @@
- 	done
- 
- 	rm "$DOCSRC"/$LANGUAGE/*~ 2>/dev/null
--	gzip -f man/$LANGUAGE/*.[0-9]
--
--done
--
--echo
--
--for LANGUAGE in $(ls "$DOCSRC"/); do
--
--	[ ! -d "$DOCSRC/$LANGUAGE" ] && continue
--	mkdir -p doc/$LANGUAGE
--	rm doc/$LANGUAGE/* 2>/dev/null
--
--	for i in man/$LANGUAGE/*.gz; do
--		echo -ne "create doc file from man page: ($LANGUAGE) $(basename "$i")..."
--		zcat "$i" | nroff -man - | col -xbp > "doc/$LANGUAGE/$(basename "$i" ".gz").txt"
--		echo " done"
--	done
- 
- done
- 
---- a/Makefile	2018-04-25 23:32:59.042967016 +0200
-+++ b/Makefile	2018-04-25 23:33:35.535649724 +0200
-@@ -276,16 +276,6 @@
- 	cp -n conf/* $(DESTDIR)$(CONFDIR)/plugins/$(PLUGIN)
- 
- install-doc:
--	mkdir -p $(DESTDIR)$(MANDIR)/man1
--	mkdir -p $(DESTDIR)$(MANDIR)/man4
--	mkdir -p $(DESTDIR)$(MANDIR)/man5
--	mkdir -p $(DESTDIR)$(MANDIR)/de/man1
--	mkdir -p $(DESTDIR)$(MANDIR)/de/man5
--	cp man/en/*1.gz $(DESTDIR)$(MANDIR)/man1/
--	cp man/en/*4.gz $(DESTDIR)$(MANDIR)/man4/
--	cp man/en/*5.gz $(DESTDIR)$(MANDIR)/man5/
--	cp man/de/*1.gz $(DESTDIR)$(MANDIR)/de/man1/
--	cp man/de/*5.gz $(DESTDIR)$(MANDIR)/de/man5/
- 
- install-bin: createcats
- 	mkdir -p $(DESTDIR)$(BINDIR)
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.2.0_clang.patch b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.2.0_clang.patch
new file mode 100644
index 000000000000..9c414509ea8c
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.2.0_clang.patch
@@ -0,0 +1,35 @@
+when compiling with CC="clang" CXX="clang++" it aborts with 
+
+
+createcats.c:71:42: error: ordered comparison between pointer and zero ('char *' and 'int')
+    if (fgets(buffer, sizeof(buffer), f) > 0) {
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~
+
+This patch fixes it.
+
+Signed-off-by: Martin Dummer <martin.dummer@gmx.net> ( 2021-02-16 )
+
+diff -Naur vdr-plugin-epgsearch-2.2.0.orig/createcats.c vdr-plugin-epgsearch-2.2.0/createcats.c
+--- vdr-plugin-epgsearch-2.2.0.orig/createcats.c	2017-05-01 21:40:19.000000000 +0200
++++ vdr-plugin-epgsearch-2.2.0/createcats.c	2021-02-27 11:59:41.175196651 +0100
+@@ -65,7 +65,7 @@
+ 
+ char *cReadLine::Read(FILE *f)
+ {
+-    if (fgets(buffer, sizeof(buffer), f) > 0) {
++    if (fgets(buffer, sizeof(buffer), f) != NULL) {
+ 	int l = strlen(buffer) - 1;
+ 	if (l >= 0 && buffer[l] == '\n')
+ 	    buffer[l] = 0;
+diff -Naur vdr-plugin-epgsearch-2.2.0.orig/epgsearchext.c vdr-plugin-epgsearch-2.2.0/epgsearchext.c
+--- vdr-plugin-epgsearch-2.2.0.orig/epgsearchext.c	2017-05-01 21:40:19.000000000 +0200
++++ vdr-plugin-epgsearch-2.2.0/epgsearchext.c	2021-02-27 12:01:51.502220684 +0100
+@@ -1497,7 +1497,7 @@
+          int line = 0;
+          char buffer[MAXPARSEBUFFER];
+          result = true;
+-         while (fgets(buffer, sizeof(buffer), f) > 0) {
++         while (fgets(buffer, sizeof(buffer), f) != NULL) {
+             line++;
+             char *p = strchr(buffer, '#');
+             if (p == buffer) *p = 0;
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.2.0_docsrc2man-no-gzip.patch b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.2.0_docsrc2man-no-gzip.patch
new file mode 100644
index 000000000000..508ad7f5d9ab
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.2.0_docsrc2man-no-gzip.patch
@@ -0,0 +1,11 @@
+--- a/docsrc2man.sh	2021-02-25 22:14:42.139999981 +0100
++++ b/docsrc2man.sh	2021-02-25 22:16:14.079999983 +0100
+@@ -37,8 +37,6 @@
+ 	done
+ 
+ 	rm "$DOCSRC"/$LANGUAGE/*~ 2>/dev/null
+-	gzip -f man/$LANGUAGE/*.[0-9]
+-
+ done
+ 
+ echo
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.2.0_makefile.patch b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.2.0_makefile.patch
new file mode 100644
index 000000000000..2871b46ccbe1
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.2.0_makefile.patch
@@ -0,0 +1,39 @@
+Signed-off-by: Martin Dummer <martin.dummer@gmx.net> ( 2021 Feb 21 )
+
+--- a/Makefile	2021-02-26 08:43:13.903753021 +0100
++++ b/Makefile	2021-02-26 08:48:50.793719332 +0100
+@@ -255,9 +255,6 @@
+ docs:
+ 	./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
+ 
+ install-$(PLUGIN): libvdr-$(PLUGIN).so
+ 	install -D libvdr-$(PLUGIN).so $(DESTDIR)$(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION)
+@@ -272,7 +269,7 @@
+ 	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:
+@@ -291,7 +288,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)
+ 
+@@ -322,3 +319,6 @@
+ 	@-rm -f $(OBJS) $(OBJS2) $(OBJS3) $(OBJS4) $(DEPFILE) *.so *.tgz core* createcats createcats.o pod2*.tmp
+ 	@-find . \( -name "*~" -o -name "#*#" \) -print0 | xargs -0r rm -f
+ 	@-rm -rf doc html man
++
++# make detection in vdr-plugin-2.eclass for new Makefile handling happy
++# SOFILE
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
deleted file mode 100644
index ae6c6dc517e9..000000000000
--- a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_fix-docs.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-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_p20200402_clang.patch b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20200402_clang.patch
new file mode 100644
index 000000000000..98e642593a4e
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20200402_clang.patch
@@ -0,0 +1,33 @@
+when compiling with CC="clang" CXX="clang++" it aborts with 
+
+
+createcats.c:71:42: error: ordered comparison between pointer and zero ('char *' and 'int')
+    if (fgets(buffer, sizeof(buffer), f) > 0) {
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~
+
+This patch fixes it.
+
+Signed-off-by: Martin Dummer <martin.dummer@gmx.net> ( 2021-02-16 )
+
+--- a/epgsearchext.c	2021-02-14 02:29:17.347224714 +0100
++++ b/epgsearchext.c	2021-02-14 09:12:46.606509411 +0100
+@@ -1424,7 +1424,7 @@
+             int line = 0;
+             char buffer[MAXPARSEBUFFER];
+             result = true;
+-            while (fgets(buffer, sizeof(buffer), f) > 0) {
++            while (fgets(buffer, sizeof(buffer), f) != NULL) {
+                 line++;
+                 char *p = strchr(buffer, '#');
+                 if (p == buffer) *p = 0;
+--- a/createcats.c	2021-02-14 09:18:05.146499999 +0100
++++ b/createcats.c	2021-02-14 09:18:25.974499384 +0100
+@@ -68,7 +68,7 @@
+ 
+ char *cReadLine::Read(FILE *f)
+ {
+-    if (fgets(buffer, sizeof(buffer), f) > 0) {
++    if (fgets(buffer, sizeof(buffer), f) != NULL) {
+         int l = strlen(buffer) - 1;
+         if (l >= 0 && buffer[l] == '\n')
+             buffer[l] = 0;
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
deleted file mode 100644
index 0917f4f8da50..000000000000
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR plugin: create timers from epg content based on saved search expressions"
-HOMEPAGE="http://winni.vdr-developer.org/epgsearch"
-
-case ${P#*_} in
-	rc*|beta*)
-		MY_P="${P/_/.}"
-		SRC_URI="http://winni.vdr-developer.org/epgsearch/downloads/beta/${MY_P}.tgz"
-		S="${WORKDIR}/${MY_P#vdr-}"
-		;;
-	p*)
-		GIT_COMMIT_ID="a908daa4c5c6edd6c560ed96939358b4352e9b42"
-		GIT_COMMIT_DATE="20141227"
-		SRC_URI="http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-${GIT_COMMIT_ID}.tar.gz
-		-> ${P}.tar.gz"
-		S="${WORKDIR}/vdr-plugin-epgsearch-${GIT_COMMIT_ID}"
-		;;
-	*)
-		SRC_URI="http://winni.vdr-developer.org/epgsearch/downloads/${P}.tgz"
-		;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+conflictcheckonly +epgsearchonly l10n_de pcre +quicksearch tre"
-REQUIRED_USE="?? ( pcre tre )"
-
-DEPEND="media-video/vdr
-	pcre? ( dev-libs/libpcre )
-	tre? ( dev-libs/tre )"
-RDEPEND="${DEPEND}"
-QA_FLAGS_IGNORED="usr/lib/vdr/plugins/libvdr-.* usr/lib64/vdr/plugins/libvdr-.* usr/bin/createcats"
-
-src_prepare() {
-	# make detection in vdr-plugin-2.eclass for new Makefile handling happy
-	echo "# SOFILE" >> Makefile || die "cannot write to 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 || die "cannot remove .po files"
-
-	local PATCHES=(
-		"${FILESDIR}/vdr-epgsearch-1.x.makefile.patch"
-		"${FILESDIR}/fix-manpage-generation.diff"
-		)
-
-	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() {
-	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/*
-
-	if use l10n_de; then
-		doman -i18n=de man/de/*
-	fi
-}
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0-r1.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..25420e6723ec
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 2021 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"
+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"
+REQUIRED_USE="?? ( pcre tre )"
+
+DEPEND="
+	=media-video/vdr-2.2*
+	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-${VDRPLUGIN}-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${P}_makefile.patch"
+	"${FILESDIR}/${P}_docsrc2man-no-gzip.patch"
+	"${FILESDIR}/${P}_clang.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"
+
+	if ! use conflictcheckonly; then
+		sed -e "s:install-\$(PLUGIN3)::" -i Makefile || die "cannot modify Makefile"
+	fi
+
+	if ! use epgsearchonly; then
+		sed -e "s:install-\$(PLUGIN2)::" -i Makefile || die "cannot modify Makefile"
+	fi
+
+	if ! use quicksearch; then
+		sed -e "s:install-\$(PLUGIN4)::" -i Makefile || die "cannot modify Makefile"
+	fi
+
+	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/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() {
+	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/*
+}
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 0a8a30e973a4..ebf6ebe1eb32 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 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-${VDRPLUGIN}.git/snap
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+conflictcheckonly +epgsearchonly pcre +quicksearch tre"
 
 DEPEND="=media-video/vdr-2.2*
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0.ebuild
deleted file mode 100644
index f3656d228f5a..000000000000
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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_p20200402-r1.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20200402-r1.ebuild
new file mode 100644
index 000000000000..cf3297423806
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20200402-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 2021 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="d8cff1a251ef2b54f1de3f8e6ea55a838eeb73c3"
+SRC_URI="https://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"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.0_makefile.patch"
+	"${FILESDIR}/${PN}-2.4.0_docsrc2man-no-gzip.patch"
+	"${FILESDIR}/${P}_clang.patch"
+)
+
+QA_FLAGS_IGNORED="
+	usr/lib/vdr/plugins/libvdr-.*
+	usr/lib64/vdr/plugins/libvdr-.*
+	usr/bin/createcats"
+S="${WORKDIR}/vdr-plugin-epgsearch-${GIT_COMMIT_ID}"
+
+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"
+
+	if ! use conflictcheckonly; then
+		sed -e "s:install-\$(PLUGIN3)::" -i Makefile || die "cannot modify Makefile"
+	fi
+
+	if ! use epgsearchonly; then
+		sed -e "s:install-\$(PLUGIN2)::" -i Makefile || die "cannot modify Makefile"
+	fi
+
+	if ! use quicksearch; then
+		sed -e "s:install-\$(PLUGIN4)::" -i Makefile || die "cannot modify Makefile"
+	fi
+
+	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/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() {
+	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/*
+}
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20191202.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20200402.ebuild
index c2fc3ce4361f..d8abad551173 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20191202.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20200402.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,8 +7,8 @@ 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"
+GIT_COMMIT_ID="d8cff1a251ef2b54f1de3f8e6ea55a838eeb73c3"
+SRC_URI="https://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"
@@ -25,26 +25,34 @@ BDEPEND="
 	sys-apps/groff
 	dev-lang/perl"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.0_makefile.patch"
+	"${FILESDIR}/${PN}-2.4.0_docsrc2man-no-gzip.patch"
+	"${FILESDIR}/${P}_clang.patch"
+)
+
 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"
+	if use conflictcheckonly; then
+		sed -e "s:install-\$(PLUGIN3)::" -i Makefile || die "cannot modify Makefile"
+	fi
+
+	if use epgsearchonly; then
+		sed -e "s:install-\$(PLUGIN2)::" -i Makefile || die "cannot modify Makefile"
+	fi
+
+	if use quicksearch; then
+		sed -e "s:install-\$(PLUGIN4)::" -i Makefile || die "cannot modify Makefile"
+	fi
 
 	vdr-plugin-2_src_prepare