Fixing compilation with vdr-1.5.8

Package-Manager: portage-2.1.3.7

4 files changed, 43 insertions, 19 deletions

diff --git a/media-plugins/vdr-reelchannelscan/ChangeLog b/media-plugins/vdr-reelchannelscan/ChangeLog
index 187dea4b8f31..c7407f5ed62b 100644
--- a/media-plugins/vdr-reelchannelscan/ChangeLog
+++ b/media-plugins/vdr-reelchannelscan/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-reelchannelscan
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-reelchannelscan/ChangeLog,v 1.13 2007/06/19 09:25:20 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-reelchannelscan/ChangeLog,v 1.14 2007/09/02 13:48:05 zzam Exp $
+
+  02 Sep 2007; Matthias Schwarzott <zzam@gentoo.org> files/0.4.3/i18n.diff,
+  vdr-reelchannelscan-0.4.3-r2.ebuild:
+  Fixing compilation with vdr-1.5.8
 
   19 Jun 2007; Matthias Schwarzott <zzam@gentoo.org>
   vdr-reelchannelscan-0.4.3-r2.ebuild:
diff --git a/media-plugins/vdr-reelchannelscan/Manifest b/media-plugins/vdr-reelchannelscan/Manifest
index d359585e36d0..1b87fe44d873 100644
--- a/media-plugins/vdr-reelchannelscan/Manifest
+++ b/media-plugins/vdr-reelchannelscan/Manifest
@@ -13,10 +13,10 @@ AUX 0.4.3/gentoo.diff 463 RMD160 afcd1cdf38af25dd4207e7cd6509430f7c1287a5 SHA1 7
 MD5 3c9f3538c76d171506a85dc2a762d6ef files/0.4.3/gentoo.diff 463
 RMD160 afcd1cdf38af25dd4207e7cd6509430f7c1287a5 files/0.4.3/gentoo.diff 463
 SHA256 a8370eaf1454a4c7f2c592c2d8549946fb3d6032f6ccdcc50edcc98e3fe3b095 files/0.4.3/gentoo.diff 463
-AUX 0.4.3/i18n.diff 1442 RMD160 d96f58eae21f71318cdfb244a17b23f0ccb9d0c4 SHA1 0cf6d7fbfebc56a3dd49ca17c0ea6f4754711af9 SHA256 b9ea042c91451f2fcf7699814ed4e87956e98c85a32cb4918a51d57bc59dd6f7
-MD5 158ec22a194955c761d50888f33c81e3 files/0.4.3/i18n.diff 1442
-RMD160 d96f58eae21f71318cdfb244a17b23f0ccb9d0c4 files/0.4.3/i18n.diff 1442
-SHA256 b9ea042c91451f2fcf7699814ed4e87956e98c85a32cb4918a51d57bc59dd6f7 files/0.4.3/i18n.diff 1442
+AUX 0.4.3/i18n.diff 1700 RMD160 54d18c64d7b5b971a6d55552ddfe5b65819bb6c7 SHA1 5589777d0571f380a43d2ac98223415c728ce43c SHA256 15cdc77f53efd550494305d8ea5796299ac86c462dbb4879e4f1117d1bb49249
+MD5 af8ae41d58d9a531177b588ee55addab files/0.4.3/i18n.diff 1700
+RMD160 54d18c64d7b5b971a6d55552ddfe5b65819bb6c7 files/0.4.3/i18n.diff 1700
+SHA256 15cdc77f53efd550494305d8ea5796299ac86c462dbb4879e4f1117d1bb49249 files/0.4.3/i18n.diff 1700
 AUX 0.4.3/series 82 RMD160 6536c2d6720c45b94581072da8824e3450a5448f SHA1 3fe661d3874617a7bd76d1cf280205ba985d3f56 SHA256 f503451f6c2fefdf2e3954d276be4e27fcfb622fb353c31f9e5b851e8bbd3117
 MD5 26fcbee5e6fbc3e284ba87ae167b4cb4 files/0.4.3/series 82
 RMD160 6536c2d6720c45b94581072da8824e3450a5448f files/0.4.3/series 82
@@ -27,14 +27,14 @@ EBUILD vdr-reelchannelscan-0.3.3.ebuild 1036 RMD160 681f6b63d97045d9c4ca9412d773
 MD5 b569617e29e9cfe8063e0f9a1ea32892 vdr-reelchannelscan-0.3.3.ebuild 1036
 RMD160 681f6b63d97045d9c4ca9412d773084befb7edfa vdr-reelchannelscan-0.3.3.ebuild 1036
 SHA256 7d5f0a58cdc8b1187ca954e5830522da00f9614a6e861646ff2e04cc81def20a vdr-reelchannelscan-0.3.3.ebuild 1036
