sys-libs/libcxx: Use llvm.eclass for reliable upgrade from :0

diff --git a/sys-libs/libcxx/libcxx-4.0.0.ebuild b/sys-libs/libcxx/libcxx-4.0.0.ebuild
index 691e252ab0265a9542e976e309772f0d38e274f4..ce256df08e8f715c3018745fc1728dfb40f78202 100644 (file)
--- a/sys-libs/libcxx/libcxx-4.0.0.ebuild
+++ b/sys-libs/libcxx/libcxx-4.0.0.ebuild
@@ -10,7 +10,7 @@ EAPI=6
 CMAKE_MIN_VERSION=3.7.0-r1
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-multilib python-any-r1 toolchain-funcs
+inherit cmake-multilib llvm python-any-r1 toolchain-funcs
 
 DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
 HOMEPAGE="http://libcxx.llvm.org/"
@@ -54,6 +54,7 @@ python_check_deps() {
 }
 
 pkg_setup() {
+       llvm_pkg_setup
        use test && python-any-r1_pkg_setup
 
        if ! use libcxxabi && ! use libcxxrt && ! tc-is-gcc ; then

diff --git a/sys-libs/libcxx/libcxx-9999.ebuild b/sys-libs/libcxx/libcxx-9999.ebuild
index 0f39966844bb8b32d5080bae35261159caef8508..c063388b1adcb6de24d495e153b2474b9c6e8cb2 100644 (file)
--- a/sys-libs/libcxx/libcxx-9999.ebuild
+++ b/sys-libs/libcxx/libcxx-9999.ebuild
@@ -14,7 +14,7 @@ PYTHON_COMPAT=( python2_7 )
 
 [[ ${PV} == 9999 ]] && SCM="git-r3" || SCM=""
 
-inherit ${SCM} cmake-multilib python-any-r1 toolchain-funcs
+inherit ${SCM} cmake-multilib llvm python-any-r1 toolchain-funcs
 
 DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
 HOMEPAGE="http://libcxx.llvm.org/"
@@ -65,6 +65,7 @@ python_check_deps() {
 }
 
 pkg_setup() {
+       llvm_pkg_setup
        use test && python-any-r1_pkg_setup
 
        if ! use libcxxabi && ! use libcxxrt && ! tc-is-gcc ; then