Fix for gcc-4.1, bug #134265

Package-Manager: portage-2.1_rc3-r1

6 files changed, 63 insertions, 17 deletions

diff --git a/games-strategy/attal/ChangeLog b/games-strategy/attal/ChangeLog
index c3112634968c..220c0771521f 100644
--- a/games-strategy/attal/ChangeLog
+++ b/games-strategy/attal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/attal
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/attal/ChangeLog,v 1.16 2006/02/09 13:56:18 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/attal/ChangeLog,v 1.17 2006/05/30 20:42:08 tupone Exp $
+
+  30 May 2006; <Tupone@gentoo.org> +files/attal-0.9.4-gcc41.patch,
+  attal-0.9.4.ebuild:
+  Fix for gcc-4.1, bug #134265 by me
 
   09 Feb 2006; Caleb Tennis <caleb@gentoo.org> attal-0.9.3.ebuild,
   attal-0.9.4.ebuild:
diff --git a/games-strategy/attal/Manifest b/games-strategy/attal/Manifest
index e576c01f0ffb..3aea2c9528dd 100644
--- a/games-strategy/attal/Manifest
+++ b/games-strategy/attal/Manifest
@@ -1,21 +1,44 @@
-MD5 1c8f2aeb132e1f85a15cd8c0e0146a58 ChangeLog 2068
-RMD160 b5c09fca6821e88282b6762b1f6dbd0d3e264e69 ChangeLog 2068
-SHA256 14f41e885314b7e8276879299b8a31d2f6d1ea6eb9206ad4222b7a96041c600c ChangeLog 2068
-MD5 bf2c6bfd562ed7ad305d16cac49644a5 attal-0.9.3.ebuild 1872
-RMD160 937b3d99877fc946677a7efbb6ebcbd1a18a5438 attal-0.9.3.ebuild 1872
-SHA256 0a2cf548e33f3e2b520b0f03259e6d696176c1776f33f7335c93638d00f843dd attal-0.9.3.ebuild 1872
-MD5 21542a229aece115ed7d6ea723094c85 attal-0.9.4.ebuild 1674
-RMD160 445346946f21512685fd045c9252ecf3bb54e5cc attal-0.9.4.ebuild 1674
-SHA256 88c704d139827a6cba74d9b8f1d9dadea20b72f51b9cc6b6d1bba2fbec85d674 attal-0.9.4.ebuild 1674
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0.8.1-gcc34.patch 436 RMD160 76f6de4a68d1c152e9811d26074abd67d6520596 SHA1 d660a67bd8d5a0cfa78cffdef59259f00f7fa758 SHA256 a47e81619da942c8b443e3d1ebb1bdf20686dd1b7f3ad7d5710ff5bf5c5bd06e
 MD5 bc43ed577df6439f1a168a4441031b6c files/0.8.1-gcc34.patch 436
 RMD160 76f6de4a68d1c152e9811d26074abd67d6520596 files/0.8.1-gcc34.patch 436
 SHA256 a47e81619da942c8b443e3d1ebb1bdf20686dd1b7f3ad7d5710ff5bf5c5bd06e files/0.8.1-gcc34.patch 436
