gentoo resync : 02.08.2019

8 files changed, 147 insertions, 25 deletions

diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 6765118ab721..afbdbc3e49de 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -2,10 +2,12 @@ DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
-EBUILD llvm-ocaml-5.0.2.ebuild 2984 BLAKE2B 723a1e859c8e35f2ece65cc8dd6fdd4ef13017fa0ea8ded0c2c1e343a996828194097389b6db5fb2fd5f6c62fcfb9f443e72def7c6549037ae51816c3c7d9f64 SHA512 ba6033dab81c3abd7d9fe2e664b229cfa7f2674193287794ac1cf106a31f35db8d31795362787567d6f0703cdd216f36af3997055c594301dc29e93bd7336615
-EBUILD llvm-ocaml-6.0.1.ebuild 3148 BLAKE2B 08a61098a9782694f57d4a56dd450200abdc1fb117ff327e4005c8f81d1b5cb861bba0fdadb19e94e3d4c409b1431a5ce361bc77b0ce590c69b855b1d866e1f5 SHA512 b0cc43ae38254cf01688e4a5b375452c8d17e9a8cae89a43ea1635383516d217850f16e605de3c45c8cef993ec9c95fbcf98f4333e27770000cae6899615e631
-EBUILD llvm-ocaml-7.1.0.ebuild 3145 BLAKE2B 270cccdb5a50fb12485660336195c89de92c3a2f93defb8bfe31dd28ea155ded54a8aebffa14e5b5f31e2121da563a2269dfdec4a726c1f18c39552510c8a8ea SHA512 6f14a6decebc23a4631a4b17ffad1b5e6d342514cf9f7dae72a7780792089b070851608c0a0e4162f441fc395ea3583e0236c23794d9272b30a04e1bb3eee65e
-EBUILD llvm-ocaml-8.0.0.ebuild 3157 BLAKE2B 7c85496ecc7e89dc7126299ce38e1964494c3e073a4fd77e71d080af53f76ab5dc5e13c69c0261a9acc9ad7a58a01366ef98c543466c6f477e02339a66acdc3f SHA512 4a1a8b47634d0a73d16b0bf05fb888d230fa45606e96e73efcd6bdb2fc5ace03a138f54bcac7ae90975b578ff2ef0ea3139f8231a0ad9b84ea832fee0d3465c9
-EBUILD llvm-ocaml-8.0.9999.ebuild 3169 BLAKE2B 1f7ad169958abd781bbbcde21ecd06b43ab75492411499507816c6068de95d509a989baafad0692f8a29642dc7a1c1b172ca00d149ee1ac01a5726eb9beb1d28 SHA512 b8fd0bf8099bc2e8bb3415073d1f16c87bc9d1493966c11f84cc71436b000177fe2d78b0c3a9334ec2ebd76c8f6b19c404b44648a61eb82fadd887a0a9d8e6fa
-EBUILD llvm-ocaml-9999.ebuild 3395 BLAKE2B df9a89ef69e0d98a797980be5507a28b16a2eea0aebf1a667462c27e62a3bd05267825e37b8dd8da2bfa662dbcf8ada3078c58a75fb41ab78b9eb33f067183e9 SHA512 b8edfccd9fb78b91b1b476ebb9d982243084774765306ed0f984a86e54cdb7dcc283aad8bef3f417b7bed7d46d6b6f3320285f11b48f0da077e35bc1448379a4
+DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
+EBUILD llvm-ocaml-10.0.0.9999.ebuild 3395 BLAKE2B 830a412e3234bee213c16a675c2db8d433b1059b444bf7efee646b39ff86b8619d684af78746bd5471c239835340174904fb0c7127a38e4e0305735cbcd321dd SHA512 76d4b03a0731289f63c2c18627e3dfa9a265e0df832770a02f8312dc1f7cbf3d36e2af2d8d45dc850f196717436ed41ebd351e487367c6fdd120c3890b495ace
+EBUILD llvm-ocaml-5.0.2.ebuild 2957 BLAKE2B 66d6e022870116b4be40bc20706694a479577bd29b3e429d492333e7a7a3590fa1ba02397d1e76e5aba06b7b5813c69520c46e53c775d79c0b311ccc9e4d5edd SHA512 0019b664dff97399015abf4ab56c4bd7152185f9e894bff674adf095ff5ef87ba1c86f81cc8c424a229a9e84769c0a622b97c346e478cf8442defc4a60aee36b
+EBUILD llvm-ocaml-6.0.1.ebuild 3121 BLAKE2B dca92122927a7fd4c8e3213f85393e134f194ddf51f436ac2dacef59585d340fd27e6ac77bb3b9306bee3560f998805abe06a695664d6f50920c250dce413147 SHA512 e328f56e4eb855be1528a4e5fafb4ef7ddaf23592369650fdb275b3a59a7fd318c9384cf93d0d4da46403ae9ceac409a1668db76f21a9662783e6666eabc89b8
+EBUILD llvm-ocaml-7.1.0.ebuild 3121 BLAKE2B dca92122927a7fd4c8e3213f85393e134f194ddf51f436ac2dacef59585d340fd27e6ac77bb3b9306bee3560f998805abe06a695664d6f50920c250dce413147 SHA512 e328f56e4eb855be1528a4e5fafb4ef7ddaf23592369650fdb275b3a59a7fd318c9384cf93d0d4da46403ae9ceac409a1668db76f21a9662783e6666eabc89b8
+EBUILD llvm-ocaml-8.0.0.ebuild 3133 BLAKE2B f39bdfe95cddd3d162b607a72b05d5fbeccd71dc573a5d95525619dfe89352cac9d47537f7edb1a74013ebd0397ab57d8da6bf605a4685e1e49a537881c65eb8 SHA512 403d99d7d8aac24b5c0db11a9402af8c99b6b7cf9e2caec0c900a632b904558c64c86364883c460c68cb2d814fa2b13bd983b8c56f906c957a57e0d83b44677f
+EBUILD llvm-ocaml-8.0.1.ebuild 3166 BLAKE2B 6326a9a3811a74f7927d63187677f4b53b70b267e1f577773b9cd2cdd7205f164bb864993228b2b4ce1b0bf87a1fce56f11b2dd71f4242c0882dccfef5afa7c9 SHA512 c886ad555a335793ef8980007034c0e8b1606351783df88cab5fbf9fc96cd26a2dc27372a2d2d0fdfdcce6f03c4a7521c3a3125fb5ec4473ec418b5cb7a6b855
+EBUILD llvm-ocaml-9.0.0.9999.ebuild 3157 BLAKE2B 3850e745bcfbee9e966d4a8819dc448ef007681feca807a43990422f1064d55ec9efbf5c08b08d08423de1b3dfc4d7046fcfd119a3df92c809127c385c3f8b21 SHA512 d8d1fc1e7fa35bc45ae701b05f52254e8522893f83f5f0910f8399a7e22dc18379bf9f056f082ffbe2c265fd5fa217a99b783e865253b0cc797482c324e60180
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild
index eb4bb8c24833..e354e4765340 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 # (needed due to CMAKE_BUILD_TYPE != Gentoo)
@@ -43,14 +43,13 @@ DEPEND="${RDEPEND}
 	!!<dev-python/configparser-3.3.0.2
 	${PYTHON_DEPS}"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( ${ALL_LLVM_TARGETS[*]} )"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
 
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
 pkg_setup() {
-	llvm_pkg_setup
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	python-any-r1_pkg_setup
 }
 
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-5.0.2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-5.0.2.ebuild
index ca74c5a91283..d21c45f2aac3 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-5.0.2.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-5.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,8 +39,7 @@ DEPEND="${RDEPEND}
 	!!<dev-python/configparser-3.3.0.2
 	${PYTHON_DEPS}"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( ${ALL_LLVM_TARGETS[*]} )"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-6.0.1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-6.0.1.ebuild