-EBUILD vdr-reelchannelscan-0.4.3-r2.ebuild 1156 RMD160 ae817aa2e6ced6ae6ae70721abd454341b52b621 SHA1 04e0dee90946cacc948891f2019036ec38f3e15c SHA256 94ea6b55d4263977dcc7fb4da65cdcc4aa7100fffe7e548c34a2965704c89e4f
-MD5 f71b21427b83ddc4f0c16cfd6eee18cd vdr-reelchannelscan-0.4.3-r2.ebuild 1156
-RMD160 ae817aa2e6ced6ae6ae70721abd454341b52b621 vdr-reelchannelscan-0.4.3-r2.ebuild 1156
-SHA256 94ea6b55d4263977dcc7fb4da65cdcc4aa7100fffe7e548c34a2965704c89e4f vdr-reelchannelscan-0.4.3-r2.ebuild 1156
-MISC ChangeLog 2804 RMD160 094adcee5aef5f236c36ef3d514ba751e4133488 SHA1 150a9aa9cd738af4132404331a3cdabd2bff6438 SHA256 75c991665f22d0111dc020cb1917022928333cb5a6dd56e75fa63ecbcb3172d1
-MD5 b763644a7ab7129ba7887795ef785157 ChangeLog 2804
-RMD160 094adcee5aef5f236c36ef3d514ba751e4133488 ChangeLog 2804
-SHA256 75c991665f22d0111dc020cb1917022928333cb5a6dd56e75fa63ecbcb3172d1 ChangeLog 2804
+EBUILD vdr-reelchannelscan-0.4.3-r2.ebuild 1212 RMD160 2af5b8280b4ff977c1f8741ef683ed8ad6b2e8c7 SHA1 fdd530764bc4a792b55ecae56cf612cb674f5512 SHA256 ba091fdfa2f3c70c6944f49a2d2b3c1b65338145f9f50bbe5fed4f3959cb6f6a
+MD5 bc3f21482faceac342ab28c976e62705 vdr-reelchannelscan-0.4.3-r2.ebuild 1212
+RMD160 2af5b8280b4ff977c1f8741ef683ed8ad6b2e8c7 vdr-reelchannelscan-0.4.3-r2.ebuild 1212
+SHA256 ba091fdfa2f3c70c6944f49a2d2b3c1b65338145f9f50bbe5fed4f3959cb6f6a vdr-reelchannelscan-0.4.3-r2.ebuild 1212
+MISC ChangeLog 2956 RMD160 444176bace338a125284a1710af3e9b98380ee56 SHA1 93c216e71f7e92d9cd28853aa7eea71cd7ff9bf5 SHA256 4df0d5b9c3475e1c37e4fd5f3fe45f4ba3c2a5a24036f5bf3d14119b8a299c2e
+MD5 bdfd4a15eb037221e3c497f4e3a91c6a ChangeLog 2956
+RMD160 444176bace338a125284a1710af3e9b98380ee56 ChangeLog 2956
+SHA256 4df0d5b9c3475e1c37e4fd5f3fe45f4ba3c2a5a24036f5bf3d14119b8a299c2e ChangeLog 2956
 MISC metadata.xml 309 RMD160 2564df04af9eead2fe189df8286f0d005570353a SHA1 71c4e367ebc6e1bce1311c0e6fbdf5f773f75256 SHA256 25af13f1c33d3a0935e1d3c71c5db29bc069f2692cd50e053a5215e70940a231
 MD5 99b79afc01e96944c8afdb90ccc03cab metadata.xml 309
 RMD160 2564df04af9eead2fe189df8286f0d005570353a metadata.xml 309
@@ -46,9 +46,9 @@ MD5 dc954ffb6f64a5c084bbb5d36e641eff files/digest-vdr-reelchannelscan-0.4.3-r2 2
 RMD160 1a2f933e9db1935877f4f3808b7d828c8c90ae07 files/digest-vdr-reelchannelscan-0.4.3-r2 265
 SHA256 3a183d9e43786ddff7bf1f4ec801b5601020d1058a22023aa846edd82dc0b5bf files/digest-vdr-reelchannelscan-0.4.3-r2 265
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFGd6EKt2vP6XvVdOcRAo1oAJ9q+OJYVu8ts4joGHfu/q5Z56+MLACeMfUl
-2uYiEoZvwbzSe7whjb7YRGk=
-=/Vsg
+iD8DBQFG2r8bt2vP6XvVdOcRAmBvAJoCcNYDL9ZKQpcpWxh4TxS2o+QFswCgwUr5
+HLm2rAJ0oSPX0MdPc7MS35w=
+=dM9c
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-reelchannelscan/files/0.4.3/i18n.diff b/media-plugins/vdr-reelchannelscan/files/0.4.3/i18n.diff
index dc014bdfc5fe..6c18c1759332 100644
--- a/media-plugins/vdr-reelchannelscan/files/0.4.3/i18n.diff
+++ b/media-plugins/vdr-reelchannelscan/files/0.4.3/i18n.diff
@@ -60,6 +60,24 @@ Index: reelchannelscan-0.4.3/i18n.c
    { "Scanning on transponder",
      "Durchsuche Transponder",
      "",
+@@ -524,7 +568,7 @@
+     "",
+     "",
+     "",
+-    "Haku käynnissä %s.\tOdota hetkinen...",
++    "",
+     "",
+     "",
+     "",
+@@ -546,7 +590,7 @@
+     "",
+     "",
+     "",
+-    "Haku käynnissä %s.\tOdota hetkinen...",
++    "",
+     "",
+     "",
+     "",
 Index: reelchannelscan-0.4.3/csmenu.c
 ===================================================================
 --- reelchannelscan-0.4.3.orig/csmenu.c
diff --git a/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r2.ebuild b/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r2.ebuild
index 763de77ccc83..f40608c59434 100644
--- a/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r2.ebuild
+++ b/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r2.ebuild,v 1.3 2007/06/19 09:25:20 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r2.ebuild,v 1.4 2007/09/02 13:48:05 zzam Exp $
 
 inherit vdr-plugin eutils
 
@@ -26,13 +26,15 @@ pkg_setup(){
 }
 
 src_unpack() {
-	vdr-plugin_src_unpack
+	vdr-plugin_src_unpack unpack
+	cd "${S}"
 	epatch "${FILESDIR}/${PV}/default-source-if-no-channel-set.diff"
 	epatch "${FILESDIR}/${PV}/device-numbering.diff"
 	epatch "${FILESDIR}/${PV}/i18n.diff"
 	epatch "${FILESDIR}/${PV}/gentoo.diff"
 
 	fix_vdr_libsi_include filter.[ch]
+	vdr-plugin_src_unpack all_but_unpack
 }
 
 src_install() {