-MD5 5e4899bfee7e24bbf648aef045222196 files/digest-attal-0.9.3 135
-RMD160 8715f26146b5a61ebb4439ae8e7dd1dcdc0b8528 files/digest-attal-0.9.3 135
-SHA256 862b24e71b9d341aad68b27e099468a8da24ef6e29133ca1060e41c1c7e3da9c files/digest-attal-0.9.3 135
-MD5 95b5c9723295ad8d5b134c3c46a463ed files/digest-attal-0.9.4 135
-RMD160 381adadffcd2459560e9035e2170626cca32a9b3 files/digest-attal-0.9.4 135
-SHA256 3e5eec36d0fba5df7c53200bb4383fab228603702979db5f6d6abbcf5903189a files/digest-attal-0.9.4 135
+AUX attal-0.9.4-gcc41.patch 424 RMD160 96a26c3c8d6f5aacfdd225ba7dc58ea4a68dbda9 SHA1 9da744c984c3a213d632298506e75567fddf508d SHA256 abbf1a9a4f2f99a0c2ac8639ce8fa5db96ad67d0aa5bc12f9c9e950dd9cbd611
+MD5 4fc33dcb4b26324351a03dc9a1848b24 files/attal-0.9.4-gcc41.patch 424
+RMD160 96a26c3c8d6f5aacfdd225ba7dc58ea4a68dbda9 files/attal-0.9.4-gcc41.patch 424
+SHA256 abbf1a9a4f2f99a0c2ac8639ce8fa5db96ad67d0aa5bc12f9c9e950dd9cbd611 files/attal-0.9.4-gcc41.patch 424
+DIST attal-src-0.9.3.tar.bz2 264443
+DIST attal-src-0.9.4.tar.bz2 271231 RMD160 afe78aa2916ceb57706f01536db401f7bb0ab5ba SHA1 ec1638d28bcb8dd799c35b967623490e0517871a SHA256 0b383b25554b68647e42d80eceb4b56cd5f3d2c960cd582bdeb401ada0207977
+DIST themes-0.9.3.tar.bz2 28763653 RMD160 716eeaa63bf015369709a4e5614818614e37e9b7 SHA1 4921297ec7c43867ad6529e2dbbeb3b0a8fa72b7 SHA256 5c5c01b6aceee8c3d748eef3884ef70d3614abffa28d5d6a396324e2c0653894
+DIST themes-0.9.4.tar.bz2 28740999 RMD160 646d7a60d932565053d62b2fef0fd6ccb3c693cc SHA1 746d4871e81ed7bf35bd379dd8b66776ea1aa752 SHA256 354d80cf453ad844c5a1249a5071b3801a71c9336e8fa5bc1fac70f4f8592d70
+EBUILD attal-0.9.3.ebuild 1872 RMD160 937b3d99877fc946677a7efbb6ebcbd1a18a5438 SHA1 ac14200ac1570392a5bc4bd75d873f5f8da129d0 SHA256 0a2cf548e33f3e2b520b0f03259e6d696176c1776f33f7335c93638d00f843dd
+MD5 bf2c6bfd562ed7ad305d16cac49644a5 attal-0.9.3.ebuild 1872
+RMD160 937b3d99877fc946677a7efbb6ebcbd1a18a5438 attal-0.9.3.ebuild 1872
+SHA256 0a2cf548e33f3e2b520b0f03259e6d696176c1776f33f7335c93638d00f843dd attal-0.9.3.ebuild 1872
+EBUILD attal-0.9.4.ebuild 1714 RMD160 28a4918e924b3519caa598201648ec643eb4fea3 SHA1 9b8ea2a7fdaa5ef6be6356dcd17914c9e5642ce3 SHA256 0c5f7d59fea6955df2156e6c1a50db2c97fc14bee1992dff27b6a5b56bb3365d
+MD5 801d39bcb45ff868d5d9c41f917d272a attal-0.9.4.ebuild 1714
+RMD160 28a4918e924b3519caa598201648ec643eb4fea3 attal-0.9.4.ebuild 1714
+SHA256 0c5f7d59fea6955df2156e6c1a50db2c97fc14bee1992dff27b6a5b56bb3365d attal-0.9.4.ebuild 1714
+MISC ChangeLog 2196 RMD160 e024e7b9f638575ad99f0060d985fb7535bbd523 SHA1 c7fb8b95f4f48355f1a47474bb7b634d6bb83e27 SHA256 c82c531b5655d2a8adc975a8fddbdd16b01d565f7eb93d00333dbc23b1ad976c
+MD5 91d747516189aff747d92a7fe5ecdf55 ChangeLog 2196
+RMD160 e024e7b9f638575ad99f0060d985fb7535bbd523 ChangeLog 2196
+SHA256 c82c531b5655d2a8adc975a8fddbdd16b01d565f7eb93d00333dbc23b1ad976c ChangeLog 2196
+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 63dc9c30c340f10091f4e2e379106a47 files/digest-attal-0.9.3 315
+RMD160 44f40ec2f8cc3aafea7a7e958680bc3793ed2f44 files/digest-attal-0.9.3 315
+SHA256 a6573d11ca8277e716a0a9b87c63fa5aa65c7fae67f0f9166820628b638516a4 files/digest-attal-0.9.3 315
+MD5 57af7c79c40e031fa7b1ec7b7cb0bba8 files/digest-attal-0.9.4 497
+RMD160 c4eb069d1f297de2d72100b6554868d63a10d74a files/digest-attal-0.9.4 497
+SHA256 cbe8f5e8b373c7940d625197753976dc5bd1e191b9a80ac24b29c546f833a88e files/digest-attal-0.9.4 497
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEfK4z2CTtIKiFlQIRAgLnAJ484Rz40BRWkvOjHA/3+kzAgocyXwCdGXse
+zc/yQq8sRqdR2MFeC1RH2+E=
+=Vey2
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/attal/attal-0.9.4.ebuild b/games-strategy/attal/attal-0.9.4.ebuild
index a8b966e8c42a..45d1e2606a99 100644
--- a/games-strategy/attal/attal-0.9.4.ebuild
+++ b/games-strategy/attal/attal-0.9.4.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-strategy/attal/attal-0.9.4.ebuild,v 1.3 2006/02/09 13:56:18 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/attal/attal-0.9.4.ebuild,v 1.4 2006/05/30 20:42:08 tupone Exp $
 
 inherit eutils flag-o-matic games
 
@@ -22,6 +22,7 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}/${P}"-gcc41.patch
 	sed -i \
 		-e "s:\"\./:\"${GAMES_BINDIR}/:" \
 		server/serverInterface.cpp \
diff --git a/games-strategy/attal/files/attal-0.9.4-gcc41.patch b/games-strategy/attal/files/attal-0.9.4-gcc41.patch
new file mode 100644
index 000000000000..c9ef8214e2d5
--- /dev/null
+++ b/games-strategy/attal/files/attal-0.9.4-gcc41.patch
@@ -0,0 +1,12 @@
+diff -ur attal-src-0.9.4-orig/libCommon/creature.h attal-src-0.9.4/libCommon/creature.h
+--- attal-src-0.9.4-orig/libCommon/creature.h	2006-05-25 00:50:11.000000000 -0400
++++ attal-src-0.9.4/libCommon/creature.h	2006-05-25 00:51:51.000000000 -0400
+@@ -38,6 +38,7 @@
+ 
+ class CreatureHandler;
+ class GenericFightUnit;
++int computeSequence( GenericFightUnit * unit );
+ 
+ /** Manage a creature */
+ enum CreatureAnimationType {
+
diff --git a/games-strategy/attal/files/digest-attal-0.9.3 b/games-strategy/attal/files/digest-attal-0.9.3
index 6dba3c64e9b0..5779f796e005 100644
--- a/games-strategy/attal/files/digest-attal-0.9.3
+++ b/games-strategy/attal/files/digest-attal-0.9.3
@@ -1,2 +1,4 @@
 MD5 ff3965097a78f5ce89282447d701edaa attal-src-0.9.3.tar.bz2 264443
 MD5 f06595058cc0eae5fd94a24f250b8363 themes-0.9.3.tar.bz2 28763653
+RMD160 716eeaa63bf015369709a4e5614818614e37e9b7 themes-0.9.3.tar.bz2 28763653
+SHA256 5c5c01b6aceee8c3d748eef3884ef70d3614abffa28d5d6a396324e2c0653894 themes-0.9.3.tar.bz2 28763653
diff --git a/games-strategy/attal/files/digest-attal-0.9.4 b/games-strategy/attal/files/digest-attal-0.9.4
index 95f2378e8277..da93262ca603 100644
--- a/games-strategy/attal/files/digest-attal-0.9.4
+++ b/games-strategy/attal/files/digest-attal-0.9.4
@@ -1,2 +1,6 @@
 MD5 9dd03fe8eaf13180115e9674e905d71a attal-src-0.9.4.tar.bz2 271231
+RMD160 afe78aa2916ceb57706f01536db401f7bb0ab5ba attal-src-0.9.4.tar.bz2 271231
+SHA256 0b383b25554b68647e42d80eceb4b56cd5f3d2c960cd582bdeb401ada0207977 attal-src-0.9.4.tar.bz2 271231
 MD5 d42148697be3251097de5ad2d841ca04 themes-0.9.4.tar.bz2 28740999
+RMD160 646d7a60d932565053d62b2fef0fd6ccb3c693cc themes-0.9.4.tar.bz2 28740999
+SHA256 354d80cf453ad844c5a1249a5071b3801a71c9336e8fa5bc1fac70f4f8592d70 themes-0.9.4.tar.bz2 28740999