summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2019-09-21 11:06:36 +0200
committerMichał Górny <mgorny@gentoo.org>2019-09-21 11:15:42 +0200
commit7be1d385b317055e3f5367c7a952e6760dcc5e12 (patch)
treed3b17722f6e9131ab3405818635b29616a2689f7 /sys-libs
parentsys-libs/llvm-libunwind: Reorder ebuild vars in 9+ (diff)
downloadgentoo-7be1d385b317055e3f5367c7a952e6760dcc5e12.tar.gz
gentoo-7be1d385b317055e3f5367c7a952e6760dcc5e12.tar.bz2
gentoo-7be1d385b317055e3f5367c7a952e6760dcc5e12.zip
sys-libs/libcxx: Remove weird, unmaintainable PV-ifs
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/libcxx/libcxx-10.0.0.9999.ebuild21
-rw-r--r--sys-libs/libcxx/libcxx-9.0.0.9999.ebuild23
2 files changed, 11 insertions, 33 deletions
diff --git a/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild
index 04b405e517ea..83d8eeaa8c40 100644
--- a/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild
@@ -8,31 +8,20 @@ EAPI=7
: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
# (needed due to CMAKE_BUILD_TYPE != Gentoo)
CMAKE_MIN_VERSION=3.7.0-r1
-EGIT_REPO_URI="https://git.llvm.org/git/libcxx.git
- https://github.com/llvm-mirror/libcxx.git"
PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-[[ ${PV} == *9999 ]] && SCM="git-r3" || SCM=""
-
-inherit ${SCM} cmake-multilib llvm multiprocessing python-any-r1 \
+inherit cmake-multilib git-r3 llvm multiprocessing python-any-r1 \
toolchain-funcs
DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
HOMEPAGE="https://libcxx.llvm.org/"
-if [[ ${PV} != *9999 ]] ; then
- SRC_URI="https://llvm.org/releases/${PV}/${P}.src.tar.xz"
- S="${WORKDIR}/${P}.src"
-else
- SRC_URI=""
-fi
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/libcxx.git
+ https://github.com/llvm-mirror/libcxx.git"
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
SLOT="0"
-if [[ ${PV} != *9999 ]] ; then
- KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-else
- KEYWORDS=""
-fi
+KEYWORDS=""
IUSE="elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs test"
REQUIRED_USE="libunwind? ( || ( libcxxabi libcxxrt ) )
?? ( libcxxabi libcxxrt )"
diff --git a/sys-libs/libcxx/libcxx-9.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-9.0.0.9999.ebuild
index 2b9a0e1433d5..5a84e2f5f998 100644
--- a/sys-libs/libcxx/libcxx-9.0.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-9.0.0.9999.ebuild
@@ -8,32 +8,21 @@ EAPI=7
: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
# (needed due to CMAKE_BUILD_TYPE != Gentoo)
CMAKE_MIN_VERSION=3.7.0-r1
-EGIT_REPO_URI="https://git.llvm.org/git/libcxx.git
- https://github.com/llvm-mirror/libcxx.git"
-EGIT_BRANCH="release_90"
PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-[[ ${PV} == *9999 ]] && SCM="git-r3" || SCM=""
-
-inherit ${SCM} cmake-multilib llvm multiprocessing python-any-r1 \
+inherit cmake-multilib git-r3 llvm multiprocessing python-any-r1 \
toolchain-funcs
DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
HOMEPAGE="https://libcxx.llvm.org/"
-if [[ ${PV} != *9999 ]] ; then
- SRC_URI="https://llvm.org/releases/${PV}/${P}.src.tar.xz"
- S="${WORKDIR}/${P}.src"
-else
- SRC_URI=""
-fi
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/libcxx.git
+ https://github.com/llvm-mirror/libcxx.git"
+EGIT_BRANCH="release_90"
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
SLOT="0"
-if [[ ${PV} != *9999 ]] ; then
- KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-else
- KEYWORDS=""
-fi
+KEYWORDS=""
IUSE="elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs test"
REQUIRED_USE="libunwind? ( || ( libcxxabi libcxxrt ) )
?? ( libcxxabi libcxxrt )"