[gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/

[Matthias Maier]

commit:     05ecb12916b71851c74dbba2304520f8c7034189
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  8 02:30:32 2021 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Thu Apr  8 02:30:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05ecb129

dev-lang/julia: ebuild maintenance

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 dev-lang/julia/julia-1.5.3.ebuild | 12 +++++++-----
 dev-lang/julia/julia-1.6.0.ebuild |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/dev-lang/julia/julia-1.5.3.ebuild 
b/dev-lang/julia/julia-1.5.3.ebuild
index ebff8169d4a..48dc63f1925 100644
--- a/dev-lang/julia/julia-1.5.3.ebuild
+++ b/dev-lang/julia/julia-1.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,9 +35,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="system-llvm"
 
+       # llvm:9 has been removed from the tree USE=-system-llvm force in
+       # profiles
+       #system-llvm? ( sys-devel/llvm:9=[llvm_targets_NVPTX(-)] )
 RDEPEND="
-       system-llvm? ( sys-devel/llvm:9=[llvm_targets_NVPTX(-)] )
-       !system-llvm? ( dev-util/cmake )
 "
 LLVM_MAX_SLOT=9
 
@@ -74,7 +75,8 @@ RDEPEND+="
 
 DEPEND="${RDEPEND}
        dev-util/patchelf
-       virtual/pkgconfig"
+       virtual/pkgconfig
+       !system-llvm? ( dev-util/cmake )"
 
 PATCHES=(
        "${FILESDIR}"/${PN}-1.1.0-fix_build_system.patch
@@ -182,7 +184,7 @@ src_compile() {
        addpredict /proc/self/mem
 
        emake \
-               prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+               prefix="${EPREFIX}/usr" \
                CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)"
        pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
 }

diff --git a/dev-lang/julia/julia-1.6.0.ebuild 
b/dev-lang/julia/julia-1.6.0.ebuild
index cc14c651833..ae323aa7ab3 100644
--- a/dev-lang/julia/julia-1.6.0.ebuild
+++ b/dev-lang/julia/julia-1.6.0.ebuild
@@ -29,7 +29,6 @@ IUSE="+system-llvm"
 
 RDEPEND="
        system-llvm? ( sys-devel/llvm:11=[llvm_targets_NVPTX(-)] )
-       !system-llvm? ( dev-util/cmake )
 "
 LLVM_MAX_SLOT=11
 
@@ -61,7 +60,8 @@ RDEPEND+="
 
 DEPEND="${RDEPEND}
        dev-util/patchelf
-       virtual/pkgconfig"
+       virtual/pkgconfig
+       !system-llvm? ( dev-util/cmake )"
 
 PATCHES=(
        "${FILESDIR}/${PN}"-1.1.0-fix_llvm_install.patch