gentoo resync : 11.05.2018

5 files changed, 0 insertions, 284 deletions

diff --git a/media-plugins/vdr-epgsearch/Manifest b/media-plugins/vdr-epgsearch/Manifest
index 7b032564ce45..e0836751ddc9 100644
--- a/media-plugins/vdr-epgsearch/Manifest
+++ b/media-plugins/vdr-epgsearch/Manifest
@@ -1,10 +1,5 @@
 AUX fix-manpage-generation.diff 1264 BLAKE2B 8b31a038bc0b7c3c77d4852a170981f5eba4bf690cd922d7a883d16a0ebd7a2be9df6e3b0716a78ecf6b7008d56bc3554564757ee84ec5bc56754773a6475f8d SHA512 c2d402b3830f16307ed44cd85e0d7c05b204b9b7556a754a84a13af1c7d794d976d7dc36a45d187d84be764c14f9193ca4d90b2771bcfdf715368ba32f176010
-AUX vdr-epgsearch-1.0.0_vdr-1.7.25.diff 909 BLAKE2B f8506ebd9e3a02c36fd14071b3d0326dd1a4d95c01968c358550875b2751118dad1714cbf9388ffc9a09a7dab7b43cc445fe95604478c059d9464cef4864470f SHA512 4a9bf07360c4703b32c426d04ec6a904cc689df859d67781ba0d957ffc3e32217bf97ea018c0b2b195244b592bccf67d7e12373b262492cdd9ed884939917940
-AUX vdr-epgsearch-1.0.0_vdr-1.7.33.diff 4901 BLAKE2B 97ff253d4902ccc3420377b5cc443c1bcdf31cb62cf40ddf42be8719afd09a147aa8287207e025a36663ae76ddf5f205027b227c4ffb6431d34967146f95c80e SHA512 8bcdff9978f7ea0e50e0aac6b065103ebcb3f9676e1f37b0706a6195a2ae81944dbaaa3103600654eb421570ea452c43f6c6379bad806fd94eddead866e87c31
-AUX vdr-epgsearch-1.0.0_vdr-2.1.2.diff 472 BLAKE2B fd9546d765d1df3405fafb14c6c901561fa7eabb3b09a614a9374bbbd2fbe8c3d4ef45ec45227752729543c552c8126e3fb80fbd0c9a1b0f0e9b087f48cb49a7 SHA512 04b4b448e196a7aa77a38a21c233b52f41ca93ef3e3611e92d9cd367d2a6ad9ff27defc650b65c4ee4e7a6b333e6242f8b48786698d57841837900d55ad3ca86
 AUX vdr-epgsearch-1.0.1_beta5_makefile.diff 1136 BLAKE2B 3b82bfc71e75d02739f02071afb9cdc7d6fc0c0f0d7169b8f02a360c2b493d829f141dd586ce7d7f9a854f4b76423191e3f1b7a8df29b0c42beb037ff9cf9729 SHA512 79114081c2cb17402c0e0a431204d7afbc161a90d911d0c389a90f047280ee17b8112b3f2e9d32295c1dd15ef86695935a54354211c9b28669ad925df8173b92
-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
-EBUILD vdr-epgsearch-1.0.0-r1.ebuild 2564 BLAKE2B efd5b036305aa8fca4486a15204cddf9a520443510968ed1751b890ef0c90c44e18dd018f500f3e19788ebf5df5274c5f919cb8276bb5f0deefc3c5f9479ea5d SHA512 19d9a030befb7d03c8eb2e817d70ab786eff287f9f9effb4f5fa8447ca62d9025c77b35c6b73eeaaf9c07936423c60c2297b2613411bb0dfbe73cbbd24487e88
 EBUILD vdr-epgsearch-1.0.1_p20141227-r1.ebuild 2712 BLAKE2B ee96a3d9ad98c5103aeced80afee2f4b99392cb6f38a8afc0154467565510e18afd5ad7835cffab36bd7cea3e3babaeee78a939c1d0aa630b24ec1fb5f8452ca SHA512 d232cb2eb3ec4ac55d175904885288e67fbbad80da193a219064c2231ba860f89f63d81be8431a51c74bd62a90a70060d560d7a223ba73494e6741f558035a5c
 MISC metadata.xml 816 BLAKE2B 2a7a4b5223b30aaffd7e0300ceba04f69d411e1b4615e0fb8d1ff6afa65850f4558c065a1e3ca6a12c2526d2bf736cbc7b6aba8a9fc66b3dcef09dfa4b7ec3bc SHA512 ea3e5fac06c7e1a53b127d2ce10bbccbf97a80cadcd172100f39512772b0120f59ef9f538b779ebc6a8df6431000f1e4112a18a0300841a8e2c5065f4016b3cd
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 3a8babbc16fb..000000000000
--- 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 aa51685cb282..000000000000
--- 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 5b9d657e95ec..000000000000
--- 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 d550ca75a669..000000000000
--- 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
-}