[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/

[Michał Górny]

commit:     1ca1d52deefca71a771cb4d803f8041ebefd6200
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  9 08:33:15 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Mar  9 14:58:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ca1d52d

sys-devel/llvm: Bump to 6.0.0 final

 sys-devel/llvm/Manifest                            |  3 ++-
 .../{llvm-6.0.0_rc3.ebuild => llvm-6.0.0.ebuild}   | 23 ++++++++++++----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 8377b3f8284..30ef87f02cf 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -32,5 +32,6 @@ DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 
6327eed2d1feb108440f22d2581d1ff86c10
 DIST llvm-5.0.1-manpages.tar.bz2 94004 BLAKE2B 
34eb29361ad7aa881e64d1dd2992fd89ce44adafd2521284c27b6ffe7082bc7e70458204e6f34d582b704bf7c5dad93c6a6dc41fc7abc41862aab8f5ec53ed07
 SHA512 
3444cc8e06009f5dd2669b92af662a1049d9294c8ca0dcf45486e1dc1aaf10160860b7856d30ad70bbe5864b21d1539316e89f5237549f5653954e23baf64334
 DIST llvm-5.0.1-patchset.tar.bz2 4204 BLAKE2B 
e7282e84578631d88549bdf34e5a44e0294e47ef1fee29c0cb954d7afd160d4b6a0f39bb3bd53791ea53503a60eaa0ada0a512a63d696ff096dc6f21f4aecdc7
 SHA512 
395ea2b13008e222c034e2bdd8c2bb033b9c01e61fb89c840f009f6cddb499b317df8b061d29f40968d8f0df5540a2f4a9de31eef1de886796c8c334f37254eb
 DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 
3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e
 SHA512 
bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb
-DIST llvm-6.0.0rc3.src.tar.xz 25295644 BLAKE2B 
5832b3daefbbf043caaac38791eb95a321cbee82bfa12710e332ea14b8ee6d1fe81c4fcea19cdbabd24b89e338575e367bab481c47eb6a6bfbd6a926f02fe5b2
 SHA512 
9932debae40ced0137c1e1675fb91b996326c7eed1b67d1280bd2b0f5bd62e15d47c87d0e215fe29680cb628853c6a446587623a6f3312ce42612b2ac865e3cd
+DIST llvm-6.0.0-manpages.tar.bz2 102668 BLAKE2B 
f458cbfcfdd6600f90f9bbe8cd9681de3dc11c62dbfcaa5ba7a281ad30d6367c33bebd5090c255e85a10b00b7bcb9c988d340b67f1db51982f55956acba109e9
 SHA512 
a7ed3e246e6488254f19dbb8484c079be39bc52f9b2fab3f736dd013683b7f46e8e036ee571dec5066c86ee7c25713608a2426555e8ad04b81891912314ee48e
+DIST llvm-6.0.0.src.tar.xz 25296048 BLAKE2B 
7ea90bb63d6f26cfbc1c1ed2f243b0fcd8ad2ceb7963cf768d262cd55e9a0c71a9cfdea0333fb220faacf4540d924d2512532774dcfb52b52490ad74e38c09e0
 SHA512 
a71fdd5ddc46f01327ad891cfcc198febdbe10769c57f14d8a4fb7d514621ee4080e1a641200d3353c16a16731d390270499ec6cd3dc98fadc570f3eb6b52b8c
 DIST llvm-manpages-4.0.1.tar.bz2 87981 BLAKE2B 
79ffd254ee5c6e09159c954913ef820f74107d4fcea5e3ed82592dc36af8fdfbf1e850547ba8bfc20aa9a5ecdd26c50329e6a6d558ae3aa5475a930789ce3e01
 SHA512 
d5b3213567c25db58ef364d272314a79c311a80fc21d98c09a5540af45a8190a38f489228663fe9a9b63bf0f2b952c460c4196a8fc8d6f221619f6e7ed2fc415

diff --git a/sys-devel/llvm/llvm-6.0.0_rc3.ebuild 
b/sys-devel/llvm/llvm-6.0.0.ebuild
similarity index 90%
rename from sys-devel/llvm/llvm-6.0.0_rc3.ebuild
rename to sys-devel/llvm/llvm-6.0.0.ebuild
index 5656b68b8b5..b9ffcade1fa 100644
--- a/sys-devel/llvm/llvm-6.0.0_rc3.ebuild
+++ b/sys-devel/llvm/llvm-6.0.0.ebuild
@@ -9,12 +9,12 @@ CMAKE_MIN_VERSION=3.7.0-r1
 PYTHON_COMPAT=( python2_7 )
 
 inherit cmake-utils eapi7-ver flag-o-matic multilib-minimal \
-       pax-utils python-any-r1 toolchain-funcs
+       multiprocessing pax-utils python-any-r1 toolchain-funcs
 
 DESCRIPTION="Low Level Virtual Machine"
 HOMEPAGE="https://llvm.org/";
-SRC_URI="http://prereleases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz";
-#      !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/${P}-manpages.tar.bz2 
)"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz
+       !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/${P}-manpages.tar.bz2 
)"
 
 # Keep in sync with CMakeLists.txt
 ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
@@ -32,7 +32,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LICENSE="UoI-NCSA rc BSD public-domain
        llvm_targets_ARM? ( LLVM-Grant )"
 SLOT="$(ver_cut 1)"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc gold libedit +libffi ncurses test xar xml
        kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
 RESTRICT="!test? ( test )"
@@ -80,6 +80,9 @@ src_prepare() {
        # https://bugs.gentoo.org/show_bug.cgi?id=565358
        eapply 
"${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
 
+       # Fix appending -Wl,-rpath-link on non-Linux (-> FreeBSD).
+       eapply 
"${FILESDIR}"/6.0.9999/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch
+
        # disable use of SDK on OSX, bug #568758
        sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
 
@@ -136,7 +139,7 @@ multilib_src_configure() {
 #      fi
 
        use test && mycmakeargs+=(
-               -DLLVM_LIT_ARGS="-vv"
+               -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs 
"${MAKEOPTS}" "$(get_nproc)")}"
        )
 
        if multilib_is_native_abi; then
@@ -229,11 +232,11 @@ _EOF_
        doenvd "${T}/10llvm-${revord}"
 
        # install pre-generated manpages
-#      if ! use doc; then
-#              # (doman does not support custom paths)
-#              insinto "/usr/lib/llvm/${SLOT}/share/man/man1"
-#              doins "${WORKDIR}/${P}-manpages/llvm"/*.1
-#      fi
+       if ! use doc; then
+               # (doman does not support custom paths)
+               insinto "/usr/lib/llvm/${SLOT}/share/man/man1"
+               doins "${WORKDIR}/${P}-manpages/llvm"/*.1
+       fi
 
        docompress "/usr/lib/llvm/${SLOT}/share/man"
 }