Fix compilation with glibc-2.10, wrt bug #276065

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

4 files changed, 27 insertions, 14 deletions

diff --git a/dev-util/elfsh/ChangeLog b/dev-util/elfsh/ChangeLog
index 461f73233923..6ff0be117ded 100644
--- a/dev-util/elfsh/ChangeLog
+++ b/dev-util/elfsh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/elfsh
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/elfsh/ChangeLog,v 1.10 2009/05/02 20:29:16 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/elfsh/ChangeLog,v 1.11 2009/07/22 23:26:52 vostorga Exp $
+
+  22 Jul 2009; Víctor Ostorga <vostorga@gentoo.org>
+  elfsh-0.51_beta3.ebuild, +files/elfsh-0.51_beta3-glibc210.patch:
+  Fix compilation with glibc-2.10, wrt bug #276065
 
   02 May 2009; Mark Loeser <halcy0n@gentoo.org> elfsh-0.51_beta3.ebuild,
   elfsh-0.65_rc1.ebuild:
diff --git a/dev-util/elfsh/Manifest b/dev-util/elfsh/Manifest
index ac8ae153ad14..e77f2756f184 100644
--- a/dev-util/elfsh/Manifest
+++ b/dev-util/elfsh/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.51_beta3-gentoo.patch 2027 RMD160 25addaf101cd9442496c33d8349519793870c79b SHA1 c39b5a44776ad56a6774e4d45b3cf37f6c4c5b93 SHA256 7e2ca434936f97c2726ebf5c1bae92f67b4d0f4de7bbfba9719447eb566da32d
+AUX elfsh-0.51_beta3-glibc210.patch 757 RMD160 ebc883a5e2211064ad737466fca232ee3954d00f SHA1 0e7c19ca6a7e8fcfe28e9a30578dfc6472b1c3fc SHA256 9d606e76f82b092f302584ad0db55e54ecdb480c9893f6e0ead244b773360972
 DIST elfsh-0.51b3-portable.tgz 136679 RMD160 278b2c846335d14953b27fa8946763622acb6303 SHA1 d8afc99cb2966710aa4b6a781ad9008bf0baaeb9 SHA256 ecffe100d0da12235cfe464726313491409739493030f3fbdb3a28696b23447f
 DIST elfsh-0.65_rc1.zip 444993 RMD160 dd7bd496d1f47230d1f734140df47ae439a92b49 SHA1 ef68515f1a89b137ba44314bee3623a742e8b841 SHA256 740e0bda6c368cbf7ceb6082e038d84c155220666c4edbb8dc8724b83d4feb93
-EBUILD elfsh-0.51_beta3.ebuild 1012 RMD160 5b2d9780802b3ec689acb12de46c4b094a26dd66 SHA1 84a8d62f5c161b2441cd48dfb8d0b7da7ac84fff SHA256 0c3bf28a324f2c94e42d9bdbd831972b9c17ac901b022f0b833ba29d12ab5aa1
+EBUILD elfsh-0.51_beta3.ebuild 1075 RMD160 f49fdde6418d6f324dcf5fb776c3c7c56c426d59 SHA1 e5872b2aa66fbc9fffe25e841511917502e79c37 SHA256 960441a3f2432a0563bb91f21706db425c80875d72e1f110c0cc8a313438a58e
 EBUILD elfsh-0.65_rc1.ebuild 1432 RMD160 34a5807e907704c248b1ad2fbe79b12d6c9cb7ef SHA1 39e42ef1d21b9aa2c6f0f1b8f1d7d74b0ba2e020 SHA256 def54e688f03c06b029575e26a12376c77b72893f17bc148e6bbd15409c7dcdc
-MISC ChangeLog 1991 RMD160 7b859436c9cda5e25f5bbeea1161f3c0ed106804 SHA1 bb27923c07e4db0194278eb75e8df5b591e116bf SHA256 1ab5391964a81ed690fc5c123d274a9a7d5f1727c3d81ce5b10db54dfb491cb3
+MISC ChangeLog 2164 RMD160 4b6387df6563cbee7ecf62f493ac64a85251aa32 SHA1 61979ebba7da3ef952dc991d51a0523c05432c05 SHA256 8d9c5ecf14b13187181f8d7a1dbbbf17680d8d7f139ed64e2fcd92fc28a2643f
 MISC metadata.xml 606 RMD160 23ce401ea7dd4560e166009eb3a774c67cc450a2 SHA1 c31adbffe4f69ae03374ff61460b476a3769505a SHA256 7fb12226b4230ba5bbbbfda6f0e76be978114bfc2391f2c9e82b0a09b1e72c1c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkn8rSgACgkQCRZPokWLroR8xgCgmDobz62W/6Ev3J3Smz2w6gMC
-EUIAoLjlLJvMYHSBpfKz1Op1jIahLtey
-=S6pY
------END PGP SIGNATURE-----
diff --git a/dev-util/elfsh/elfsh-0.51_beta3.ebuild b/dev-util/elfsh/elfsh-0.51_beta3.ebuild
index 2051f15b84dd..f01becb4df3b 100644
--- a/dev-util/elfsh/elfsh-0.51_beta3.ebuild
+++ b/dev-util/elfsh/elfsh-0.51_beta3.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/dev-util/elfsh/elfsh-0.51_beta3.ebuild,v 1.6 2009/05/02 20:29:16 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/elfsh/elfsh-0.51_beta3.ebuild,v 1.7 2009/07/22 23:26:52 vostorga Exp $
 
 inherit eutils
 
@@ -17,11 +17,13 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND=">=dev-libs/expat-1.95"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PV}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-glibc210.patch
 	sed -i \
 		-e "s:-g3 -O2:${CFLAGS}:" \
 		`find -name Makefile` \
diff --git a/dev-util/elfsh/files/elfsh-0.51_beta3-glibc210.patch b/dev-util/elfsh/files/elfsh-0.51_beta3-glibc210.patch
new file mode 100644
index 000000000000..8866db7ed31b
--- /dev/null
+++ b/dev-util/elfsh/files/elfsh-0.51_beta3-glibc210.patch
@@ -0,0 +1,16 @@
+diff -NrU5 elfsh-0.51b3.original/vm/include/elfsh.h elfsh-0.51b3/vm/include/elfsh.h
+--- elfsh-0.51b3.original/vm/include/elfsh.h	2009-07-22 23:17:51.000000000 -0600
++++ elfsh-0.51b3/vm/include/elfsh.h	2009-07-22 23:22:30.000000000 -0600
+@@ -469,11 +469,11 @@
+ int		vm_getsort(u_int index, u_int argc, char **argv);
+ int		vm_getdisasm(u_int index, u_int argc, char **argv);
+ int		vm_gethexa(u_int index, u_int argc, char **argv);
+ int		vm_getvarparams(u_int index, u_int argc, char **argv);
+ 
+-int		dprintf(int fd, char *format, ...);
++int		d_printf(int fd, char *format, ...);
+ 
+ /* Libasm resolve handler */
+ void		do_resolve(void *data, u_int vaddr, char *, u_int);
+ u_int		display_instr(int, u_int, u_int, u_int, u_int,
+ 			      char *, u_int, char *);