Added gcc4-compatibility patch.

Package-Manager: portage-2.1.1_pre4-r4

4 files changed, 36 insertions, 15 deletions

diff --git a/media-plugins/vdr-channelscan/ChangeLog b/media-plugins/vdr-channelscan/ChangeLog
index 5ec2ceb2df5d..d49502ccf549 100644
--- a/media-plugins/vdr-channelscan/ChangeLog
+++ b/media-plugins/vdr-channelscan/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-channelscan
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-channelscan/ChangeLog,v 1.7 2006/06/23 10:30:58 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-channelscan/ChangeLog,v 1.8 2006/08/09 13:55:14 zzam Exp $
+
+  09 Aug 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-channelscan-0.1.0-gcc4.diff, vdr-channelscan-0.1.0.ebuild:
+  Added gcc4-compatibility patch.
 
 *vdr-channelscan-0.1.0 (23 Jun 2006)
 
diff --git a/media-plugins/vdr-channelscan/Manifest b/media-plugins/vdr-channelscan/Manifest
index 6701125e9167..f79d3588c9f9 100644
--- a/media-plugins/vdr-channelscan/Manifest
+++ b/media-plugins/vdr-channelscan/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX vdr-channelscan-0.1.0-gcc4.diff 545 RMD160 9d6cb85b5c6014243ad043927c87237cf18845e4 SHA1 3a214bcd889e83d25d84045d1cfc298f49951030 SHA256 77eef7eb4de93952da460ec334a46eb9886c3fb0d7769bb853ec5fd37c04b95d
+MD5 2fa513e14a5366eb766e6d0eff751aac files/vdr-channelscan-0.1.0-gcc4.diff 545
+RMD160 9d6cb85b5c6014243ad043927c87237cf18845e4 files/vdr-channelscan-0.1.0-gcc4.diff 545
+SHA256 77eef7eb4de93952da460ec334a46eb9886c3fb0d7769bb853ec5fd37c04b95d files/vdr-channelscan-0.1.0-gcc4.diff 545
 AUX vdr-channelscan-0.1.0-shared-data.diff 3922 RMD160 e8889c7daf399bf60b1184d5a9cdb98c1d06182a SHA1 240667219b58098012ab3cbb25da7a78ae0a30b7 SHA256 0f2e4c6198d19d3c3191ae68c381a86cc362de418d74a66b91d60246e0ffa21e
 MD5 333ed6ed45db51172a8b81cf118a152c files/vdr-channelscan-0.1.0-shared-data.diff 3922
 RMD160 e8889c7daf399bf60b1184d5a9cdb98c1d06182a files/vdr-channelscan-0.1.0-shared-data.diff 3922
@@ -10,14 +14,14 @@ MD5 29e0c340bb5d4f1936cea5352718cef1 files/vdr-channelscan-0.1.0-show-only-basen
 RMD160 6f1c7e4477fd324bf50b0c55b11d341b2f65e325 files/vdr-channelscan-0.1.0-show-only-basename.diff 881
 SHA256 7ec4e190a25f9f31b98dea8f06056d44698d7a8f8e519e0af02918159dd0a454 files/vdr-channelscan-0.1.0-show-only-basename.diff 881
 DIST vdr-channelscan-0.1.0.tgz 48928 RMD160 d5dabd8aa7b82ace69be5e72ed9e914b0987b7fd SHA1 f6b5f34f671200cc3f4571166375cc5f26e3b5f7 SHA256 13b9398e2c9d449cf6f8a3c7c07416d0ecae7b2e6f5102978b341d3db5b1a0ab
