4 files changed, 185 insertions, 18 deletions
diff --git a/sys-libs/libcxx/ChangeLog b/sys-libs/libcxx/ChangeLog
index de5130b1b86c..38d52d551464 100644
--- a/sys-libs/libcxx/ChangeLog
+++ b/sys-libs/libcxx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/libcxx
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.38 2014/01/05 11:41:35 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.39 2014/03/22 12:39:59 aballier Exp $
+
+*libcxx-0.0_p20140322 (22 Mar 2014)
+
+  22 Mar 2014; Alexis Ballier <aballier@gentoo.org>
+  +libcxx-0.0_p20140322.ebuild:
+  bump a new snapshot
 
   05 Jan 2014; Naohiro Aota <naota@gentoo.org> libcxx-0.0_p20131222.ebuild:
   Add ~x86-fbsd. #482820
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 49b86cb3d748..3339f6b2cdaf 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -5,25 +5,17 @@ AUX Makefile 874 SHA256 ba99d3b7b98ed88a64f8370ba2d90e245f8e5ea9bfe302382ef8eede
 AUX prepare_snapshot.sh 427 SHA256 9ebf22257a2e296dee41a56b0a721cd1ba459c620009ca8422ba812515ff726f SHA512 ebac2a467f8b1dfb68f1dc46a35f8294d1cf74b70be2a008217fa13b3366ddf4a9f2ebbe611cd63824f42305c5c0304aac2f46386b2956c9e07d82d5d984b435 WHIRLPOOL 232a60d6a22f50c424ec9cf6f325bbb4e8e96815ba9dffdad0a5b1b872b19d20126d316ced71956978eb5ce098f72584d21104c14e232330b3893a73e4c3c358
 DIST libcxx-0.0_p20130725.tar.xz 833240 SHA256 16428d2a493d2f833bc695300f4fc4e2bfd756fa4eb8e0b7696af10ff5e82653 SHA512 756cb089dc6514125b53623a410039c0edc2fb56a734b7faabee018e073adb96a30f7413546ba42fb40dd815697f27735fbbb6bbcce2e7dea10d284a3ed394d3 WHIRLPOOL 329817e70c27e13d37d75d3d15f0b49375e59d660d784b2e174b059046090a2514d7ddd39ac8fc917da784899f7d394842e73f7c81301d4fdf9add74d259f086
 DIST libcxx-0.0_p20131222.tar.xz 872416 SHA256 d77b7555daa368a493a71c99d9d5868706cc3a66a4e37e002a860733407d21ee SHA512 d4466a4e66365d38c552813f9d4be251bbc956ca0f2800dcd08b3d5633e6bd1a48601016e0e63a92cb4cd2f7863b31ece0ce9b68f2de2c76cf457a7093920fec WHIRLPOOL 07acd16939694e2cfc946f8f021a2b8a4d4ae40dfe2128273a6e0c76b9a2ac8d9f2e6347d091861219044674ea02b76caf80b3f55f74e8e504c58fe96b19eb91
+DIST libcxx-0.0_p20140322.tar.xz 879256 SHA256 b5eae28ced378349e4b7ec6f2e944d0630213462159a0bb2393dc82b536d77d8 SHA512 a80cc3b47acdc1de1a24f5aad19ed0b2518529fe6e8d56cbbe6801874ea334dabd6cec38c27cccbaec961de69b731e22462f0faae30f371e3acb8ecd1b46b2b4 WHIRLPOOL 9374e2b717a3a00f3046f06920775a31403e36ee9a6c5049e4a50173eae947c5e4641dafd178e459ab3caf6dcad6c99baf37cd5587ebf8a3e2d021e18ac36793
 EBUILD libcxx-0.0_p20130725.ebuild 5329 SHA256 8e2ea353ccbd357b099fa67bab9ce7f7847e58a6245b405f203ca644acc61f29 SHA512 b83a2f38caa6b979cd3b352ccf90a61e647e677e09602cf7b5fa100b18b6590c40587a34fc46c12b0bb494d82648cb2070dd8845d95d78f2539a856e79137a7a WHIRLPOOL 8df3b96cf5c99aaad8b326569f510cad1989ded4f26cb2b52bfbdfbdf15e3d9a570ae9c2feba4171313eb5695c2e9382a325f646d8832c534eb21264e55a2ad0
 EBUILD libcxx-0.0_p20131222.ebuild 5402 SHA256 5ef91bbdb56bac6744a3ab3f88efd5f29514f615e14482374dfbaa74923ee436 SHA512 653843717237cc98fa35a17c1d0471e5e03fe5e995a9739a5c07235a647e7b0350a27ccea8a593aadf58aa29477f8a8584978a60af73cd5eb8e600ce32da2229 WHIRLPOOL 13c46b4948f46785690b07daaf762045333c7404c984f463cb470b3dc5af274c9fb8351f82408a8b1932ab84e262daf2657deece9ac487c9a263f8dd77a76634
-EBUILD libcxx-9999.ebuild 5387 SHA256 5007f071b37412fe5251a2c7e71ea7305c337dee1ac99ac7b41faab9950c25de SHA512 6abd4b7df82f0ac45e651c63943fa4cf7b62250d417753b4dbcd216af41e6cb7658340a19449f1f1c4e212c9ea9a0c11cbe4831d4ef3df12a4d83a42e6c3d8d7 WHIRLPOOL 44a9b506020b3bedc63294fe4115f12f72e242632e776ab615c0b57b2fa3782072a31c258d5603de62bd54cef02a87e67187bba48950d9cd470cd59f24f85296
-MISC ChangeLog 6145 SHA256 7050fd50cf412a950115b4b412d79a8a5016058f9b1bb57442b0c08e4da50d2b SHA512 778bf09a54701493c84b5d41f2c007ee0c123a303ed7c58031f0eee6072778bc64049ef9df1950dd7af9a730e3f83ac76f9600fba7445b3c48e304de0ef084e5 WHIRLPOOL cda4fc494445272ebc0cdcb3636b35f42b0fb485849be40ce106fd3fc5028bf3b203f6d615d05fd777edb688c7e927db768facd1c20b235c93d0f44a62bf64b0
+EBUILD libcxx-0.0_p20140322.ebuild 5405 SHA256 ca0f3fc1b4e0e39a61d6b160477640671fd2059d5ad3f31c1159d6eebf752cf3 SHA512 992d1ee7d45eff69afc46e83e2cd7fed5a5f0e5eb72c95294ffd7c9800a9bb9c73a852be75daf0916fd0f55521bfeb4aa7191976c9980d20844d3055c45be9bc WHIRLPOOL 9f5a92472919f3e8aa239e5628b33ab02c6d96dccfab8553d671b0babe136ebfdd3ea385b3be7ba0918abb07948a1e1fca40fd9668022177949e35fda2da8253
+EBUILD libcxx-9999.ebuild 5397 SHA256 f4fa03345f2daac9d58e17d72af1e4866d07b6e29ee89d5e69314d970ee27e40 SHA512 db54813e8e5558c232d5b5b89648f3da52faed9657692a9bdf80cb0854f2e70d473cfe2a98a20e82972864dc18214b8261e93055b43093e5f1622bcdb14b59b7 WHIRLPOOL bf783b9093f54964dfd4d923e2f1b6e5327720d3a487ebab1d54bf3c5ab5cf0e41938e831d46f572b4dbf6534b155231351c8239736f97a5e576e1de7850f550
+MISC ChangeLog 6292 SHA256 a067cc450529b58b8aaa7229b9c088a143267ce0cdfcbb6699e11b529237e473 SHA512 49260f2edec027e550b6bbfecfce5e700fcb674426eeac9e3b2f1b55c351056be96216f3469c487dff03f4d3a6f6aae835d56b8d206f503dc78ddd04d1ceff67 WHIRLPOOL 7bbc07ba7d2b7b330ae8d4500c3762aa074e8511b31c7ed03a322687e32ea417ab5e8fdbfc58f2db8135fa1457230acced48795c41d986a893037065102a36a8
 MISC metadata.xml 558 SHA256 c9fe7077a8c7f767d7cdbe154d85dd344fb86ea246b16613242c70a40f3e1ef2 SHA512 3f324c4959a7c9f2613b29928957fd010b35c6e9c1601f0296e7e8b7c8d59a3c27c5c04fef87ac825f2f7bb07553bc617c4405e1e22847dc8db3e7a1ebb21f50 WHIRLPOOL 3ade5e3852afcd533c89ce0aeead55101f23d1b31825718bfccd60fac485961df617c93962be4c60333a21335dcd6bb5630c8002fe06f456c4e177c14d434455
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSyUTwAAoJEDYO1FT4VRUUJ1EP/3P40APGUTubmSu9EpMXbmFd
-w19wbyqLnYcMFmKkKjD2K6kA9FVutaer35qwiD3xXh0fMD0lHqbhGO9SQATXpCXi
-+fu7qy7KgoACH0SULkLD9ef6T9Kgl5xC8GjDRw7CHcB2eBFc0VhRPRRk7BDgzOA1
-QjqeRVAJ0D7lLCDKxBtpyr99HAcP3wZ0AKvUhk+bzDksQ97Vb1yTSMkB6lxK9EmG
-wb9143NTSfsh4bc1D4iuQss8EIUItHCzNxw3uPVgbRa7+zO+7xyHs+pCM3VuQIcp
-MeprlId1CxXN2qC8L91QzukktzJly/fON54tcGniULLyXPdQ/IRhN7L/nRz99WkR
-xJDqfWyA2eiP9AyI2T88Lt/ekrMP4dVnSTMOthB8raGWM6SlHfRedvxGIq+ir6d1
-l3pI6EfoDgbTBtRh45uVo0juclKgQbUwXQJMjRcjsp+GtZs+qGYAlS7fK+z+z1AI
-T/rmlfjF7099KK6fEWWRh7bCekfTVCtX/kXyEKZHz4btcm1mgsYcJOYR+q7KLHDp
-gchSpM4SqqzsXqsgZ2CcgZBEDtwcDZq1vrbUfQpabGQJlOBlwByurnbnD1PCr/4L
-Qt/PnhfDwW9rZxwcpmJQ9pcdRMEwZsLCSzJKNDHvs7Q4F+f0ltBRaNc+6Fwel4Py
-Y6WXrXZLmvcUZqFMTO34
-=7Qj4
+iEYEAREIAAYFAlMthKAACgkQvFcC4BYPU0pRGgCePEsv9JduC5TY/5v1FPn31W+t
+8LkAmgPQNteKkWL5SwEx7iUfZIdfTwf9
+=LCob
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libcxx/libcxx-0.0_p20140322.ebuild b/sys-libs/libcxx/libcxx-0.0_p20140322.ebuild
new file mode 100644
index 000000000000..31a784df5bd3
--- /dev/null
+++ b/sys-libs/libcxx/libcxx-0.0_p20140322.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-0.0_p20140322.ebuild,v 1.1 2014/03/22 12:39:59 aballier Exp $
+
+EAPI=5
+
+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 multilib-minimal
+
+DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
+HOMEPAGE="http://libcxx.llvm.org/"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	SRC_URI="mirror://gentoo/${P}.tar.xz"
+else
+	SRC_URI=""
+fi
+
+LICENSE="|| ( UoI-NCSA MIT )"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="elibc_glibc +libcxxrt static-libs test"
+
+RDEPEND="libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130530[static-libs?,${MULTILIB_USEDEP}] )
+	!libcxxrt? ( >=sys-devel/gcc-4.7[cxx] )"
+DEPEND="${RDEPEND}
+	test? ( sys-devel/clang )
+	app-arch/xz-utils"
+
+DOCS=( CREDITS.TXT )
+
+pkg_setup() {
+	if ! use libcxxrt ; then
+		ewarn "You have disabled USE=libcxxrt. This will build ${PN} against"
+		ewarn "libsupc++. Please note that this is not well supported."
+		ewarn "In particular, static linking will not work."
+	fi
+	if [[ $(gcc-version) < 4.7 ]] && [[ $(tc-getCXX) != *clang++* ]] ; then
+		eerror "${PN} needs to be built with clang++ or gcc-4.7 or later."
+		eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+		die
+	fi
+}
+
+src_prepare() {
+	cp -f "${FILESDIR}/Makefile" lib/ || die
+	multilib_copy_sources
+}
+
+src_configure() {
+	export LIBS="-lpthread -lrt -lc -lgcc_s"
+	if use libcxxrt ; then
+		append-cppflags -DLIBCXXRT "-I${EPREFIX}/usr/include/libcxxrt/"
+		LIBS="-lcxxrt ${LIBS}"
+		cp "${EPREFIX}/usr/include/libcxxrt/"*.h "${S}/include"
+	else
+		# Very hackish, see $HOMEPAGE
+		# If someone has a clever idea, please share it!
+		local includes="$(echo | ${CHOST}-g++ -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | sed -e 's/^ /-I/' | tr '\n' ' ')"
+		local libcxx_gcc_dirs="$(echo | ${CHOST}-g++ -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | tr '\n' ' ')"
+		append-cppflags -D__GLIBCXX__ ${includes}
+		LIBS="-lsupc++ ${LIBS}"
+		local libsupcxx_includes="cxxabi.h bits/c++config.h bits/os_defines.h bits/cpu_defines.h bits/cxxabi_tweaks.h bits/cxxabi_forced.h"
+		for i in ${libsupcxx_includes} ; do
+			local found=""
+			[ -d "${S}/include/$(dirname ${i})/" ] || mkdir -p "${S}/include/$(dirname ${i})"
+			for j in ${libcxx_gcc_dirs} ; do
+				if [ -f "${j}/${i}" ] ; then
+					cp "${j}/${i}" "${S}/include/$(dirname ${i})/" || die
+					found=yes
+				fi
+			done
+			[ -n "${found}" ] || die "Header not found: ${i}"
+		done
+	fi
+
+	tc-export AR CC CXX
+
+	append-ldflags "-Wl,-z,defs" # make sure we are not underlinked
+}
+
+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.
+multilib_src_test() {
+	cd "${BUILD_DIR}/test"
+	LD_LIBRARY_PATH="${BUILD_DIR}/lib:${LD_LIBRARY_PATH}" \
+		CC="clang++ $(get_abi_CFLAGS) ${CXXFLAGS}" \
+		HEADER_INCLUDE="-I${BUILD_DIR}/include" \
+		SOURCE_LIB="-L${BUILD_DIR}/lib" \
+		LIBS="-lm $(usex libcxxrt -lcxxrt "")" \
+		./testit || die
+	# TODO: fix link against libsupc++
+}
+
+# Usage: deps
+gen_ldscript() {
+	local output_format
+	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+
+	cat <<-END_LDSCRIPT
+/* GNU ld script
+   Include missing dependencies
+*/
+${output_format}
+GROUP ( $@ )
+END_LDSCRIPT
+}
+
+gen_static_ldscript() {
+	if use libcxxrt ; then
+		# Move it first.
+		mv "${ED}/usr/$(get_libdir)/libc++.a" "${ED}/usr/$(get_libdir)/libc++_static.a" || die
+
+		# Generate libc++.a ldscript for inclusion of its dependencies so that
+		# clang++ -stdlib=libc++ -static works out of the box.
+		local deps="${EPREFIX}/usr/$(get_libdir)/libc++_static.a ${EPREFIX}/usr/$(get_libdir)/libcxxrt.a"
+		# On Linux/glibc it does not link without libpthread or libdl. It is
+		# fine on FreeBSD.
+		use elibc_glibc && deps="${deps} ${EPREFIX}/usr/$(get_libdir)/libpthread.a ${EPREFIX}/usr/$(get_libdir)/libdl.a"
+
+		gen_ldscript "${deps}" > "${ED}/usr/$(get_libdir)/libc++.a"
+	fi
+	# TODO: Generate a libc++.a ldscript when building against libsupc++
+}
+
+gen_shared_ldscript() {
+	if use libcxxrt ; then
+		mv "${ED}/usr/$(get_libdir)/libc++.so" "${ED}/usr/$(get_libdir)/libc++_shared.so" || die
+		local deps="${EPREFIX}/usr/$(get_libdir)/libc++_shared.so ${EPREFIX}/usr/$(get_libdir)/libcxxrt.so"
+		gen_ldscript "${deps}" > "${ED}/usr/$(get_libdir)/libc++.so"
+	fi
+	# TODO: Generate the linker script for other confiurations too.
+}
+
+multilib_src_install() {
+	cd "${BUILD_DIR}/lib"
+	if use static-libs ; then
+		dolib.a libc++.a
+		gen_static_ldscript
+	fi
+	dolib.so libc++.so*
+	gen_shared_ldscript
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	insinto /usr/include/c++/v1
+	doins -r include/*
+}
+
+pkg_postinst() {
+	elog "This package (${PN}) is mainly intended as a replacement for the C++"
+	elog "standard library when using clang."
+	elog "To use it, instead of libstdc++, use:"
+	elog "    clang++ -stdlib=libc++"
+	elog "to compile your C++ programs."
+}
diff --git a/sys-libs/libcxx/libcxx-9999.ebuild b/sys-libs/libcxx/libcxx-9999.ebuild
index 17e4723fe039..09b224447985 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.26 2013/12/22 17:51:28 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.27 2014/03/22 12:39:59 aballier Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ fi
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
 if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 else
 	KEYWORDS=""
 fi