gentoo christmass resync : 25.12.2020

7 files changed, 131 insertions, 8 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 66dbadfef331..f8a38f734273 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index 03cec4dd980d..065e7dcd5031 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -3,5 +3,5 @@ AUX externalmeta5.patch 562 BLAKE2B 0618a1691472c3248f63f157f2ba36d886a7b34b1813
 AUX externalmeta6.patch 546 BLAKE2B d0d5f75c46704b280ae4480ffe2ebca097adbc457c845615721888b45612da1a8e71b41bd6d8d9dadb16cdffa35108fc87a3dfd32313fa96d92f0021817e0112 SHA512 c112b7d44101e483d408c56dcd0d2524208b6e95b65a09dfe01f8ad6d09a20617020f9174cb4631473bab2550fec151329fb5e8d0e2e3378991f1ab88cce0301
 AUX externalmeta7.patch 527 BLAKE2B bf4a4aec02096766f9741705fbf99201c742abc992ddb05c143378d7bb6d0b79f3c3541199eb5a81142fa1b317980646c3fe12528f792cbfaa7762f024bd88d1 SHA512 61c1e03e5b0d021f2cd7d013bed54edd610edb48cf9f6c063d3542abea2d2fc811c1cf7284b54a584491064dee8dd4e72656ba90a63c144586f40705b8443a1d
 DIST findlib-1.8.1.tar.gz 261544 BLAKE2B acfa9d4e0d118ebbc0dd7b03da1fe5eaa994e5fec13dc54e60ba42f643d93968469a1a43fe4f832433dca6c3902e8846616fcf460c748bf037fe16cb2f93a847 SHA512 0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1
-EBUILD findlib-1.8.1-r1.ebuild 1666 BLAKE2B dc1031afd592e0b82a11768991bc6c13d2034ce0354d8659d18397366e3eb4d5bbac50b1f62d0b944ec3e298cdd2ffe3134d10a16a9d2c2f53d8528188fc44a1 SHA512 ea9348133fa3c07f312121ea5a02e255cf5848ee6bc149972cf548df0531fb87e4c388d72e7134d0afdb61908d29390b6182aec36fe244dea51b6e3d3585dad7
+EBUILD findlib-1.8.1-r2.ebuild 1647 BLAKE2B e87f9ec61c280cbd09dbcfb9d18240d99b6ba6b044af9b0c5496278769b31ebc50fd9e4168bf9916dd6da5e1b3991a492a9c05f2bfd9e6c1c3af38c57a3ee545 SHA512 77a42202efbcc1b430464b660ba1e8b7cd01620f19453a8ef4cd4837fcc59c9f6a109b6b0b9a54b9390e18e63d43e29299c6cac8dfb4d7ed4500e0543688e7b6
 MISC metadata.xml 244 BLAKE2B c82f45966666e095a27d4d8b14f01f93e202177ea8222c5fc806f4e243b8ca653a61232533a6dd10ed36a35f765dc94cfc651f9fade565b8eedfe1129b5c2d23 SHA512 756b8d091c29b6c4c621ba30588da62cf99e777243fbdd88cc668f3ec071353beea675c853f8c58752fbc6c01c795760cb10428d3a7fd087967a88b885d91149
diff --git a/dev-ml/findlib/findlib-1.8.1-r1.ebuild b/dev-ml/findlib/findlib-1.8.1-r2.ebuild
index 9c3988c304ea..fa1af8f3e840 100644
--- a/dev-ml/findlib/findlib-1.8.1-r1.ebuild
+++ b/dev-ml/findlib/findlib-1.8.1-r2.ebuild
@@ -3,19 +3,16 @@
 
 EAPI=7
 
-inherit multilib
-
 DESCRIPTION="OCaml tool to find/use non-standard packages"
 HOMEPAGE="http://projects.camlcity.org/projects/findlib.html"
 SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
-IUSE="doc +ocamlopt tk"
 
 LICENSE="MIT"
-
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc +ocamlopt tk"
 
-DEPEND=">=dev-lang/ocaml-4.08.1-r1:=[ocamlopt?]
+DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
 	tk? ( dev-ml/labltk:= )"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 44305e3bed33..c6d2f1a450f9 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,11 +1,13 @@
 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-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
+DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD llvm-ocaml-10.0.1.ebuild 2990 BLAKE2B 3993630867acb739d621fa701f83e4c8ddbc44cb9b77e9c9ff1cbd173c18c894836a9eeb2aa2d9182fbed3e05af2d3cf180a535d27c74de4dd2f87afdadc8f99 SHA512 a6444d4877fc671390b0396f04a770363a5be803afa4f657c61bfb0449fa0aa8b68960f4be1ab6061d9c44f69d4130a64c6a4dff1d76e1896919ae2e59ec30d6
 EBUILD llvm-ocaml-11.0.0.ebuild 3052 BLAKE2B 9697dc5b6c2365415dd405b00c913606055d56366ef7710e559611c1bcd1b955777ae4d7836b75a49635bf5132feaf423af9ec7b033e34eb40864a6ecbed3c28 SHA512 855bcfbb8198e815c7d89dfed959fe95d78221eec20a6512c9190eb9e3d9c7b3ebada04a85ccf4653cf9e8e89e318b5339113b92afc1f99d8cd19ffd17c22dd5
 EBUILD llvm-ocaml-11.0.1.9999.ebuild 3037 BLAKE2B 4f8b569495b3248f95e3e363b7bcde257d28d7160be55500aca8dc5160937956ec52b3b3e0eb83bd98d50ebfd04117112c5eecf5afce6e5fb30873aa834f4b06 SHA512 3107f267f868c1420f2bad3a4b27e5f9863fbfa23f9548e568a82fd414ca64d5f1491d26e153dd2a2c11fc840051073f4892ef9056ab977c16ccc7afd436bbe2
 EBUILD llvm-ocaml-11.0.1_rc1.ebuild 3037 BLAKE2B 4f8b569495b3248f95e3e363b7bcde257d28d7160be55500aca8dc5160937956ec52b3b3e0eb83bd98d50ebfd04117112c5eecf5afce6e5fb30873aa834f4b06 SHA512 3107f267f868c1420f2bad3a4b27e5f9863fbfa23f9548e568a82fd414ca64d5f1491d26e153dd2a2c11fc840051073f4892ef9056ab977c16ccc7afd436bbe2
+EBUILD llvm-ocaml-11.0.1_rc2.ebuild 3037 BLAKE2B 4f8b569495b3248f95e3e363b7bcde257d28d7160be55500aca8dc5160937956ec52b3b3e0eb83bd98d50ebfd04117112c5eecf5afce6e5fb30873aa834f4b06 SHA512 3107f267f868c1420f2bad3a4b27e5f9863fbfa23f9548e568a82fd414ca64d5f1491d26e153dd2a2c11fc840051073f4892ef9056ab977c16ccc7afd436bbe2
 EBUILD llvm-ocaml-12.0.0.9999.ebuild 3042 BLAKE2B bd3be02016d1136e2f87dd8da51ff1815f9edc633c1c109ddf108f53d1aaa68ad9af967261ffab5836eb96911071525f20741841e45fada95b6edeb1ce1adc54 SHA512 7610604754b5cd6be108c532b211532a30fb3320216ac7f9042673b50c2411058532d01166610f049f7ecbda6ea45fb495841ce0b4d1b58d14690473d347d206
 EBUILD llvm-ocaml-9.0.1.ebuild 2952 BLAKE2B d0a7879b89bddff51521378d5cf96626b2bad80f35bae6b0026a51806fdc47139049b23a6ded6f64ce9161b1951341ec71e496a9b094e4b3aa1ca8c44e626cbb SHA512 f1937a057dd79a8fcb5ff587520199941d22e5d4ef18be5f5cc7c854e9d42e32beac3101f37897dd1ea32ef6a38a232685a11bee4b2cc83dfedbec3b5e08c75d
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1_rc2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1_rc2.ebuild
new file mode 100644
index 000000000000..40fb0676b744
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1_rc2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..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/ocaml-sqlite3/Manifest b/dev-ml/ocaml-sqlite3/Manifest
index 3d158298cded..7f2839644286 100644
--- a/dev-ml/ocaml-sqlite3/Manifest
+++ b/dev-ml/ocaml-sqlite3/Manifest
@@ -1,3 +1,3 @@
 DIST sqlite3-4.3.0.tbz 22498 BLAKE2B c57d8edbc0897229cb415d48efb02ae41dff1d87fabc667a40b984807c5c5885201dca3d7f523872435b7e18b450c15707212eeeafc0a75f1ad28d7e7671b4c7 SHA512 f09d425830ac24ea835a403bc51d257c265b6e77b1dce01367c715545cbd98f3ad2694e6dfdbc7491d590aa809c0313329e81c9614228170f90197f2a94200c9
-EBUILD ocaml-sqlite3-4.3.0.ebuild 709 BLAKE2B 201c0c0eecef1094d0a1bf8b5b0648e65701feb78db814218ad8d4eac4e3acec1a93fe84b1131e5cabdc24d5eeaa7089c2a36db9c14ff2fd33c72ef354bebce9 SHA512 5bdf0c57b4f9e77a312d95226eb244b5865f2c17468a294b25fb9a126ff323809d8d89bbabec8492aaaa0df699b13ed1e84c5a1d5e258815b232d477f9e844d3
+EBUILD ocaml-sqlite3-4.3.0.ebuild 706 BLAKE2B dcf608ec1e70b6ec84cdbc6c9666abf1b43c65bfa1c284ad1847431c5f9209d956654850b899772da3590e793e4e422a35011027bdc624573ce89d95e0ab4cb2 SHA512 04bd680d44d56e05eed62dd38a1a12c6400fd5cb88b200e5cb2308a24cc784fc892d89cf6402db3ce770f2e77c9ece22bc681afaef1a4c825a982e01d1ab3ca0
 MISC metadata.xml 322 BLAKE2B 943cead5c3010411a8507ac09a05d88a413db06c3fac3967ecb6bde0bdddaa4bb9a7ea081e31e6382c805e3c437f64d26b254b0a630a963021c0507ec51e8526 SHA512 c3844393c1910c1982d20a00e04727028be2cf63a33daa48fba4ea13068cfd6b1d3d175446185e82ba3753880c0559d4b4ed0542243e55908569f603e2524c10
diff --git a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.3.0.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.3.0.ebuild
index 8cc25ff20034..f93d515733bf 100644
--- a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.3.0.ebuild
+++ b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.3.0.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=5