old

Package-Manager: portage-2.2_pre5

9 files changed, 3 insertions, 377 deletions

diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 255bf6e3c5b7..1470af10f4ed 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -2,35 +2,21 @@
 Hash: SHA1
 
 AUX elfutils-0.118-PaX-support.patch 954 RMD160 ed86dfec7b51b273721f3dd0c6e11bba935e6c1e SHA1 baaaa3686902c3f4ce9f81f7a83e2e66ba1575d2 SHA256 e769e1168dc645ce99655f984f5c19a54d765210cacd098556b6b68743b877fa
-AUX elfutils-0.118-glibc-hacks.patch 368 RMD160 ebd18a941f0c5771c164b7c3754f34acd086cc6d SHA1 d929f8ce58dc759e47ddc38d6017546f7f56edd8 SHA256 917145e0a236a3eb6f222cf2ae84924281c92e55e2054a9990947fe34023a61b
-AUX elfutils-0.118-libelf-link.patch 1495 RMD160 7b69456f49f98caf51ccae2af239a3bd09e0fa8d SHA1 8a15cd628add3975536b35f319acd70a30da6991 SHA256 edb9eaf85521ca15a0fa8282125ae41892fcc577a7c596df9948738ab0d2c180
-AUX elfutils-0.118-no-nested-functions.patch 1961 RMD160 271c15eb11f4fb69e9972928bb47a72e27184df3 SHA1 08aae8d7520d766e66e8314a0d4b5842d73616c4 SHA256 5648aa0a4b4b519c1103fcd7e3f0b6e2009377e1e13e798b20d7c3cbeee12a10
-AUX elfutils-0.120-mkinstalldirs.patch 752 RMD160 523cceb5a3d394ebba88cb5bdb6e0b41daf9e6da SHA1 17786d9131067cf59c57d8de1ac529eae47bd99b SHA256 73cd540e3a473b145d0efa227d8744fcef531834f2b730dd1cfc191b86872ffb
 AUX elfutils-0.131-gnu-inline.patch 8899 RMD160 6c41d63b3e231eda0ba2f337a206bf649ec85729 SHA1 53d0d15bc925f559471e2ab0ad86539208f93140 SHA256 69e1781732b3babd00d6fbc5976f908d293942cc3f253f451e9c22f49ee6b7b6
