Fix for gcc-4. Bug #145125

Package-Manager: portage-2.1.1

4 files changed, 73 insertions, 21 deletions

diff --git a/games-roguelike/tome/ChangeLog b/games-roguelike/tome/ChangeLog
index 110481ff18b7..6f00d111cee9 100644
--- a/games-roguelike/tome/ChangeLog
+++ b/games-roguelike/tome/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-roguelike/tome
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/ChangeLog,v 1.23 2006/03/07 19:28:10 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/ChangeLog,v 1.24 2006/10/08 20:54:22 tupone Exp $
+
+  08 Oct 2006; <tupone@gentoo.org> +files/tome-2.3.3-gcc41.patch,
+  tome-2.3.3.ebuild:
+  Failed emerging with gcc-4. Bug #145125 by Elmo Todurov
 
   07 Mar 2006; <Tupone@gentoo.org> tome-2.3.3.ebuild:
   using bindnow-flags and adding ~ppc-macosx
diff --git a/games-roguelike/tome/Manifest b/games-roguelike/tome/Manifest
index 42ded661ff32..2dfc104868ed 100644
--- a/games-roguelike/tome/Manifest
+++ b/games-roguelike/tome/Manifest
@@ -1,18 +1,54 @@
-MD5 8283623059747e6bc1774c74d7bccbf5 ChangeLog 4544
-RMD160 1bbd4cbe37a8a84a638725c08333e60ba23e1d7b ChangeLog 4544
-SHA256 25ef1a8719011ee74efeb13d0464882406d1fce5631e4d64412653f4b300990f ChangeLog 4544
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 2.2.7-gentoo-paths.patch 1172 RMD160 284efaf1eb85ee17f9d08719179f835cf4777100 SHA1 c6c2203e504cd0b09f91c2ed8e3eec9fd6f84280 SHA256 e1978ac45c002a7b40a1f7123430a8aa1a4c45c48468b8d0bd6c670041a538e1
 MD5 23dd9f8f71868b8ab82d8bbbc79ad740 files/2.2.7-gentoo-paths.patch 1172
 RMD160 284efaf1eb85ee17f9d08719179f835cf4777100 files/2.2.7-gentoo-paths.patch 1172
 SHA256 e1978ac45c002a7b40a1f7123430a8aa1a4c45c48468b8d0bd6c670041a538e1 files/2.2.7-gentoo-paths.patch 1172
+AUX 2.3.0-gentoo-paths.patch 1172 RMD160 284efaf1eb85ee17f9d08719179f835cf4777100 SHA1 c6c2203e504cd0b09f91c2ed8e3eec9fd6f84280 SHA256 e1978ac45c002a7b40a1f7123430a8aa1a4c45c48468b8d0bd6c670041a538e1
 MD5 23dd9f8f71868b8ab82d8bbbc79ad740 files/2.3.0-gentoo-paths.patch 1172
 RMD160 284efaf1eb85ee17f9d08719179f835cf4777100 files/2.3.0-gentoo-paths.patch 1172
 SHA256 e1978ac45c002a7b40a1f7123430a8aa1a4c45c48468b8d0bd6c670041a538e1 files/2.3.0-gentoo-paths.patch 1172
+AUX 2.3.1-gentoo-paths.patch 1172 RMD160 284efaf1eb85ee17f9d08719179f835cf4777100 SHA1 c6c2203e504cd0b09f91c2ed8e3eec9fd6f84280 SHA256 e1978ac45c002a7b40a1f7123430a8aa1a4c45c48468b8d0bd6c670041a538e1
 MD5 23dd9f8f71868b8ab82d8bbbc79ad740 files/2.3.1-gentoo-paths.patch 1172
 RMD160 284efaf1eb85ee17f9d08719179f835cf4777100 files/2.3.1-gentoo-paths.patch 1172
 SHA256 e1978ac45c002a7b40a1f7123430a8aa1a4c45c48468b8d0bd6c670041a538e1 files/2.3.1-gentoo-paths.patch 1172
+AUX 2.3.3-gentoo-paths.patch 1172 RMD160 284efaf1eb85ee17f9d08719179f835cf4777100 SHA1 c6c2203e504cd0b09f91c2ed8e3eec9fd6f84280 SHA256 e1978ac45c002a7b40a1f7123430a8aa1a4c45c48468b8d0bd6c670041a538e1
 MD5 23dd9f8f71868b8ab82d8bbbc79ad740 files/2.3.3-gentoo-paths.patch 1172
 RMD160 284efaf1eb85ee17f9d08719179f835cf4777100 files/2.3.3-gentoo-paths.patch 1172
 SHA256 e1978ac45c002a7b40a1f7123430a8aa1a4c45c48468b8d0bd6c670041a538e1 files/2.3.3-gentoo-paths.patch 1172
+AUX tome-2.3.3-gcc41.patch 605 RMD160 b69a831cb23c35f16fe01db2ef052129591e0247 SHA1 e95496729d1a007a83ce9f48157f9a030f83c7fc SHA256 876a5505048b845fa44f6051f10b93f93a8acc5fb2f252ba1c7b57e454532626
+MD5 1d9ee2dd777668e69d1d30b610c1faa6 files/tome-2.3.3-gcc41.patch 605
+RMD160 b69a831cb23c35f16fe01db2ef052129591e0247 files/tome-2.3.3-gcc41.patch 605
+SHA256 876a5505048b845fa44f6051f10b93f93a8acc5fb2f252ba1c7b57e454532626 files/tome-2.3.3-gcc41.patch 605
+DIST tome-227-src.tar.bz2 2600527 RMD160 6f86a6bc1a8f6f311bb3d04f91dcfc6486a31f17 SHA1 d2ba527c65e3da19be4751c97d4a160f43e17a70 SHA256 58ce8c1199b7c8e5ceaa44e3d1179414fead31b43934bacaf69c0b240b147f75
+DIST tome-230-src.tar.bz2 2815096 RMD160 2d1ffba118123073492c56deba3f428dd3fbe298 SHA1 f213ed9f483ab9e9ccd74692289b4d38aa3e2991 SHA256 ba872f4c20bf9d591135c8d50061d9f59c3f97c00d546c4a0c543d930232063c
+DIST tome-231-src.tar.bz2 2638388 RMD160 f25e609409f0055a8fa3fade72bc42eb97e07338 SHA1 1c611663c90865cc56d90334efdf333e9ba70ed2 SHA256 f764e1e059c86f2591f5a830dccbfada67dba176b1dbbab6e562663deb979971
+DIST tome-233-src.tar.bz2 2865537 RMD160 5f7006182be65e1fd49a9f3be1ef1f25e00fd0d3 SHA1 067f98cd395c268dbfd87a923fe064abeac12855 SHA256 2220419d69533ac8c3cc5687c1f9f6e5c9eadacf9643900ba50dce3696a9d721
+EBUILD tome-2.2.7-r1.ebuild 1933 RMD160 35770cb5ebdfdcbb67d3a2d76682d33cf58bbd56 SHA1 ce96ab48be43ce2888996bc2f9ed05d26fcd4131 SHA256 abd6492c84520fb81f1608da5ff2d6c9de2d3254d388e33a774c55341c898187
+MD5 0b0a13ad1028fdf0c82b63d2f5124a7e tome-2.2.7-r1.ebuild 1933
+RMD160 35770cb5ebdfdcbb67d3a2d76682d33cf58bbd56 tome-2.2.7-r1.ebuild 1933
+SHA256 abd6492c84520fb81f1608da5ff2d6c9de2d3254d388e33a774c55341c898187 tome-2.2.7-r1.ebuild 1933
+EBUILD tome-2.3.0.ebuild 2071 RMD160 b4883467b9053f1c840e2bbc982b61ff8f0e5bf6 SHA1 80255298a2f95485120e2695d17f0ed5984a911a SHA256 9ce9516732448776b487cab1a4601741735827f7da490bc40d840ef7d8e92e45
+MD5 a92f303c235ad449026180dfd3cf1cfd tome-2.3.0.ebuild 2071
+RMD160 b4883467b9053f1c840e2bbc982b61ff8f0e5bf6 tome-2.3.0.ebuild 2071
+SHA256 9ce9516732448776b487cab1a4601741735827f7da490bc40d840ef7d8e92e45 tome-2.3.0.ebuild 2071
+EBUILD tome-2.3.1.ebuild 2082 RMD160 869ad5506fec7e5d49cd773fae79c4896f71d1c0 SHA1 a84368cdb61e1ce4f91748411e80614deb1f9231 SHA256 077360e62a2905f915a5c888e94633fd26f7d5bc54cbcc52bc62bdbc5ae0c575
+MD5 11700d82746873465da2ae1725abff8d tome-2.3.1.ebuild 2082
+RMD160 869ad5506fec7e5d49cd773fae79c4896f71d1c0 tome-2.3.1.ebuild 2082
+SHA256 077360e62a2905f915a5c888e94633fd26f7d5bc54cbcc52bc62bdbc5ae0c575 tome-2.3.1.ebuild 2082
+EBUILD tome-2.3.3.ebuild 3708 RMD160 e82d9344d52cdc5fb3b0a8afe71c22bc39c03d9f SHA1 0456133f359b35d615c270cabff2af00229a22cf SHA256 6c782b215487c1ccee22fad53d1e78c6824002dc1b4a71c42c6964787b9aea60
+MD5 49245f10ebf8341112877b1ab855252f tome-2.3.3.ebuild 3708
+RMD160 e82d9344d52cdc5fb3b0a8afe71c22bc39c03d9f tome-2.3.3.ebuild 3708
+SHA256 6c782b215487c1ccee22fad53d1e78c6824002dc1b4a71c42c6964787b9aea60 tome-2.3.3.ebuild 3708
+MISC ChangeLog 4690 RMD160 d2cf62ea40b270eab80f6b8eedcbc2f86a7c4a83 SHA1 cea5dfabdcb1ad4d0a88d1390819426fa9b3deb4 SHA256 f2646f74299cfa079caf4e2bf5d189fc348d908bebc553fc48987dcb94443bd1
+MD5 ed9d38f1b2c651b0a19506941c1b4f53 ChangeLog 4690
+RMD160 d2cf62ea40b270eab80f6b8eedcbc2f86a7c4a83 ChangeLog 4690
+SHA256 f2646f74299cfa079caf4e2bf5d189fc348d908bebc553fc48987dcb94443bd1 ChangeLog 4690
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
 MD5 2b7fa16de09206112d60ee628383f526 files/digest-tome-2.2.7-r1 244
 RMD160 7170d6df363869a41d89c0fba227e4657642a508 files/digest-tome-2.2.7-r1 244
 SHA256 88de2724caf495d98751495e00246e82984a0f5185c7734745774883b4b4befd files/digest-tome-2.2.7-r1 244
