13 files changed, 273 insertions, 8 deletions
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 4a393df2b682..000704e455a2 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index b0a58bfff746..999bb389c3ea 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -1,7 +1,8 @@
+AUX lablgtk-2.18.10-cflags.patch 2852 BLAKE2B 9460dc7e50572f006eca3858b485d99b39fd8b29648bde3559f04b431cf0363725a9e3ed324db20fe0177cf1afff58c3436432c2fbb2de219b390d2bd830b494 SHA512 7f731a8ecd8e10de8519e91f346f73d479a31fee22a9c16ba60109e055655d54a66183a1f4a072702597a65c005fb3d17819672edd8d12396e41bb41c9231250
 DIST lablgtk-2.18.10.tar.gz 1068504 BLAKE2B 8f82cd8b31c136420bfbbeaf78ec2d7913b7c5fc16abd485c508f8de3ab587173b0b5c798cdbe851254b48754929c1f0063cfc9e3c5e0663b7cdebc380ec0e8a SHA512 73705aaa80db433d11a28df5f6f5d10bd282e477e90916152a87e71865ccfcd7dfbdbe77350ecadf61ba2ccc7a188de1c68f1e6385e20c75f167969001e8418d
 DIST lablgtk-2.18.5.tar.gz 808005 BLAKE2B 279fd9f018948438b616a12ab60fca3019330504a79d8b76c58fa0a99a7b36df9bf78f57f0e60c4eea6f0bad60f94c06b26490518ec25a5a72c342e4b7c42501 SHA512 7b6ba1a4dfa82cc3bbc502082ff4fccc23cc06ee4f30d01a2e423f3f99e945a4befe450d230b5aa19c5b810e9f46f2838655099d49da2db7c8a2e52eac213024
 DIST lablgtk-2.18.8.tar.gz 855263 BLAKE2B 92aeadcfac666756e50ea573c7a2119cc13eab5c2f2e033fcdf92d5c33d597d64bf2e860ff181d958b4d8e9a3d4002b3eaabbd1da7580444fee91dafaba26289 SHA512 1510b8886dd55b82fbc96f333d84779f51a4794d13b0934569d13b1975ded9ec684855b9856f636fb302fd8ff2f118d0d5f3ffb2b8086d22cdad442e963868ae
-EBUILD lablgtk-2.18.10.ebuild 1884 BLAKE2B e64363193707f30dc7c85c68a80aa83700a4033a1ca08c3f51e5deb685e67523ab0507cf6a9e0c10e31522783f856bcb34e7ac5feac33c222e3893ff629cd4e1 SHA512 ee518a55a66c7876464034435516192af8c91e338fbdec2dbd0575c1eb2fe68f0cbde4fcc23f8814a430296f4e59f474b275b50c4c033a92f8d19725f85c4fbc
+EBUILD lablgtk-2.18.10.ebuild 1968 BLAKE2B 3b337ec377bf85ca60cb18197b5d702f3942056e45dd3ed5d8ea4b6dda727b4418fb5e6a759235955b8b31f86aab39cbac72705a9366a428bec1c281d4e9e50c SHA512 fcc1dd98df79f3416e0641a3a4f8cda052172822802fd41461dc6701c1e83f6a6b56ef289676c6fe41df2eb99667cf462ab10ba04cb1be3e761f064ae54c1c23
 EBUILD lablgtk-2.18.5.ebuild 2327 BLAKE2B debd856df94beb8f43f803b38f3a07c9b30e2636152be3af9e39defb3a78551c08e748e2096c4014ee22046a7cb121650271caee10ed6db7119bb140b5db7300 SHA512 e2b0225484f28971d02c02dde960095a60a0ef2db2b25263ad678a3f7a33473bdeafd96e100d671a11da5fe331d0c69f092fc23d64ffcf07e0d1d2ddfe60b268
 EBUILD lablgtk-2.18.8-r1.ebuild 1717 BLAKE2B 0f951f152a005cbe10ba78e829215087f3d32f27fcddba88af0ab943f23e30d053f3fbd364900f689aacce7896800a31731c87489109b6612b1eacb8fe802036 SHA512 db05d897d25054b497a16a531e7d13fb19de2e5f74aa3faf162cfc2d960e61b106511bec89a332586cc96633a1a92820bf9c03da91edbe0b7073424335177c32
 MISC metadata.xml 463 BLAKE2B 79b09024eeae81c18bf584e6341773512c569e348cea23294fd1354bbc6f5ac4da24ffa2a00cf89c44fe7b3af4b8214d6c53f2b36e7c2aca0fedbe2a7d944c97 SHA512 c4dc8d0ea137fa1d8694702fec3dc42eec83967f061c72097b77032ccfe8e6f47450d7a7486647acdf0387ac3d2cf8c028b772d71943d402bec5a7bd976a0ce1