-DIST elfutils-0.118-patches-1.0.tar.bz2 16369 RMD160 9125f94c0c1c6380100bae6f5d9fb0341001ce2f SHA1 0445a0634521c371c625e454061c5bcce973fe75 SHA256 d61d0849c4e3114d503ec1a3cb477c285f1bddf89178b3011c9948fac14c3bb8
-DIST elfutils-0.118.tar.gz 1083164 RMD160 4952405a42290bffbed9f8ee7f1cfcc7fc3ae8fd SHA1 882029a3fd7cd7d5d1cba4d8d0e238d0e3308ac0 SHA256 e90db35bc93e23b198b60f09fb767ab5bf855921f7fd7e7e00add16772d3fe32
-DIST elfutils-0.123-patches-1.0.tar.bz2 18420 RMD160 a0e0621742ef5ecc39482bdd80950e94738b749e SHA1 cf701e4c3c9f6f2e360bc0d7503276c8dd24f81a SHA256 15820b04bb95f52b26fcdc1057272006fb02e4cbca71b6c2c4d47cd6ab6e9a80
-DIST elfutils-0.123.tar.gz 1146882 RMD160 54dafa4bb272093dffdad90d1f91954a17da0d70 SHA1 a4ea55ac4dbda774b8b30e0b20b12dadb3f60e51 SHA256 e6937a7069618520b610b250bc70cebd5fdf6da1312396e6f4a89f15a0d38834
-DIST elfutils-0.125-patches-1.0.tar.bz2 22285 RMD160 9611429caa1058e1818962f10832feed49da1a60 SHA1 c66953af60c38de62776c8edf0d354c755199285 SHA256 06cb77d60f3352c7c7912c00386e1503296b0dd8e59c5f0aaf83f04bd6d299ed
-DIST elfutils-0.125.tar.gz 1173216 RMD160 27300bd959db43a69b5fb0aa8cd85ea3689949c1 SHA1 a40e6bd8509c0f34409f3b57d7ab49faa022e417 SHA256 491450a8c2cbb4a250a0100cbb63d014b558796c4b4c6570a90f2e98b43e36a4
 DIST elfutils-0.127-patches-1.0.tar.bz2 19950 RMD160 7bd6e8fd52a2c5df3b423a6e9f553a745dab6047 SHA1 20591f01ae916464aa28ca291e96a3d3a632dd4f SHA256 ccaa15294c9a1e11b6b0d0cf20ea2f882a8fbda47141301b5af57db5064f23eb
 DIST elfutils-0.127.tar.gz 1247883 RMD160 f083e5d3d5fdbb82f15a95f4b420c0086d2f52e1 SHA1 2b6074069960ed9258df0efc9899e7a3a0be5aeb SHA256 bb5d2a846dbb5c9e779cec37a0ebdb4b1c8071131cfcce05358a08367281c38a
 DIST elfutils-0.131-patches-1.0.tar.bz2 16640 RMD160 28c168d3d3f6731697354ab867a25c99c387ed32 SHA1 d83422054505c8e265afda85946b930636cc1321 SHA256 f959d97b68a53eedf1712bdfbf496faae0de5a0e2474aa5641a9811263b5ff8e
 DIST elfutils-0.131.tar.gz 1412328 RMD160 18483d0d03e642eafdceabdfcebf88456b5aafba SHA1 d371731e3c09f05aad05f9b02ac2abc049528fac SHA256 947a9566a622f701a2fe2416d3b85b397d38d5f4189da91fc0a306b4d9950e6f
 DIST elfutils_0.131.orig.tar.gz 1412328 RMD160 18483d0d03e642eafdceabdfcebf88456b5aafba SHA1 d371731e3c09f05aad05f9b02ac2abc049528fac SHA256 947a9566a622f701a2fe2416d3b85b397d38d5f4189da91fc0a306b4d9950e6f
-EBUILD elfutils-0.118.ebuild 1761 RMD160 68bcd05f0e005ddab426817af50eda4f7ae2caf5 SHA1 62dd172c0a6e6256b91b473462347ac68630c667 SHA256 7451204a33d72859aafade9264518a1e1f1cd9a6dc96b4d0e1119a4b80845b58
-EBUILD elfutils-0.123.ebuild 1637 RMD160 0501e449df019558384729caf014d2cc569a0cad SHA1 c062c770067ea749407a82d3a84724e3a4232bd4 SHA256 b86cb794db60d54e5f1fceb24cb259873af9d698dfc69e5018151ea34298e614
-EBUILD elfutils-0.125.ebuild 1636 RMD160 121766c9e35bbbe57dc77ec21483813a4654aaba SHA1 96555058dcaf1a90d52a8cc55de6f9883988c6c8 SHA256 d9be4d9f3a21b3b9f80157d0eb902f99fcf6c85dd38a339f9bb42be714491ecd
 EBUILD elfutils-0.127.ebuild 1634 RMD160 e54b2eebd01feae4d5f744b74a659b378f63292e SHA1 8f25094d816c1dda4fdef7ace8e7dee720776f09 SHA256 4122c95b20f86d5d6ac53f5a84d4c947cc837199f970041d66e871f1617133ea
 EBUILD elfutils-0.131-r1.ebuild 1718 RMD160 3f616ab94b1e857de1debb37861393010027d6b1 SHA1 aa77b3e6fbf17a6a345b114cc79e143a44955fa8 SHA256 33dfcd202766305fa203e77c8ef2eee5819f456fddef1f5e063bb5445f4f88c0
 EBUILD elfutils-0.131-r2.ebuild 1673 RMD160 ee2cd8c3081aa633773972416e5714397991794e SHA1 4bcc0da29b0685261c8370f01fae89df173226cb SHA256 282a07329509758fee1ede0f27f397f5091f1f18d03cf2640ce43154d503a302