index 0e64a225bb7b..8973393dd2af 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-6.0.1.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-6.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -40,8 +40,7 @@ DEPEND="${RDEPEND}
 	!!<dev-python/configparser-3.3.0.2
 	${PYTHON_DEPS}"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( ${ALL_LLVM_TARGETS[*]} )"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-7.1.0.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-7.1.0.ebuild
index 844cf32241cb..8973393dd2af 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-7.1.0.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-7.1.0.ebuild
@@ -40,8 +40,7 @@ DEPEND="${RDEPEND}
 	!!<dev-python/configparser-3.3.0.2
 	${PYTHON_DEPS}"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( ${ALL_LLVM_TARGETS[*]} )"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-8.0.0.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-8.0.0.ebuild
index f083d7d40b80..1604aeb371f4 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-8.0.0.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-8.0.0.ebuild
@@ -40,8 +40,7 @@ DEPEND="${RDEPEND}
 	!!<dev-python/configparser-3.3.0.2
 	${PYTHON_DEPS}"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( ${ALL_LLVM_TARGETS[*]} )"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-8.0.1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-8.0.1.ebuild
new file mode 100644
index 000000000000..154f485d0514
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-8.0.1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils llvm multiprocessing python-any-r1
+
+MY_P=llvm-${PV/_/}.src
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${MY_P}.tar.xz"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC Sparc SystemZ WebAssembly X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+LICENSE="UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
+	!sys-devel/llvm[ocaml(-)]"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-ml/findlib
+	test? ( dev-ml/ounit )
+	!!<dev-python/configparser-3.3.0.2
+	${PYTHON_DEPS}"
+
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+
+S=${WORKDIR}/${MY_P}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Python is needed to run tests using lit
+	python_setup
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_OCAML_OUT_OF_TREE=ON
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# disable various irrelevant deps and settings
+		-DLLVM_ENABLE_FFI=OFF
+		-DLLVM_ENABLE_TERMINFO=OFF
+		-DHAVE_HISTEDIT_H=NO
+		-DWITH_POLLY=OFF
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		# disable go bindings
+		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+		# TODO: ocamldoc
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	# also: custom rules for OCaml do not work for CPPFLAGS
+	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+	cmake-utils_src_configure
+
+	local llvm_libdir=$(llvm-config --libdir)
+	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
+	cd "${BUILD_DIR}/${libdir}" || die
+	ln -s "${llvm_libdir}"/*.so . || die
+
+	if use test; then
+		local llvm_bindir=$(llvm-config --bindir)
+		# Force using system-installed tools.
+		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+			"${BUILD_DIR}"/test/lit.site.cfg.py || die
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile ocaml_all
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake-utils_src_make check-llvm-bindings-ocaml
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+	dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-8.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-9.0.0.9999.ebuild
index 1d5a88b0a176..28e3cb65696c 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-8.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-9.0.0.9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 # (needed due to CMAKE_BUILD_TYPE != Gentoo)
 CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit cmake-utils git-r3 llvm multiprocessing python-any-r1
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://llvm.org/"
 SRC_URI=""
 EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
 	https://github.com/llvm-mirror/llvm.git"
-EGIT_BRANCH="release_80"
+EGIT_BRANCH="release_90"
 
 # Keep in sync with sys-devel/llvm
 ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
@@ -42,8 +42,7 @@ DEPEND="${RDEPEND}
 	!!<dev-python/configparser-3.3.0.2
 	${PYTHON_DEPS}"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( ${ALL_LLVM_TARGETS[*]} )"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
 
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo