Updated to extensions-patch version 59. Added back keywords as this should make it work completely again.

(Portage version: 2.1.5_rc4)

3 files changed, 13 insertions, 49 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index b67132b1ee56..d9d3eb2017c6 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vdr
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.110 2008/04/15 19:18:11 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.111 2008/04/19 14:08:06 zzam Exp $
+
+  19 Apr 2008; Matthias Schwarzott <zzam@gentoo.org>
+  -files/vdr-1.6.0_p1-ext-changes.diff, vdr-1.6.0_p1.ebuild:
+  Updated to extensions-patch version 59. Added back keywords as this should
+  make it work completely again.
 
 *vdr-1.6.0_p1 (15 Apr 2008)
 
diff --git a/media-video/vdr/files/vdr-1.6.0_p1-ext-changes.diff b/media-video/vdr/files/vdr-1.6.0_p1-ext-changes.diff
deleted file mode 100644
index f71df8e2edd8..000000000000
--- a/media-video/vdr/files/vdr-1.6.0_p1-ext-changes.diff
+++ /dev/null
@@ -1,40 +0,0 @@
---- vdr-1.6.0_extensions.diff.orig	2008-04-15 21:09:29.462210539 +0200
-+++ vdr-1.6.0_extensions.diff	2008-04-15 21:10:04.742218023 +0200
-@@ -2900,37 +2900,6 @@
-        }
-    if (Empty && Tid == 0x4E && getSectionNumber() == 0)
-       // ETR 211: an empty entry in section 0 of table 0x4E means there is currently no event running
--@@ -296,12 +457,30 @@ cTDT::cTDT(const u_char *Data)
--   time_t sattim = getTime();
--   time_t loctim = time(NULL);
-- 
--+#ifdef USE_SETTIME
--+  char *cmd;
--+  char timestr[20];
--+  struct tm *ptm;
--+  struct tm tm_r;
--+  ptm = localtime_r(&sattim, &tm_r);
--+#endif /* SETTIME */
--+
--   int diff = abs(sattim - loctim);
--   if (diff > 2) {
--      mutex.Lock();
--      if (abs(diff - lastDiff) < 3) {
--         isyslog("System Time = %s (%ld)", *TimeToString(loctim), loctim);
--         isyslog("Local Time  = %s (%ld)", *TimeToString(sattim), sattim);
--+#ifdef USE_SETTIME
--+        if (SetTime) {
--+           strftime(timestr,20,"%m%d%H%M%Y.%S",ptm);
--+           asprintf(&cmd,"%s %s %ld",SetTime,timestr,sattim);
--+           dsyslog("Executing: %s",cmd);
--+           SystemExec(cmd);
--+           free(cmd);
--+           }
--+        else
--+#endif /* SETTIME */
--         if (stime(&sattim) < 0)
--            esyslog("ERROR while setting system time: %m");
--         }
- diff -ruNp vdr-1.6.0/eitscan.c vdr-1.6.0-extensions/eitscan.c
- --- vdr-1.6.0/eitscan.c	2006-01-07 15:10:17.000000000 +0100
- +++ vdr-1.6.0-extensions/eitscan.c	2008-04-10 01:42:18.000000000 +0200
diff --git a/media-video/vdr/vdr-1.6.0_p1.ebuild b/media-video/vdr/vdr-1.6.0_p1.ebuild
index 183f21bf3000..0ac6bbad8207 100644
--- a/media-video/vdr/vdr-1.6.0_p1.ebuild
+++ b/media-video/vdr/vdr-1.6.0_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1.ebuild,v 1.2 2008/04/15 19:18:11 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1.ebuild,v 1.3 2008/04/19 14:08:06 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -19,10 +19,10 @@ MY_PV="${PV%_p*}"
 MY_P="${PN}-${MY_PV}"
 S="${WORKDIR}/${MY_P}"
 
-EXT_V="58"
+EXT_V="59"
 EXT_P=VDR-Extensions-Patch-${EXT_V}
 EXT_DIR=${WORKDIR}/${EXT_P}/
-EXT_VDR_PV="${MY_PV}"
+EXT_VDR_PV="${PV/_p/-}"
 
 DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
 HOMEPAGE="http://www.cadsoft.de/vdr/"
@@ -30,7 +30,7 @@ SRC_URI="ftp://ftp.cadsoft.de/vdr/${MY_P}.tar.bz2
 	ftp://ftp.cadsoft.de/vdr/Developer/${MY_P}-1.diff
 	http://www.zulu-entertainment.de/files/patches/${EXT_P}.tar.bz2"
 
-KEYWORDS=""
+KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 
@@ -202,8 +202,6 @@ src_unpack() {
 		-e 's/ install-plugins//'
 
 	if ! use vanilla; then
-		cd "${EXT_DIR}"
-		epatch "${FILESDIR}/${P}-ext-changes.diff"
 
 		cd "${S}"
 		# Now apply extensions patch
@@ -326,10 +324,11 @@ src_install() {
 	doins "${CAP_FILE}"
 
 	if [[ -n "${VDRSOURCE_DIR}" ]]; then
+		local SOURCES_DEST="${VDRSOURCE_DIR}/${P/_p/-}"
 		einfo "Installing sources"
-		insinto "${VDRSOURCE_DIR}/${P}"
+		insinto "${SOURCES_DEST}"
 		doins -r "${T}"/source-tree/*
-		keepdir "${VDRSOURCE_DIR}/${P}"/PLUGINS/lib
+		keepdir "${SOURCES_DEST}"/PLUGINS/lib
 	fi
 
 	if use setup; then