Convert to multilib, bug #479316. Stack it for emul-baselibs r12

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 68 insertions, 17 deletions

diff --git a/dev-libs/libelf/ChangeLog b/dev-libs/libelf/ChangeLog
index b0c9d3cc967a..0c1858194a53 100644
--- a/dev-libs/libelf/ChangeLog
+++ b/dev-libs/libelf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libelf
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libelf/ChangeLog,v 1.43 2012/11/29 13:42:25 blueness Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libelf/ChangeLog,v 1.44 2013/08/16 12:36:10 aballier Exp $
+
+*libelf-0.8.13-r2 (16 Aug 2013)
+
+  16 Aug 2013; Alexis Ballier <aballier@gentoo.org> +libelf-0.8.13-r2.ebuild:
+  Convert to multilib, bug #479316. Stack it for emul-baselibs r12
 
   29 Nov 2012; Anthony G. Basile <blueness@gentoo.org> libelf-0.8.13-r1.ebuild:
   Rapid stabilization arm and ppc64
diff --git a/dev-libs/libelf/Manifest b/dev-libs/libelf/Manifest
index d8523669250b..06e1639cf8dd 100644
--- a/dev-libs/libelf/Manifest
+++ b/dev-libs/libelf/Manifest
@@ -4,22 +4,13 @@ Hash: SHA256
 AUX libelf-0.8.13-build.patch 1358 SHA256 8e43936210c2a2e81f29f5e9cd74a462d9f100113b47fde4d35811cb53b0327b SHA512 7971ef661c058d092c7d5c89649c9abdec1b9fea45bb71f442d5a671a754f793b54674a7665614551067733f1c415c4e05be99c7714d78488eb19850a409f98c WHIRLPOOL 0ac387f70d3be35e106faf2e83f003ddaa7fb07bd4e65db22dd237857e8402fbd4d1d889e818ce4f572b3603382f338c97e77d7481232b8ab15bca544af9f6b2
 DIST libelf-0.8.13.tar.gz 148529 SHA256 591a9b4ec81c1f2042a97aa60564e0cb79d041c52faa7416acb38bc95bd2c76d SHA512 d2a4ea8ccc0bbfecac38fa20fbd96aefa8e86f8af38691fb6991cd9c5a03f587475ecc2365fc89a4954c11a679d93460ee9a5890693112f6133719af3e6582fe WHIRLPOOL 9349d18a1c96ad200166b6c39da1cb097894f5e39c34d07b9e168a8172ec4b7838d9c1dd57f2de4fb945fa3a2bab9cf0c78ce983ee6093e83405a67515ac03ce
 EBUILD libelf-0.8.13-r1.ebuild 1329 SHA256 63d136e05ab2a3bd805287570f7e3990bd057da68caeaef603075e530a085392 SHA512 9e88401e5ee99bd3c1328da270141c0e264a83fa8a28645f0aafd6ce21b2a31125ec71991b229f3bffaf95a417a8e2c820a63e57ed4680f71963c559598906a0 WHIRLPOOL 709ea8b1d28b38561b24da11a6b2a3af4eeef4859243a63c2fcfe72a660d38649a4a04ff42331006693598de62e9203f83c39b1d1ba37ced78d57c7a694928cb
-MISC ChangeLog 5392 SHA256 4b0d78e2873465586ab19ac2914bfcf2373c618e6c5bd658988333a68cc67de6 SHA512 2a650fd9844a4915c3740432efa92d2ed6420dc19a9b927d03307a29612a70b300090a2965bc71c4c1dff8ddb476f0a018e00ca223533a3338090e50f2414286 WHIRLPOOL 12d9ad27d357924059879ebc0388e612b635cc84700b564cb4a93a575a3ebf4fea56df5993288f529882f6caf6151b96d0d0df14320bf0d3570eba146097ba78
+EBUILD libelf-0.8.13-r2.ebuild 1575 SHA256 7b293df0ab1e813bb7032236be204717ecb88fd90fc32f4578db6bbd8b9f45e7 SHA512 a8664791b50ef8df0bf36c4cd817dd2ef742f1ae7d95506e28ea7a268fd7aa53be4edb1eac7382b1ae87610edb4f1145c3bb59c30d697f68be9d33a8e4ef428a WHIRLPOOL f6441dee0e41c2b1b84d678e683e8467e5af6e7d219fe44ab0c6a9cb4e3f096349e27fbdbec76443c9726e2bdec93789bfc068f4c8a25e5dc391d16448b4e352
+MISC ChangeLog 5571 SHA256 f16e93c38ac71611df449bb5f525704e165f8f63bce5af6ef039e4d328b66594 SHA512 1e95a0ad6c667fe4f30689b5351faaf229efdb36953e514d978db4ca250cc5c0850ff979e6b7be40b88abbf2e10f0b8d2dbd5c496a8ed658f2b93ab68423acf1 WHIRLPOOL 2104c34239c73c5ff2bdd8c3b8108346c65ea5f8561465450e0672a9f7c8e0ed7fd38313818dad4020e9997a418e64f6e16138b924b7772b688d43e96ce070b9
 MISC metadata.xml 238 SHA256 f13e6e7b65d20beb9ae945d520160ef0dba80c1965754958945904d7e3c0a75f SHA512 3c3d75f1cb90ffcfb98df47481fbde6d451254a29fa87577acd25bc27cbcc3e5dbc0c1efce5974be905428f0b7caf912c8b051417aff92763847fa377493a153 WHIRLPOOL 6ec3d597b87aff99014404b8b732e6f600aafc3c3eeebfab135c9c19cde2e43161cfa23f841bd72826cc3393b724e1dac115c15dcce2b74ace6f1d6ec209dbf3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQt2Y0AAoJEJOE+m71LUu6XwMP/2kUSf0rTNkx18NpQFze81iH
-ddLDwaL7sk5d9znrrW4g+zamzNXvb/8IRdavwkvcUaUpyAlOUYDe9lmVAkpqeAFC
-zs4vC5kJrVgNXZFEwOTXWeebdVJXxd4H9QmpJEu2iFi6ZYZLtlYN0M87ZBllCNYN
-zV7dt+s67yapic/4rarzFZ4zLmJHCe23wmVNOv2cmwmXWKgKW7RzqJCpkqgc7Pha
-ocGaMB19hs7hLcI2Pfw8Xc1RZq7kCFkYikQh1WseHIl5liPis/NqOg8iFC8kEkeb
-4mbcnv0nNaXzDBfijkc39GzAUpEcC/wT8ITp3sR8fkw5AlD9KA0Ranu0J4/XzBkg
-hlDvtmdPu92ml2LuOkN73MyBvmIYr33Ui/kEO/m6+gMgiiypNfFzxQWRMShso9i+
-zZ7f3QIL2lABc+fkApKRQ54ZO86Hbdjux0/jefYlgoQFeuvtT+LPCW0sOvDxMg4N
-o+PzIMJBhTKhRcDBXOv5FOjQ8+M7cq7BE3mKhJHf0biLmB5ruGrAIQ6bd4h/pC89
-sL6qzKhUeD0136vkzBRYUGtF+bv9f5xGI1xAN4JHDqheP5bBc4NZMDQpKpOgIAnu
-8V/Lg1amsKVyA8Xjsi1nliVV1Ahwtdo1Qlprdtwlm3u3iT5NsTvj64x0pWO7xBzF
-3E9r4XvHpxQTLqNW5OVW
-=2Zaq
+iEYEAREIAAYFAlIOHLsACgkQvFcC4BYPU0ru3ACdG89Iw8we/J2GJM56RSeN4luH
+4NUAnRFHVa2T9gk2QBMgio6CyoHwmDO1
+=1EZT
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libelf/libelf-0.8.13-r2.ebuild b/dev-libs/libelf/libelf-0.8.13-r2.ebuild
new file mode 100644
index 000000000000..b1bb4abb9311
--- /dev/null
+++ b/dev-libs/libelf/libelf-0.8.13-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libelf/libelf-0.8.13-r2.ebuild,v 1.1 2013/08/16 12:36:10 aballier Exp $
+
+EAPI="5"
+
+inherit eutils multilib autotools multilib-minimal
+
+DESCRIPTION="A ELF object file access library"
+HOMEPAGE="http://www.mr511.de/software/"
+SRC_URI="http://www.mr511.de/software/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug nls elibc_FreeBSD"
+
+RDEPEND="!dev-libs/elfutils
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20130224-r11
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="nls? ( sys-devel/gettext )"
+
+DOCS=( ChangeLog README )
+MULTILIB_WRAPPED_HEADERS=( /usr/include/libelf/sys_elf.h )
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-build.patch"
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# prefix might want to play with this; unfortunately the stupid
+	# macro used to detect whether we're building ELF is so screwed up
+	# that trying to fix it is just a waste of time.
+	export mr_cv_target_elf=yes
+
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable nls) \
+		--enable-shared \
+		$(use_enable debug)
+}
+
+multilib_src_install() {
+	emake \
+		prefix="${ED}usr" \
+		libdir="${ED}usr/$(get_libdir)" \
+		install \
+		install-compat \
+		-j1 || die
+
+	# Stop libelf from stamping on the system nlist.h
+	use elibc_FreeBSD && rm "${ED}"/usr/include/nlist.h
+}