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

Package-Manager: portage-2.1.5_rc4

4 files changed, 19 insertions, 56 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/Manifest b/media-video/vdr/Manifest
index 9109beac8a2d..1b0a4f3660d5 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -5,14 +5,13 @@ AUX vdr-1.4.7-makefile-destdir.diff 1554 RMD160 642ff610a1667d39b55736a6a702eba6
 AUX vdr-1.4.7-makefile-install-header.diff 1001 RMD160 82aeac50445709f79da2e2536b9441d8dd24370f SHA1 7c195bad6928429fa198bf1788c523b3be837812 SHA256 12411dc054993209967d6e09677733430f3b3d963f565debdaae087bbc89e961
 AUX vdr-1.6.0-dxr3-subtitlehack.diff 758 RMD160 f329bc9a66db93b7b723352412e4b6404318223c SHA1 c796c9062d673b07123bf926717f0d1370a5f4bf SHA256 3c150749a01e70111395854a8741b4de4c0fbef92372fcfcfeaa7c10312e5053
 AUX vdr-1.6.0-makefile-install-header.diff 1064 RMD160 8be661d2eca9b9f02a7a31ed6c312f3731cf5aed SHA1 f96b5d2444c5b11a3374274f37492b741d1213de SHA256 e3d9d76d0ede46b93473abe72d05771b02b1e19c380d98c48375e94a5ecab0df
-AUX vdr-1.6.0_p1-ext-changes.diff 1500 RMD160 fe2deec7441bd795b19ec69379cc5934fae4d01d SHA1 438e1ff12f5760eeb1a7a565173a6c8098c1a629 SHA256 ed0b113255746476e1ad3153f06fb48a8280e9d42de0a0a434a5c8d1fff82615
 AUX vdr-add-svdrp-down-0.1.diff 2718 RMD160 5563bac57e73c82b5fa96c4384f76f5b2b300f31 SHA1 f6bdd7d2a4428e493a8bddfb849bbd528c8e7d84 SHA256 ad2126451f04a1924367210444878f2225902e08e93fcb96a8de765eb508711e
 AUX vdr-set-dumpable.diff 734 RMD160 d5a261d121855ac4caa9cb47918850538dc26d88 SHA1 85b037d84c834021146d0c0ef515a90c2457defa SHA256 4ae1734ef10893d573e2079c1604f890ed8ae0415cbf2a0de9843174a27eb442
 DIST VDR-Extensions-Patch-42.tar.bz2 260453 RMD160 1610f9c4d3bcca0361b7906e2d9ce62dcfa066c2 SHA1 9b4af40ffa256b6f3eb5f762b1bebe908acc578e SHA256 18c4993b84b3e7aa02db4fc9929cf7c3c6ccbfe8b680f465bbff011c6fd31f80
 DIST VDR-Extensions-Patch-55.tar.bz2 129067 RMD160 a5c6fc1c74c89b1093c0b9270cca3005cc59c796 SHA1 66f356583eaa93e020ca5bb24e0a9b5e339d6511 SHA256 183fdb789c866ed049900ff8e956fe7c1e561ee0d9a7816da470c512d7371a56
 DIST VDR-Extensions-Patch-56.tar.bz2 137606 RMD160 39fff764016c96703131898124503ef424853bfa SHA1 93206a4e26d373525e2a2e8406a248e43eb63a84 SHA256 81e129b5e361802655a450955479d4d842a16fea2860bee99c082f775c1959bf
 DIST VDR-Extensions-Patch-57.tar.bz2 140007 RMD160 14cc6458365c2882edcb61338e19b80356fb2b8a SHA1 d3b306dd769c9fea5ca1ea63856906302c05f933 SHA256 180d99a7a81abb79c8dbc732707fd92d92506db2c3d9f0dec80614d63ddd643b
