Added patch for compilation with gcc 3.4. See Bug #123007.

Package-Manager: portage-2.1_rc3

7 files changed, 92 insertions, 30 deletions

diff --git a/media-video/tuxzap-programs/ChangeLog b/media-video/tuxzap-programs/ChangeLog
index 955132dd7e2f..f9a9e18b1090 100644
--- a/media-video/tuxzap-programs/ChangeLog
+++ b/media-video/tuxzap-programs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/tuxzap-programs
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/tuxzap-programs/ChangeLog,v 1.11 2006/05/03 21:03:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/tuxzap-programs/ChangeLog,v 1.12 2006/05/28 13:11:18 zzam Exp $
+
+  28 May 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/tuxzap-programs-0.5.4-gcc-34.diff, tuxzap-programs-0.5.4.ebuild:
+  Added patch for compilation with gcc 3.4. See Bug #123007.
 
   03 May 2006; Diego Pettenò <flameeyes@gentoo.org> metadata.xml:
   Update metadata to list media-video@gentoo.org as maintainer.
diff --git a/media-video/tuxzap-programs/Manifest b/media-video/tuxzap-programs/Manifest
index fd2b9989c985..187d4d060aec 100644
--- a/media-video/tuxzap-programs/Manifest
+++ b/media-video/tuxzap-programs/Manifest
@@ -1,42 +1,46 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST tuxzap_programs-0.2.3.tar.gz 162160 size 162160
-DIST tuxzap_programs-0.2.5.tar.gz 162615 size 162615
-DIST tuxzap_programs-0.5.4.tar.gz 165710 size 165710
-EBUILD tuxzap-programs-0.2.3.ebuild 1124 RMD160 5d967d96f779766ebe4e33705a5882efff6d740d SHA1 b788f2dd44fac2150d9e30b979879278b4642d48 SHA256 feed6da447e869794c7562e751b0e59427c36ef824f30ab62a11bf02ecb857f5 size 1124
+AUX tuxzap-programs-0.5.4-gcc-34.diff 1598 RMD160 f06f0b32c5e6cd63ded7af1b218681dc6a01cfed SHA1 4ed03bca6b00a451a4b855d83a73378f3dbbee35 SHA256 c21e185f3e4a5835a8e0e3ff03adf22ab766ea19b6dad3a21fe405f83afc9dc5
+MD5 aa422f8889e05f02494f7c4bf2f61cd8 files/tuxzap-programs-0.5.4-gcc-34.diff 1598
+RMD160 f06f0b32c5e6cd63ded7af1b218681dc6a01cfed files/tuxzap-programs-0.5.4-gcc-34.diff 1598
+SHA256 c21e185f3e4a5835a8e0e3ff03adf22ab766ea19b6dad3a21fe405f83afc9dc5 files/tuxzap-programs-0.5.4-gcc-34.diff 1598
+DIST tuxzap_programs-0.2.3.tar.gz 162160 RMD160 a0cb1e55f75f969777a769d58c29b65fd5e9d2d6 SHA1 8d630934d06f7690ad6bc545e662e458264977dc SHA256 985307b9f20ba6f25876d76c7e2f3f5db1741259b0e12d798d86bea15fc7611e
+DIST tuxzap_programs-0.2.5.tar.gz 162615 RMD160 b1586e310289e887fb602394bb393f6f9dfe9cb4 SHA1 5c550bbca0ab6a7b8012040e1b93e38cbbbe64ba SHA256 216915251a79ceebbe87d2514e9606c2451b9515335b21e5b631a1c5751a8749
+DIST tuxzap_programs-0.5.4.tar.gz 165710 RMD160 9e41f953f799062d6987c2b2f696fd81811c8e2b SHA1 10d987ff8b77dfa5fdb91ad7db8100123fee4c42 SHA256 a1f967f05dee48f1d28073baed6ceae2f1ea4e2760fbd60895e531f010255aa9
+EBUILD tuxzap-programs-0.2.3.ebuild 1124 RMD160 5d967d96f779766ebe4e33705a5882efff6d740d SHA1 b788f2dd44fac2150d9e30b979879278b4642d48 SHA256 feed6da447e869794c7562e751b0e59427c36ef824f30ab62a11bf02ecb857f5
 MD5 d3fae28967d77d8ff32c7bb69c0c3a98 tuxzap-programs-0.2.3.ebuild 1124
 RMD160 5d967d96f779766ebe4e33705a5882efff6d740d tuxzap-programs-0.2.3.ebuild 1124
 SHA256 feed6da447e869794c7562e751b0e59427c36ef824f30ab62a11bf02ecb857f5 tuxzap-programs-0.2.3.ebuild 1124
