bump to current release, part of bug #538364

Signed-off-by: Alexis Ballier <aballier@gentoo.org>
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 189 insertions, 20 deletions

diff --git a/sys-libs/libcxx/ChangeLog b/sys-libs/libcxx/ChangeLog
index 90e7bb5633e7..53076144cd6e 100644
--- a/sys-libs/libcxx/ChangeLog
+++ b/sys-libs/libcxx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/libcxx
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.41 2015/01/17 19:10:41 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.42 2015/04/23 08:45:26 aballier Exp $
+
+*libcxx-3.6.0 (23 Apr 2015)
+
+  23 Apr 2015; Alexis Ballier <aballier@gentoo.org> +libcxx-3.6.0.ebuild,
+  libcxx-9999.ebuild:
+  bump to current release, part of bug #538364
 
   17 Jan 2015; Anthony G. Basile <blueness@gentoo.org>
   libcxx-0.0_p20130725.ebuild, libcxx-0.0_p20131222.ebuild,
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 5c5d448343fc..d6039baba2f7 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -6,26 +6,18 @@ AUX prepare_snapshot.sh 427 SHA256 9ebf22257a2e296dee41a56b0a721cd1ba459c620009c
 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
+DIST libcxx-3.6.0.src.tar.xz 946380 SHA256 299c1e82b0086a79c5c1aa1885ea3be3bbce6979aaa9b886409b14f9b387fbb7 SHA512 fe16d129a4e2429677a2b87aa2da27fcb5331d6335a0b819ea67de6498e82293bc13661602baafabb56a7f0a4e8f304d468088b8d3e0b5d1c0d01976f7cf3e92 WHIRLPOOL 527b4d1c54e5d76d0958c6d8ac622be4cb7b1a2feb3a9f2d2efa09564ab8d2f8f8cb15a536b8390f80c327dc8b86fee4fcc0b3d7c3771b11ca64885505fb449a
 EBUILD libcxx-0.0_p20130725.ebuild 5337 SHA256 3e04f42c690716036eae7f177a2ee39c5bda2e7f6552f7b597c52a3c8aa1e269 SHA512 05e7bf1feaf42f97faf029964fb3066a24ca82383ce4af921b1430212f8a25b9fe1b10db82dd859ae101d1c40776ed0727e247a647a14417e409d1f8fb21f401 WHIRLPOOL f330d4e5c71d4c3d1d7c0a5e894fcce053c90e5a9b05c17d82feba09287958192d64489d5f05ef4508342f65fe7b0b6a0514c4f64f5b9ec5174f2a2e5b77b70f
 EBUILD libcxx-0.0_p20131222.ebuild 5411 SHA256 c49c1b76ab81e20a325b17407cbabd914edc126f55dce4320ea82a3bc57019ec SHA512 5873d4f820ce6767f60585c00aa4155f87ba1a48f37bad048e3443f4edfcf1ecf225692d7b9411d9fdd79870923ab2711d76f750e596f5fe46a99e65380e5543 WHIRLPOOL 6cd8e43852bc8fbedac8df2752eb3178f56c852d51f9e9f3201d56c996ed725cdc98c03694eba6042e8ce7238adfcf82d1bfa7d1a9dc6a78dd6d3144faf9204a
 EBUILD libcxx-0.0_p20140322.ebuild 5411 SHA256 fdff81cfce140238e0c5e358d5c33511989eae04fc1d9e72667dd057200e1c07 SHA512 0f8f56ea1b7edfd796f207b367ea94e02829136c477c751968c3cef24e69f2ee3f05c600e25dc95fb27ffd01627084771806ab1f545f89e9f4921159f0042c3e WHIRLPOOL e9d8b6f59c1f9549b18bc8722dc68ba26304d08a64ff9ee00c77db7791174a97c921112b7dd1c0e924d7d24fe41df96e56fd27fea0a177b762a320dbc18f7f06
-EBUILD libcxx-9999.ebuild 5403 SHA256 2128dee534f7ab596fad0537cb5d7390480b55cd8d0d55651303c663f032a741 SHA512 ea62fd648a05ed23d50eeefa169ec0150132702ad7855875b8efc84f8731488e9d56b06333a7815a9a195c752f4f87b587172658000c9a6ccad3f56185d54e44 WHIRLPOOL 853e0cdeebd587317035f13b9c82ac933fecd8c10de89808cfa71d954d7cdc3bbe84802305a1598329276bd1d5c540cf82d2d8d6d5eca2b53d26914c981ce2d3
-MISC ChangeLog 6735 SHA256 7c934959f6bc4ce06aee08da6943d91a5fd6d77e5b1a34c7143d593d2885d1c7 SHA512 a88217b320a3033db4d66bdcec7b0c407912c4d570e175a58e5ba9dc7f456f32cb13be1e158cc6d1652fd189b56c8f984b7859b49550cb7d20390e4614ada801 WHIRLPOOL e42c332427dbc14daba946f3376ae6622d2136c57aa08cfd6da8fa36deb2ee161d5ce5639a640c902e026e8d9f53db53f52bd92a41a714829f1ea0ee9dc99039
+EBUILD libcxx-3.6.0.ebuild 5450 SHA256 9067480bd02333c4c22b2928a9ef559beb46dbbb0f30d2e2d461d67c92cee115 SHA512 dd005b58ae681e5ea9217c0c8795253e65cd4d1ab961129c4b0c96345f250bcabd58d708999fd764927ba2c40da844f90caaf4185c100e69d70e22e6360b4a63 WHIRLPOOL edd86a67440776a5b3f917f0e48629c3c0fdd40cfa2cab28365317a7c03f968a66859e07a11ceebb77e58c68be5afeae95070592f78c14db4f73eafa7933adc9
+EBUILD libcxx-9999.ebuild 5450 SHA256 8f042870ca8cb91b4f57aad48c352252fb3ce31c5cbdf08816345e5c8a235409 SHA512 d0e16bc9e02a0619d75151d929c897afa6190bb3d68da043a2c5ff8e225c3a2c02740f006fc3b7b3dcdb48341500a90557efddf309580e2e36b6b9534fae69ea WHIRLPOOL 1e81f8e2b5400decc7acb264fd76fa005e9ac2922d0bc9962461fa215975d9d250469d9398045aaf613d63b7bd55416b635b1ef7734f0388d51cb8d8e2944f08
+MISC ChangeLog 6908 SHA256 929369b9a1a064f204814cff12f5ed89367a183b6f02e77f6eec1692f7631610 SHA512 3b3981385fb9214cdbdc0d76ba51ddb23eaf719aef43cd7dbe9a5d80fb8159e9da5dc5c20645743e2d6ca5d397268b1f628d4138d0c8b83d33042ace6257930c WHIRLPOOL 70c8b2d3c7f354b8d71f52ea9a5fbd842ae12005092a6d1eeaace83627d4fa639743a288efe44e9519290cbffbcf9bb6f49bb403a99944b7d9355e81adb07563
 MISC metadata.xml 558 SHA256 c9fe7077a8c7f767d7cdbe154d85dd344fb86ea246b16613242c70a40f3e1ef2 SHA512 3f324c4959a7c9f2613b29928957fd010b35c6e9c1601f0296e7e8b7c8d59a3c27c5c04fef87ac825f2f7bb07553bc617c4405e1e22847dc8db3e7a1ebb21f50 WHIRLPOOL 3ade5e3852afcd533c89ce0aeead55101f23d1b31825718bfccd60fac485961df617c93962be4c60333a21335dcd6bb5630c8002fe06f456c4e177c14d434455
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUurQbAAoJEJOE+m71LUu6VggP/RE3EFEruvaDbZkxxR0dHwk2
-gNwyCv/hc3DYspzyy3TCHCMrBRqgu80xKjXvxHVj26v9ikk9jiKIrNj6Rf8U5Ptg
-xfJRrM1WbbAFqyPbrrmu8buHxIs5VUTqhCNHvyMpwui7x2EO9LtKwRV8fXtA+9+t
-gqPrAlRsloOK8l9KwNSFmcgjp0jYVvnkGAuW0dkAlwGfstl6TjwfRVTj+5hYCxeg
-SmiYz41iDXcFtFxCYZiN3fgsHOe277dBSg4Jk9GZUtcvHbEhuiEBmsj1YlYcn1cI
-KDxIyXET3dro+jQM565vekphfYVUmCaxZiHRjKCYNEtHW+QoBXbH8I5DbJIOT1ci
-Vx4qT4Nqf9cSmcm8t+8j3X3sWr07n5PIpvyMQEY1S1/ThfsJbJrG/SKQOIZBlZD6
-gTu60Krv90TrKYY/STPj2sp1x/iYYSqi8ngPddaM4T/Wnd/ZCU/wXr4AB0PDO9/g
-YNHEJ1rUt6zBU0tOAsA0PLwut12kMqJ36pCojqRU2XLpMRcooJo8LRh3x05vFUuW
-tgAe8LmeN6J1C1xl9qaiC7A2NAdtKbIl34UrfG3Gc8D7a/Vctm6V/NlpveSkVyN6
-wOMcMD/WXBIY7hCgd8u3o/r5+WkzlBdwryYyBONCW+RWC3TJvkH0V1/jNt0+TifH
-iKxceVKj715NSHQnpOF1
-=nWnu
+iEYEAREIAAYFAlU4sScACgkQvFcC4BYPU0q2lgCdFZimRCMD84sp1OVj/IIAeYkm
+jE8AoI+5ZgalpObR9wMZcZsgsVovz4Bb
+=Uc3e
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libcxx/libcxx-3.6.0.ebuild b/sys-libs/libcxx/libcxx-3.6.0.ebuild
new file mode 100644
index 000000000000..8aef1f456e3c
--- /dev/null
+++ b/sys-libs/libcxx/libcxx-3.6.0.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-3.6.0.ebuild,v 1.1 2015/04/23 08:45:26 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="http://llvm.org/releases/${PV}/${P}.src.tar.xz"
+	S="${WORKDIR}/${P}.src"
+else
+	SRC_URI=""
+fi
+
+LICENSE="|| ( UoI-NCSA MIT )"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~mips ~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_p20130725[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 4d1878889853..efe019d18d4a 100644
--- a/sys-libs/libcxx/libcxx-9999.ebuild
+++ b/sys-libs/libcxx/libcxx-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.29 2015/01/17 19:10:41 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.30 2015/04/23 08:45:26 aballier Exp $
 
 EAPI=5
 
@@ -13,7 +13,8 @@ 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"
+	SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz"
+	S="${WORKDIR}/${P}.src"
 else
 	SRC_URI=""
 fi
@@ -25,10 +26,10 @@ if [ "${PV%9999}" = "${PV}" ] ; then
 else
 	KEYWORDS=""
 fi
-IUSE="elibc_glibc +libcxxrt static-libs test"
+IUSE="elibc_glibc +libcxxrt +static-libs test"
 
 RDEPEND="libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130725[static-libs?,${MULTILIB_USEDEP}] )
-	!libcxxrt? ( >=sys-devel/gcc-4.7[cxx] )"
+	!libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] )"
 DEPEND="${RDEPEND}
 	test? ( sys-devel/clang )
 	app-arch/xz-utils"