eapi=4; compilefix >=vdr-1.7.27

(Portage version: 2.1.10.11/cvs/Linux i686)

3 files changed, 57 insertions, 5 deletions

diff --git a/media-plugins/vdr-skinenigmang/ChangeLog b/media-plugins/vdr-skinenigmang/ChangeLog
index 3d27421e9d7d..b6b7ec31d6df 100644
--- a/media-plugins/vdr-skinenigmang/ChangeLog
+++ b/media-plugins/vdr-skinenigmang/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-skinenigmang
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinenigmang/ChangeLog,v 1.10 2011/01/17 18:05:13 hd_brummy Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinenigmang/ChangeLog,v 1.11 2012/04/06 23:40:35 hd_brummy Exp $
+
+  06 Apr 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  vdr-skinenigmang-0.1.1.ebuild, +files/vdr-1.7.27.diff:
+  eapi=4; compilefix >=vdr-1.7.27
 
   17 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
   -vdr-skinenigmang-0.0.6.ebuild, -vdr-skinenigmang-0.1.0.ebuild,
diff --git a/media-plugins/vdr-skinenigmang/files/vdr-1.7.27.diff b/media-plugins/vdr-skinenigmang/files/vdr-1.7.27.diff
new file mode 100644
index 000000000000..e115af08f98a
--- /dev/null
+++ b/media-plugins/vdr-skinenigmang/files/vdr-1.7.27.diff
@@ -0,0 +1,43 @@
+diff -Naur skinenigmang-0.1.1.orig/enigma.c skinenigmang-0.1.1/enigma.c
+--- skinenigmang-0.1.1.orig/enigma.c	2012-04-07 00:35:34.000000000 +0200
++++ skinenigmang-0.1.1/enigma.c	2012-04-07 00:42:42.000000000 +0200
+@@ -2617,8 +2617,8 @@
+ 
+   // draw recording date string
+   std::stringstream sstrDate;
+-  sstrDate << *DateString(Recording->start)
+-           << "  " << *TimeString(Recording->start);
++  sstrDate << *DateString(Recording->Start())
++           << "  " << *TimeString(Recording->Start());
+ 
+   unsigned long long nRecSize = -1;
+   unsigned long long nFileSize[1000];
+@@ -2674,14 +2674,14 @@
+     bool fCutIn = true;
+     cMark *mark = marks.First();
+     while (mark) {
+-      index->Get(mark->position, &FileNumber, &FileOffset); //TODO: will disc spin up?
++      index->Get(mark->Position(), &FileNumber, &FileOffset); //TODO: will disc spin up?
+       if (fCutIn) {
+-        nCutInFrame = mark->position;
++        nCutInFrame = mark->Position();
+         fCutIn = false;
+         if (nRecSize >= 0)
+           nCutInOffset = nFileSize[FileNumber-1] + FileOffset;
+       } else {
+-        nCutLength += mark->position - nCutInFrame;
++        nCutLength += mark->Position() - nCutInFrame;
+         fCutIn = true;
+         if (nRecSize >= 0)
+           nRecSizeCut += nFileSize[FileNumber-1] + FileOffset - nCutInOffset;
+@@ -2778,8 +2778,8 @@
+   }
+   delete index;
+ 
+-  sstrInfo << trVDR("Priority") << ": " << Recording->priority << std::endl
+-           << trVDR("Lifetime") << ": " << Recording->lifetime << std::endl;
++  sstrInfo << trVDR("Priority") << ": " << Recording->Priority() << std::endl
++           << trVDR("Lifetime") << ": " << Recording->Lifetime() << std::endl;
+   if (Info->Aux()) {
+     sstrInfo << std::endl << tr("Auxiliary information") << ":\n"
+              << parseaux(Info->Aux());
diff --git a/media-plugins/vdr-skinenigmang/vdr-skinenigmang-0.1.1.ebuild b/media-plugins/vdr-skinenigmang/vdr-skinenigmang-0.1.1.ebuild
index 9c04d1400cfc..9892f6009ebb 100644
--- a/media-plugins/vdr-skinenigmang/vdr-skinenigmang-0.1.1.ebuild
+++ b/media-plugins/vdr-skinenigmang/vdr-skinenigmang-0.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinenigmang/vdr-skinenigmang-0.1.1.ebuild,v 1.2 2011/01/17 18:05:13 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinenigmang/vdr-skinenigmang-0.1.1.ebuild,v 1.3 2012/04/06 23:40:35 hd_brummy Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit vdr-plugin
 
@@ -30,10 +30,15 @@ src_prepare() {
 
 	# TODO: implement a clean query / extra tool vdr-config
 	sed -i -e '/^VDRLOCALE/d' Makefile
+
 	if has_version ">=media-video/vdr-1.5.9"; then
 		sed -i -e 's/.*$(VDRLOCALE).*/ifeq (1,1)/' Makefile
 	fi
 
+	if has_version ">=media-video/vdr-1.7.27"; then
+		epatch "${FILESDIR}"/vdr-1.7.27.diff
+	fi
+
 	sed -i -e "s:-I/usr/local/include/ImageMagick::" Makefile
 }