eapi=4; compilefix >=vdr-1.7.27

Package-Manager: portage-2.1.10.11/cvs/Linux i686

4 files changed, 63 insertions, 10 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/Manifest b/media-plugins/vdr-skinenigmang/Manifest
index 36b8d74359c9..91cfd640e55e 100644
--- a/media-plugins/vdr-skinenigmang/Manifest
+++ b/media-plugins/vdr-skinenigmang/Manifest
@@ -2,15 +2,16 @@
 Hash: SHA1
 
 AUX rc-addon.sh 336 RMD160 821c3d37d0920cfc88449f0751423f357e633de1 SHA1 994dd58c4d2be1edc39cd0faf90ecd7cb8fbf39c SHA256 c9e1ad09ddcb93e47223bb3c4a64827dada84a8d942dbc442aa2b49184cf09fd
+AUX vdr-1.7.27.diff 1824 RMD160 146b9f95c9d5b1bd8bae596f6fe824ca7f59abb7 SHA1 95952670ce1960a21006386306f55eb9d2416536 SHA256 c9bcb4105e94c1b46bc7592a7e8eb51e5223c7028759b04996537d343b6def53
 DIST vdr-skinenigmang-0.1.1.tgz 89727 RMD160 0da1aed9e1be7d5dff10cf15aa2860435967a4fc SHA1 04a10afa2b449d13baccb0ac78fac0393c80efce SHA256 2d87b4f0257e6f6272b72d9dcb97446b70a0da77872b26e467b8462e53d4e72f
-EBUILD vdr-skinenigmang-0.1.1.ebuild 1148 RMD160 91bfa970c6a7ee14cfa224c1395cb68dc9b170d4 SHA1 e3c4a050d1cd92e35512cad1fbf11ec64c749b22 SHA256 2925964e16a899343f5d3bc5692e29c082be03d11c7f4401ec5a85e7d8c50ecc
-MISC ChangeLog 2190 RMD160 fb78e923c963db8df906cede171925b7bf96c119 SHA1 fbe11ad79eb6325fba3a68bd72307ab271cb4713 SHA256 7b12a7194c82ebc3adad7f353f80bc058a72f26d1eae99f1744d23c271a82347
+EBUILD vdr-skinenigmang-0.1.1.ebuild 1242 RMD160 0077240cc20a0ffe256b409d34e592b32da0f2a1 SHA1 c28e75ded18fab059b874020c96eb0a61ef444bf SHA256 49d7198bab533dfa22ee751eb7eecdae786469a29009cdaeca095abebe6cee6a
+MISC ChangeLog 2337 RMD160 2cf5eded15a7cf38e039def8514ea2effddebffe SHA1 ef8b950b219a940e63ad375de47c9b89a6a4c12e SHA256 718f5bab87a7c73e25e21f6991ea937f3627ba340bc014e045f293c1c752c137
 MISC metadata.xml 385 RMD160 5402b50a5d2d42b59c9dddde0c7e9bbb1de0995e SHA1 8035b846ec5ffc6a75e2d7fbbed2cac3e9cf0814 SHA256 d33711c20cf70540856eef5e8811923f2455861c84a525ca9b0830117dcfde94
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFNNITvdn07HTTCgIoRAilKAJ4vmLxD6H0pz5t/XffnZ7oNWWa0eQCfaZUS
-J/7NEmtlUBuUudGZnf/rDAM=
-=FqBt
+iD8DBQFPf3/Jdn07HTTCgIoRAoUMAJ0ejgqIsy1SAZgjCUhPbsG9AF2WKQCeMNzI
+rX0Gv3O3UvrvAPSSEoWyHmE=
+=6q0s
 -----END PGP SIGNATURE-----
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
 }