Go multilib, based on a patch by Yuta SATOH in bug #475294

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

3 files changed, 25 insertions, 17 deletions

diff --git a/sys-libs/libcxxrt/ChangeLog b/sys-libs/libcxxrt/ChangeLog
index fd81a1faf4f7..13b49d847870 100644
--- a/sys-libs/libcxxrt/ChangeLog
+++ b/sys-libs/libcxxrt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/libcxxrt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/ChangeLog,v 1.13 2013/06/01 14:15:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/ChangeLog,v 1.14 2013/07/03 21:30:05 aballier Exp $
+
+  03 Jul 2013; Alexis Ballier <aballier@gentoo.org> libcxxrt-9999.ebuild:
+  Go multilib, based on a patch by Yuta SATOH in bug #475294
 
   01 Jun 2013; Alexis Ballier <aballier@gentoo.org>
   libcxxrt-0.0_p20130531.ebuild:
diff --git a/sys-libs/libcxxrt/Manifest b/sys-libs/libcxxrt/Manifest
index 7d9016e442ad..9eebfc0b4467 100644
--- a/sys-libs/libcxxrt/Manifest
+++ b/sys-libs/libcxxrt/Manifest
@@ -9,13 +9,13 @@ DIST libcxxrt-0.0_p20130218.tar.xz 57444 SHA256 27e4c7dcec3603631fb2ff8d0bf8f1c6
 DIST libcxxrt-0.0_p20130531.tar.xz 57452 SHA256 7e3bb7b3a5b9695b607e520b561e494c3b946f8949e57f4bc151c56056003cde SHA512 d262a9bd6db60667e1b613bbe794b0d12b86bb641f192848e38654125850b05330e2eec0b020c92e7b6a8f45fe829c53e60ceb7e125214491418fc9edcdce2c1 WHIRLPOOL ab32fb4725da712568361c936e0bad1d43014eac80e2224c904a821d6ff66c3e6a4d2c350c704d69d31f7a50f6f1eae7f7ad7d9621b68ff7c823ffe0d36fdfc7
 EBUILD libcxxrt-0.0_p20130218.ebuild 1896 SHA256 451195f7a967977d5b55ee137e4a4be1dfa8c9317d50896c6986fd2a929853ad SHA512 50872547d64bc72a218ba6f8f4ab3c2010630cd3e0db0db47247704e891db85cc1dd6b9c91298691a269724954d999dd6279042e1487c73b5b086882a0da6246 WHIRLPOOL e5570749aa66389b6c40376aced751061b2f3ea2e5d6f1c8f24c10e4798dd8ab6d821bfcc4661626aa8b6f379edd6f94365caf02ca5876e4b7da59319ea93ebf
 EBUILD libcxxrt-0.0_p20130531.ebuild 1872 SHA256 754bd4f51188d14ce47e0be750ec2e37971e60dbb0872e931eb43b57108ed8e1 SHA512 facc00a9c6322dc4b773ce0cd0730d7695239112bed19424782767ca99f90f40adc0f801f272c472855268a331c080a2e89358106740bb1c74ab9bb3cd769bed WHIRLPOOL b8001993da61e7251f4a9d56ff5ccf6779ea2df6bc764d39949c7b895f47523b485d534145a5da2152b8baa7923cf649a5f6af577ee1dd4b9c7375586f578a72
-EBUILD libcxxrt-9999.ebuild 1863 SHA256 3db4dcd1bffcb0906dfa5aa1e19744b2070a77b028787aa60d7fbac9e02c9dee SHA512 39982a9c9837618dd475c5d3c2b797f52e331faa3bab361a520360728e85514cf650a4070402df84ebfe8ada22edff6a9541b2cad3d1280b68d411e969b4493a WHIRLPOOL 17e26b6aebc796f6f1cee91f02dc999f53067e684182ce2b229857e28b0b171a4575f0da0b68155953bf392e0db7f92009448f9e72c296027d8811c21308e6e0
-MISC ChangeLog 2789 SHA256 3d99945f3797400ab6951642d2ee5f0a53bb17e47fff51ab6efe8863b1057e08 SHA512 218cc77224bb00a502d825910b6ff1e09c36244a03e77cffb56236d7d10ba3b0436176f024d98f0056d97a3d82a72a7640d14a3128a1b3a7b4580ce311d77137 WHIRLPOOL 0e613dce01630452f4a47c9847139ed877d21cc6963db921e500c3a083f64741142ddcf66d1f6e53b78dd272aaeef1fe596d7bb749cd5f82802c5212d914dfe9
+EBUILD libcxxrt-9999.ebuild 2044 SHA256 9abbf25bc19859bdc116cd68cbfcd0aed32841773cd8e12609a5a573aa0f512f SHA512 39f90216d8c4cf580a071e03efa0147baa77c5e1a2db31b796c9cc29223a3ab0cc615c4bbf39a5c60aa793a0ee6b3504e1886e2ec8d27571324a5ca118ea42e6 WHIRLPOOL 3cfdd5983ab78e68a7eb5f0847aef9cbb6921ed25aeb51ddf7fc71551929895c9310531c580c736cc19864d39bbce5cfe8836f790a1f7a8073a1e3cc49757c70
+MISC ChangeLog 2925 SHA256 169b8c07b278099c052b5ffda65bc28613fc4f3fcb942b56c0cfd953143f91c9 SHA512 3fe33a29c3f8773cf3365bbdd366cae0b05e40a7ccab8d1f79e8cb910cc78b0224af425e2dd36901e0718f9d1fbe6fc16dc320eb94fcba8e322c8d1013fb169d WHIRLPOOL e6e64e7db1b518fbce69bff2acb4629e268d4ad0b8869dff9ff7c3b56d2247ed323464caf15008b440ce325a0b49cd9fedff1be5de7f73d4d914d83f8e399876
 MISC metadata.xml 487 SHA256 8555868cad0dd1e415efdfc947d5ad9ccfea5e68d64d8467487480c15bb594ed SHA512 a377efd893dd484c6d99509d0f5c72a81e0ca3f10078e73110cae45acf8142921265d53f540db854ce1d72b558b380dd645b8f7802aac72f9f761ad0d2767e24 WHIRLPOOL d30b16450bbbe1d7fd4120ebe04e461b89d3575e0ac4a3b1e0956c64172a1bcf0bf6637f58f899f4d6c6ad557bffdccec7c9993202ddf79425f5634882c9891f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGqAggACgkQvFcC4BYPU0oOgQCffP4Z2Ph41cFl+cZ3b3UZF94U
-Ck8AoJ0rArTSjq9+Aw5iCbTxPNL7a5v/
-=EFXP
+iEYEAREIAAYFAlHUl94ACgkQvFcC4BYPU0r+RQCcD4hIT8F2rctgqcozPwnebxUw
+bwgAn2CA/qRfZUDqcD1PXDOeB4fOptrB
+=+/O6
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libcxxrt/libcxxrt-9999.ebuild b/sys-libs/libcxxrt/libcxxrt-9999.ebuild
index 2a42a0d280b2..1c97dc406be3 100644
--- a/sys-libs/libcxxrt/libcxxrt-9999.ebuild
+++ b/sys-libs/libcxxrt/libcxxrt-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/libcxxrt-9999.ebuild,v 1.7 2013/06/01 12:58:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/libcxxrt-9999.ebuild,v 1.8 2013/07/03 21:30:05 aballier Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ EGIT_REPO_URI="git://github.com/pathscale/libcxxrt.git"
 
 [ "${PV%9999}" != "${PV}" ] && SCM="git-2" || SCM=""
 
-inherit base flag-o-matic toolchain-funcs portability ${SCM}
+inherit flag-o-matic toolchain-funcs portability ${SCM} multilib-minimal
 
 DESCRIPTION="C++ Runtime from PathScale, FreeBSD and NetBSD."
 HOMEPAGE="https://github.com/pathscale/libcxxrt http://www.pathscale.com/node/265"
@@ -32,35 +32,40 @@ RDEPEND="libunwind? ( >=sys-libs/libunwind-1.0.1-r1[static-libs?] )"
 DEPEND="${RDEPEND}
 	${DEPEND}"
 
+DOCS=( AUTHORS COPYRIGHT README )
+
 src_prepare() {
-	base_src_prepare
 	cp "${FILESDIR}/Makefile" src/ || die
 	cp "${FILESDIR}/Makefile.test" test/Makefile || die
+	multilib_copy_sources
 }
 
-src_compile() {
+multilib_src_compile() {
 	# Notes: we build -nodefaultlibs to avoid linking to gcc libs.
 	# libcxxrt needs: dladdr (dlopen_lib), libunwind or libgcc_s and the libc.
 	tc-export CC CXX AR
 	append-ldflags "-Wl,-z,defs" # make sure we are not underlinked
-	cd "${S}/src"
+	cd "${BUILD_DIR}/src"
 	LIBS="$(dlopen_lib) -l$(usex libunwind unwind gcc_s) -lc" emake shared
 	use static-libs && emake static
 }
 
-src_test() {
-	cd "${S}/test"
-	LD_LIBRARY_PATH="${S}/src:${LD_LIBRARY_PATH}" LIBS="-L${S}/src -lcxxrt -lc" emake check
+multilib_src_test() {
+	cd "${BUILD_DIR}/test"
+	LD_32_LIBRARY_PATH="${BUILD_DIR}/src:${LD_32_LIBRARY_PATH}" \
+		LD_LIBRARY_PATH="${BUILD_DIR}/src:${LD_LIBRARY_PATH}" \
+		LIBS="-L${BUILD_DIR}/src -lcxxrt -lc" \
+		emake check
 }
 
-src_install() {
+multilib_src_install() {
 	# TODO: See README. Maybe hide it in a subdir and let only libcxx know about
 	# it. FreeBSD head installs it in /lib
 	dolib.so src/${PN}.so*
 	use static-libs && dolib.a src/${PN}.a
+}
 
+multilib_src_install_all() {
 	insinto /usr/include/libcxxrt/
 	doins src/cxxabi.h src/unwind*.h
-
-	dodoc AUTHORS COPYRIGHT README
 }