commit: 0e884f0069307645819d240a1c3133c398a19bb3 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Thu Feb 11 09:41:24 2016 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Thu Feb 11 09:41:24 2016 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0e884f00
sys-libs/libcxx: sync with gx86 Package-Manager: portage-2.2.20-prefix sys-libs/libcxx/libcxx-3.5.1.ebuild | 19 ++++++++++++------- sys-libs/libcxx/libcxx-3.7.1.ebuild | 21 +++++++++++++-------- sys-libs/libcxx/metadata.xml | 3 +++ 3 files changed, 28 insertions(+), 15 deletions(-) diff --git a/sys-libs/libcxx/libcxx-3.5.1.ebuild b/sys-libs/libcxx/libcxx-3.5.1.ebuild index 0fdf949..787a678 100644 --- a/sys-libs/libcxx/libcxx-3.5.1.ebuild +++ b/sys-libs/libcxx/libcxx-3.5.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Id $ EAPI=5 @@ -13,8 +13,7 @@ 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}.src.tar.xz - http://llvm.org/releases/${PV}/${P}.src.tar.xz" + SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz" S="${WORKDIR}"/"${P}".src else SRC_URI="" @@ -30,10 +29,16 @@ fi IUSE="elibc_glibc +libcxxrt static-libs test" REQUIRED_USE="kernel_Darwin? ( libcxxrt !static-libs )" -RDEPEND="!kernel_Darwin? ( +RDEPEND=" + !kernel_Darwin? ( libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130725[static-libs?,${MULTILIB_USEDEP}] ) - !libcxxrt? ( >=sys-devel/gcc-4.7[cxx] ) ) - kernel_Darwin? ( sys-libs/libcxx-headers sys-libs/libcxxabi sys-devel/clang )" + !libcxxrt? ( >=sys-devel/gcc-4.7[cxx] ) + ) + kernel_Darwin? ( + =sys-libs/libcxx-headers-${PV} + =sys-libs/libcxxabi-${PV} + sys-devel/clang + )" DEPEND="${RDEPEND} test? ( sys-devel/clang ) app-arch/xz-utils" diff --git a/sys-libs/libcxx/libcxx-3.7.1.ebuild b/sys-libs/libcxx/libcxx-3.7.1.ebuild index 0fdf949..10fac31 100644 --- a/sys-libs/libcxx/libcxx-3.7.1.ebuild +++ b/sys-libs/libcxx/libcxx-3.7.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Id $ EAPI=5 @@ -13,9 +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}.src.tar.xz - http://llvm.org/releases/${PV}/${P}.src.tar.xz" - S="${WORKDIR}"/"${P}".src + SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz" + S="${WORKDIR}/${P}.src" else SRC_URI="" fi @@ -30,10 +29,16 @@ fi IUSE="elibc_glibc +libcxxrt static-libs test" REQUIRED_USE="kernel_Darwin? ( libcxxrt !static-libs )" -RDEPEND="!kernel_Darwin? ( +RDEPEND=" + !kernel_Darwin? ( libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130725[static-libs?,${MULTILIB_USEDEP}] ) - !libcxxrt? ( >=sys-devel/gcc-4.7[cxx] ) ) - kernel_Darwin? ( sys-libs/libcxx-headers sys-libs/libcxxabi sys-devel/clang )" + !libcxxrt? ( >=sys-devel/gcc-4.7[cxx] ) + ) + kernel_Darwin? ( + =sys-libs/libcxx-headers-${PV} + =sys-libs/libcxxabi-${PV} + sys-devel/clang + )" DEPEND="${RDEPEND} test? ( sys-devel/clang ) app-arch/xz-utils" diff --git a/sys-libs/libcxx/metadata.xml b/sys-libs/libcxx/metadata.xml index f737f23..6795d17 100644 --- a/sys-libs/libcxx/metadata.xml +++ b/sys-libs/libcxx/metadata.xml @@ -2,4 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>prefix</herd> + <use> + <flag name="libcxxrt">Build against <pkg>sys-libs/libcxxr</pkg></flag> + </use> </pkgmetadata>