gcc-4.1 fix, bug #121081

Package-Manager: portage-2.1_pre7-r3

4 files changed, 33 insertions, 14 deletions

diff --git a/games-rpg/adonthell/ChangeLog b/games-rpg/adonthell/ChangeLog
index 0be88cbcc382..dd4b0d0e43ba 100644
--- a/games-rpg/adonthell/ChangeLog
+++ b/games-rpg/adonthell/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-rpg/adonthell
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/ChangeLog,v 1.9 2006/03/23 22:54:51 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/ChangeLog,v 1.10 2006/04/03 18:59:18 tupone Exp $
+
+  03 Apr 2006; <Tupone@gentoo.org> +files/adonthell-0.3.4a-gcc-41.patch,
+  adonthell-0.3.4a.ebuild:
+  gcc-4.1 fix, bug #121081 by Jan Jitse Venselaar
 
   23 Mar 2006; <Tupone@gentoo.org> files/0.3.4a-configure.in.patch:
   Linking problem, missing -lutil, bug #111236 by Luu Danh Hieu
diff --git a/games-rpg/adonthell/Manifest b/games-rpg/adonthell/Manifest
index 595bd95d499e..bef536676ec5 100644
--- a/games-rpg/adonthell/Manifest
+++ b/games-rpg/adonthell/Manifest
@@ -1,21 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 dfe32e838a8ed986e2dcec856061d02c ChangeLog 1828
-RMD160 e66d90609ad0f41643d9c66d0ab32142cb160f9c ChangeLog 1828
-SHA256 37e8e3fc9ad8102ef5f3a5d378a3cb96ae3ca60ad9c0d112c2156cbd0ab60a2c ChangeLog 1828
+MD5 ac002a3cb0e4736dfeeb6f3aa73fc171 ChangeLog 1980
+RMD160 cf33a1d5f67078674f0b0fdbb09311a42ffee94a ChangeLog 1980
+SHA256 ace4126bd65bdc5be608a5217c38d50a90162d90c276d8f48731607966ffa801 ChangeLog 1980
 MD5 73d4b7e27d435af64ffcc6b24b1d43f7 adonthell-0.3.3-r1.ebuild 1217
 RMD160 6e96161df2f37661eed0e8caff9d6e6632db49b3 adonthell-0.3.3-r1.ebuild 1217
 SHA256 22bf7ace0fe48e4523367bff810581d2934ea6be60d8bf5220f1682dce000c62 adonthell-0.3.3-r1.ebuild 1217
-MD5 47b1922be8c7e82000af8d01e57b0814 adonthell-0.3.4a.ebuild 1412
-RMD160 5483b634337bb92924ef5dd417056b249e3efb4a adonthell-0.3.4a.ebuild 1412
-SHA256 1fb89b32411c3592b983f5f30ba7bc9f233f3d1ee839365efea0a89af50a76aa adonthell-0.3.4a.ebuild 1412
+MD5 9160c8358662e00979a978271590424c adonthell-0.3.4a.ebuild 1448
+RMD160 7222bf8266684808ff204b8bc3cf17239b04b4e9 adonthell-0.3.4a.ebuild 1448
+SHA256 8bc7a786a4280c4983d991ca4269a902f26307743a0388843526d4acfc829afa adonthell-0.3.4a.ebuild 1448
 MD5 f8819f0b8b8a019c2ab89d7c707665eb files/0.3.3-configure.in.patch 2957
 RMD160 769e470899becf31390d90d29223b1204fe30a80 files/0.3.3-configure.in.patch 2957
 SHA256 a1a35d88a31ca70e9b30f0e456414da17adad9dc31359e73fd3fcbaa15370157 files/0.3.3-configure.in.patch 2957
 MD5 a0765112fe0c2b1b0d15cca93141c3eb files/0.3.4a-configure.in.patch 2964
 RMD160 251fac9fbb7bb6e1bd3ccc54faa392755181212e files/0.3.4a-configure.in.patch 2964
 SHA256 fc9ffbc5cc1cba59f48909be92804e7d1d8b21c56e5dfff8449d84aff2cff2a2 files/0.3.4a-configure.in.patch 2964
+MD5 e0df3c89f64308db7e23f21e9d654b5c files/adonthell-0.3.4a-gcc-41.patch 368
+RMD160 7809943ceb905846fbda7ac175dddd12eba82888 files/adonthell-0.3.4a-gcc-41.patch 368
+SHA256 8725778c536ef332586e22451fab31273e4efc1db1b28c3bc6fd2c1498dbb30b files/adonthell-0.3.4a-gcc-41.patch 368
 MD5 e944f3812b6938f625c3a2bba14b3b35 files/digest-adonthell-0.3.3-r1 72
 RMD160 b570716d9a8a48c92c390566ccfed7f9fa96fe05 files/digest-adonthell-0.3.3-r1 72
 SHA256 19c53539821960785392c108709099c234104c1343c4aba242cd6722adc1147b files/digest-adonthell-0.3.3-r1 72
@@ -26,9 +29,9 @@ MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEIydX2CTtIKiFlQIRAiaKAKCT1J86aMt2uVUff5HZuC3ApHMSewCgiPGx
-ff87B1H/e2q0cu8PnEExSoY=
-=RFhn
+iD8DBQFEMXCi2CTtIKiFlQIRAs0rAKCsUaoB2UVsXbamtR9OtFbSudZxywCgrR+I
+S4iE46B+KDAtzD+onON+3EU=
+=LlY/
 -----END PGP SIGNATURE-----
diff --git a/games-rpg/adonthell/adonthell-0.3.4a.ebuild b/games-rpg/adonthell/adonthell-0.3.4a.ebuild
index c0e814bdb4db..79c40644ee00 100644
--- a/games-rpg/adonthell/adonthell-0.3.4a.ebuild
+++ b/games-rpg/adonthell/adonthell-0.3.4a.ebuild
@@ -1,6 +1,6 @@
-# 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/games-rpg/adonthell/adonthell-0.3.4a.ebuild,v 1.4 2005/07/14 00:52:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/adonthell-0.3.4a.ebuild,v 1.5 2006/04/03 18:59:18 tupone Exp $
 
 inherit eutils games
 
@@ -30,7 +30,8 @@ S=${WORKDIR}/${PN}-${PV/a/}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-configure.in.patch
+	epatch "${FILESDIR}"/${PV}-configure.in.patch \
+		"${FILESDIR}/${P}"-gcc-41.patch
 	rm -f ac{local,include}.m4
 	aclocal && \
 	libtoolize -c -f && \
diff --git a/games-rpg/adonthell/files/adonthell-0.3.4a-gcc-41.patch b/games-rpg/adonthell/files/adonthell-0.3.4a-gcc-41.patch
new file mode 100644
index 000000000000..bc452058633e
--- /dev/null
+++ b/games-rpg/adonthell/files/adonthell-0.3.4a-gcc-41.patch
@@ -0,0 +1,11 @@
+--- src/drawing_area.h	2005-03-10 19:39:38.000000000 +0100
++++ src/drawing_area.h.new	2006-01-31 19:46:07.000000000 +0100
+@@ -156,7 +156,7 @@
+      * 
+      * @return drawing_area which has the same dimensions and location as r.
+      */
+-    drawing_area& drawing_area::operator = (SDL_Rect& r); 
++    drawing_area& operator = (SDL_Rect& r); 
+ #endif
+     
+     /**