summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2006-05-21 14:28:57 +0000
committerAlfredo Tupone <tupone@gentoo.org>2006-05-21 14:28:57 +0000
commit321d50302789cda3ee58b306d3c1ebc2cbb7f430 (patch)
treead518af6ea932371bd10e7b9891745e607714006 /games-roguelike/ivan
parentStable on ppc. bug 133942 (diff)
downloadhistorical-321d50302789cda3ee58b306d3c1ebc2cbb7f430.tar.gz
historical-321d50302789cda3ee58b306d3c1ebc2cbb7f430.tar.bz2
historical-321d50302789cda3ee58b306d3c1ebc2cbb7f430.zip
Fix for gcc-4.1
Package-Manager: portage-2.1_rc1-r3
Diffstat (limited to 'games-roguelike/ivan')
-rw-r--r--games-roguelike/ivan/ChangeLog6
-rw-r--r--games-roguelike/ivan/Manifest32
-rw-r--r--games-roguelike/ivan/files/digest-ivan-0.502
-rw-r--r--games-roguelike/ivan/files/ivan-0.50-gcc41.patch58
-rw-r--r--games-roguelike/ivan/ivan-0.50.ebuild8
5 files changed, 101 insertions, 5 deletions
diff --git a/games-roguelike/ivan/ChangeLog b/games-roguelike/ivan/ChangeLog
index c98f1b2193b4..d4694e4ab4e2 100644
--- a/games-roguelike/ivan/ChangeLog
+++ b/games-roguelike/ivan/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-roguelike/ivan
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/ivan/ChangeLog,v 1.7 2006/01/05 05:38:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/ivan/ChangeLog,v 1.8 2006/05/21 14:28:57 tupone Exp $
+
+ 21 May 2006; <Tupone@gentoo.org> +files/ivan-0.50-gcc41.patch,
+ ivan-0.50.ebuild:
+ Fix for gcc-4.1
05 Jan 2006; Michael Sterrett <mr_bones_@gentoo.org> ivan-0.50.ebuild:
turn off -O to prevent segfault in reponse to bug #113627
diff --git a/games-roguelike/ivan/Manifest b/games-roguelike/ivan/Manifest
index 870d8ae736fd..7e56b78d31e4 100644
--- a/games-roguelike/ivan/Manifest
+++ b/games-roguelike/ivan/Manifest
@@ -1,4 +1,30 @@
-MD5 17b3d729b200fa5d0fbcf5487465ed15 ChangeLog 919
-MD5 e37cfae1e95d0608a8ccad181cb5a31c files/digest-ivan-0.50 61
-MD5 3cdc466656c1e53f044fdaac241ca821 ivan-0.50.ebuild 766
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ivan-0.50-gcc41.patch 1778 RMD160 fed503a18b7ce30a989fd8fcbfc081c37c3723fa SHA1 e1672b9d65ca337752acc3f35063ec170c8f2afe SHA256 58318ef7984dde2c30ad4221e6571d97db8b4fe5edfe6d50e0241dda1feff5b5 size 1778
+MD5 00b7beb4d9c0270253ed8fc69470f2d5 files/ivan-0.50-gcc41.patch 1778
+RMD160 fed503a18b7ce30a989fd8fcbfc081c37c3723fa files/ivan-0.50-gcc41.patch 1778
+SHA256 58318ef7984dde2c30ad4221e6571d97db8b4fe5edfe6d50e0241dda1feff5b5 files/ivan-0.50-gcc41.patch 1778
+DIST ivan-0.50.tar.gz 803651 RMD160 7e84340cd8fdfbdaaf7fde730fc0a76b137e2e91 SHA256 d8bc588ad902f27906ab34c2f8a9cace03867b45ff6a57025e046931f36ad480 size 803651
+EBUILD ivan-0.50.ebuild 844 RMD160 49ffd4a1120ac86b0e84e0cf19bcd7166c7b3bb1 SHA1 f31a2e906eaa14659e510fce72ee802cf6cd4202 SHA256 57facc1383c24337e383ec803381c6434f58c332eb75bc32ebe6e1a9bb9eadac size 844
+MD5 3d883f03e2ab8e09fa601b0c38359619 ivan-0.50.ebuild 844
+RMD160 49ffd4a1120ac86b0e84e0cf19bcd7166c7b3bb1 ivan-0.50.ebuild 844
+SHA256 57facc1383c24337e383ec803381c6434f58c332eb75bc32ebe6e1a9bb9eadac ivan-0.50.ebuild 844
+MISC ChangeLog 1020 RMD160 bb8fc38f3ca0342c7084ddf68d2c499360d5671d SHA1 5cb942493a8cd148ddb3e78a0be927bef8e18a60 SHA256 4d87b2958c01bb0c3ab5bf5a75cc925c52ea06fcebdaffb748e2c4a993c2222f size 1020
+MD5 f26f7a969aafe1519d138b2075f3597e ChangeLog 1020
+RMD160 bb8fc38f3ca0342c7084ddf68d2c499360d5671d ChangeLog 1020
+SHA256 4d87b2958c01bb0c3ab5bf5a75cc925c52ea06fcebdaffb748e2c4a993c2222f ChangeLog 1020
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 ca40f76b283032b40f1829c691a794b6 files/digest-ivan-0.50 229
+RMD160 0a363731c21fe90d1d4a14dc089545a042ab887f files/digest-ivan-0.50 229
+SHA256 ef22b60956342f6329efe43268456bf3dacb98c19929415e98159d2179f2b78e files/digest-ivan-0.50 229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD4DBQFEcHk12CTtIKiFlQIRApZHAKCA0yg4weJT9renoBUc2RxmsQitKACY6PzK
+PKozG+NJ5g9VsrK65odtiA==
+=xk3j
+-----END PGP SIGNATURE-----
diff --git a/games-roguelike/ivan/files/digest-ivan-0.50 b/games-roguelike/ivan/files/digest-ivan-0.50
index 6e6c683d13e0..5f1475aa8465 100644
--- a/games-roguelike/ivan/files/digest-ivan-0.50
+++ b/games-roguelike/ivan/files/digest-ivan-0.50
@@ -1 +1,3 @@
MD5 88de761ea3ed34a977cd412ff7d2a36e ivan-0.50.tar.gz 803651
+RMD160 7e84340cd8fdfbdaaf7fde730fc0a76b137e2e91 ivan-0.50.tar.gz 803651
+SHA256 d8bc588ad902f27906ab34c2f8a9cace03867b45ff6a57025e046931f36ad480 ivan-0.50.tar.gz 803651
diff --git a/games-roguelike/ivan/files/ivan-0.50-gcc41.patch b/games-roguelike/ivan/files/ivan-0.50-gcc41.patch
new file mode 100644
index 000000000000..4562ce144a72
--- /dev/null
+++ b/games-roguelike/ivan/files/ivan-0.50-gcc41.patch
@@ -0,0 +1,58 @@
+--- FeLib/Include/fearray.h.old 2006-05-21 16:02:19.000000000 +0200
++++ FeLib/Include/fearray.h 2006-05-21 16:03:16.000000000 +0200
+@@ -34,7 +34,7 @@
+ };
+
+ template <class type>
+-inline fearray<type>::fearray<type>(const fearray<type>& A)
++inline fearray<type>::fearray(const fearray<type>& A)
+ : Data(A.Data), Size(A.Size)
+ {
+ if(Data)
+@@ -42,7 +42,7 @@
+ }
+
+ template <class type>
+-inline fearray<type>::fearray<type>(const type* Array, sizetype Size)
++inline fearray<type>::fearray(const type* Array, sizetype Size)
+ : Size(Size)
+ {
+ char* Ptr = new char[Size * sizeof(type) + sizeof(ulong)];
+--- Main/Source/script.cpp.old 2006-05-21 16:14:43.000000000 +0200
++++ Main/Source/script.cpp 2006-05-21 16:16:12.000000000 +0200
+@@ -471,7 +471,7 @@
+ INIT_ENTRY(Flags);
+ }
+
+-contentscript<character>::contentscript<character>()
++contentscript<character>::contentscript()
+ : INIT(Team, DEFAULT_TEAM),
+ INIT(Flags, 0)
+ { }
+@@ -498,7 +498,7 @@
+ return Instance;
+ }
+
+-contentscript<item>::contentscript<item>()
++contentscript<item>::contentscript()
+ : INIT(Category, ANY_CATEGORY),
+ INIT(MinPrice, 0),
+ INIT(MaxPrice, MAX_PRICE),
+@@ -592,7 +592,7 @@
+ INIT_ENTRY(IsInside);
+ }
+
+-contentscript<olterrain>::contentscript<olterrain>()
++contentscript<olterrain>::contentscript()
+ : INIT(VisualEffects, 0),
+ INIT(AttachedArea, DEFAULT_ATTACHED_AREA),
+ INIT(AttachedEntry, DEFAULT_ATTACHED_ENTRY)
+@@ -679,7 +679,7 @@
+ }
+ }
+
+-template <class type, class contenttype> contentmap<type, contenttype>::contentmap<type, contenttype>() : ContentMap(0) { }
++template <class type, class contenttype> contentmap<type, contenttype>::contentmap() : ContentMap(0) { }
+
+ template <class type, class contenttype> contentmap<type, contenttype>::~contentmap<type, contenttype>()
+ {
diff --git a/games-roguelike/ivan/ivan-0.50.ebuild b/games-roguelike/ivan/ivan-0.50.ebuild
index 9afafa061c90..6904097df7c4 100644
--- a/games-roguelike/ivan/ivan-0.50.ebuild
+++ b/games-roguelike/ivan/ivan-0.50.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/ivan/ivan-0.50.ebuild,v 1.3 2006/01/05 05:38:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/ivan/ivan-0.50.ebuild,v 1.4 2006/05/21 14:28:57 tupone Exp $
inherit flag-o-matic games
@@ -15,6 +15,12 @@ IUSE=""
DEPEND=">=media-libs/libsdl-1.2.0"
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}/${P}"-gcc41.patch
+}
+
src_compile() {
replace-flags -O? -O0 #bug #113627
egamesconf || die