-EBUILD vdr-channelscan-0.1.0.ebuild 902 RMD160 f617d391866aebc5ff2d1e276e5359af8105c141 SHA1 6dc98a9b5ad4b31e041414638bc5b0ca18ed4e92 SHA256 aaa750c992142670c4448ed765865d3a104a5cad580cb8efe00b7c54f638f440
-MD5 2d3b0154e6e36625fcbeb61480554e86 vdr-channelscan-0.1.0.ebuild 902
-RMD160 f617d391866aebc5ff2d1e276e5359af8105c141 vdr-channelscan-0.1.0.ebuild 902
-SHA256 aaa750c992142670c4448ed765865d3a104a5cad580cb8efe00b7c54f638f440 vdr-channelscan-0.1.0.ebuild 902
-MISC ChangeLog 1480 RMD160 819c929c2c5e3cea4debad9bc18a16c043efec26 SHA1 38ea75807319f95e1892bd3edb9f4fa5d41abde5 SHA256 d2e16d9137eb177e54705e7b5d20e21713230e1e7581593ab3f64898345c23bc
-MD5 f3c2ea41a48fb789eff3f365fc7e7fff ChangeLog 1480
-RMD160 819c929c2c5e3cea4debad9bc18a16c043efec26 ChangeLog 1480
-SHA256 d2e16d9137eb177e54705e7b5d20e21713230e1e7581593ab3f64898345c23bc ChangeLog 1480
+EBUILD vdr-channelscan-0.1.0.ebuild 931 RMD160 571cf2e67ef42f5963a7f738e7a3fe59c447973d SHA1 50a6cf60d5a1380ea1386667e40c299a0ff2d746 SHA256 8d17fe823c6609959cde1b96b7f5a9f31c3018e57c16c3e6b0dfd0cf3f3b48b6
+MD5 f86fdc3d909c41ed319198de7c36bbfa vdr-channelscan-0.1.0.ebuild 931
+RMD160 571cf2e67ef42f5963a7f738e7a3fe59c447973d vdr-channelscan-0.1.0.ebuild 931
+SHA256 8d17fe823c6609959cde1b96b7f5a9f31c3018e57c16c3e6b0dfd0cf3f3b48b6 vdr-channelscan-0.1.0.ebuild 931
+MISC ChangeLog 1640 RMD160 b278cbfb884fcb46744b0dfec9bef77124dc9c8b SHA1 ed0493b717f187fda392549f55d4bb6deabfdf46 SHA256 d48f5701af86be4c6bd1354fe0b02c2b2819c3155b73f9afd692df20feb69cda
+MD5 7ec25f49d35d1c16549cf8c27f1ffc9f ChangeLog 1640
+RMD160 b278cbfb884fcb46744b0dfec9bef77124dc9c8b ChangeLog 1640
+SHA256 d48f5701af86be4c6bd1354fe0b02c2b2819c3155b73f9afd692df20feb69cda ChangeLog 1640
 MISC metadata.xml 414 RMD160 69e3b0864427a1c85ed9d6d0788fef9b6b50e99c SHA1 6dd589863838d4dc8957804da568eef172eb9c04 SHA256 bd74f2a6e566b211a82b8ea53295894c8f3a2f8a6bb3fcb51a47851b25d86603
 MD5 4bd2f6d639706e548820ed3bd4e9d2c8 metadata.xml 414
 RMD160 69e3b0864427a1c85ed9d6d0788fef9b6b50e99c metadata.xml 414
@@ -26,9 +30,9 @@ MD5 2577b8c9779e6931a50bd891127a07cb files/digest-vdr-channelscan-0.1.0 253
 RMD160 2f3475f3a3f90ad2e5b216f694c25ac526a2173f files/digest-vdr-channelscan-0.1.0 253
 SHA256 9ce206730fa21b75d220bfd5cc61d38a8bc79b31e3568b004eed18c5cead57d8 files/digest-vdr-channelscan-0.1.0 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEm8LpZfSl1Kp5KmoRAqRhAJwKk7q7RfdS5/6+Z5rs7ROKVBsh0gCdF7o8
-Ub9nEWsjdYbHzCidN9PgJ1U=
-=DaSW
+iD8DBQFE2elzt2vP6XvVdOcRAh17AKDRUk3RQRT40yKwSxw9KSyd7G+gzwCgoOke
+jnI1uOZ3h2VfYighO47qDHY=
+=I2BR
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-gcc4.diff b/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-gcc4.diff
new file mode 100644
index 000000000000..a2bd29d8e988
--- /dev/null
+++ b/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-gcc4.diff
@@ -0,0 +1,12 @@
+diff -ru channelscan-0.1.0-orig/channelscan.c channelscan-0.1.0/channelscan.c
+--- channelscan-0.1.0-orig/channelscan.c	2006-08-09 15:43:41.658270206 +0200
++++ channelscan-0.1.0/channelscan.c	2006-08-09 15:43:55.115608737 +0200
+@@ -86,7 +86,7 @@
+                              unsigned int &UNCChip  );
+   bool Signal(int Frequenz, char *Pol, int Symbolrate);
+   void LoadSatFile(int iPosition);
+-  void cMainMenu::ShowSatData(const char cSelectedFile[100]);
++  void ShowSatData(const char cSelectedFile[100]);
+ };
+ 
+ cMainMenu::cMainMenu(void) {
diff --git a/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild b/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild
index b4397416bc13..481815a253fd 100644
--- a/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild
+++ b/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild,v 1.1 2006/06/23 10:30:58 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild,v 1.2 2006/08/09 13:55:14 zzam Exp $
 
 inherit vdr-plugin
 
@@ -19,7 +19,8 @@ RDEPEND="${DEPEND}"
 
 # access transponder-data under /usr/share/vdr/channelscan-transponders
 PATCHES="${FILESDIR}/${P}-shared-data.diff
-		${FILESDIR}/${P}-show-only-basename.diff"
+		${FILESDIR}/${P}-show-only-basename.diff
+		${FILESDIR}/${P}-gcc4.diff"
 
 src_unpack() {
 	vdr-plugin_src_unpack