-EBUILD elfutils-0.131.ebuild 1650 RMD160 742c347e9fce2c83f02c8b251c4c0b07dd216984 SHA1 cf429cdda485964d273650770db75a38afc9465f SHA256 ae972acca05eae85708ac0b25549c1119a3904bcaa7a700ef2700db832a59ee9
 MISC ChangeLog 14714 RMD160 a9c80fa171cfe0f4dfc7dae803544632e0502947 SHA1 3c37472ac384427ac9e3d3efe3a6f37e1016aed9 SHA256 6edf41215380b9dffafb5e9fe26d458fcacc98cad3c5ff4cc3c7b5204ee853d5
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFIJZA/j9hvisErhMIRAlRyAKCzEiYgtA33G2D/vyT4lRqWHVJFjwCbBmOA
-1QnRXqXt4K5tKkO1vBZDepQ=
-=TmPK
+iD8DBQFIJZCGj9hvisErhMIRArO8AJ4g5XmH01IZWG8TKoJrn4eEuRuepQCfYA1O
+N3cDFYBW0a2VvXukYaKt3I8=
+=azgu
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/elfutils/elfutils-0.118.ebuild b/dev-libs/elfutils/elfutils-0.118.ebuild
deleted file mode 100644
index 54008679ec26..000000000000
--- a/dev-libs/elfutils/elfutils-0.118.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.118.ebuild,v 1.19 2007/02/07 03:35:07 vapier Exp $
-
-inherit eutils autotools
-
-PVER="1.0"
-DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
-HOMEPAGE="http://people.redhat.com/drepper/"
-SRC_URI="ftp://sources.redhat.com/pub/systemtap/${PN}/${P}.tar.gz
-	http://dev.gentoo.org/~azarah/${PN}/${P}-patches-${PVER}.tar.bz2
-	mirror://gentoo/${P}-patches-${PVER}.tar.bz2"
-
-LICENSE="OpenSoftware"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-# This pkg does not actually seem to compile currently in a uClibc
-# environment (xrealloc errs), but we need to ensure that glibc never
-# gets pulled in as a dep since this package does not respect virtual/libc
-DEPEND="elibc_glibc? ( >=sys-libs/glibc-2.3.2 )
-	sys-devel/gettext
-	sys-devel/autoconf
-	!dev-libs/libelf"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	EPATCH_SUFFIX="patch" \
-	epatch "${WORKDIR}"/patch/
-	epatch "${FILESDIR}"/${P}-glibc-hacks.patch #130121
-	epatch "${FILESDIR}"/${P}-libelf-link.patch
-	epatch "${FILESDIR}"/${P}-PaX-support.patch
-	epatch "${FILESDIR}"/${P}-no-nested-functions.patch #116968
-
-	eautoreconf
-
-	find . -name Makefile.in -print0 | xargs -0 sed -i -e 's:-W\(error\|extra\)::g'
-}
-
-src_compile() {
-	econf \
-		--program-prefix="eu-" \
-		--enable-shared \
-		|| die "./configure failed"
-	emake || die
-}
-
-src_test() {
-	env LD_LIBRARY_PATH="${S}/libelf:${S}/libebl:${S}/libdw:${S}/libasm" \
-		make check || die "test failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS NOTES README THANKS TODO
-}
diff --git a/dev-libs/elfutils/elfutils-0.123.ebuild b/dev-libs/elfutils/elfutils-0.123.ebuild
deleted file mode 100644
index 614ff9c15e4f..000000000000
--- a/dev-libs/elfutils/elfutils-0.123.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.123.ebuild,v 1.9 2007/08/25 22:38:06 vapier Exp $
-
-inherit eutils autotools
-
-PVER="1.0"
-DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
-HOMEPAGE="http://people.redhat.com/drepper/"
-SRC_URI="ftp://sources.redhat.com/pub/systemtap/${PN}/${P}.tar.gz
-	mirror://gentoo/${P}-patches-${PVER}.tar.bz2"
-
-LICENSE="OpenSoftware"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-# This pkg does not actually seem to compile currently in a uClibc
-# environment (xrealloc errs), but we need to ensure that glibc never
-# gets pulled in as a dep since this package does not respect virtual/libc
-DEPEND="elibc_glibc? ( >=sys-libs/glibc-2.3.2 )
-	sys-devel/gettext
-	sys-devel/autoconf
-	>=sys-devel/binutils-2.15.90.0.1
-	>=sys-devel/gcc-3.3.3
-	!dev-libs/libelf"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/patch/*.patch
-	# this will make more files +x than need be, but who cares really
-	chmod a+rx config/*
-
-	AT_M4DIR="${S}/m4" eautoreconf
-	find . -name Makefile.in -print0 | xargs -0 sed -i -e 's:-W\(error\|extra\)::g'
-}
-
-src_compile() {
-	econf \
-		--program-prefix="eu-" \
-		--enable-shared \
-		|| die "./configure failed"
-	emake || die
-}
-
-src_test() {
-	env LD_LIBRARY_PATH="${S}/libelf:${S}/libebl:${S}/libdw:${S}/libasm" \
-		make check || die "test failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS NOTES README THANKS TODO
-}
diff --git a/dev-libs/elfutils/elfutils-0.125.ebuild b/dev-libs/elfutils/elfutils-0.125.ebuild
deleted file mode 100644
index d03523f10e10..000000000000
--- a/dev-libs/elfutils/elfutils-0.125.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.125.ebuild,v 1.9 2007/05/12 02:40:05 kumba Exp $
-
-inherit eutils autotools
-
-PVER="1.0"
-DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
-HOMEPAGE="http://people.redhat.com/drepper/"
-SRC_URI="ftp://sources.redhat.com/pub/systemtap/${PN}/${P}.tar.gz
-	mirror://gentoo/${P}-patches-${PVER}.tar.bz2"
-
-LICENSE="OpenSoftware"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-# This pkg does not actually seem to compile currently in a uClibc
-# environment (xrealloc errs), but we need to ensure that glibc never
-# gets pulled in as a dep since this package does not respect virtual/libc
-DEPEND="elibc_glibc? ( >=sys-libs/glibc-2.3.2 )
-	sys-devel/gettext
-	sys-devel/autoconf
-	>=sys-devel/binutils-2.15.90.0.1
-	>=sys-devel/gcc-3.3.3
-	!dev-libs/libelf"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/patch/*.patch
-	# this will make more files +x than need be, but who cares really
-	chmod a+rx config/*
-
-	AT_M4DIR="${S}/m4" eautoreconf
-	find . -name Makefile.in -print0 | xargs -0 sed -i -e 's:-W\(error\|extra\)::g'
-}
-
-src_compile() {
-	econf \
-		--program-prefix="eu-" \
-		--enable-shared \
-		|| die "./configure failed"
-	emake || die
-}
-
-src_test() {
-	env LD_LIBRARY_PATH="${S}/libelf:${S}/libebl:${S}/libdw:${S}/libasm" \
-		make check || die "test failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS NOTES README THANKS TODO
-}
diff --git a/dev-libs/elfutils/elfutils-0.131.ebuild b/dev-libs/elfutils/elfutils-0.131.ebuild
deleted file mode 100644
index bd5dc61d60a8..000000000000
--- a/dev-libs/elfutils/elfutils-0.131.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.131.ebuild,v 1.1 2007/12/30 19:00:07 flameeyes Exp $
-
-inherit eutils autotools
-
-PVER="1.0"
-DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
-HOMEPAGE="http://people.redhat.com/drepper/"
-SRC_URI="ftp://sources.redhat.com/pub/systemtap/${PN}/${P}.tar.gz
-	mirror://gentoo/${P}-patches-${PVER}.tar.bz2"
-
-LICENSE="OpenSoftware"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-# This pkg does not actually seem to compile currently in a uClibc
-# environment (xrealloc errs), but we need to ensure that glibc never
-# gets pulled in as a dep since this package does not respect virtual/libc
-DEPEND="elibc_glibc? ( >=sys-libs/glibc-2.3.2 )
-	sys-devel/gettext
-	sys-devel/autoconf
-	>=sys-devel/binutils-2.15.90.0.1
-	>=sys-devel/gcc-3.3.3
-	!dev-libs/libelf"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/patch/*.patch
-	# this will make more files +x than need be, but who cares really
-	chmod a+rx config/*
-
-	AT_M4DIR="${S}/m4" eautoreconf
-	find . -name Makefile.in -print0 | xargs -0 sed -i -e 's:-W\(error\|extra\)::g'
-}
-
-src_compile() {
-	econf \
-		--program-prefix="eu-" \
-		--enable-shared \
-		|| die "./configure failed"
-	emake || die
-}
-
-src_test() {
-	env LD_LIBRARY_PATH="${S}/libelf:${S}/libebl:${S}/libdw:${S}/libasm" \
-		make check || die "test failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS NOTES README THANKS TODO
-}
diff --git a/dev-libs/elfutils/files/elfutils-0.118-glibc-hacks.patch b/dev-libs/elfutils/files/elfutils-0.118-glibc-hacks.patch
deleted file mode 100644
index 829a3f61f5c0..000000000000
--- a/dev-libs/elfutils/files/elfutils-0.118-glibc-hacks.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/130121#c8
-
---- src/strings.c
-+++ src/strings.c
-@@ -480,6 +480,10 @@
-       if (mem != MAP_FAILED)
- 	{
- 	  /* We will go through the mapping sequentially.  */
-+/* hack for old glibc systems */
-+#ifndef POSIX_MADV_SEQUENTIAL
-+# define POSIX_MADV_SEQUENTIAL 2
-+#endif
- 	  (void) posix_madvise (mem, map_size, POSIX_MADV_SEQUENTIAL);
- 	  break;
- 	}
diff --git a/dev-libs/elfutils/files/elfutils-0.118-libelf-link.patch b/dev-libs/elfutils/files/elfutils-0.118-libelf-link.patch
deleted file mode 100644
index 9bb2d6065f59..000000000000
--- a/dev-libs/elfutils/files/elfutils-0.118-libelf-link.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-libdw needs libelf
-
-http://bugs.gentoo.org/115385
-
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -93,7 +93,7 @@
- ld_LDFLAGS = -rdynamic
- elflint_LDADD  = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
- findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap)
--addr2line_LDADD = $(libdw) $(libmudflap)
-+addr2line_LDADD = $(libdw) $(libelf) $(libmudflap)
- elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) -ldl
- objdump_LDADD  = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
- ranlib_LDADD = $(libelf) $(libeu) $(libmudflap)
---- tests/Makefile.am
-+++ tests/Makefile.am
-@@ -160,12 +160,12 @@
- get_aranges_LDADD = $(libdw) $(libelf) $(libmudflap)
- allfcts_LDADD = $(libdw) $(libelf) $(libmudflap)
- line2addr_no_Wformat = yes
--line2addr_LDADD = $(libdw) $(libmudflap)
--addrscopes_LDADD = $(libdw) $(libmudflap)
--funcscopes_LDADD = $(libdw) $(libmudflap)
--funcretval_LDADD = $(libdw) $(libmudflap)
--allregs_LDADD = $(libdw) $(libmudflap)
--find_prologues_LDADD = $(libdw) $(libmudflap)
-+line2addr_LDADD = $(libdw) $(libelf) $(libmudflap)
-+addrscopes_LDADD = $(libdw) $(libelf) $(libmudflap)
-+funcscopes_LDADD = $(libdw) $(libelf) $(libmudflap)
-+funcretval_LDADD = $(libdw) $(libelf) $(libmudflap)
-+allregs_LDADD = $(libdw) $(libelf) $(libmudflap)
-+find_prologues_LDADD = $(libdw) $(libelf) $(libmudflap)
- #show_ciefde_LDADD = ../libdwarf/libdwarf.so $(libelf) $(libmudflap)
- asm_tst1_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl
- asm_tst2_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl
diff --git a/dev-libs/elfutils/files/elfutils-0.118-no-nested-functions.patch b/dev-libs/elfutils/files/elfutils-0.118-no-nested-functions.patch
deleted file mode 100644
index f89158b1a1b3..000000000000
--- a/dev-libs/elfutils/files/elfutils-0.118-no-nested-functions.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Using nested functions causes gcc to generate trampolines which
-requires an executable stack.
-
-http://bugs.gentoo.org/116968
-
---- elfutils/src/nm.c
-+++ elfutils/src/nm.c
-@@ -926,23 +926,22 @@
- /* Maximum size of memory we allocate on the stack.  */
- #define MAX_STACK_ALLOC	65536
- 
--static void
--show_symbols (Ebl *ebl, GElf_Ehdr *ehdr, Elf_Scn *scn, Elf_Scn *xndxscn,
--	      GElf_Shdr *shdr, const char *prefix, const char *fname,
--	      const char *fullname)
--{
-+/* hack to avoid nested functions -> executable stack */
-+static Ebl *_show_symbols_ebl;
-+static GElf_Shdr *_show_symbols_shdr;
-+static
-   int sort_by_name (const void *p1, const void *p2)
-     {
-       GElf_SymX *s1 = (GElf_SymX *) p1;
-       GElf_SymX *s2 = (GElf_SymX *) p2;
-       int result;
- 
--      result = strcmp (elf_strptr (ebl->elf, shdr->sh_link, s1->sym.st_name),
--		       elf_strptr (ebl->elf, shdr->sh_link, s2->sym.st_name));
-+      result = strcmp (elf_strptr (_show_symbols_ebl->elf, _show_symbols_shdr->sh_link, s1->sym.st_name),
-+		       elf_strptr (_show_symbols_ebl->elf, _show_symbols_shdr->sh_link, s2->sym.st_name));
- 
-       return reverse_sort ? -result : result;
-     }
--
-+static
-   int sort_by_address (const void *p1, const void *p2)
-     {
-       GElf_SymX *s1 = (GElf_SymX *) p1;
-@@ -954,6 +953,11 @@
-       return reverse_sort ? -result : result;
-     }
- 
-+static void
-+show_symbols (Ebl *ebl, GElf_Ehdr *ehdr, Elf_Scn *scn, Elf_Scn *xndxscn,
-+	      GElf_Shdr *shdr, const char *prefix, const char *fname,
-+	      const char *fullname)
-+{
-   /* Get the section header string table index.  */
-   size_t shstrndx;
-   if (elf_getshstrndx (ebl->elf, &shstrndx) < 0)
-@@ -1129,6 +1133,8 @@
-   nentries = nentries_used;
- 
-   /* Sort the entries according to the users wishes.  */
-+  _show_symbols_ebl = ebl;
-+  _show_symbols_shdr = shdr;
-   if (sort == sort_name)
-     qsort (sym_mem, nentries, sizeof (GElf_SymX), sort_by_name);
-   else if (sort == sort_numeric)
diff --git a/dev-libs/elfutils/files/elfutils-0.120-mkinstalldirs.patch b/dev-libs/elfutils/files/elfutils-0.120-mkinstalldirs.patch
deleted file mode 100644
index 1af1b990182c..000000000000
--- a/dev-libs/elfutils/files/elfutils-0.120-mkinstalldirs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- libelf-po/Makefile.in.in
-+++ libelf-po/Makefile.in.in
-@@ -28,7 +28,7 @@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- MKINSTALLDIRS = @MKINSTALLDIRS@
--mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
-+mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
- 
- GMSGFMT = @GMSGFMT@
- MSGFMT = @MSGFMT@
---- po/Makefile.in.in
-+++ po/Makefile.in.in
-@@ -28,7 +28,7 @@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- MKINSTALLDIRS = @MKINSTALLDIRS@
--mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
-+mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
- 
- GMSGFMT = @GMSGFMT@
- MSGFMT = @MSGFMT@