compile fix for >=vdr-1.7.33; eapi=5

Package-Manager: portage-2.1.11.31/cvs/Linux i686
Manifest-Sign-Key: 0x34C2808A

4 files changed, 144 insertions, 15 deletions

diff --git a/media-plugins/vdr-epgsearch/ChangeLog b/media-plugins/vdr-epgsearch/ChangeLog
index 5a087143bff4..d3d696a2db96 100644
--- a/media-plugins/vdr-epgsearch/ChangeLog
+++ b/media-plugins/vdr-epgsearch/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-epgsearch
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/ChangeLog,v 1.58 2012/06/05 19:59:38 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/ChangeLog,v 1.59 2012/12/15 13:27:34 hd_brummy Exp $
+
+  15 Dec 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  vdr-epgsearch-1.0.0-r1.ebuild, +files/vdr-epgsearch-1.0.0_vdr-1.7.33.diff:
+  compile fix for >=vdr-1.7.33; eapi=5
 
   05 Jun 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-epgsearch-1.0.0-r1.ebuild:
diff --git a/media-plugins/vdr-epgsearch/Manifest b/media-plugins/vdr-epgsearch/Manifest
index c29adedb683f..a1b8cbcb0ead 100644
--- a/media-plugins/vdr-epgsearch/Manifest
+++ b/media-plugins/vdr-epgsearch/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX vdr-epgsearch-1.0.0_vdr-1.7.25.diff 909 RMD160 781df521dc6d0a291362e3d69d684c1710c64ff2 SHA1 3fc9bdaacb35f1565513b2064cdfc3783f39028d SHA256 718e65bed9067b0f4780aa953a2471d563d621464cb582ab84c6b478fa09446d
-DIST vdr-epgsearch-0.9.25.beta17.tgz 780599 RMD160 5c54efd9fdbdf179717bfacfc7b89df18de28531 SHA1 7f9da736d71cc8ff5ebc896421253be13daf2522 SHA256 856f2a2c8ccaa60ddad04587464f08d7b7e673ff3b307a1b3e1f7aa53e09e0ba
-DIST vdr-epgsearch-1.0.0.tgz 667633 RMD160 481f23a659a1a8275feb351af660b28a6034d8c7 SHA1 0fb78ef195c6b41a17c31f0859143167e363d8c8 SHA256 989c3ce611ad2b591783dcd7e52a4b462b3352a7657c478e7a3b3c38164b4a12
-EBUILD vdr-epgsearch-0.9.25_beta17.ebuild 2136 RMD160 b628915f2eb725da13951bff2cfd3d56cbffdcdb SHA1 215c93e1e10c1d04f28f585bb6da819ea27b521a SHA256 168a2170c3842eb7f1e8ec5ab28b31d6fb3e688429eb70b5150e465ce1165dbd
-EBUILD vdr-epgsearch-1.0.0-r1.ebuild 2541 RMD160 789ae0fc014e57a67f414468bdae595147728e3b SHA1 d4a358bc6c9d16028794faaee49123537565dadf SHA256 61f1c73b9e5a4038773ba5fa3295995f0e7dadf9e96431216740ee17057f8383
-EBUILD vdr-epgsearch-1.0.0.ebuild 2275 RMD160 b8536ae80b085d8a4b689a5234c8c7dc70f0e7d7 SHA1 08d8ff1b233771b1c0387de0b83ba475440538df SHA256 fc6e800f77f7369ddd8c120490d05a99f9afae29ae233324ccc005a1c9d977c9
-MISC ChangeLog 11090 RMD160 909be2626ef829aa382ede8d996a848402d19105 SHA1 e1abc19710ce50c652504bcdfe272345f3446782 SHA256 f268fb02a26312576fc9f532f8b2e785d6f9827b7c555add8ed8c89734d67497
-MISC metadata.xml 423 RMD160 ffbb30742555fbcd39919829b7ce199e68072664 SHA1 7d35aca3ae43a0f0897f506a486c371727c44d91 SHA256 4306b9a475db49970298cb67b2870255ab3906c778c9275c3ae2c345dfc433b5
+AUX vdr-epgsearch-1.0.0_vdr-1.7.25.diff 909 SHA256 718e65bed9067b0f4780aa953a2471d563d621464cb582ab84c6b478fa09446d SHA512 4a9bf07360c4703b32c426d04ec6a904cc689df859d67781ba0d957ffc3e32217bf97ea018c0b2b195244b592bccf67d7e12373b262492cdd9ed884939917940 WHIRLPOOL 0619f9b674ba4b8717702321f7ea8b27e88387a4be338b711ca15f9f0ac0814aa8cd5a68763582aa2b3be6f17a902cedfbe1619aa00ded7013e6911e431343c6
+AUX vdr-epgsearch-1.0.0_vdr-1.7.33.diff 4901 SHA256 47beccaf1baa6baf7cddec152645399a7bdd2873ef3a8b4eebf5e75d2df4af55 SHA512 8bcdff9978f7ea0e50e0aac6b065103ebcb3f9676e1f37b0706a6195a2ae81944dbaaa3103600654eb421570ea452c43f6c6379bad806fd94eddead866e87c31 WHIRLPOOL 3498c975274b5116971ce95bb89cffe7985d1c892bdad078c6786993e6f3ca6605e5f0a39c14c397842651d7694913aa63e0e223f1e1e8a167adb33f25cf9001
+DIST vdr-epgsearch-0.9.25.beta17.tgz 780599 SHA256 856f2a2c8ccaa60ddad04587464f08d7b7e673ff3b307a1b3e1f7aa53e09e0ba
+DIST vdr-epgsearch-1.0.0.tgz 667633 SHA256 989c3ce611ad2b591783dcd7e52a4b462b3352a7657c478e7a3b3c38164b4a12 SHA512 3105dc847a75ad54ca854418a83db847942ba1d85f1c65a94b88310dfcdd5d614b89f0f27fd3ffc8e8c5db6c1c1e0f36e8e7a33cc71299922287f2d19dd385af WHIRLPOOL a661d76f05739d8f411ff8c1dace9b1c059e33d04a87698578a9cecf31bdf4ebc6d41bf9fce21338bafd001f0d1d386a19b08d7a1188081d33ff6f7b9a45a979
+EBUILD vdr-epgsearch-0.9.25_beta17.ebuild 2136 SHA256 168a2170c3842eb7f1e8ec5ab28b31d6fb3e688429eb70b5150e465ce1165dbd SHA512 e94a9a23044d3fc8e208f421262b442e71fd75286b3266a14bf7d9d69fe59e4a3f262bf2a3ca9665a5094f1284b02d6ef3922aecb5791fee3679d9bc232b2254 WHIRLPOOL 2a2ff51ab8ad6aaabda78f73db3208b2a92bc63f58160195cdbc92d22a3b3a1ba0c7b624411d7063faaeb730148d679d8909762ee49451172830edf3a8aa5630
+EBUILD vdr-epgsearch-1.0.0-r1.ebuild 2639 SHA256 81610cce478f43e0641a0c2294488028b2250f132b2ff001170e68b6c2c375cb SHA512 482557db1fc4071e7b1b3dcf64a0ba433764038465b0342895c073377e383fddc4d6cdb6eae5a5b8586e2f10277e052c2e9841d4ad3fc8ecd13fa9b537dcbbac WHIRLPOOL a8c28bcbdb1697d3f133aaaa1dcb61ab045e03a6b562bc5f9d15274125fcfc678e2884141a91ba7b7428990eee8f724c9fc3b22532220ceee55deb72331cbff7
+EBUILD vdr-epgsearch-1.0.0.ebuild 2275 SHA256 fc6e800f77f7369ddd8c120490d05a99f9afae29ae233324ccc005a1c9d977c9 SHA512 7565d1d773c2b4df132c5426e03bf560740bf738d4118c6c6a698fd6a091370c26a5712e5907fae77b3428c9dc0cb2b398b5c6256434512b078a70574728642c WHIRLPOOL f866a3e6f1026cf6d8b902172f286f1f1706487d24710b0ffe19bb39356ad9b7b36a0e479c6684f5752859f0ad6eb10fbcb31d013e7fc235f04a40ce06a4ced4
+MISC ChangeLog 11262 SHA256 42d9a77fc7801c8b201fdfc62cda78545d3f7e6e4d5b741f074feb680d9790e8 SHA512 ef4cf3351d7b98a4adec8ee2d5a9c6b19b8ebf61d1ea30ec35322b0497b79b2fdb46708b069b549ebb337a204aea27fd90f2c183b9dfef92f98d5113b2981257 WHIRLPOOL 35ea668f60f3471b92300317270bfbd20c8c7945fe1baaf8868f2122045eb87666ee9456762b69171ee0babd3c8039e7104c2b915b0e740a99856c5149083729
+MISC metadata.xml 423 SHA256 4306b9a475db49970298cb67b2870255ab3906c778c9275c3ae2c345dfc433b5 SHA512 6f80b68ca7eb1e31c4b1e6f7ae129d6304148748e98b9c31affaec1af69d132b4d2583edfa1b0e1b1caedfc015c2bb2d844cfa080bef981c1d192961f5c15223 WHIRLPOOL 3eafe225e5ac698cdf7ed893590f38c1a333ad7d1b5501292a3224e6f3e3c0d0c42aa8f9215c80e8a971135fde178f8b24d937f1fe83a0585a2fa08edf4805ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFPzmU1dn07HTTCgIoRAl4kAJ9rRqSD7/YSSLny31DvX4pF6oKGXgCdEnP6
-MN2qMeei9F6O/d8EluyhK8k=
-=2WLu
+iD8DBQFQzHtGdn07HTTCgIoRCBtyAKCDEdWohEwxHEIfvgluFrafoGUIRwCgiuG7
+gl2dPf/Fx9+TGoyblKi/bQs=
+=WDic
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..aa51685cb282
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-1.7.33.diff
@@ -0,0 +1,120 @@
+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/vdr-epgsearch-1.0.0-r1.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0-r1.ebuild
index b58d2827494b..e0604647ba71 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0-r1.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0-r1.ebuild,v 1.4 2012/06/05 19:59:38 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0-r1.ebuild,v 1.5 2012/12/15 13:27:34 hd_brummy Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit vdr-plugin-2
 
@@ -46,6 +46,10 @@ src_prepare() {
 		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
+
 	# disable automagic deps
 	sed -i Makefile -e '/^AUTOCONFIG=/s/^/#/'