* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-epgsearch/, media-plugins/vdr-epgsearch/files/
@ 2018-05-05 15:38 Michał Górny
0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2018-05-05 15:38 UTC (permalink / raw
To: gentoo-commits
commit: e4762549ddfe5d9a8eb912ecaab3a77cde845fbe
Author: Martin Dummer <martin.dummer <AT> ts <DOT> fujitsu <DOT> com>
AuthorDate: Wed Apr 25 22:52:24 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 5 15:38:00 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4762549
media-plugins/vdr-epgsearch: no "doman" with *.gz files, EAPI=6
Remove usage of "doman" with pre-compressed files
Update the ebuild to EAPI=6
metadata.xml: Add proper use flag description
Closes: https://bugs.gentoo.org/619954
Package-Manager: Portage-2.3.31, Repoman-2.3.9
.../files/fix-manpage-generation.diff | 45 ++++++++++++++++++++++
media-plugins/vdr-epgsearch/metadata.xml | 18 ++++++---
...ild => vdr-epgsearch-1.0.1_p20141227-r1.ebuild} | 41 ++++++++++----------
3 files changed, 78 insertions(+), 26 deletions(-)
diff --git a/media-plugins/vdr-epgsearch/files/fix-manpage-generation.diff b/media-plugins/vdr-epgsearch/files/fix-manpage-generation.diff
new file mode 100644
index 00000000000..9e1047c8c00
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/files/fix-manpage-generation.diff
@@ -0,0 +1,45 @@
+--- 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/metadata.xml b/media-plugins/vdr-epgsearch/metadata.xml
index 09e439aec93..44d42030c0c 100644
--- a/media-plugins/vdr-epgsearch/metadata.xml
+++ b/media-plugins/vdr-epgsearch/metadata.xml
@@ -1,14 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<maintainer type="person">
+ <email>martin.dummer@gmx.net</email>
+ <name>Martin Dummer</name>
+</maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
<maintainer type="project">
-<email>vdr@gentoo.org</email>
-<name>Gentoo VDR Project</name>
+ <email>vdr@gentoo.org</email>
+ <name>Gentoo VDR Project</name>
</maintainer>
<use>
- <flag name="conflictcheckonly">ToDo</flag>
- <flag name="epgsearchonly">ToDo</flag>
- <flag name="quicksearch">ToDo</flag>
+ <flag name="conflictcheckonly">install the "conflictcheckonly" vdr-plugin</flag>
+ <flag name="epgsearchonly">install the "epgsearchonly" vdr-plugin</flag>
+ <flag name="quicksearch">install the "quicksearch" vdr-plugin</flag>
<flag name="tre">Add support for unlimited fuzzy searching with help of <pkg>dev-libs/tre</pkg> library</flag>
</use>
</pkgmetadata>
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227-r1.ebuild
similarity index 72%
rename from media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227.ebuild
rename to media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227-r1.ebuild
index fedaa7a512b..c3d70846e48 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
inherit vdr-plugin-2
@@ -30,37 +30,38 @@ 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}"
-REQUIRED_USE="pcre? ( !tre )
- tre? ( !pcre )"
-
src_prepare() {
# make detection in vdr-plugin-2.eclass for new Makefile handling happy
- echo "# SOFILE" >> Makefile
+ 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
+ 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"
- epatch "${FILESDIR}/vdr-epgsearch-1.0.1_beta5_makefile.diff"
+ local PATCHES=(
+ "${FILESDIR}/vdr-epgsearch-1.0.1_beta5_makefile.diff"
+ "${FILESDIR}/fix-manpage-generation.diff"
+ )
- 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 "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
+ sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf || die "cannot modify epgsearchmenu.conf"
- # Get rid of the broken symlinks
- rm -f README{,.DE} MANUAL
+ # Get rid of the broken symlink
+ rm README || die "cannot remove broken symlink"
}
src_compile() {
@@ -80,20 +81,18 @@ src_compile() {
}
src_install() {
+ DOCS=( conf/*.templ HISTORY* README.Translators )
vdr-plugin-2_src_install
- diropts "-m755 -o vdr -g vdr"
+ 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/*
- doins conf/epgsearchmenu.conf
- doins conf/epgsearchconflmail.templ conf/epgsearchupdmail.templ
-
- nonfatal dodoc conf/*.templ HISTORY*
-
- doman man/en/*.gz
+ doman man/en/*
if use l10n_de; then
- doman -i18n=de man/de/*.gz
+ doman -i18n=de man/de/*
fi
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-epgsearch/, media-plugins/vdr-epgsearch/files/
@ 2018-05-11 9:24 Michał Górny
0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2018-05-11 9:24 UTC (permalink / raw
To: gentoo-commits
commit: 9b395179dbfab9dfbd7f0883fc85268b4ed1e643
Author: Martin Dummer <martin.dummer <AT> ts <DOT> fujitsu <DOT> com>
AuthorDate: Thu May 10 21:44:36 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri May 11 09:23:17 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b395179
media-plugins/vdr-epgsearch: drop old
Closes: https://bugs.gentoo.org/650078
Closes: https://github.com/gentoo/gentoo/pull/8338
Package-Manager: Portage-2.3.31, Repoman-2.3.9
media-plugins/vdr-epgsearch/Manifest | 1 -
.../files/vdr-epgsearch-1.0.0_vdr-1.7.25.diff | 32 ------
.../files/vdr-epgsearch-1.0.0_vdr-1.7.33.diff | 120 ---------------------
.../files/vdr-epgsearch-1.0.0_vdr-2.1.2.diff | 15 ---
.../vdr-epgsearch/vdr-epgsearch-1.0.0-r1.ebuild | 112 -------------------
5 files changed, 280 deletions(-)
diff --git a/media-plugins/vdr-epgsearch/Manifest b/media-plugins/vdr-epgsearch/Manifest
index b87ce9a7d70..f90f3c0a14a 100644
--- a/media-plugins/vdr-epgsearch/Manifest
+++ b/media-plugins/vdr-epgsearch/Manifest
@@ -1,2 +1 @@
-DIST vdr-epgsearch-1.0.0.tgz 667633 BLAKE2B 6a5c03b595f1f25c1f77b8e1e86f9a35a59ce20c258a196c5d828d48e139d25bf1d6c8da32d2e55fcc1576165c9f0c849e1ae8199657f062baf9ed738d97344a SHA512 3105dc847a75ad54ca854418a83db847942ba1d85f1c65a94b88310dfcdd5d614b89f0f27fd3ffc8e8c5db6c1c1e0f36e8e7a33cc71299922287f2d19dd385af
DIST vdr-epgsearch-1.0.1_p20141227.tar.gz 472802 BLAKE2B 9ffc067c2aff29e3d79b620edf88ff7aca64ad5d1de3aa32b19fbc1889673e2439a6d65b46e2f3ff5fd3d416ff24cbafd6d41f562b3775210f0234c6990f03ab SHA512 952d58f6f03d2804f97be14779faf37c3788b42d78a6460102e2f1c74f6a58d7d68639e7e95e40f27417ce3658c0d5bf856399b6e8e8c214ea143d2865507562
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-1.7.25.diff b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-1.7.25.diff
deleted file mode 100644
index 3a8babbc16f..00000000000
--- a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-1.7.25.diff
+++ /dev/null
@@ -1,32 +0,0 @@
---- epgsearch/conflictcheck.h.bak 2012-03-03 15:33:15.000000000 +0100
-+++ epgsearch/conflictcheck.h 2012-03-03 15:35:43.000000000 +0100
-@@ -169,12 +169,12 @@
- result = true;
- #ifdef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE
- else
-- result = Priority >= Setup.PrimaryLimit;
-+ result = Priority >= 0;
- #endif
- #endif
- }
- else
-- result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit;
-+ result = !IsPrimaryDevice() || Priority >= 0;
- }
- else
- needsDetachReceivers = true;
-@@ -259,12 +259,12 @@
- result = true;
- #ifdef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE
- else
-- result = Priority >= Setup.PrimaryLimit;
-+ result = Priority >= 0;
- #endif
- #endif
- }
- else
-- result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit;
-+ result = !IsPrimaryDevice() || Priority >= 0;
- }
- else
- needsDetachReceivers = true;
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-1.7.33.diff b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-1.7.33.diff
deleted file mode 100644
index aa51685cb28..00000000000
--- a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-1.7.33.diff
+++ /dev/null
@@ -1,120 +0,0 @@
-diff -Naur epgsearch-1.0.0.orig/epgsearchsvdrp.c epgsearch-1.0.0/epgsearchsvdrp.c
---- epgsearch-1.0.0.orig/epgsearchsvdrp.c 2012-12-15 11:42:41.000000000 +0100
-+++ epgsearch-1.0.0/epgsearchsvdrp.c 2012-12-15 11:44:38.000000000 +0100
-@@ -564,7 +564,7 @@
- strftime(bufStart, sizeof(bufStart), "%H%M", localtime_r(&start, &tm_r));
- strftime(bufEnd, sizeof(bufEnd), "%H%M", localtime_r(&stop, &tm_r));
-
-- int timerMatch;
-+ eTimerMatch timerMatch;
- bool hasTimer = false;
- if (Timers.GetMatch(pEvent, &timerMatch))
- hasTimer = (timerMatch == tmFull);
-diff -Naur epgsearch-1.0.0.orig/mail.c epgsearch-1.0.0/mail.c
---- epgsearch-1.0.0.orig/mail.c 2012-12-15 11:42:41.000000000 +0100
-+++ epgsearch-1.0.0/mail.c 2012-12-15 11:45:02.000000000 +0100
-@@ -49,7 +49,7 @@
- const cEvent* pEvent = GetEvent();
- if (!pEvent) return "";
-
-- int TimerMatch = tmNone;
-+ eTimerMatch TimerMatch = tmNone;
- cTimer* pTimer = Timers.GetMatch(pEvent, &TimerMatch);
- if (!pTimer) return "";
-
-diff -Naur epgsearch-1.0.0.orig/menu_commands.c epgsearch-1.0.0/menu_commands.c
---- epgsearch-1.0.0.orig/menu_commands.c 2012-12-15 11:42:41.000000000 +0100
-+++ epgsearch-1.0.0/menu_commands.c 2012-12-15 11:45:40.000000000 +0100
-@@ -121,7 +121,7 @@
- {
- if (!event) return osContinue;
-
-- int timerMatch = tmNone;
-+ eTimerMatch timerMatch = tmNone;
- cTimer* timer = Timers.GetMatch(event, &timerMatch);
- if (timerMatch == tmFull)
- {
-diff -Naur epgsearch-1.0.0.orig/menu_event.c epgsearch-1.0.0/menu_event.c
---- epgsearch-1.0.0.orig/menu_event.c 2012-12-15 11:42:41.000000000 +0100
-+++ epgsearch-1.0.0/menu_event.c 2012-12-15 11:46:17.000000000 +0100
-@@ -92,7 +92,7 @@
- cEventObj* eventObjPrev = GetPrev(event);
- cEventObj* eventObjNext = GetNext(event);
-
-- int timerMatch = tmNone;
-+ eTimerMatch timerMatch = tmNone;
- Timers.GetMatch(event, &timerMatch);
- const char* szRed = trVDR("Button$Record");
- if (timerMatch == tmFull)
-diff -Naur epgsearch-1.0.0.orig/menu_main.c epgsearch-1.0.0/menu_main.c
---- epgsearch-1.0.0.orig/menu_main.c 2012-12-15 11:42:41.000000000 +0100
-+++ epgsearch-1.0.0/menu_main.c 2012-12-15 11:47:08.000000000 +0100
-@@ -181,7 +181,7 @@
- if (item) {
- if (item->timerMatch == tmFull)
- {
-- int tm = tmNone;
-+ eTimerMatch tm = tmNone;
- cTimer *timer = Timers.GetMatch(item->event, &tm);
- if (timer)
- {
-diff -Naur epgsearch-1.0.0.orig/menu_searchresults.c epgsearch-1.0.0/menu_searchresults.c
---- epgsearch-1.0.0.orig/menu_searchresults.c 2012-12-15 11:42:41.000000000 +0100
-+++ epgsearch-1.0.0/menu_searchresults.c 2012-12-15 11:51:12.000000000 +0100
-@@ -217,7 +217,7 @@
- if (item) {
- if (item->timerMatch == tmFull)
- {
-- int tm = tmNone;
-+ eTimerMatch tm = tmNone;
- cTimer *timer = Timers.GetMatch(item->event, &tm);
- if (timer)
- {
-diff -Naur epgsearch-1.0.0.orig/menu_searchresults.h epgsearch-1.0.0/menu_searchresults.h
---- epgsearch-1.0.0.orig/menu_searchresults.h 2012-12-15 11:42:41.000000000 +0100
-+++ epgsearch-1.0.0/menu_searchresults.h 2012-12-15 11:51:57.000000000 +0100
-@@ -50,7 +50,7 @@
- bool episodeOnly;
- cMenuTemplate* menuTemplate;
- public:
-- int timerMatch;
-+ eTimerMatch timerMatch;
- bool inSwitchList;
- const cEvent *event;
- const cSearchExt* search;
-diff -Naur epgsearch-1.0.0.orig/menu_whatson.c epgsearch-1.0.0/menu_whatson.c
---- epgsearch-1.0.0.orig/menu_whatson.c 2012-12-15 11:42:41.000000000 +0100
-+++ epgsearch-1.0.0/menu_whatson.c 2012-12-15 11:52:37.000000000 +0100
-@@ -527,7 +527,7 @@
- {
- if (item->timerMatch == tmFull)
- {
-- int tm = tmNone;
-+ eTimerMatch tm = tmNone;
- cTimer *timer = Timers.GetMatch(item->event, &tm);
- if (timer)
- {
-diff -Naur epgsearch-1.0.0.orig/menu_whatson.h epgsearch-1.0.0/menu_whatson.h
---- epgsearch-1.0.0.orig/menu_whatson.h 2012-12-15 11:42:41.000000000 +0100
-+++ epgsearch-1.0.0/menu_whatson.h 2012-12-15 11:53:09.000000000 +0100
-@@ -35,7 +35,7 @@
- const cEvent *event;
- cChannel *channel;
- showMode mode;
-- int timerMatch;
-+ eTimerMatch timerMatch;
- bool inSwitchList;
- cMenuTemplate* menuTemplate;
-
-diff -Naur epgsearch-1.0.0.orig/services.c epgsearch-1.0.0/services.c
---- epgsearch-1.0.0.orig/services.c 2012-12-15 11:42:41.000000000 +0100
-+++ epgsearch-1.0.0/services.c 2012-12-15 11:53:34.000000000 +0100
-@@ -143,7 +143,7 @@
- strftime(bufStart, sizeof(bufStart), "%H%M", localtime_r(&start, &tm_r));
- strftime(bufEnd, sizeof(bufEnd), "%H%M", localtime_r(&stop, &tm_r));
-
-- int timerMatch;
-+ eTimerMatch timerMatch;
- bool hasTimer = false;
- if (Timers.GetMatch(pEvent, &timerMatch))
- hasTimer = (timerMatch == tmFull);
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-2.1.2.diff b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-2.1.2.diff
deleted file mode 100644
index 5b9d657e95e..00000000000
--- a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-2.1.2.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur epgsearch-1.0.0.orig/uservars.h epgsearch-1.0.0/uservars.h
---- epgsearch-1.0.0.orig/uservars.h 2013-10-23 00:54:29.000000000 +0200
-+++ epgsearch-1.0.0/uservars.h 2013-10-23 00:56:21.000000000 +0200
-@@ -537,7 +537,11 @@
- cVideodirVar() : cInternalVar("%videodir%") {}
- string Evaluate(const cEvent*, bool escapeStrings = false)
- {
-+#if APIVERSNUM > 20101
-+ return cVideoDirectory::Name();
-+#else
- return VideoDirectory;
-+#endif
- }
- };
-
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0-r1.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0-r1.ebuild
deleted file mode 100644
index d550ca75a66..00000000000
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: Searchtimer and replacement of the VDR program menu"
-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-}"
- ;;
- *)
- SRC_URI="http://winni.vdr-developer.org/epgsearch/downloads/${P}.tgz"
- ;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pcre tre l10n_de"
-
-DEPEND=">=media-video/vdr-1.3.45
- pcre? ( dev-libs/libpcre )
- tre? ( dev-libs/tre )"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="pcre? ( !tre )
- tre? ( !pcre )"
-
-src_prepare() {
- vdr-plugin-2_src_prepare
-
- fix_vdr_libsi_include conflictcheck.c
-
- if has_version ">=media-video/vdr-1.7.25"; then
- epatch "${FILESDIR}/${P}_vdr-1.7.25.diff"
- fi
-
- if has_version ">=media-video/vdr-1.7.28"; then
- sed -i "s:SetRecording(recording->FileName(), recording->Title:SetRecording(recording->FileName:" menu_searchresults.c
- fi
-
- if has_version ">=media-video/vdr-1.7.33"; then
- epatch "${FILESDIR}/${P}_vdr-1.7.33.diff"
- fi
-
- epatch "${FILESDIR}/${P}_vdr-2.1.2.diff"
-
- # disable automagic deps
- sed -i Makefile -e '/^AUTOCONFIG=/s/^/#/'
-
- if use pcre; then
- einfo "Using pcre for regexp searches"
- sed -i Makefile -e 's:^#REGEXLIB = pcre:REGEXLIB = pcre:'
- fi
-
- if use tre; then
- einfo "Using tre for unlimited fuzzy searches"
- sed -i Makefile -e 's:^#REGEXLIB = pcre:REGEXLIB = tre:'
- fi
-
- # install conf-file disabled
- sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf
-
- # Get a rid of the broken symlinks
- rm -f README{,.DE} MANUAL
-}
-
-src_install() {
- vdr-plugin-2_src_install
-
- diropts "-m755 -o vdr -g vdr"
- keepdir /etc/vdr/plugins/epgsearch
- insinto /etc/vdr/plugins/epgsearch
-
- doins conf/epgsearchmenu.conf
- doins conf/epgsearchconflmail.templ conf/epgsearchupdmail.templ
-
- dodoc conf/*.templ
-
- doman man/en/*.gz
-
- if use l10n_de; then
- doman -i18n=de man/de/*.gz
- fi
-}
-
-pkg_preinst() {
- has_version "<${CATEGORY}/${PN}-0.9.18"
- previous_less_than_0_9_18=$?
-}
-
-pkg_postinst() {
- vdr-plugin-2_pkg_postinst
- if [[ $previous_less_than_0_9_18 = 0 ]] ; then
- elog "Moving config-files to new location /etc/vdr/plugins/epgsearch"
- cd "${ROOT}"/etc/vdr/plugins
- local f
- local moved=""
- for f in epgsearch*.* .epgsearch*; do
- [[ -e ${f} ]] || continue
- mv "${f}" "${ROOT}/etc/vdr/plugins/epgsearch"
- moved="${moved} ${f}"
- done
- elog "These files were moved:${moved}"
- fi
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-epgsearch/, media-plugins/vdr-epgsearch/files/
@ 2018-09-02 21:10 Joerg Bornkessel
0 siblings, 0 replies; 7+ messages in thread
From: Joerg Bornkessel @ 2018-09-02 21:10 UTC (permalink / raw
To: gentoo-commits
commit: 8b1e7dfe0b89cbe30f64dea3563687636ab19943
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 2 21:09:44 2018 +0000
Commit: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Sun Sep 2 21:09:44 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b1e7dfe
media-plugins/vdr-epgsearch: bump; closed bug 623576, thx to M.Brakemeier
Package-Manager: Portage-2.3.48, Repoman-2.3.10
media-plugins/vdr-epgsearch/Manifest | 1 +
.../files/vdr-epgsearch-2.2.0_makefile.diff | 25 +++++++
.../vdr-epgsearch/vdr-epgsearch-2.2.0.ebuild | 83 ++++++++++++++++++++++
3 files changed, 109 insertions(+)
diff --git a/media-plugins/vdr-epgsearch/Manifest b/media-plugins/vdr-epgsearch/Manifest
index f90f3c0a14a..45eb08a12d9 100644
--- a/media-plugins/vdr-epgsearch/Manifest
+++ b/media-plugins/vdr-epgsearch/Manifest
@@ -1 +1,2 @@
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
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
new file mode 100644
index 00000000000..25e27e958a4
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.2.0_makefile.diff
@@ -0,0 +1,25 @@
+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-2.2.0.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0.ebuild
new file mode 100644
index 00000000000..bfc710beb8f
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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.2*
+ pcre? ( dev-libs/libpcre )
+ tre? ( dev-libs/tre )"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="?? ( pcre tre )"
+
+S="${WORKDIR}/vdr-plugin-${VDRPLUGIN}-${PV}"
+
+src_prepare() {
+ # make detection in vdr-plugin-2.eclass for new Makefile handling happy
+ 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
+
+ eapply "${FILESDIR}/${P}_makefile.diff"
+
+ 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} MANUAL
+}
+
+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"
+ keepdir /etc/vdr/plugins/epgsearch
+ insinto /etc/vdr/plugins/epgsearch
+
+ doins conf/epgsearchmenu.conf
+ doins conf/epgsearchconflmail.templ conf/epgsearchupdmail.templ
+
+ nonfatal dodoc conf/*.templ HISTORY*
+
+ 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] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-epgsearch/, media-plugins/vdr-epgsearch/files/
@ 2021-02-22 14:47 Joonas Niilola
0 siblings, 0 replies; 7+ messages in thread
From: Joonas Niilola @ 2021-02-22 14:47 UTC (permalink / raw
To: gentoo-commits
commit: 6cbce064e37ce085c89d80e61fa4bf8a4c406e90
Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net>
AuthorDate: Tue Feb 16 22:29:39 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 14:47:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cbce064
media-plugins/vdr-epgsearch: 2.4.0 snapshot 20200402
new upstream patch level available, and
clang compile fix
Closes: https://bugs.gentoo.org/740300
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net>
Closes: https://github.com/gentoo/gentoo/pull/19497
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-plugins/vdr-epgsearch/Manifest | 1 +
.../vdr-epgsearch-2.4.0_p20200402_clang.patch | 33 ++++++++
.../vdr-epgsearch-2.4.0_p20200402.ebuild | 88 ++++++++++++++++++++++
3 files changed, 122 insertions(+)
diff --git a/media-plugins/vdr-epgsearch/Manifest b/media-plugins/vdr-epgsearch/Manifest
index 65444331481..952abcccedc 100644
--- a/media-plugins/vdr-epgsearch/Manifest
+++ b/media-plugins/vdr-epgsearch/Manifest
@@ -2,3 +2,4 @@ DIST vdr-epgsearch-1.0.1_p20141227.tar.gz 472802 BLAKE2B 9ffc067c2aff29e3d79b620
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
+DIST vdr-epgsearch-2.4.0_p20200402.tar.gz 479998 BLAKE2B 04e83bd2361743669baba7b10a27fab91f22115b81fe69e9252cc5ecd94fb0fda55d8b6ce3fcaeb08e779f07d46d26e37026d1732d6b38c03385c659eacd5ab0 SHA512 586b369a25c32bbf2d33e68997e7298ad7fda50ac78da5321c848a74d91753a51e6f47d70ef6893ca980bfa2c9f167defd611464729ca4ebf704247e8e37a065
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 00000000000..98e642593a4
--- /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-2.4.0_p20200402.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20200402.ebuild
new file mode 100644
index 00000000000..0a99011a719
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20200402.ebuild
@@ -0,0 +1,88 @@
+# 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"
+
+ 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] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-epgsearch/, media-plugins/vdr-epgsearch/files/
@ 2021-02-27 18:49 Joonas Niilola
0 siblings, 0 replies; 7+ messages in thread
From: Joonas Niilola @ 2021-02-27 18:49 UTC (permalink / raw
To: gentoo-commits
commit: 5a0620eaced6ddb565231da93e82c896bb3b5cda
Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net>
AuthorDate: Sat Feb 27 17:03:39 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=5a0620ea
media-plugins/vdr-epgsearch: remove old
delete old versions
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net>
Closes: https://github.com/gentoo/gentoo/pull/19690
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-plugins/vdr-epgsearch/Manifest | 3 -
.../files/fix-manpage-generation.diff | 45 ----------
.../vdr-epgsearch-1.0.1_p20141227-r1.ebuild | 99 ----------------------
.../vdr-epgsearch/vdr-epgsearch-2.4.0.ebuild | 79 -----------------
.../vdr-epgsearch-2.4.0_p20191202.ebuild | 88 -------------------
5 files changed, 314 deletions(-)
diff --git a/media-plugins/vdr-epgsearch/Manifest b/media-plugins/vdr-epgsearch/Manifest
index 952abcccedc..6a9f4de9ed4 100644
--- a/media-plugins/vdr-epgsearch/Manifest
+++ b/media-plugins/vdr-epgsearch/Manifest
@@ -1,5 +1,2 @@
-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
DIST vdr-epgsearch-2.4.0_p20200402.tar.gz 479998 BLAKE2B 04e83bd2361743669baba7b10a27fab91f22115b81fe69e9252cc5ecd94fb0fda55d8b6ce3fcaeb08e779f07d46d26e37026d1732d6b38c03385c659eacd5ab0 SHA512 586b369a25c32bbf2d33e68997e7298ad7fda50ac78da5321c848a74d91753a51e6f47d70ef6893ca980bfa2c9f167defd611464729ca4ebf704247e8e37a065
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 9e1047c8c00..00000000000
--- 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/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 0917f4f8da5..00000000000
--- 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.4.0.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0.ebuild
deleted file mode 100644
index f3656d228f5..00000000000
--- 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_p20191202.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20191202.ebuild
deleted file mode 100644
index c2fc3ce4361..00000000000
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20191202.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-epgsearch/, media-plugins/vdr-epgsearch/files/
@ 2021-06-03 7:01 Joonas Niilola
0 siblings, 0 replies; 7+ messages in thread
From: Joonas Niilola @ 2021-06-03 7:01 UTC (permalink / raw
To: gentoo-commits
commit: 8d43d1f453e06fb9108e2f89edb0633cafc803ae
Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net>
AuthorDate: Sun May 16 11:02:40 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jun 3 07:01:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d43d1f4
media-plugins/vdr-epgsearch: version bump and gcc-11 fix
Closes: https://bugs.gentoo.org/789402
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net>
Closes: https://github.com/gentoo/gentoo/pull/20833
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-plugins/vdr-epgsearch/Manifest | 1 +
...vdr-epgsearch-2.4.0_p20210426_gcc11-const.patch | 18 ++++
...-epgsearch-2.4.0_p20210426_gcc11-warnings.patch | 58 +++++++++++++
.../vdr-epgsearch-2.4.0_p20210426.ebuild | 97 ++++++++++++++++++++++
4 files changed, 174 insertions(+)
diff --git a/media-plugins/vdr-epgsearch/Manifest b/media-plugins/vdr-epgsearch/Manifest
index 6a9f4de9ed4..a2859941876 100644
--- a/media-plugins/vdr-epgsearch/Manifest
+++ b/media-plugins/vdr-epgsearch/Manifest
@@ -1,2 +1,3 @@
DIST vdr-epgsearch-2.2.0.tgz 472502 BLAKE2B f98053d95a6fe56aff48bd3e86ae8a37166b3b8556fe3500c956901cb3f8d19c5792b157606d372392b7387c05a72f4d664881a27bbd5b9484640d8de73b8673 SHA512 c0fef60069addc3cca82535c22b7e1f73f01de7466bc6d0b837ba34df7a7dd0fe2cbf7e9b9bc36a523a75a3db18889a1ff9040fb2647c889ea74666067c3a1e4
DIST vdr-epgsearch-2.4.0_p20200402.tar.gz 479998 BLAKE2B 04e83bd2361743669baba7b10a27fab91f22115b81fe69e9252cc5ecd94fb0fda55d8b6ce3fcaeb08e779f07d46d26e37026d1732d6b38c03385c659eacd5ab0 SHA512 586b369a25c32bbf2d33e68997e7298ad7fda50ac78da5321c848a74d91753a51e6f47d70ef6893ca980bfa2c9f167defd611464729ca4ebf704247e8e37a065
+DIST vdr-epgsearch-2.4.0_p20210426.tar.gz 481490 BLAKE2B 71c336f2f8838c435ca439a61be58884ef001954cf33fe99c1b20987baaa207e74b5a032f3fa9543f58b53157ecfabcd7fca08f7ebf49c015ba6893e7e6f7759 SHA512 4260ebbd3c18dd66b18ff7d05480a1affd0ba9a4dd130cf23e93cd7085218ebb8f60f5733ee1f616b74618ea68a367a001d330a60294faced7e04d4f10a5ffa3
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20210426_gcc11-const.patch b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20210426_gcc11-const.patch
new file mode 100644
index 00000000000..b0d756a73b4
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20210426_gcc11-const.patch
@@ -0,0 +1,18 @@
+the following change to const is necessary since gcc-11
+
+thanks to seahawk1986 @ vdr-portal.de
+https://www.vdr-portal.de/forum/index.php?thread/134005-vdr-2-4-6-kompiliert-mit-gcc-11-0-0-nicht/&postID=1340496#post1340496
+
+Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
+
+--- a/conflictcheck.h
++++ b/conflictcheck.h
+@@ -73,7 +73,7 @@
+ class TimerObjSort
+ {
+ public:
+- bool operator()(cConflictCheckTimerObj* a, cConflictCheckTimerObj* b) {
++ bool operator()(const cConflictCheckTimerObj* a, const cConflictCheckTimerObj* b) const {
+ return (a->Compare(*b) < 0);
+ }
+ };
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20210426_gcc11-warnings.patch b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20210426_gcc11-warnings.patch
new file mode 100644
index 00000000000..fb5e672cf0e
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20210426_gcc11-warnings.patch
@@ -0,0 +1,58 @@
+the following change removes a bunch of warnings since gcc-11
+
+afuzzy.c: In function ‘int afuzzy_checkSUB(const char*, AFUZZY*)’:
+afuzzy.c:197:19: warning: ISO C++17 does not allow ‘register’ storage class specifier [-Wregister]
+
+Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
+--- a/afuzzy.c
++++ b/afuzzy.c
+@@ -194,8 +194,8 @@
+ ******************************************************************************/
+ int afuzzy_checkSUB(const char *t, AFUZZY *fuzzy)
+ {
+- register char c;
+- register int j, d;
++ char c;
++ int j, d;
+
+ /* For eficciency this case should be little bit optimized */
+ if (!fuzzy->k) {
+@@ -207,7 +207,7 @@
+
+ if (R1 & fuzzy->mask_ok)
+ return 1;
+- } /* end for (register int j = 0 ... */
++ } /* end for (int j = 0 ... */
+ return 0;
+ }
+
+@@ -229,16 +229,16 @@
+
+ memcpy(fuzzy->R, fuzzy->R1, fuzzy->r_size);
+
+- } /* end for (register int j = 0 ... */
++ } /* end for (int j = 0 ... */
+
+ return 0;
+ }
+
+ static int afuzzy_checkFLT(const char *t, AFUZZY *fuzzy)
+ {
+- register Uint FilterR = 0;
+- register Uint FilterR1;
+- register int j;
++ Uint FilterR = 0;
++ Uint FilterR1;
++ int j;
+
+ for (j = 0; t[j] != '\0'; j++) {
+ FilterR1 = (((FilterR << (fuzzy->k + 1)) | fuzzy->filter_shift) &
+@@ -246,7 +246,7 @@
+ if (FilterR1 & fuzzy->filter_ok)
+ return 1;
+ FilterR = FilterR1;
+- } /* end for (register int j = 0 ... */
++ } /* end for (int j = 0 ... */
+
+ return 0;
+ }
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20210426.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20210426.ebuild
new file mode 100644
index 00000000000..14836980108
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20210426.ebuild
@@ -0,0 +1,97 @@
+# 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="fc309e3841d204554dba001b6f01fcc4c4cc0fc6"
+SRC_URI="https://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}"
+
+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}_gcc11-const.patch"
+ "${FILESDIR}/${P}_gcc11-warnings.patch"
+)
+
+QA_FLAGS_IGNORED="
+ usr/lib/vdr/plugins/libvdr-.*
+ usr/lib64/vdr/plugins/libvdr-.*
+ usr/bin/createcats"
+
+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/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] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-epgsearch/, media-plugins/vdr-epgsearch/files/
@ 2021-06-15 1:14 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2021-06-15 1:14 UTC (permalink / raw
To: gentoo-commits
commit: eac33db41c7f20bda77418f9ed1ff6465f36c417
Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net>
AuthorDate: Sat Jun 5 07:57:54 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 15 00:53:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eac33db4
media-plugins/vdr-epgsearch: remove obsolete version
upstream made new release, so remove obsoleted intermediate version
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net>
Closes: https://github.com/gentoo/gentoo/pull/21128
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-plugins/vdr-epgsearch/Manifest | 1 -
...vdr-epgsearch-2.4.0_p20210426_gcc11-const.patch | 18 ----
...-epgsearch-2.4.0_p20210426_gcc11-warnings.patch | 58 -------------
.../vdr-epgsearch-2.4.0_p20210426.ebuild | 97 ----------------------
4 files changed, 174 deletions(-)
diff --git a/media-plugins/vdr-epgsearch/Manifest b/media-plugins/vdr-epgsearch/Manifest
index 991a845deae..44ad6fb4a12 100644
--- a/media-plugins/vdr-epgsearch/Manifest
+++ b/media-plugins/vdr-epgsearch/Manifest
@@ -1,4 +1,3 @@
DIST vdr-epgsearch-2.2.0.tgz 472502 BLAKE2B f98053d95a6fe56aff48bd3e86ae8a37166b3b8556fe3500c956901cb3f8d19c5792b157606d372392b7387c05a72f4d664881a27bbd5b9484640d8de73b8673 SHA512 c0fef60069addc3cca82535c22b7e1f73f01de7466bc6d0b837ba34df7a7dd0fe2cbf7e9b9bc36a523a75a3db18889a1ff9040fb2647c889ea74666067c3a1e4
DIST vdr-epgsearch-2.4.0_p20200402.tar.gz 479998 BLAKE2B 04e83bd2361743669baba7b10a27fab91f22115b81fe69e9252cc5ecd94fb0fda55d8b6ce3fcaeb08e779f07d46d26e37026d1732d6b38c03385c659eacd5ab0 SHA512 586b369a25c32bbf2d33e68997e7298ad7fda50ac78da5321c848a74d91753a51e6f47d70ef6893ca980bfa2c9f167defd611464729ca4ebf704247e8e37a065
-DIST vdr-epgsearch-2.4.0_p20210426.tar.gz 481490 BLAKE2B 71c336f2f8838c435ca439a61be58884ef001954cf33fe99c1b20987baaa207e74b5a032f3fa9543f58b53157ecfabcd7fca08f7ebf49c015ba6893e7e6f7759 SHA512 4260ebbd3c18dd66b18ff7d05480a1affd0ba9a4dd130cf23e93cd7085218ebb8f60f5733ee1f616b74618ea68a367a001d330a60294faced7e04d4f10a5ffa3
DIST vdr-epgsearch-2.4.1.tar.gz 481899 BLAKE2B ab0325fbab73d3c6e6753b926ca0cde6ec971fd42f7b8badf4b306671bf3380c5784262fe1f24e6ce57fef1903ef533b450ea03c346242b5a72f26eeba8a6bd9 SHA512 031ee227a5d45bbf1344cc8195dfd38d23ff23303d55c8492e7b2f86f1f53402a68e6500888bf847cd3506ebc2cfbb73aef2b8b0d6ef98f210631642de1d1f9c
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20210426_gcc11-const.patch b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20210426_gcc11-const.patch
deleted file mode 100644
index b0d756a73b4..00000000000
--- a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20210426_gcc11-const.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-the following change to const is necessary since gcc-11
-
-thanks to seahawk1986 @ vdr-portal.de
-https://www.vdr-portal.de/forum/index.php?thread/134005-vdr-2-4-6-kompiliert-mit-gcc-11-0-0-nicht/&postID=1340496#post1340496
-
-Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
-
---- a/conflictcheck.h
-+++ b/conflictcheck.h
-@@ -73,7 +73,7 @@
- class TimerObjSort
- {
- public:
-- bool operator()(cConflictCheckTimerObj* a, cConflictCheckTimerObj* b) {
-+ bool operator()(const cConflictCheckTimerObj* a, const cConflictCheckTimerObj* b) const {
- return (a->Compare(*b) < 0);
- }
- };
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20210426_gcc11-warnings.patch b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20210426_gcc11-warnings.patch
deleted file mode 100644
index fb5e672cf0e..00000000000
--- a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20210426_gcc11-warnings.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-the following change removes a bunch of warnings since gcc-11
-
-afuzzy.c: In function ‘int afuzzy_checkSUB(const char*, AFUZZY*)’:
-afuzzy.c:197:19: warning: ISO C++17 does not allow ‘register’ storage class specifier [-Wregister]
-
-Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
---- a/afuzzy.c
-+++ b/afuzzy.c
-@@ -194,8 +194,8 @@
- ******************************************************************************/
- int afuzzy_checkSUB(const char *t, AFUZZY *fuzzy)
- {
-- register char c;
-- register int j, d;
-+ char c;
-+ int j, d;
-
- /* For eficciency this case should be little bit optimized */
- if (!fuzzy->k) {
-@@ -207,7 +207,7 @@
-
- if (R1 & fuzzy->mask_ok)
- return 1;
-- } /* end for (register int j = 0 ... */
-+ } /* end for (int j = 0 ... */
- return 0;
- }
-
-@@ -229,16 +229,16 @@
-
- memcpy(fuzzy->R, fuzzy->R1, fuzzy->r_size);
-
-- } /* end for (register int j = 0 ... */
-+ } /* end for (int j = 0 ... */
-
- return 0;
- }
-
- static int afuzzy_checkFLT(const char *t, AFUZZY *fuzzy)
- {
-- register Uint FilterR = 0;
-- register Uint FilterR1;
-- register int j;
-+ Uint FilterR = 0;
-+ Uint FilterR1;
-+ int j;
-
- for (j = 0; t[j] != '\0'; j++) {
- FilterR1 = (((FilterR << (fuzzy->k + 1)) | fuzzy->filter_shift) &
-@@ -246,7 +246,7 @@
- if (FilterR1 & fuzzy->filter_ok)
- return 1;
- FilterR = FilterR1;
-- } /* end for (register int j = 0 ... */
-+ } /* end for (int j = 0 ... */
-
- return 0;
- }
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20210426.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20210426.ebuild
deleted file mode 100644
index 14836980108..00000000000
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20210426.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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="fc309e3841d204554dba001b6f01fcc4c4cc0fc6"
-SRC_URI="https://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}"
-
-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}_gcc11-const.patch"
- "${FILESDIR}/${P}_gcc11-warnings.patch"
-)
-
-QA_FLAGS_IGNORED="
- usr/lib/vdr/plugins/libvdr-.*
- usr/lib64/vdr/plugins/libvdr-.*
- usr/bin/createcats"
-
-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/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] 7+ messages in thread
end of thread, other threads:[~2021-06-15 1:14 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-15 1:14 [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-epgsearch/, media-plugins/vdr-epgsearch/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-06-03 7:01 Joonas Niilola
2021-02-27 18:49 Joonas Niilola
2021-02-22 14:47 Joonas Niilola
2018-09-02 21:10 Joerg Bornkessel
2018-05-11 9:24 Michał Górny
2018-05-05 15:38 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox