gentoo resync : 03.03.2021

4 files changed, 6 insertions, 132 deletions

diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 134200a46d56..42198f51e200 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,19 +1,17 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
-DIST llvmorg-11.1.0-rc1.tar.gz 122793491 BLAKE2B f4777455f5903cffea284eaffd872be6c287c6c1ebbd0c4b5b5473f146d7f5476f3551998a58d3e976ab90cde7b0d05db2b3be97f4e8e2c3474755ff38739268 SHA512 44e281486c44fa1611042ab658b9833a75f9613b7f896863613cfb99de66d13607fb1e9064f42ea3d89ca7951113465a90fd96ca4544262f165f78bd5261f5a8
-DIST llvmorg-11.1.0-rc2.tar.gz 122794772 BLAKE2B ab533f078d9d6c37e27c578866a07896344a0b4cf4ebf6402f4fa490213e017310d1c882bf63e552e99a5b4f6d1d8c01413420713b200bfa6732eff64f3c47a9 SHA512 88d8f1d938f0ba7ec39478d03a35c09a30bea51735276205494265b1061621b3ebcda8ee4211e896783b1b99a377c9fa68046118b0d6cb7fcb7bea1e960f95b7
-DIST llvmorg-11.1.0-rc3.tar.gz 122785838 BLAKE2B d0998219471476be1a1249b3a2444750585a352047d4dc14de6fec87eb3407d0f4b848757340200d3423cb4090554ae033fb4ec3797446e46556fbb566bb77a3 SHA512 b67874cb127f3f929a3796558cdfbf509b384c4247f4936ba08cecf88ca880a167cf67c23d78104b5bab4a98efd9435d1b923deb7ae7367875414e6c896957d1
+DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0-rc1.tar.gz 134164708 BLAKE2B d4261ff7d9586b47f4cfda3d2cda4b76534f9e17fbd5cdb8861895b8eb466021962f4608bfcdeb52f8fce78850a994fd5eda0560f7211e5c8d1ac9330a738a36 SHA512 3d07d013d0705bb99f56898cc55d054d0d95aeb53b3c756cfab80b4c9097cc4935bcea89b9efde2e503a899b9fccf0dacc0073c9991c8ea352755c5ec68a757a
+DIST llvmorg-12.0.0-rc2.tar.gz 134242619 BLAKE2B bb741a311db608fc2ba7eeaab71c5c9f2a430f7fee3f0c5c4334e5c14caa19738d18c87b568de963d57d9b53e808ac412cf8554eca7fcae9ecca65aa4442e197 SHA512 d8f9b3dfeb0fe9b91eb7f49da393784333044db2653373fbb168afd3c8d50f3e3ec7a7b8f44df522d0facafbfe4cfc4d9e2906d19f1e6feb0bdc569b6c10a17d
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD llvm-ocaml-10.0.1.ebuild 2990 BLAKE2B 71c2d364d0e6c52cec07cb743813963d12bd6918c0558b2edcf73b14647b40ce217a4b824def2e0590d06bcd085f71f0de18e1a12504a7a10ce072284393657f SHA512 7e572802eb3ece2e2f57ec391334860a1e9fb911e74ddd7e224965657031cc5ae463cb26466ca0f34e93c488acae5c8814f0f72e6b1201864e573033effeddc7
 EBUILD llvm-ocaml-11.0.0.ebuild 3052 BLAKE2B 6bb5afbfe3536cd33530e082aef0e634b925c4887de9340ad19a9ed55ee5e647aa48ee0d0e66960cd088cf34306f254f931c8e21fd9e4e73875b977126d23ac1 SHA512 27fe154682b0d163118ff5311bc4443f36a4533f92d254878e57fc4917ab47b7a93c549cbd09f4c182f0f8f95f98044ead0edef7a4e29073404b513c5415b817
 EBUILD llvm-ocaml-11.0.1.ebuild 3053 BLAKE2B 9af55df861e473d24ba0cd3641527c8c1d7be544175c7e74a2e1e4f977fd8b0b1132510bc132b47ec494d07ca514720c8ea9742f39c9d327b0ee141ab7fe91d0 SHA512 6aa5aec51ce0dcd3271d2b0c4965f62a171ede0b01b63f3e84906a88f16821e4cf2fe97eb1f040ad3a5c536c1a990ee567bc54682f61971e0e495850271a630f
-EBUILD llvm-ocaml-11.1.0_rc1.ebuild 3037 BLAKE2B 72845a0925dac80b3ce7f530188280f96977dc327b7e377f5627c83e801a8193e43ca0a148e2671ece9fce9f6a250cfdf0c7fcc9fccd9a89b6e1c643c25d2744 SHA512 63646ba0de971c8517c9c0c5dc739bc404f7b94fbf36605ec4dee5299f49486068dd16c99dc5055cecbdd7c346731912e73e8a236bbcff77bdc84b6cce76d14b
-EBUILD llvm-ocaml-11.1.0_rc2.ebuild 3037 BLAKE2B 72845a0925dac80b3ce7f530188280f96977dc327b7e377f5627c83e801a8193e43ca0a148e2671ece9fce9f6a250cfdf0c7fcc9fccd9a89b6e1c643c25d2744 SHA512 63646ba0de971c8517c9c0c5dc739bc404f7b94fbf36605ec4dee5299f49486068dd16c99dc5055cecbdd7c346731912e73e8a236bbcff77bdc84b6cce76d14b
-EBUILD llvm-ocaml-11.1.0_rc3.ebuild 3037 BLAKE2B 72845a0925dac80b3ce7f530188280f96977dc327b7e377f5627c83e801a8193e43ca0a148e2671ece9fce9f6a250cfdf0c7fcc9fccd9a89b6e1c643c25d2744 SHA512 63646ba0de971c8517c9c0c5dc739bc404f7b94fbf36605ec4dee5299f49486068dd16c99dc5055cecbdd7c346731912e73e8a236bbcff77bdc84b6cce76d14b
+EBUILD llvm-ocaml-11.1.0.ebuild 3053 BLAKE2B 9af55df861e473d24ba0cd3641527c8c1d7be544175c7e74a2e1e4f977fd8b0b1132510bc132b47ec494d07ca514720c8ea9742f39c9d327b0ee141ab7fe91d0 SHA512 6aa5aec51ce0dcd3271d2b0c4965f62a171ede0b01b63f3e84906a88f16821e4cf2fe97eb1f040ad3a5c536c1a990ee567bc54682f61971e0e495850271a630f
 EBUILD llvm-ocaml-12.0.0.9999.ebuild 3042 BLAKE2B 609f78d60cc0a66d0f929db8d6855d0f6db24c769ef156a1d69796eeca0de6a4475e99c105504253d77680949f568efdefd4007bee79015ebea159dabed5f7e3 SHA512 ce96aeeaeb4119d69ada3fdd626fcfcbe919f22faa1f2562b048adc0278b8a38d5dd074a606326f3286812402200767b08deb1ff44f9d3e3bc34f778af02242b
 EBUILD llvm-ocaml-12.0.0_rc1.ebuild 3042 BLAKE2B a78e90337120b5e98258feab0423fbcd097ed91ad7a29419ea15ec2e1d52f24eb944bf4f70d3e8b915d7385821c9d50312c2d9c8052644a9e1d516c554e9db99 SHA512 0a1809b8ef9c4c9c1266af12d5aa613bc861e433c78f7b0e09b69d06b5f82421f80f6514f00c03f07aa94535157a24f6f8543c457ebbfaf289c8a7c0817d55fc
+EBUILD llvm-ocaml-12.0.0_rc2.ebuild 3042 BLAKE2B a78e90337120b5e98258feab0423fbcd097ed91ad7a29419ea15ec2e1d52f24eb944bf4f70d3e8b915d7385821c9d50312c2d9c8052644a9e1d516c554e9db99 SHA512 0a1809b8ef9c4c9c1266af12d5aa613bc861e433c78f7b0e09b69d06b5f82421f80f6514f00c03f07aa94535157a24f6f8543c457ebbfaf289c8a7c0817d55fc
 EBUILD llvm-ocaml-13.0.0.9999.ebuild 3042 BLAKE2B a78e90337120b5e98258feab0423fbcd097ed91ad7a29419ea15ec2e1d52f24eb944bf4f70d3e8b915d7385821c9d50312c2d9c8052644a9e1d516c554e9db99 SHA512 0a1809b8ef9c4c9c1266af12d5aa613bc861e433c78f7b0e09b69d06b5f82421f80f6514f00c03f07aa94535157a24f6f8543c457ebbfaf289c8a7c0817d55fc
 EBUILD llvm-ocaml-9.0.1.ebuild 2948 BLAKE2B 3ce68866671edc4640c0585a580f17f28f6bf1a63daf87620eb652e515307e697ed9004912befc5a0fe0e73184e29fbe8315141566df51498bb652f338b40769 SHA512 e89fa47356e21307e84d93423e3cf9716eb6066af985b30386a2867ebe5f82ed889b2500e6b9763895a84294d9890f342843f23f3caaccc617eaddf03270dbbb
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0_rc1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0.ebuild
index 66e7626ab637..6a74d00cd2fd 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0_rc1.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0.ebuild
@@ -18,7 +18,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0/${PV}"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
 RESTRICT="!test? ( test )"
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0_rc3.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0_rc3.ebuild
deleted file mode 100644
index 66e7626ab637..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0_rc3.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
-	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS=""
-IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]"
-for x in "${ALL_LLVM_TARGETS[@]}"; do
-	RDEPEND+="
-		${x}? ( ~sys-devel/llvm-${PV}[${x}] )"
-done
-unset x
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	dev-ml/findlib
-	>=dev-util/cmake-3.16
-	test? ( dev-ml/ounit )
-	${PYTHON_DEPS}"
-
-LLVM_COMPONENTS=( llvm )
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_OCAML_OUT_OF_TREE=ON
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_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
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# disable go bindings
-		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
-
-		# TODO: ocamldoc
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	# 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_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_build ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build 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-11.1.0_rc2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0_rc2.ebuild
index 66e7626ab637..0376bb7114cc 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0_rc2.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0_rc2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="OCaml bindings for LLVM"
 HOMEPAGE="https://llvm.org/"
 
 # Keep in sync with sys-devel/llvm
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY VE )
 ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
 	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
 	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )