Go multilib, based on the work of Yuta SATOH in bug #475294

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

3 files changed, 30 insertions, 22 deletions

diff --git a/sys-libs/libcxx/ChangeLog b/sys-libs/libcxx/ChangeLog
index cd8612ec5d53..43e3bce8114d 100644
--- a/sys-libs/libcxx/ChangeLog
+++ b/sys-libs/libcxx/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/libcxx
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.23 2013/07/03 21:17:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.24 2013/07/03 21:52:45 aballier Exp $
+
+  03 Jul 2013; Alexis Ballier <aballier@gentoo.org> libcxx-9999.ebuild:
+  Go multilib, based on the work of Yuta SATOH in bug #475294
 
   03 Jul 2013; Alexis Ballier <aballier@gentoo.org> libcxx-9999.ebuild,
   +files/Makefile:
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 24bea406aeff..80c094560a53 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -10,13 +10,13 @@ DIST libcxx-0.0_p20130531.tar.xz 804716 SHA256 41c3d40d37378f4d3f065f884df6b3e0c
 EBUILD libcxx-0.0_p20130218.ebuild 1762 SHA256 73ec38dcc52bb2e35172dcb99ae667a976ade6a672b6c6e0e3e503460866b3ae SHA512 57abd59e833f5594b19505363e492efaef70872d0e8e31d8fca1667380f21fe67d266b6b7dab1a6b3aeb906039d93e51081da85b0c43e1f4e1c4f65b3d4d75f7 WHIRLPOOL 94de3f70ba4083e95b85a81d3518c5d0af5655547f389cc87ed917e424b22e671850191efaf3bafc997b8d24c569ec6b39b6d72886c9e75c570d86e451264de8
 EBUILD libcxx-0.0_p20130531-r1.ebuild 4125 SHA256 bf5a4d84369351c86aaf51d9ba4f530eac8427106db936456fbb0517c9ae7372 SHA512 f6e7c455280a3bf30fc9378299b10dbcde89f7d85850c7644632be9052d3e3bfac167f47a2a1c67e647783152b3d68c3d30f8aface2a1eaa5e330f17d9a56a7f WHIRLPOOL bda77f7a7365f887257d3f6e09f537b469baddbdd77a03763d49da750f0ec43450d2bc4aff4f39b80188a26ac587710db604c346d78967ca591674714598d7e5
 EBUILD libcxx-0.0_p20130531.ebuild 2872 SHA256 46ec7affff2212776a32ee9c4879016f8b07cf942f55f45e374c5594ae48d5e4 SHA512 63808230eff4b71bec89e003c89987da83429bdaf5975b257860ed0a48dc0a6b7c9de409e5783a0c87d2b67b9e112cc9d90e74cba46629fbb35960b5e98234db WHIRLPOOL b9497c69346d2e3f4220bdb545373f2a9012bc6e7da8c23a97e4ac8fb54d482c0e0d7d898c53e0e10fdb907d7a44552d1f5fd166c02c7111044ceced747edad2
-EBUILD libcxx-9999.ebuild 3632 SHA256 cc14faa77638d0c5faa888d3ad3268dcc6eb22413752828206651c73b4801229 SHA512 2a45779275385a8afad8f99c57c039c4861cd521dd372c4bf8fce02ae7f60a3fa54501049b89044b0129fe58987171e8aef55a09241328b1a39de6db4f6b6bd1 WHIRLPOOL 1d5ce9d0bb80bdd23e5416141f5212841e69d22c0192f91ba46f63a5e38d46727551a9c9c70cff1c3456fe23cfe2de46eba88a58ccab0980a6ce32891e9623fd
-MISC ChangeLog 3846 SHA256 446daad24a90d71304d3d4a34e970fb844e5709d5b7a584950164b81bf7645f4 SHA512 87a0ad57d50c4ea004d8286b93362daf0e6381446463278291fe67aeeae3f52a26f7fba17d94d6afc1a94f70453649acc2ff2f9cfc4e970dd512a914049f5605 WHIRLPOOL cfc7d286d61a56d2d478704d0e0e7e8be3ee36b5ddbbd27a3363d1a29dfced1738368cd5e5fb6def3db541f455fffda18d52ef8c76eeb44ceb58f2d6ce3c7398
+EBUILD libcxx-9999.ebuild 3901 SHA256 69b9d1710c9311aee618f73e3f4c2ce84f3111a4272e5ebd4c55ea785142dea0 SHA512 59f86b471a25882c76951fcadf4c338ec3e330b2bdaec87886e6407929cb27b5e2d47fef15aaed6875226470d5fed5b4981c7c5d7ad5a278b1e83d13d89fcebb WHIRLPOOL 68b43d4b7b01e931f211d5f053670f2c8f2b5af4c76a47d3ee1cfd689b75df5c91767c60433f2cecba4d44b407cbad959c185441b011d8357b719e63a83be908
+MISC ChangeLog 3981 SHA256 751d34b130aa65d168adf4967aa5b49eacb343f06b70ee00e843b0d6f37413c5 SHA512 0f52be2b095125950c354ce107ff1b6b88ed257f0f9292b28fb379086cd31c68dfae9e7ef40fa6e0a5f6bd9254800c9051b2283aa5720d4775b0c79dba36afd8 WHIRLPOOL 27e01ab216f705a2ab091b07568d10d9b8909fe1ba0bce6e9dadcdbf5aeac385ffb00530fc4fe12af7e291e11cd312ba5d074d389ca3cde906dc55b48ba8f3d4
 MISC metadata.xml 558 SHA256 c9fe7077a8c7f767d7cdbe154d85dd344fb86ea246b16613242c70a40f3e1ef2 SHA512 3f324c4959a7c9f2613b29928957fd010b35c6e9c1601f0296e7e8b7c8d59a3c27c5c04fef87ac825f2f7bb07553bc617c4405e1e22847dc8db3e7a1ebb21f50 WHIRLPOOL 3ade5e3852afcd533c89ce0aeead55101f23d1b31825718bfccd60fac485961df617c93962be4c60333a21335dcd6bb5630c8002fe06f456c4e177c14d434455
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHUlN4ACgkQvFcC4BYPU0q4UQCfbYayirEJaIWdkaOTNPweC1EF
-QZoAnA1WKu+pCK1sO8gY4z1cMCWIwwRJ
-=Qkni
+iEYEAREIAAYFAlHUnS4ACgkQvFcC4BYPU0pWFwCfd1opYJsStv2boOD0jRkj2HiN
+xkEAn0LREqI6PbDjYkEFrvnKL5hyWDZx
+=13nj
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libcxx/libcxx-9999.ebuild b/sys-libs/libcxx/libcxx-9999.ebuild
index 2b448f475f12..abffa7b00431 100644
--- a/sys-libs/libcxx/libcxx-9999.ebuild
+++ b/sys-libs/libcxx/libcxx-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/libcxx/libcxx-9999.ebuild,v 1.15 2013/07/03 21:17:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.16 2013/07/03 21:52:45 aballier Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ ESVN_REPO_URI="http://llvm.org/svn/llvm-project/libcxx/trunk"
 
 [ "${PV%9999}" != "${PV}" ] && SCM="subversion" || SCM=""
 
-inherit ${SCM} flag-o-matic toolchain-funcs multilib
+inherit ${SCM} flag-o-matic toolchain-funcs multilib multilib-minimal
 
 DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
 HOMEPAGE="http://libcxx.llvm.org/"
@@ -27,17 +27,20 @@ else
 fi
 IUSE="elibc_glibc +libcxxrt static-libs test"
 
-RDEPEND="libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130530[static-libs?] )
+RDEPEND="libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130530[static-libs?,${MULTILIB_USEDEP}] )
 	!libcxxrt? ( sys-devel/gcc[cxx] )"
 DEPEND="${RDEPEND}
 	test? ( sys-devel/clang )
 	app-arch/xz-utils"
 
+DOCS=( CREDITS.TXT )
+
 src_prepare() {
 	cp -f "${FILESDIR}/Makefile" lib/ || die
+	multilib_copy_sources
 }
 
-src_compile() {
+src_configure() {
 	export LIBS="-lpthread -lrt -lc -lgcc_s"
 	if use libcxxrt ; then
 		append-cppflags -DLIBCXXRT "-I${EPREFIX}/usr/include/libcxxrt/"
@@ -53,19 +56,22 @@ src_compile() {
 	tc-export AR CC CXX
 
 	append-ldflags "-Wl,-z,defs" # make sure we are not underlinked
+}
 
-	cd "${S}/lib" || die
+multilib_src_compile() {
+	cd "${BUILD_DIR}/lib" || die
 	emake shared
 	use static-libs && emake static
 }
 
 # Tests fail for now, if anybody is able to fix them, help is very welcome.
-src_test() {
-	cd "${S}/test"
-	LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" \
-		CC="clang++" \
-		HEADER_INCLUDE="-I${S}/include" \
-		SOURCE_LIB="-L${S}/lib" \
+multilib_src_test() {
+	cd "${BUILD_DIR}/test"
+	LD_LIBRARY_PATH="${BUILD_DIR}/lib:${LD_LIBRARY_PATH}" \
+	LD_32_LIBRARY_PATH="${BUILD_DIR}/lib:${LD_32_LIBRARY_PATH}" \
+		CC="clang++ $(get_abi_CFLAGS) ${CXXFLAGS}" \
+		HEADER_INCLUDE="-I${BUILD_DIR}/include" \
+		SOURCE_LIB="-L${BUILD_DIR}/lib" \
 		LIBS="-lm" \
 		./testit || die
 }
@@ -99,19 +105,18 @@ END_LDSCRIPT
 	# TODO: Generate a libc++.a ldscript when building against libsupc++
 }
 
-src_install() {
-	cd "${S}/lib"
+multilib_src_install() {
+	cd "${BUILD_DIR}/lib"
 	if use static-libs ; then
 		dolib.a libc++.a
 		gen_static_ldscript
 	fi
 	dolib.so libc++.so*
+}
 
-	cd "${S}"
+multilib_src_install_all() {
 	insinto /usr/include/c++/v1
 	doins -r include/*
-
-	dodoc CREDITS.TXT
 }
 
 pkg_postinst() {