-EBUILD tuxzap-programs-0.2.5.ebuild 1116 RMD160 1f9cf9e2412885397744e72a3318bed4d7de76bf SHA1 61a13ba337bdf9c0ed2293bb28c6fa2720eab449 SHA256 4f0892ff800dee00006cacac680bcb8f66075785ff6682db142f9134482e349e size 1116
+EBUILD tuxzap-programs-0.2.5.ebuild 1116 RMD160 1f9cf9e2412885397744e72a3318bed4d7de76bf SHA1 61a13ba337bdf9c0ed2293bb28c6fa2720eab449 SHA256 4f0892ff800dee00006cacac680bcb8f66075785ff6682db142f9134482e349e
 MD5 336310433200e3324e0953504cf45ce1 tuxzap-programs-0.2.5.ebuild 1116
 RMD160 1f9cf9e2412885397744e72a3318bed4d7de76bf tuxzap-programs-0.2.5.ebuild 1116
 SHA256 4f0892ff800dee00006cacac680bcb8f66075785ff6682db142f9134482e349e tuxzap-programs-0.2.5.ebuild 1116
-EBUILD tuxzap-programs-0.5.4.ebuild 1009 RMD160 c0f94e0bd0cd486f3f78e8352810cea851604092 SHA1 07726c4b8cb537b035e288c346fc4f1d9e0acd58 SHA256 f02673852c503991e0e182660311474048554e71cda100c522be46ce1d36907d size 1009
-MD5 a02d7e8177437516c4d4874f44d2d814 tuxzap-programs-0.5.4.ebuild 1009
-RMD160 c0f94e0bd0cd486f3f78e8352810cea851604092 tuxzap-programs-0.5.4.ebuild 1009
-SHA256 f02673852c503991e0e182660311474048554e71cda100c522be46ce1d36907d tuxzap-programs-0.5.4.ebuild 1009
-MISC ChangeLog 2208 RMD160 913f7a31687aebc56d1a9d87e12b89b01ab2beb4 SHA1 4d3ebc70b18726383ebaeda5a4c691fb6c0f693f SHA256 6b29e98b840e720a95ea3b00fdb1af0c8e792f5e1c1f87744619f9c334b6bba4 size 2208
-MD5 195c104c1279ed7eb65070124b7543d4 ChangeLog 2208
-RMD160 913f7a31687aebc56d1a9d87e12b89b01ab2beb4 ChangeLog 2208
-SHA256 6b29e98b840e720a95ea3b00fdb1af0c8e792f5e1c1f87744619f9c334b6bba4 ChangeLog 2208
-MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 size 223
+EBUILD tuxzap-programs-0.5.4.ebuild 1085 RMD160 e8a43c193971e10b2277ec567576f60b9f6a9f1e SHA1 76af25087c427dc6ca090a979ec08f850faf3671 SHA256 d26e499fc65308ce0d9a48a3aea6b15b4b8a32df3f253b55074aa23c20f51975
+MD5 f474d25f1b6789307289e68717042dbd tuxzap-programs-0.5.4.ebuild 1085
+RMD160 e8a43c193971e10b2277ec567576f60b9f6a9f1e tuxzap-programs-0.5.4.ebuild 1085
+SHA256 d26e499fc65308ce0d9a48a3aea6b15b4b8a32df3f253b55074aa23c20f51975 tuxzap-programs-0.5.4.ebuild 1085
+MISC ChangeLog 2392 RMD160 93d0650c2049189f9d40e9f81dba6d03796695bb SHA1 c3bf2f5566dd8b82dccf16fef5896c6bd9d829ac SHA256 26b552b4264f79f77c009e7a233cee7a8772f9bee544c69d70ec57d18529534c
+MD5 5d2243c119a24b67f57d0e8810d14352 ChangeLog 2392
+RMD160 93d0650c2049189f9d40e9f81dba6d03796695bb ChangeLog 2392
+SHA256 26b552b4264f79f77c009e7a233cee7a8772f9bee544c69d70ec57d18529534c ChangeLog 2392
+MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
 SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 metadata.xml 223