diff --git a/dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch b/dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch
new file mode 100644
index 000000000000..9cbc94a8a036
--- /dev/null
+++ b/dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch
@@ -0,0 +1,97 @@
+--- a/src/Makefile	2020-05-14 22:01:09.565870733 +0200
++++ b/src/Makefile	2020-05-14 22:06:49.081621996 +0200
+@@ -18,6 +18,7 @@
+ 
+ include $(CONFIG)
+ #GTKCFLAGS += -Werror -Wno-error=deprecated-declarations
++CFLAGS=
+ 
+ TARGETS = varcc$(XE) lablgtktop$(XE) lablgtk2$(XB) gdk_pixbuf_mlsource$(XE) \
+ 	$(THINITOBJS) build.ml
+@@ -45,14 +46,13 @@
+ 
+ ifdef DEBUG
+ COMPILER += -warn-error A-52
+-CFLAGS = -g $(GTKCFLAGS)
++OCAMLCFLAGS = $(GTKCFLAGS)
+ CUSTOM = -custom
+ #MLLINK += -cclib -lcamlrund
+ MLBYTEFLAGS = -g -dtypes
+ else
+-CFLAGS = -DG_DISABLE_ASSERT -DG_DISABLE_CAST_CHECKS $(GTKCFLAGS)
++OCAMLCFLAGS = -DG_DISABLE_ASSERT -DG_DISABLE_CAST_CHECKS $(GTKCFLAGS)
+ ifneq ($(TOOLCHAIN),msvc)
+-CFLAGS += -O
+ endif
+ endif
+ 
+@@ -65,9 +65,9 @@
+ THLINK = unix.cma threads.cma
+ 
+ ifdef USE_CC
+-CCOMPILER = $(CC) -c -I"$(LIBDIR)" $(CFLAGS)
++CCOMPILER = $(CC) -c -I"$(LIBDIR)" $(OCAMLCFLAGS) $(CFLAGS)
+ else
+-CCOMPILER = $(CAMLC) -c -ccopt '$(CFLAGS)' -verbose
++CCOMPILER = $(CAMLC) -c -ccopt '$(OCAMLCFLAGS) $(CFLAGS)' -verbose
+ endif
+ 
+ ifdef USE_GL
+@@ -123,7 +123,7 @@
+ CLIBS += liblablrsvg$(XA)
+ RSVGMLOBJS = rsvg.cmo
+ RSVGCOBJS = ml_rsvg$(XO)
+-$(RSVGCOBJS) : CFLAGS+=$(HAVE_SVGZ)
++$(RSVGCOBJS) : OCAMLCFLAGS+=$(HAVE_SVGZ)
+ endif
+ 
+ ifdef USE_GTKSPELL
+@@ -140,7 +140,7 @@
+ opt::  lablgtksourceview.cmxs
+ endif
+ 
+-ml_gtksourceview.o: CFLAGS=$(GTKSOURCEVIEWCFLAGS)
++ml_gtksourceview.o: OCAMLCFLAGS=$(GTKSOURCEVIEWCFLAGS)
+ GTKSOURCEVIEWMLOBJS = gtkSourceView.cmo gSourceView.cmo
+ GTKSOURCEVIEWCOBJS = ml_gtksourceview$(XO)
+ ml_gtksourceview.c: pango_tags.h
+@@ -179,7 +179,7 @@
+ endif
+ 
+ ifdef USE_GTKQUARTZ
+-CFLAGS += -DHAS_GTKQUARTZ
++OCAMLCFLAGS += -DHAS_GTKQUARTZ
+ endif
+ # Rules
+ .SUFFIXES: .ml .mli .cmo .cmi .cmx .cmxs .cmxa .c $(XO) .d$(XO) .var .h .opt .def .ml4
+@@ -188,7 +188,7 @@
+ .cpp$(XO):
+ 	$(CCOMPILER) $<
+ .c.d$(XO):
+-	$(CAMLC) -c -ccopt '-MT -DCAML_DLL -Fo$@ $(CFLAGS)' $<
++	$(CAMLC) -c -ccopt '-MT -DCAML_DLL -Fo$@ $(OCAMLCFLAGS) $(CFLAGS)' $<
+ .ml.cmo:
+ 	$(COMPILER) $(PRINCIPAL) $<
+ .mli.cmi:
+--- a/src/ml_gdk.h	2020-05-14 22:19:59.045394874 +0200
++++ b/src/ml_gdk.h	2020-05-14 22:20:06.694277819 +0200
+@@ -102,7 +102,7 @@
+ CAMLexport int OptFlags_GdkModifier_val (value);
+ CAMLexport int Flags_GdkModifier_val (value);
+ CAMLexport int Flags_Event_mask_val (value);
+-CAMLexport lookup_info *ml_table_extension_events;
++extern lookup_info *ml_table_extension_events;
+ #define Extension_events_val(key) ml_lookup_to_c(ml_table_extension_events,key)
+ 
+ #define GdkDragContext_val(val) check_cast(GDK_DRAG_CONTEXT,val)
+--- a/src/ml_gdk.c	2020-05-14 22:21:39.244861128 +0200
++++ b/src/ml_gdk.c	2020-05-14 22:21:57.571580518 +0200
+@@ -55,6 +55,8 @@
+ #define GDK_WINDOW_TYPE_HINT_DOCK GDK_WINDOW_TYPE_HINT_NORMAL
+ #endif
+ 
++lookup_info *ml_table_extension_events;
++
+ CAMLprim void ml_raise_gdk (const char *errmsg)
+ {
+   static const value * exn = NULL;
diff --git a/dev-ml/lablgtk/lablgtk-2.18.10.ebuild b/dev-ml/lablgtk/lablgtk-2.18.10.ebuild
index ad3698d27a55..780d515a5e01 100644
--- a/dev-ml/lablgtk/lablgtk-2.18.10.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.10.ebuild
@@ -26,6 +26,10 @@ BDEPEND="dev-ml/findlib
 
 DOCS=( CHANGES README CHANGES.API )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-cflags.patch
+)
+
 src_configure() {
 	local myeconfargs=(
 		$(use_enable debug)
@@ -46,9 +50,9 @@ src_configure() {
 
 src_compile() {
 	# parallel build crashes
-	emake -j1 all
+	emake -j1 all CFLAGS="${CFLAGS}"
 	if use ocamlopt; then
-		emake -j1 opt
+		emake -j1 opt CFLAGS="${CFLAGS}"
 	fi
 }
 
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index a9597c5e4ed0..48c5869afb96 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,8 +1,10 @@
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
+DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD llvm-ocaml-10.0.0.9999.ebuild 3206 BLAKE2B 5eebb24bcd854430172565433326f723f1707fbadc941d9a891dc42934120fa00d27f4ec8c14467b8919dd4132d9f0bb00ad84db6ac98008bf7218d7403ed34a SHA512 62d413a75c1c3eb03b1b0dd63814d25b248632fd0faaea1e9f74ad089d0a79e03503db293b0081712e4ea0d55c2b8d186d79f933a04ba50e327a56122a96c33f
 EBUILD llvm-ocaml-10.0.0.ebuild 3219 BLAKE2B 8d2ac0dc88b865f723c527315aaabb6bbd75773660b63197c833c72d7915495e494d73144f84a451dec3793d45a2f7f44dc22beb5c60f55dfd88a23bb04aede0 SHA512 fa83b587c1170564e25c040e2809daf6dc13d1718074d22a7093f08e7444d6378dbeb2f5ddc57f681f4a93b14c95275c87027c9e9191757b1fba4c9008464d38
+EBUILD llvm-ocaml-10.0.1.9999.ebuild 3206 BLAKE2B 5eebb24bcd854430172565433326f723f1707fbadc941d9a891dc42934120fa00d27f4ec8c14467b8919dd4132d9f0bb00ad84db6ac98008bf7218d7403ed34a SHA512 62d413a75c1c3eb03b1b0dd63814d25b248632fd0faaea1e9f74ad089d0a79e03503db293b0081712e4ea0d55c2b8d186d79f933a04ba50e327a56122a96c33f
+EBUILD llvm-ocaml-10.0.1_rc1.ebuild 3203 BLAKE2B 0704301a50ed440809470c0753a7c59ba2118dac3cc284f4bdaed07ff9080d2ac09cc624aa7001526f900c7ffa27dc2f04a42ed964f6759d313d7c5281591311 SHA512 86c415b7cda21fac1137f4af120bf6df3e65afbf0c08a3afba60854383306faec4bd4b32fa1be3d7cafdcdbe3faa3efe2f482142d49d01c5cebc0a7f1515fa53
 EBUILD llvm-ocaml-11.0.0.9999.ebuild 3206 BLAKE2B 9f18892346ac171baff4f5044b34d80a206e6257dbdabb7f95794e4eea8c58de58f45c315586f7569e2e4068d8363233e466bfb11cb28003dda977aacd689713 SHA512 1c257c6bb2b04a7fade003b7a035cce1016457c1287950ee7d6c4e5ecdb4d0cacd5970048d326092bfa68ce97eaf68fed44b1dc8e52751d2752fd9e5f09af824
 EBUILD llvm-ocaml-8.0.1.ebuild 3064 BLAKE2B 41792ef0b7764c4b7c297a05ee56d4e613cbfbcb2e2157e7b70c8ecbb71aea698079abca2324291f9e0b9565e36509e81ee313bd152bb0c15c74c6b69c5f4dd6 SHA512 042075a171609318603e93320a6080f6b75319b7a6490a85bced7138001d30a72b45a0bf348a0e7c5a80f56c8c7cf3e6f921ed5fea41b62ece3226d00dde49d3
 EBUILD llvm-ocaml-9.0.1.ebuild 2922 BLAKE2B d7ae97c680d9f223a0fbaf2989ee60c4ae2baebf73664c9909485fea6c99f5c4c817ff522bee6175a741a5632687d1d0ea5b7b961587a258ca0737ac419390ac SHA512 dc30f078950d944a5c9d18d8804db82300845564afc05878cc7b157d37ad32259c528b358b9cd12684da3b9885b62e92cc6a32b46b8c4cbf48269839bd4cfa02
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.9999.ebuild
index 52e3836cb57f..52e3836cb57f 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.9999.ebuild
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc1.ebuild
new file mode 100644
index 000000000000..8a7efe8fca43
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( llvm )
+llvm.org_set_globals
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM 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_}" )
+LLVM_TARGET_USEDEPS=${ALL_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}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
+	!sys-devel/llvm[ocaml(-)]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	dev-ml/findlib
+	test? ( dev-ml/ounit )
+	${PYTHON_DEPS}"
+
+# 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=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}"
+
+		# 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/num/Manifest b/dev-ml/num/Manifest
index fa7caef20812..1059a554855d 100644
--- a/dev-ml/num/Manifest
+++ b/dev-ml/num/Manifest
@@ -1,3 +1,4 @@
+AUX num-1.3-cflags.patch 409 BLAKE2B 97db7e69d4bee7e6940386349620799d586ab7094a51995c015ddec399747381175936e523f25b2312aed434ef25dfbcc2d6ef3aaa502ade39ff14fbd0ead636 SHA512 95245b0c3738511ff6a8a43b5f4c8897a82502a751552e1f1c846f3c7bb1040a5227055a55303292c1eca18a454d0f7c038ef574f00a772db2b72611857e15b5
 DIST num-1.3.tar.gz 66251 BLAKE2B d6fde246693c8aef3b881a4ebc2b601392e0f0bf561dc4f4d32a5e1f835a5186deba3ffa77c88c6c05cd6e837dc836567fcabffefae99ce1ccae94e1bdfc849a SHA512 c88310f8c45700990095e6b2e9abf24c27347711b9abfd1dde75e540fbbfc6a365e6713bd69f66009af305728fcb36dc61eb37fdd0be7d73824b0e92fbe8c031
-EBUILD num-1.3.ebuild 634 BLAKE2B be8b0e904f78cbfef4f69a21a6370686a50293e682c73d96a1f7f6c5f619db37e4c6221f8bb3da7326d0dbf60e4a1ad0d3a0b61663f8f26153ee84822334bab8 SHA512 7a1a486b11c4bba28c83ca76ffacd793eee9ba144ee41bb3dd036687b019d77ba7080f5917e1e91e6a9672299921474c5280216fefdb14624d1616dff0f33a55
+EBUILD num-1.3.ebuild 723 BLAKE2B 50ac5e2566b164c5b1aa77037a77f68763ab7d7db2d043f67ce011b1aaf49b97eacb6eaada17af468e9d0f4cc451f977e5964e789dcf03f2b7addce7c935d01b SHA512 d3c8198445dc5eae9c517243bd54a72762e0c3a698a4ef332e48c6fa8cdd1c9f18cab924980e575b8170a85e19766380a4b053b999e24dae5dd9d9233632fb7e
 MISC metadata.xml 247 BLAKE2B ca08677c4c0af66af431abe578122a2ea0278f7ffabab245eec806167a6226c65f97e9826d64fc4b82eb14b6200cd1e3a31a5b4999e18aac41a4f9af43d708d6 SHA512 fff6c25e644477aaa35b838e10c44ca8eae9824ef8f19795e31201db40c10068f0216dec38deb0ba80782155b43fd1d72fb888cb825eaabacc3bd1ec0d18f3ca
diff --git a/dev-ml/num/files/num-1.3-cflags.patch b/dev-ml/num/files/num-1.3-cflags.patch
new file mode 100644
index 000000000000..771455c4f724
--- /dev/null
+++ b/dev-ml/num/files/num-1.3-cflags.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile	2020-05-21 18:54:31.176399032 +0200
++++ b/src/Makefile	2020-05-21 18:55:27.881498310 +0200
+@@ -65,7 +65,7 @@
+ %.cmx: %.ml
+ 	$(OCAMLOPT) $(CAMLOPTFLAGS) -c $*.ml
+ %.$(O): %.c
+-	$(OCAMLC) -ccopt -DBNG_ARCH_$(BNG_ARCH) -c $*.c
++	$(OCAMLC) -ccopt "-DBNG_ARCH_$(BNG_ARCH) $(CFLAGS)" -c $*.c
+ 
+ # Legacy installation: files go into OCaml's stdlib directory; only META
+ # is installed via findlib
diff --git a/dev-ml/num/num-1.3.ebuild b/dev-ml/num/num-1.3.ebuild
index 0f68ec7d75bf..8cea14497085 100644
--- a/dev-ml/num/num-1.3.ebuild
+++ b/dev-ml/num/num-1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=dev-lang/ocaml-4.09.0[ocamlopt]
@@ -19,6 +19,14 @@ DEPEND=">=dev-lang/ocaml-4.09.0[ocamlopt]
 RDEPEND="${DEPEND}"
 BDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-cflags.patch
+)
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+}
+
 src_install() {
 	findlib_src_preinst
 	OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install DESTDIR="${D}"
diff --git a/dev-ml/zarith/Manifest b/dev-ml/zarith/Manifest
index 12ad36152045..77b1b34fc8a8 100644
--- a/dev-ml/zarith/Manifest
+++ b/dev-ml/zarith/Manifest
@@ -1,5 +1,6 @@
+AUX zarith-1.9.1-ar.patch 221 BLAKE2B 6772e1a5c30a5b9dd6e170860b82e82bd2e5dc5b145d69f20354bcc9fff037098ad03c8365347663dc49499ec72da15f098e186e5b1721f8acb65b7875253155 SHA512 34a5e88ea485ba12b37c7e0fdcd6e21ad64453802fcc48fca39042d52d7b21997888c3c9e76754fe0ceb326dfb2a9a443ba3794b9628ec78f94aa5ea791ffeb2
 DIST zarith-1.7.tar.gz 89617 BLAKE2B ee8a272a7421d9e723af8aa6207da8fe046585804e669058b6dec8fb47cab80e438d0520c1b61ed6c79bc279d162a7a1043fa40e74c50342b7e4d553ca8e8f5b SHA512 812b5f9b24ce7a24d3370b8728ff6eeb56e3280fa1573e694fe54e781668c29bf8ff95e94aeff59df948adc85b8acd6b4efe117fb50a124f19b4227bee78e753
 DIST zarith-1.9.1.tar.gz 92321 BLAKE2B d61def81600cb5f3ae931eabebcdf081b6025dd24b1deae46a55f5db4f2c67d44b38b9cb9d73fc7fd9bd76c81545294373e3df5969da217209079a2912a8e285 SHA512 e77620c66a59d35811acfc45c7ef3f0d50d3042194654b1f5b652a2ed5fb9d5f88e9173222e5ced286c61854434da05a4d96668089faa66ff2917afa677fc32f
 EBUILD zarith-1.7.ebuild 1324 BLAKE2B 25281d39a44be1b345fab0ba5ff4bd34c1355a2f9bd5a80ffbe8d3d7685bec4ced72865c29a56f69b9db4555a35eac0c752b6752d0083c3d2a018ad50d8e47ba SHA512 33c9759c47aef05c74514d71077b2ab791f83b4d8b46bc32b12b75ddc7032dc4fe5b04ed7690e6a251f54994b5793d0c1c4a5eeb06f53f5eacb5ec5ff18267bf
-EBUILD zarith-1.9.1.ebuild 1406 BLAKE2B f83e2de18f7a854f18fec35a8160c50be586ec79bbf4f5ef82077c0698ccd839e2f89035ef381e1bd80446e18e754d6cff2d8214b71d6b7dcd82b9ea178665c6 SHA512 8e0f501911f3e6267b8ea630e1d7d8c1ff23b8e2e60eed3a7a105b0c5e49efe76f48598cdf00e891b57438d966e84ec813859c5eed1ff6948adbc25f9ef416c1
+EBUILD zarith-1.9.1.ebuild 1451 BLAKE2B 419ba5a2e47c15f37dfba72582d32c6b9c0549eb42fbf75273ea0d3205ee076f4a12b7244d6fb455ec2d823c4849a599138f5056ee4fbecfdf24d3f470a912e5 SHA512 e4a406d57cd0c16e2b9e97f6d65d49bb7e03e3d49a1b536d0a7b941953bb6548b7bf54687ac6865d3956d48141a7e8b3c02e1c9c07e56241f4c4964a8535819b
 MISC metadata.xml 399 BLAKE2B 8d0594f3da1c885b3c23bc0bd85bb499b46c1bf9e6d9ce97d03a5bbb9b3ef07be3fe71887464d0334eb5338db123a07113b40f83c4887a99041eccd77d3aed21 SHA512 a1b5ac5f460c86208b260d2adf19bcfe4e34c076be1aa4f52aef993d8e709411ecaf3fa0b6170b0fca952ae7fc1c8e70cb20f7d40ea528ec69dc32624a61faf0
diff --git a/dev-ml/zarith/files/zarith-1.9.1-ar.patch b/dev-ml/zarith/files/zarith-1.9.1-ar.patch
new file mode 100644
index 000000000000..122cf0797dbe
--- /dev/null
+++ b/dev-ml/zarith/files/zarith-1.9.1-ar.patch
@@ -0,0 +1,11 @@
+--- a/configure	2020-05-17 17:46:29.826822055 +0200
++++ b/configure	2020-05-17 17:47:37.699808615 +0200
+@@ -22,7 +22,7 @@
+ gmp='auto'
+ perf='no'
+ 
+-ar='ar'
++ar="${AR}"
+ ocaml='ocaml'
+ ocamlc='ocamlc'
+ ocamlopt='ocamlopt'
diff --git a/dev-ml/zarith/zarith-1.9.1.ebuild b/dev-ml/zarith/zarith-1.9.1.ebuild
index 85651e3b4951..6f6085a8c092 100644
--- a/dev-ml/zarith/zarith-1.9.1.ebuild
+++ b/dev-ml/zarith/zarith-1.9.1.ebuild
@@ -22,10 +22,14 @@ RDEPEND="
 DEPEND="${RDEPEND} dev-lang/perl"
 DOCS=( README.md Changes )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-ar.patch
+)
+
 S="${WORKDIR}/Zarith-release-${PV}"
 
 src_configure() {
-	tc-export CC
+	tc-export CC AR
 	./configure -host "${CHOST}" \
 		-ocamllibdir /usr/$(get_libdir)/ocaml \
 		-installdir "${ED}"/usr/$(get_libdir)/ocaml \