* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-epgsearch/files/, media-plugins/vdr-epgsearch/
@ 2019-10-17 4:52 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2019-10-17 4:52 UTC (permalink / raw
To: gentoo-commits
commit: a70910f9505a15b120f883685769d27149710256
Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net>
AuthorDate: Mon Oct 14 21:26:59 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Oct 17 04:51:17 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a70910f9
media-plugins/vdr-epgsearch: fix QA issues, #694644
remove duplicate identical patch files
update ebuild headers
add QA_FLAGS_IGNORED hint
Closes: https://bugs.gentoo.org/694644
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net>
Closes: https://github.com/gentoo/gentoo/pull/13304
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
...efile.diff => vdr-epgsearch-1.x.makefile.patch} | 0
.../files/vdr-epgsearch-2.2.0_makefile.diff | 25 ----------------------
.../vdr-epgsearch-1.0.1_p20141227-r1.ebuild | 5 +++--
.../vdr-epgsearch/vdr-epgsearch-2.2.0.ebuild | 5 +++--
4 files changed, 6 insertions(+), 29 deletions(-)
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.1_beta5_makefile.diff b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.x.makefile.patch
similarity index 100%
rename from media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.1_beta5_makefile.diff
rename to media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.x.makefile.patch
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.2.0_makefile.diff b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.2.0_makefile.diff
deleted file mode 100644
index 25e27e958a4..00000000000
--- a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.2.0_makefile.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur vdr-plugin-epgsearch-a908daa4c5c6edd6c560ed96939358b4352e9b42.orig/Makefile vdr-plugin-epgsearch-a908daa4c5c6edd6c560ed96939358b4352e9b42/Makefile
---- vdr-plugin-epgsearch-a908daa4c5c6edd6c560ed96939358b4352e9b42.orig/Makefile 2015-02-21 21:01:08.926052710 +0100
-+++ vdr-plugin-epgsearch-a908daa4c5c6edd6c560ed96939358b4352e9b42/Makefile 2015-02-21 21:03:42.768052710 +0100
-@@ -255,9 +255,9 @@
- 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
-+# 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 +272,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:
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 ddd0e54173a..c79abd511d1 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 1999-2018 Gentoo Foundation
+# Copyright 2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -36,6 +36,7 @@ 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
@@ -45,7 +46,7 @@ src_prepare() {
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.0.1_beta5_makefile.diff"
+ "${FILESDIR}/vdr-epgsearch-1.x.makefile.patch"
"${FILESDIR}/fix-manpage-generation.diff"
)
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 bfc710beb8f..036df79eeb1 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 1999-2018 Gentoo Foundation
+# Copyright 2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,6 +18,7 @@ DEPEND="=media-video/vdr-2.2*
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"
REQUIRED_USE="?? ( pcre tre )"
@@ -30,7 +31,7 @@ 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
- eapply "${FILESDIR}/${P}_makefile.diff"
+ 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-epgsearch/files/, media-plugins/vdr-epgsearch/
@ 2019-12-25 18:53 Jörg Bornkessel
0 siblings, 0 replies; 4+ messages in thread
From: Jörg Bornkessel @ 2019-12-25 18:53 UTC (permalink / raw
To: gentoo-commits
commit: 1635430fb0cc1cf5fdcb348748e1ccf359aa95b8
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 25 18:52:38 2019 +0000
Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Wed Dec 25 18:53:31 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1635430f
media-plugins/vdr-epgsearch: version bump
this version need
>=media-video/vdr-2.4
Bug: https://bugs.gentoo.org/696746
Close: https://bugs.gentoo.org/696746
Package-Manager: Portage-2.3.82, Repoman-2.3.18
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>
media-plugins/vdr-epgsearch/Manifest | 1 +
.../files/vdr-epgsearch-2.4.0_makefile.patch | 42 ++++++++++++
.../vdr-epgsearch/vdr-epgsearch-2.4.0.ebuild | 79 ++++++++++++++++++++++
3 files changed, 122 insertions(+)
diff --git a/media-plugins/vdr-epgsearch/Manifest b/media-plugins/vdr-epgsearch/Manifest
index 45eb08a12d9..f9adc5c6bd1 100644
--- a/media-plugins/vdr-epgsearch/Manifest
+++ b/media-plugins/vdr-epgsearch/Manifest
@@ -1,2 +1,3 @@
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
+DIST vdr-epgsearch-2.4.0.tgz 479041 BLAKE2B 1d0b87bca573c90d13fb07d39c2945be1451ac405739ba788482488994832d3fc053dd076d474cc4e78e9a6b3078952fac7e799945120ff220d58b7f2fc2f181 SHA512 4fec779edeee0b326624b6904b5e6b5f0c8243208938389787433638355436fe82899864d33f512c3a9e0feadde1f770d4ca562f06212f83f8d753a9a34700e4
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 00000000000..5ec9c69af41
--- /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-2.4.0.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0.ebuild
new file mode 100644
index 00000000000..840362e7069
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 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
+
+ eapply "${FILESDIR}/vdr-epgsearch-2.4.0_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
+
+ vdr-plugin-2_src_prepare
+
+ fix_vdr_libsi_include conflictcheck.c
+
+ # install conf-file disabled
+ sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf
+
+ # Get rid of the broken symlinks
+ rm -f README{,.DE}
+}
+
+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
+ doman man/en/*.[0-9]
+
+ gunzip -f man/de/*.gz
+ doman -i18n=de man/de/*.[0-9]
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-epgsearch/files/, media-plugins/vdr-epgsearch/
@ 2020-01-03 20:54 Jörg Bornkessel
0 siblings, 0 replies; 4+ messages in thread
From: Jörg Bornkessel @ 2020-01-03 20:54 UTC (permalink / raw
To: gentoo-commits
commit: 20d66f658150e85f68e43bd7a508a9272cbdae39
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 3 20:53:22 2020 +0000
Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Fri Jan 3 20:54:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20d66f65
media-plugins/vdr-epgsearch: man page creation fixed
https://projects.vdr-developer.org/issues/2581
Manpages with encoding will not created correct
Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net>
Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>
media-plugins/vdr-epgsearch/Manifest | 1 +
.../vdr-epgsearch-2.4.0_docsrc2man-no-gzip.patch | 12 ++
.../files/vdr-epgsearch-2.4.0_fix-docs.patch | 124 +++++++++++++++++++++
.../vdr-epgsearch-2.4.0_p20191202.ebuild | 88 +++++++++++++++
4 files changed, 225 insertions(+)
diff --git a/media-plugins/vdr-epgsearch/Manifest b/media-plugins/vdr-epgsearch/Manifest
index f9adc5c6bd1..65444331481 100644
--- a/media-plugins/vdr-epgsearch/Manifest
+++ b/media-plugins/vdr-epgsearch/Manifest
@@ -1,3 +1,4 @@
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
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
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 00000000000..591323f7860
--- /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 00000000000..ae6c6dc517e
--- /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/vdr-epgsearch-2.4.0_p20191202.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20191202.ebuild
new file mode 100644
index 00000000000..c2dec8dea7e
--- /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/*
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-epgsearch/files/, media-plugins/vdr-epgsearch/
@ 2021-02-27 18:49 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2021-02-27 18:49 UTC (permalink / raw
To: gentoo-commits
commit: 07d23eb89e595e56f3dd9de084f139071578ee7f
Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net>
AuthorDate: Sat Feb 27 16:28:54 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 18:48:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07d23eb8
media-plugins/vdr-epgsearch: fix QA+clang issue in 2.2.0-r1
problem with pre-compressed man+doc fixed, add patch for CC="clang"
Closes: https://bugs.gentoo.org/772899
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/vdr-epgsearch-2.2.0_clang.patch | 35 ++++++++
.../vdr-epgsearch-2.2.0_docsrc2man-no-gzip.patch | 11 +++
.../files/vdr-epgsearch-2.2.0_makefile.patch | 39 +++++++++
.../vdr-epgsearch/vdr-epgsearch-2.2.0-r1.ebuild | 95 ++++++++++++++++++++++
4 files changed, 180 insertions(+)
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 00000000000..9c414509ea8
--- /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 00000000000..508ad7f5d9a
--- /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 00000000000..2871b46ccbe
--- /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/vdr-epgsearch-2.2.0-r1.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0-r1.ebuild
new file mode 100644
index 00000000000..25420e6723e
--- /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/*
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-02-27 18:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-03 20:54 [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-epgsearch/files/, media-plugins/vdr-epgsearch/ Jörg Bornkessel
-- strict thread matches above, loose matches on Subject: below --
2021-02-27 18:49 Joonas Niilola
2019-12-25 18:53 Jörg Bornkessel
2019-10-17 4:52 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox