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 -}