-MD5 0891de6f156d6359fa93b062689f68b0 files/digest-tuxzap-programs-0.2.3 73
-RMD160 fde49c727e3a4d19115b50545174cbc7244e5585 files/digest-tuxzap-programs-0.2.3 73
-SHA256 328256ce0e881aebdebd5ddb1984e6873970bf6d83128b271ff511f36e0f9a68 files/digest-tuxzap-programs-0.2.3 73
-MD5 275c443eecaafa17b2d4750320d45e26 files/digest-tuxzap-programs-0.2.5 73
-RMD160 5a990f313564c6ae3d2e47adec907ee3ca52dad5 files/digest-tuxzap-programs-0.2.5 73
-SHA256 16a9ad07c83dbadb110a0572bf9e9791814dba3f7571c9a45ffdc61a0973573d files/digest-tuxzap-programs-0.2.5 73
-MD5 696157bae4b75290c36601559e107ce8 files/digest-tuxzap-programs-0.5.4 73
-RMD160 b0c8b9e3ec4bc4fdc516b8eee59e982f373a939d files/digest-tuxzap-programs-0.5.4 73
-SHA256 751e8f8a7e42f979cd652dd8de9fe85ad408f4b674c174dc520f1322ec85301e files/digest-tuxzap-programs-0.5.4 73
+MD5 4237c1cb8f097da97df3d71bccec23fc files/digest-tuxzap-programs-0.2.3 265
+RMD160 8be109c8a59875ea12f31812da9f5e2b0c512bd5 files/digest-tuxzap-programs-0.2.3 265
+SHA256 83ff0b893e2e51a0e37fbacb8908166cd442485e4090ea237b2768a8ab079868 files/digest-tuxzap-programs-0.2.3 265
+MD5 c65faa0d1f9ba1bea92503acafb57251 files/digest-tuxzap-programs-0.2.5 265
+RMD160 525e2f63bc5c0c11ac4dcab7f0f515b2f8125a94 files/digest-tuxzap-programs-0.2.5 265
+SHA256 884a0ee91b70a30aaf8cf5a7eef52446be1009065a9b8fd932891c97cd304193 files/digest-tuxzap-programs-0.2.5 265
+MD5 b83ff9d96ad892d4425a40ddc831622e files/digest-tuxzap-programs-0.5.4 265
+RMD160 85f0f2ac33943cfa6b4503088e1054b871437f77 files/digest-tuxzap-programs-0.5.4 265
+SHA256 fd527ca563e05ae4feab754051b6fc46cba1ff8d522bc5e784eb35c6e1aebccd files/digest-tuxzap-programs-0.5.4 265
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEWRqMAiZjviIA2XgRAvsmAJ44NEo6Xg+bbW8XTvwb/8W1gTLM9ACgyuof
-HZAEL/sKqnQFmIsSplvnCAQ=
-=kFNL
+iD8DBQFEeaGCZfSl1Kp5KmoRAqAtAJ9ME4fUxc+e2sSL9WJ6vzmJckWZFwCg4ooo
+WN4464kWfdWib4VdGimX0hw=
+=srUx
 -----END PGP SIGNATURE-----
diff --git a/media-video/tuxzap-programs/files/digest-tuxzap-programs-0.2.3 b/media-video/tuxzap-programs/files/digest-tuxzap-programs-0.2.3
index 0a4022966f96..8223acb6086c 100644
--- a/media-video/tuxzap-programs/files/digest-tuxzap-programs-0.2.3
+++ b/media-video/tuxzap-programs/files/digest-tuxzap-programs-0.2.3
@@ -1 +1,3 @@
 MD5 03dc448caf7f401b1a22e7dbd868b960 tuxzap_programs-0.2.3.tar.gz 162160
+RMD160 a0cb1e55f75f969777a769d58c29b65fd5e9d2d6 tuxzap_programs-0.2.3.tar.gz 162160
+SHA256 985307b9f20ba6f25876d76c7e2f3f5db1741259b0e12d798d86bea15fc7611e tuxzap_programs-0.2.3.tar.gz 162160
diff --git a/media-video/tuxzap-programs/files/digest-tuxzap-programs-0.2.5 b/media-video/tuxzap-programs/files/digest-tuxzap-programs-0.2.5
index 332562af5eb2..634ed779f275 100644
--- a/media-video/tuxzap-programs/files/digest-tuxzap-programs-0.2.5
+++ b/media-video/tuxzap-programs/files/digest-tuxzap-programs-0.2.5
@@ -1 +1,3 @@
 MD5 3f62152dc2d4f780fbdcf5f32e659771 tuxzap_programs-0.2.5.tar.gz 162615
+RMD160 b1586e310289e887fb602394bb393f6f9dfe9cb4 tuxzap_programs-0.2.5.tar.gz 162615
+SHA256 216915251a79ceebbe87d2514e9606c2451b9515335b21e5b631a1c5751a8749 tuxzap_programs-0.2.5.tar.gz 162615
diff --git a/media-video/tuxzap-programs/files/digest-tuxzap-programs-0.5.4 b/media-video/tuxzap-programs/files/digest-tuxzap-programs-0.5.4
index aac1e63f4ecb..df4437350ee0 100644
--- a/media-video/tuxzap-programs/files/digest-tuxzap-programs-0.5.4
+++ b/media-video/tuxzap-programs/files/digest-tuxzap-programs-0.5.4
@@ -1 +1,3 @@
 MD5 68b3aac1b941c66172ad2b530c48803b tuxzap_programs-0.5.4.tar.gz 165710
