Drop cross-compiling hacks now that upstream has updated things.

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

3 files changed, 23 insertions, 54 deletions

diff --git a/dev-libs/elfutils/ChangeLog b/dev-libs/elfutils/ChangeLog
index d67a4af10221..fae9fe354ae9 100644
--- a/dev-libs/elfutils/ChangeLog
+++ b/dev-libs/elfutils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/elfutils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/ChangeLog,v 1.158 2012/02/23 22:06:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/ChangeLog,v 1.159 2012/02/28 21:52:39 vapier Exp $
+
+  28 Feb 2012; Mike Frysinger <vapier@gentoo.org> elfutils-0.153.ebuild:
+  Drop cross-compiling hacks now that upstream has updated things.
 
 *elfutils-0.153 (23 Feb 2012)
 
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index a8ac9c4eecb8..9ba88434476d 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -23,23 +23,23 @@ EBUILD elfutils-0.150.ebuild 1748 RMD160 5b632aac813e2507b5ecbe997d9074a257872c9
 EBUILD elfutils-0.151.ebuild 1748 RMD160 5f5a6b12bd9376ec8c4b0608b3471401bfe226ae SHA1 6654039c566905d1c9e51bbe5ae063373e13b605 SHA256 af61869db9596a30a9985b27b68b568ed724730ca3faefae373341c5f8bdc0b0
 EBUILD elfutils-0.152-r1.ebuild 2810 RMD160 e02a0fc254aeb30b540f0f262902b64af71966ed SHA1 7c1d2594d29ff6e95723ee14431faae9fd8f0848 SHA256 546ce3e0841fbd8be5e4fed73c7240e5ff4d7e442e234c5e4bccc04c0d32da47
 EBUILD elfutils-0.152.ebuild 1748 RMD160 276159137c4abbbbf81550486027e393d7f0f060 SHA1 fd1e41ce6c31cd7c0a2f8601e541fad377370b2e SHA256 fad62bce2ca23b765c33e0c2e975d86f0e5632b9eca34f8692ad6addcf747957
-EBUILD elfutils-0.153.ebuild 2807 RMD160 e8ee0a0fc11c31fd56bcbf96099c7c631ec4fc82 SHA1 7d497713f275bb8b609fbc651f6bc2e35148c2c1 SHA256 716a3c0a89131c8ec4cb5d53b7fb2bf59f00f694794944b389c6fd13677e2045
-MISC ChangeLog 21099 RMD160 1d7912bf3a67c330fd9c0d7457f0edd19043f349 SHA1 4f70acba628d343f044324f021d8a7f0862b6a21 SHA256 35c51dcde2d15b1a033bbcf988efa43fa7cad8e2fc955065ddea64945d1130ce
+EBUILD elfutils-0.153.ebuild 1987 RMD160 51a44a2ec225a066dec12024de08bc2b17050d48 SHA1 bc553879f7a35d3c42c69a6a4371fb6f1c81fe5d SHA256 e3925db58e092332982eb5f322f5213ee316932dce7970a3208e021c2d7ef2d7
+MISC ChangeLog 21240 RMD160 b41e6adaa10be2f05456f061bfd050c328b515d5 SHA1 a85c72b3cdd2f667ce34f7c063b3c4272454e75a SHA256 e791d0edad53967b6ffd498ee1839f22e630baa3164182ae50098410e14eb9da
 MISC metadata.xml 281 RMD160 2e23c1850f32822e50d0905b2e36ba1e22c004b2 SHA1 8f2ea427f9a348676d948018d621bea51f0f8740 SHA256 2418a06fe1c33bf09a8cad2a5b582a9a5b4c2d3315e74f67e3b10c4d76f53736
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPRrh7AAoJELEHsLL7fEFWxksQALgI1hNAXsnRPf/cuWYr5KL4
-bNLBD2lrUzKORcyGhnT6O86DheEeFi6YgLkK5Qa3cgCiQ518vGar+kYbUyWH+QSt
-aHcM5+yzCpeGdMXVXcCpEm3J4HjAr0u0SIXIWn+ujdMVZw60A5HzrAf7LBNdmlOi
-DizWXuZydHd+XoTwh9QrYQPRg6Izaa73LR0jyhIksnqcwZ2aOpruApZIw/az7hus
-DbBInL0/fNSYofhfdOjxAme+p3GSmNBMI9eMIBMPZBMCxWZnM8w4MvjGc9H5KS6W
-bX9zQAcAzAPU4rObKSoI9INaHV8qa9eqwNLu+zrkdzvD+YKkYWpFYn3R9VsB9+XA
-4auXaMFC1qK7z6E/kbqCCzRPHeTYnisSEgFT3+fg3kfnJPCsiwmig8r+Wy9TV+LS
-a6DKmKUxzGVMcAtxAPPHU59CrlqI1p01+CHRvdfhkuTLFHKMvvt3d0v1a5de8VJZ
-jmkVZZM1YZjySU1Ar/fIiEw3O+u0vvZYwhIKz25q5VZP0nviKHqc97JXRAqBxkRM
-Db6xEv9w60+5AXmM/IkumH9wAnjfmv9EOc7jymLdnizeQe+rKCtmqxrrTSW/DFu3
-LtpGkMaIwxYvHay4nXHfR0yOJcSALlBQlpDS7V9TCbaiL/fYMO7fXPjCfiZSgqQh
-ofNfeVdYsQ8SdWeszDoJ
-=f6aA
+iQIcBAEBAgAGBQJPTUyvAAoJELEHsLL7fEFW854P/02qz1giin6o9GNKrMpUHtqa
+yXlOW/KwzZ/zRUQMmK8+pZy9agkZQRAjulwzWHoNW7BQNmhDLL43ugfuhj75wMv/
+/4ay1ZyD4ssXT/UpepaEJjxHdj8uL/H8C1dQgQ2+rjD8u4mm+BRcYfXQF4RX2Rwn
+v1OWW1DnksPLKuKxR0W//kmhatDwOXVv2TCnOOcU0A03ZQqRLuPwC1z9nfBRy20K
+DuOXZLjJRcl11Rfpoyx4/GHVPmLI0bxUxC0F/0K3Pp0J9EI9tmSfNiEigq8RRlRI
+i2artbvY6Oej7ntiV8k0wgcaB9VvqEdwW3MpBKu7rJ5g64mxlkWPuaT6xi05McEh
+9EPpOkOssFTOm+cIL9T7dM5MXV3FunWyo3a3RG58SUtAesaY0oFHyHsBojUiJojf
+AdDhreqjGzg4wSVFtF5toyqDF/A5P9IDjbsOoeSnh/t1N0wb67NJrbjkyoGcYosS
+PBluqhr6I8964+cVWVkssmAgqOxVjvTUPltT92viVPztTV+V08VevJWR+dEBuf+2
+wpXt9UEjVGnqsFvpY0P5g7ph6WdZ73NEkNVS9e4Lu7z1d18ZK5ak8RTD3xvilmFi
+LAdo10t2Arz/KFcXtRZ2PIarqOC92Ui2p8WTQKw4yYVlc25pikyAR0ZdkTbq8YbU
+/lUHZEZqadtWfob9T97t
+=P71i
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/elfutils/elfutils-0.153.ebuild b/dev-libs/elfutils/elfutils-0.153.ebuild
index 8afc1aa93eab..b07b8c35a05c 100644
--- a/dev-libs/elfutils/elfutils-0.153.ebuild
+++ b/dev-libs/elfutils/elfutils-0.153.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.153.ebuild,v 1.1 2012/02/23 22:06:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.153.ebuild,v 1.2 2012/02/28 21:52:39 vapier Exp $
 
 EAPI="3"
 
-inherit eutils toolchain-funcs
+inherit eutils
 
 DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
 HOMEPAGE="https://fedorahosted.org/elfutils/"
@@ -36,58 +36,24 @@ src_prepare() {
 	use test || sed -i -e 's: tests::' Makefile.in #226349
 	# some patches touch both configure and configure.ac
 	find -type f -exec touch -r configure {} +
-	mkdir -p ${CBUILD} ${CHOST}
-}
-
-econf_build() {
-	CFLAGS=${BUILD_CFLAGS:--O1 -pipe} \
-	CXXFLAGS=${BUILD_CXXFLAGS:--O1 -pipe} \
-	CPPFLAGS=${BUILD_CPPFLAGS} \
-	LDFLAGS=${BUILD_LDFLAGS} \
-	CC=$(tc-getBUILD_CC) \
-	LD=$(tc-getBUILD_LD) \
-	econf --host=${CBUILD} "$@"
 }
 
 src_configure() {
-	ECONF_SOURCE=${S}
-
-	if tc-is-cross-compiler ; then
-		pushd ${CBUILD} >/dev/null
-		econf_build --disable-nls --without-{zlib,bzlib,lzma}
-		popd >/dev/null
-	fi
-
-	pushd ${CHOST} >/dev/null
 	econf \
 		$(use_enable nls) \
 		--program-prefix="eu-" \
 		$(use_with zlib) \
 		$(use_with bzip2 bzlib) \
 		$(use_with lzma)
-	popd >/dev/null
-}
-
-src_compile() {
-	if tc-is-cross-compiler ; then
-		pushd ${CBUILD} >/dev/null
-		emake -C lib || die
-		emake -C libcpu || die
-		popd >/dev/null
-		ln ${CBUILD}/libcpu/i386_gendis ${CHOST}/libcpu/ || die
-		sed -i -e '/^%_dis.h: %_defs/s: i386_gendis::' ${CHOST}/libcpu/Makefile || die
-	fi
-
-	emake -C ${CHOST} || die
 }
 
 src_test() {
 	env LD_LIBRARY_PATH="${S}/libelf:${S}/libebl:${S}/libdw:${S}/libasm" \
 		LC_ALL="C" \
-		emake -C ${CHOST} -j1 check || die "test failed"
+		emake -j1 check || die "test failed"
 }
 
 src_install() {
-	emake -C ${CHOST} DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog NEWS NOTES README THANKS TODO
 }