@@ -25,18 +61,10 @@ SHA256 efacb79f05ec2662bdbce251ea95ca42148f3201ba71874199866296c87468e2 files/di
 MD5 431dea3eb67e375073976220f6f968d3 files/digest-tome-2.3.3 244
 RMD160 c6c54aa02f66a011fdd6a1b8ea8efbccda7af3aa files/digest-tome-2.3.3 244
 SHA256 5b525bbceb08351853df881ea9482ca77827edc4a9979284dfd348518e25722e files/digest-tome-2.3.3 244
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
-SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 0b0a13ad1028fdf0c82b63d2f5124a7e tome-2.2.7-r1.ebuild 1933
-RMD160 35770cb5ebdfdcbb67d3a2d76682d33cf58bbd56 tome-2.2.7-r1.ebuild 1933
-SHA256 abd6492c84520fb81f1608da5ff2d6c9de2d3254d388e33a774c55341c898187 tome-2.2.7-r1.ebuild 1933
-MD5 a92f303c235ad449026180dfd3cf1cfd tome-2.3.0.ebuild 2071
-RMD160 b4883467b9053f1c840e2bbc982b61ff8f0e5bf6 tome-2.3.0.ebuild 2071
-SHA256 9ce9516732448776b487cab1a4601741735827f7da490bc40d840ef7d8e92e45 tome-2.3.0.ebuild 2071
-MD5 11700d82746873465da2ae1725abff8d tome-2.3.1.ebuild 2082
-RMD160 869ad5506fec7e5d49cd773fae79c4896f71d1c0 tome-2.3.1.ebuild 2082
-SHA256 077360e62a2905f915a5c888e94633fd26f7d5bc54cbcc52bc62bdbc5ae0c575 tome-2.3.1.ebuild 2082
-MD5 c6f0ccd21bc45a20e451813cfc5123e4 tome-2.3.3.ebuild 3663
-RMD160 05ef5837d65adbf83399078cf1a1cd41f0ad06e8 tome-2.3.3.ebuild 3663
-SHA256 aedbb1a9217b57a421d2f75cdd99be2d85bfc60ec650beb6e30c08dbe6009071 tome-2.3.3.ebuild 3663
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFKWWMbfN2jvlVAhwRAjNoAKCdl49pmY/9qDT2DCOG+mkf7XL7rQCgmcBE
+lfr9231u5NukqAPVPqddfOE=
+=nnLk
+-----END PGP SIGNATURE-----
diff --git a/games-roguelike/tome/files/tome-2.3.3-gcc41.patch b/games-roguelike/tome/files/tome-2.3.3-gcc41.patch
new file mode 100644
index 000000000000..89ef0bb2e07d
--- /dev/null
+++ b/games-roguelike/tome/files/tome-2.3.3-gcc41.patch
@@ -0,0 +1,18 @@
+--- src/main-gtk.c.old	2006-10-08 22:36:50.000000000 +0200
++++ src/main-gtk.c	2006-10-08 22:37:24.000000000 +0200
+@@ -4478,13 +4478,13 @@
+ 		strnfmt(buf, 64, "/Terms/%s", angband_term_name[i]);
+ 
+ 		/* XXX XXX Store it in the menu definition */
+-		(cptr)term_entry[i].path = string_make(buf);
++		term_entry[i].path = string_make(buf);
+ 
+ 		/* XXX XXX Build the real path name to the entry */
+ 		strnfmt(buf, 64, "/Options/Font/%s", angband_term_name[i]);
+ 
+ 		/* XXX XXX Store it in the menu definition */
+-		(cptr)font_entry[i].path = string_make(buf);
++		font_entry[i].path = string_make(buf);
+ 	}
+ }
+ 
diff --git a/games-roguelike/tome/tome-2.3.3.ebuild b/games-roguelike/tome/tome-2.3.3.ebuild
index 0bbfe7fe544b..adf09d91400c 100644
--- a/games-roguelike/tome/tome-2.3.3.ebuild
+++ b/games-roguelike/tome/tome-2.3.3.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/games-roguelike/tome/tome-2.3.3.ebuild,v 1.2 2006/03/07 19:28:10 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.3.3.ebuild,v 1.3 2006/10/08 20:54:22 tupone Exp $
 
 inherit eutils flag-o-matic games
 
@@ -30,7 +30,9 @@ S="${WORKDIR}/tome-${MY_PV}-src"
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}/src"
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc41.patch
+	cd "src"
 	mv makefile.std makefile
 	epatch "${FILESDIR}/${PV}-gentoo-paths.patch"
 	sed -i \