-DIST VDR-Extensions-Patch-58.tar.bz2 138227 RMD160 689ac2f3435fbd927d01817d5b6dff35eddd7634 SHA1 5b095e0361e97b1460803a7da42278371bf59450 SHA256 812f7839d0cd13505d16be64ae9ab0b3e032dbd280231784e94005afacbb1d5c
+DIST VDR-Extensions-Patch-59.tar.bz2 241559 RMD160 dfb26099f9876e82f96bd54dedf018ef81cdcb41 SHA1 91b8074b6c18fad6ac77b04534c4be083fea19b1 SHA256 aa0ac0e8caff6f353e5d9f95d5a12c6d442fb1badc2fcae4f44b5121db3b1f1f
 DIST gentoo-vdr-patchset-1.4.6-1.tar.bz2 183896 RMD160 c122a082605841410fb5497cd5671f965bdfe3fe SHA1 c13bc1769f36ece50fe4c1a183f3d2bd9e871ca3 SHA256 68be18b4409211e3303eff3f67e75a4ac844f48a89d8fee453e19c143ae79f9a
 DIST vdr-1.4.6.tar.bz2 561236 RMD160 e8d5498b6935e67941bc10be46a0f3fa9ea7aa9d SHA1 084c6c937aa64fd3339f87d3f56b53fa701b0d28 SHA256 06dea8e028480fa59f04976db83beacd75592835d89058dd5206f4191d315c9c
 DIST vdr-1.4.7.tar.bz2 560888 RMD160 0e7a0d1cf133ee5e168afb6e2374e2ee6c229fcf SHA1 11e8976b3480a0c9cf2b2aec88c329e9bb0f701b SHA256 9e9f3687efc135d890cf8d70068221e661fea21d1efd7d8dc74bc4e810d4a464
@@ -24,13 +23,13 @@ EBUILD vdr-1.4.7-r10.ebuild 9129 RMD160 27c21054ebbca77d0cfbadbc2d8d76bed34f894c
 EBUILD vdr-1.6.0-r1.ebuild 9376 RMD160 fd840d03d891996e1c7e4831c3b0be6b54c8e81b SHA1 8c1d265d4f8d5f3be64064f22fe62f5fdc565db6 SHA256 7abfbf24a030b1c61cd878da32b7f9bf277fa747cb4caaab55a2959607ccf293
 EBUILD vdr-1.6.0-r2.ebuild 9532 RMD160 590a282ab26eb5fe99a210d231de8bad583aafcf SHA1 011b14e10d31aa46f30a3355368de1d7d29fbd85 SHA256 3cbfb0ccfb8402982a9e3571fa67a96b44d497a8e520e90c5bbeb3567d59615b
 EBUILD vdr-1.6.0.ebuild 9472 RMD160 f10698fd725efbf152b4363980b0a964d0e2d5e0 SHA1 da744f54fe09051a66155b9e2bb2ee65d4f3a6c0 SHA256 0ec1166d80edf15618849db2e28cb211950c29b7fb98b7166691c76b39c9c36f
-EBUILD vdr-1.6.0_p1.ebuild 9751 RMD160 1d0ebdf56ee0056bbb7ee5d4c8b8d1615927756c SHA1 f3278c0f681f7ba2991cea60f97798a8213cce7b SHA256 bb0a0f75e794a8aac65990fbf5d40f20cb81327f58e1ac49e556278b8b3b0e32
-MISC ChangeLog 19035 RMD160 763feb9e9077bf3a550c0a007697127e48df3bd5 SHA1 19cd8dc711468eb07c2a8d3249220d1204be98f6 SHA256 a348ee2c21bf97bf7d3eb984005571e2a0ce8c2bf641c5e247a4df41bce1d2b7
+EBUILD vdr-1.6.0_p1.ebuild 9744 RMD160 e5a497476ef3f14dd078cc746562a9b57d12e914 SHA1 40cf96872dadff0eda9722dc396e5123e9f0ece4 SHA256 62faf4f4f77c467ec373d4b4d77d10c5632896a7cf79bd62cd258bba4c8795c1
+MISC ChangeLog 19260 RMD160 b6769b3b587b0d6b90be21b05f7220c2c14607c8 SHA1 65255b5c04ba8821786e10019d606d6b264840e3 SHA256 bf8fe0bce229a6273e043aaa79cfcd780663c53badd1aafe4241d2865f24d15c
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgE/4EACgkQt2vP6XvVdOcfiQCfdmR2LhaKwJ5c6oNKQquWyKv/
-s+YAnjaKVsfC7sW6dvpL9cFF83brFBZg
-=JOhQ
+iEYEARECAAYFAkgJ/NAACgkQt2vP6XvVdOcbcwCfRGBVDSQ/BCFexbRgB2Ev+XGg
+TuQAn151mtM3Lxi9acZrg8obIAvyB9zr
+=SioN
 -----END PGP SIGNATURE-----
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