re-add glibc210 patch

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 34 insertions, 15 deletions

diff --git a/games-rpg/adonthell/ChangeLog b/games-rpg/adonthell/ChangeLog
index f9cf59335986..e009c386394f 100644
--- a/games-rpg/adonthell/ChangeLog
+++ b/games-rpg/adonthell/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-rpg/adonthell
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/ChangeLog,v 1.18 2009/11/21 18:00:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/ChangeLog,v 1.19 2009/11/26 04:01:28 mr_bones_ Exp $
+
+  26 Nov 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  adonthell-0.3.5.ebuild, +files/adonthell-0.3.5-glibc-2.10.patch:
+  re-add glibc210 patch
 
   21 Nov 2009; Markus Meier <maekke@gentoo.org> adonthell-0.3.5.ebuild:
   x86 stable, bug #288816
diff --git a/games-rpg/adonthell/Manifest b/games-rpg/adonthell/Manifest
index 554d5b696826..29931c2205b2 100644
--- a/games-rpg/adonthell/Manifest
+++ b/games-rpg/adonthell/Manifest
@@ -1,22 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.3.4a-configure.in.patch 3310 RMD160 4de8ce67f5362c1d89d64d0ac37687c1e9bba5ab SHA1 818fe23ac15bba79712fb269078d41f4766345d1 SHA256 29883a145e5aaecbec3c526dffc9a75933eb1e6b0f0d536b6ecbb440cd26a17e
 AUX adonthell-0.3.4a-external-libs.patch 3713 RMD160 6abeffb5adc289fec74814ea97e1e57c1b524cfe SHA1 7ece53eed1389804eb1a5c40cf6a748507145520 SHA256 e49b89b079e607d5077daf1e81ec64c81927b36e2cb804f20ff9623746b8c439
 AUX adonthell-0.3.4a-gcc-41.patch 368 RMD160 7809943ceb905846fbda7ac175dddd12eba82888 SHA1 9f2b8d4e3b3f2b3f56d468cacc65186e76a32b2b SHA256 8725778c536ef332586e22451fab31273e4efc1db1b28c3bc6fd2c1498dbb30b
 AUX adonthell-0.3.4a-glibc-2.10.patch 792 RMD160 e3516959c0554009628f78cf0e49b3969b054d51 SHA1 0faaeeda028a24ee38671fd5f3b3eb38476027a3 SHA256 23e1a0ad1f49035c80797bec1ba6740bceb84426938ac4a3f7c7169c32424d31
 AUX adonthell-0.3.4a-inline.patch 432 RMD160 0df619b071ddd582cc34d819a10db234ba64fe58 SHA1 d2800639f56dfad8434a84e987e1fc357907b234 SHA256 b2a1ffec7e75fb1919873c14173ce7f821fb3b7388125c93cfaff551503ae661
 AUX adonthell-0.3.5-configure.in.patch 3310 RMD160 4de8ce67f5362c1d89d64d0ac37687c1e9bba5ab SHA1 818fe23ac15bba79712fb269078d41f4766345d1 SHA256 29883a145e5aaecbec3c526dffc9a75933eb1e6b0f0d536b6ecbb440cd26a17e
+AUX adonthell-0.3.5-glibc-2.10.patch 792 RMD160 e3516959c0554009628f78cf0e49b3969b054d51 SHA1 0faaeeda028a24ee38671fd5f3b3eb38476027a3 SHA256 23e1a0ad1f49035c80797bec1ba6740bceb84426938ac4a3f7c7169c32424d31
 DIST adonthell-src-0.3.4a.tar.gz 680872 RMD160 0ad52d2940375fbddccd387346f84fa8f009a03c SHA1 01c07a138a7c41f5640d4306f2197f71a8554aee SHA256 05e0a282d15dfdac282f9a8fee077e43d09423eb30ae9a1654ada765e3052087
 DIST adonthell-src-0.3.5.tar.gz 877439 RMD160 b0633c7c3c89c51d67ca13d053c5f61c22cfa881 SHA1 8e913173225b351b79db45124f627b436794f845 SHA256 b1b24f26b9f32782793b222c687943442be83fc0d7f5dbb4928a61074be36dd7
 EBUILD adonthell-0.3.4a-r1.ebuild 1529 RMD160 39c82ce3524944530f5224381b382148684a223a SHA1 a91386d0326ad69e29e5ffa6d360b550e18d437f SHA256 9f1aaa1f1057d979aeaf9805c280325ddc1111feb87bfa6faf06ee36f3db13e8
-EBUILD adonthell-0.3.5.ebuild 1257 RMD160 1816500e0cb61e5e907b1d1c78fb71ab39408837 SHA1 7c167c27a82b6e0209be2a6f0a1107e42100e030 SHA256 e1a47202965ad91a8cb861f31e031fe77f2396bfe10977a53aaedb3d88e5d9ec
-MISC ChangeLog 3271 RMD160 29132f7616f1493f28c8f791baa85c0c4edec836 SHA1 914aeee674249109c7897dbbc590a19361754a45 SHA256 b345fde30808b40f81a0b6ab55228f698a7bbb0eec6f0384533305a98a980275
+EBUILD adonthell-0.3.5.ebuild 1304 RMD160 39ae9ad0002e91186c2804a75bfd3ec820794d6e SHA1 231ac2e338608a56e8288e18165796d1f40a9794 SHA256 2e878e42a5ab2a1effa26069014987d75022aad84ddfdfc03e6cc7d8cdb6d941
+MISC ChangeLog 3421 RMD160 325e844609758966b987d19d1bf97009710685c9 SHA1 9a10ae5b51c2ae5f5c29826762846740d574bf52 SHA256 2a270aa087ea97d6f67d49eaa4cd332d7b78e4a74bebf5f9657b18d752aa3e4b
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAksIKssACgkQkKaRLQcq0GJkogCbBhCt6bZX1VtKS239XrVFKRFu
-mKkAnid99PDMskkzOa7e2BOxi1WeBwHu
-=9Mag
------END PGP SIGNATURE-----
diff --git a/games-rpg/adonthell/adonthell-0.3.5.ebuild b/games-rpg/adonthell/adonthell-0.3.5.ebuild
index 491843bc9b96..7c9108d34e34 100644
--- a/games-rpg/adonthell/adonthell-0.3.5.ebuild
+++ b/games-rpg/adonthell/adonthell-0.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/adonthell-0.3.5.ebuild,v 1.2 2009/11/21 18:00:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/adonthell-0.3.5.ebuild,v 1.3 2009/11/26 04:01:28 mr_bones_ Exp $
 
 EAPI=2
 inherit autotools eutils games
@@ -34,7 +34,9 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}-${PV/a/}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-configure.in.patch
+	epatch \
+		"${FILESDIR}"/${P}-configure.in.patch \
+		"${FILESDIR}"/${P}-glibc-2.10.patch
 	rm -f ac{local,include}.m4
 	eautoreconf
 }
diff --git a/games-rpg/adonthell/files/adonthell-0.3.5-glibc-2.10.patch b/games-rpg/adonthell/files/adonthell-0.3.5-glibc-2.10.patch
new file mode 100644
index 000000000000..7aec808cd5f1
--- /dev/null
+++ b/games-rpg/adonthell/files/adonthell-0.3.5-glibc-2.10.patch
@@ -0,0 +1,22 @@
+diff -Naurp adonthell-0.3.4-orig/src/dialog.cc adonthell-0.3.4/src/dialog.cc
+--- adonthell-0.3.4-orig/src/dialog.cc	2005-03-10 12:39:41.000000000 -0600
++++ adonthell-0.3.4/src/dialog.cc	2009-07-26 15:57:01.410882131 -0600
+@@ -265,7 +265,8 @@ string dialog::scan_string (const char *
+ {
+     u_int32 begin, end, len;
+     PyObject *result;
+-    char *tmp, *start, *mid, *str = NULL;
++    const char *start;
++    char *tmp, *mid, *str = NULL;
+     character *the_player = data::the_player;
+     string newstr (s); 
+ 
+@@ -318,7 +319,7 @@ string dialog::scan_string (const char *
+ 
+         // Error!
+         cout << "\n*** Error, unknown macro " << start << flush;
+-        start[0] = ' ';
++        newstr[newstr.length () - strlen (start)] = ' ';
+     }
+     
+     // execute python functions