+RMD160 9e41f953f799062d6987c2b2f696fd81811c8e2b tuxzap_programs-0.5.4.tar.gz 165710
+SHA256 a1f967f05dee48f1d28073baed6ceae2f1ea4e2760fbd60895e531f010255aa9 tuxzap_programs-0.5.4.tar.gz 165710
diff --git a/media-video/tuxzap-programs/files/tuxzap-programs-0.5.4-gcc-34.diff b/media-video/tuxzap-programs/files/tuxzap-programs-0.5.4-gcc-34.diff
new file mode 100644
index 000000000000..36a30f3f9b44
--- /dev/null
+++ b/media-video/tuxzap-programs/files/tuxzap-programs-0.5.4-gcc-34.diff
@@ -0,0 +1,42 @@
+Nur in tuxzap_programs-0.5.4/src: cam_set.
+diff -ru tuxzap_programs-0.5.4-orig/src/interface2.cc tuxzap_programs-0.5.4/src/interface2.cc
+--- tuxzap_programs-0.5.4-orig/src/interface2.cc	2006-05-28 13:00:39.379215952 +0200
++++ tuxzap_programs-0.5.4/src/interface2.cc	2006-05-28 13:01:24.615531456 +0200
+@@ -576,7 +576,7 @@
+ 	gtvscreen_get_values(gwid, GTV_NINPUT, &ninput);
+ 
+ 	GtkWidget **intool;
+-	intool = new(GtkWidget *)[ninput];
++	intool = new(GtkWidget * [ninput]);
+ 	// first button of radio box for input switching : tuner
+ 	switch (ninput) {
+ 
+Nur in tuxzap_programs-0.5.4/src: interface2.o.
+Nur in tuxzap_programs-0.5.4/src: ntuxplayer.
+Nur in tuxzap_programs-0.5.4/src: ntuxzap.
+diff -ru tuxzap_programs-0.5.4-orig/src/ntuxzap.cc tuxzap_programs-0.5.4/src/ntuxzap.cc
+--- tuxzap_programs-0.5.4-orig/src/ntuxzap.cc	2006-05-28 13:00:39.379215952 +0200
++++ tuxzap_programs-0.5.4/src/ntuxzap.cc	2006-05-28 13:01:09.494088957 +0200
+@@ -249,7 +249,7 @@
+ 	switch (k){
+ 	case 0:
+ 		num = dvb.num[CHAN];
+-		info = new (char *) [num];
++		info = new (char * [num]);
+ 		for (int i=0; i < num; i++){
+ 			ostringstream str;
+ 			str << dvb.chans[i].name << "  (" << i << ")"<< ends;
+@@ -260,7 +260,7 @@
+ 
+ 	case 1 ... NLIST:
+ 		num = chlist[k-1].NumChan();
+-		info = new (char *) [num];
++		info = new (char * [num]);
+ 		j = 0;
+ 		for (int i = 0; i < num; i++) {
+ 			ostringstream str;
+Nur in tuxzap_programs-0.5.4/src: ntuxzap.o.
+Nur in tuxzap_programs-0.5.4/src: rtuxzap.
+Nur in tuxzap_programs-0.5.4/src: tuxplayer.
+Nur in tuxzap_programs-0.5.4/src: tuxview.
+Nur in tuxzap_programs-0.5.4/src: tuxzap.
diff --git a/media-video/tuxzap-programs/tuxzap-programs-0.5.4.ebuild b/media-video/tuxzap-programs/tuxzap-programs-0.5.4.ebuild
index 467e2944aef6..026354e7fcee 100644
--- a/media-video/tuxzap-programs/tuxzap-programs-0.5.4.ebuild
+++ b/media-video/tuxzap-programs/tuxzap-programs-0.5.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/tuxzap-programs/tuxzap-programs-0.5.4.ebuild,v 1.2 2005/12/08 07:48:45 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/tuxzap-programs/tuxzap-programs-0.5.4.ebuild,v 1.3 2006/05/28 13:11:18 zzam Exp $
 
-inherit multilib
+inherit multilib eutils
 
 MY_P=${PN/-/_}-${PV}
 S=${WORKDIR}/${MY_P}
@@ -20,6 +20,12 @@ DEPEND=">=media-libs/libdvb-0.2.1
 	dev-libs/cdk
 	gtk? ( =x11-libs/gtk+-1.2* )"
 
+src_unpack() {
+	unpack ${A}
+
+	epatch ${FILESDIR}/${P}-gcc-34.diff
+}
+
 src_compile() {
 	local myconf=""
 	# not using X use var because gtk is needed too anyway