gentoo resync : 25.03.2022

12 files changed, 64 insertions, 11 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 19515e3b44dd..57a303d1b82c 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/curses/Manifest b/dev-ml/curses/Manifest
new file mode 100644
index 000000000000..9347bb450194
--- /dev/null
+++ b/dev-ml/curses/Manifest
@@ -0,0 +1,4 @@
+AUX curses-1.0.10-CC.patch 339 BLAKE2B d76ac0731c68cb99aab9ece38b43e9c0e3d3b920987b9c6cae7b295d523c2df42f960c5f9bb8bdcb390dba44c1b323407712db23638d55e4b970e3bc041a0583 SHA512 949862b91f09652d94fcc36fcdda392b9fabe978b61066188ca3e65cf36c0f087dfa439020aa8207432aa809025847c4b81559176e170aef87e0703ad5736b10
+DIST curses-1.0.10.tbz 25780 BLAKE2B 62eba2e769571e73d22ed1cd698e64895be2a78fe53a98feffd98a0ee0914d765e8d9a997792721b7f2fb544d6db88c94e6e6946bf60cd1d3628a987a6891d60 SHA512 158626f3fd6931f30482a47ab149990ff49334c8c0dc966eb07d92f22e87faaab3fd48ed7788bbc5a77f82cb6163520588ce55ab53456bca22994f147c7e00c5
+EBUILD curses-1.0.10.ebuild 460 BLAKE2B a0c5b5c8bb824d6d40b1d5e4e840f5464b81dedb52bef728235204e2f551e2c98270b23e9ad4add27fdedb216192b2b036247e6470072843d969cbe2c573f3b3 SHA512 82ad515e4693b3af5988a824b96bf3a3f6417fc9cd992f0fcc5f8c79484c6896fae495db9f4119e13780f428b95a776ffb6f03e9e33e2909bc94ad374e592dda
+MISC metadata.xml 315 BLAKE2B b25f1212b4b01ea6c550c2a8dcd6412fe610a31eb655151d02710c0037659e5b1a4378df22877ceaebffc970aa8cef53225b0e6f2fe2bbd8c05d2b548525a3e4 SHA512 ab9f7ef0b71be47e71ddd4141bc195e5d5e23bbfc90f1eaf00bfe6643c4bf817826a1ef6f6b6b3fdd91e6cf5d3c97977193073bf965fbe94831ccabacdc32aa2
diff --git a/dev-ml/curses/curses-1.0.10.ebuild b/dev-ml/curses/curses-1.0.10.ebuild
new file mode 100644
index 000000000000..b8295ca2a935
--- /dev/null
+++ b/dev-ml/curses/curses-1.0.10.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Bindings to ncurses"
+HOMEPAGE="https://github.com/mbacarella/curses"
+SRC_URI="https://github.com/mbacarella/${PN}/releases/download/${PV}/${P}.tbz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND="dev-ml/dune-configurator"
+
+PATCHES=( "${FILESDIR}"/${P}-CC.patch )
diff --git a/dev-ml/curses/files/curses-1.0.10-CC.patch b/dev-ml/curses/files/curses-1.0.10-CC.patch
new file mode 100644
index 000000000000..8acff01c5d9c
--- /dev/null
+++ b/dev-ml/curses/files/curses-1.0.10-CC.patch
@@ -0,0 +1,11 @@
+--- a/dune	2022-03-21 21:07:36.326440959 +0100
++++ b/dune	2022-03-21 21:07:46.650295407 +0100
+@@ -45,7 +45,7 @@
+    %{workspace_root}
+    (with-stdout-to
+     %{target}
+-    (system "%{bin:gcc} -x c -E _curses.ml")))))
++    (system "%{cc} -x c -E _curses.ml")))))
+ 
+ (rule
+  (targets c_flags.sexp c_library_flags.sexp config.ml _config.h)
diff --git a/dev-ml/curses/metadata.xml b/dev-ml/curses/metadata.xml
new file mode 100644
index 000000000000..eb7e88206e4c
--- /dev/null
+++ b/dev-ml/curses/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mbacarella/curses</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index cbb3d8ba13d7..c4907691b689 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -2,12 +2,12 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
-DIST llvmorg-14.0.0-rc4.tar.gz 158082013 BLAKE2B 0e717898d8f1ed160e525a68aba56a84b7d31856ea72fdb8fa02e863c5a2074245a38d4a4aa7d178beab1ea64aa92d0ba9dcad4373ebb03868070bf718112107 SHA512 a942848aa5042b97bab6d0d5bcee11ea2f85f1244d7eaadb8f7000bf104b2160e6034c04e3755501dd178bc99c26669cf4aca40edb4bba598fdde6bcf3f40ddc
+DIST llvmorg-14.0.0.tar.gz 158057350 BLAKE2B 7052684c620a5eaf52beeee4591adf58cfec9e64a5ee0b24f3d5849fd4df5b006e2906a839cb806ac69c33fab6013c58589b1d74e4fb8558758edcb7d5065064 SHA512 eb5acf96b5e2c59bd07579f7ebe73018b0dd6e2f2d9a5a3c7986320e88febd837d1084b9e5313a2264310342193044629d228337cc76dd2b8527dc0a8bdda999
 EBUILD llvm-ocaml-11.1.0.ebuild 3054 BLAKE2B 0498a14f644a956cf1a495c4b10687328cdd7044b4cf90e09d51c3c93c3f8e7eae29e93b605e7079975cf9b585e14e0c50c85f6b210d6516395f3278f0c2cace SHA512 28ac245ce6fb5caafec11a501e4a8e7a39bf15bad171b445f9b6faf82b8c3a4416925c42ac022bddf262332ca275de3969735b99e642df8c3b64ab3b7d04f85a
 EBUILD llvm-ocaml-12.0.1.ebuild 3060 BLAKE2B ed1223c503df5487c666642a02df41095eb724b46a79c1204f8ce2ff6b9eb650fbb46907d00e721c1ecb5df6648afdefeca6dabca456ab54656fc45871beff80 SHA512 57cdf97cf5a401a5ec33f15f8fb1c83998a7503b4ebcab1c2e35c2b35519d9b30f4b25598ddc2f8e6757f6de42a6a5878ab43e50fd45f1df0db6549a204b1680
 EBUILD llvm-ocaml-13.0.0.ebuild 2596 BLAKE2B 4d22e0d0f89b14f338f0dde0701819d5d94f4c298bf024b06c4d13601f6a61e1ecfd7e7db50c8ab1f7c34e0bb9bbed26c5e61e2ddac80bd6766cf1b163f3626a SHA512 aaba7713d7acaff78ab9949765bd2e095bdf7c32a006653967f9a031113b3c3911b01e55c460f67e38da3574bd2dc8d81026a55cad2aea775363287e01b72684
 EBUILD llvm-ocaml-13.0.1.ebuild 2596 BLAKE2B 4125904f29738c9d1df5dda7737d2edb1e68512f66b561d4ab4b24ebaa457da1a13ab830ab911b5016e05cb48696aff0f6cd1753615e33e8b06f5b086deb020f SHA512 7b80a864207d4c0ef50725a5e9e64c6ff0956b4dfd3f6c55f4363f44703a7113205a39a53624e288562b08ca3191bd11cd7615ecb53395e07777ae7161a173c4
-EBUILD llvm-ocaml-14.0.0.9999.ebuild 2598 BLAKE2B ece82974470a98526e86f37905d839403c05f53e9674bb5e5a6143389f26330ac2521765d34d90ca0e3e1ca3cfca94298dc17e2381fa43c7ae7b6c0ecaf4536e SHA512 d2386f680a121db6c6b4776a90a70aa8c4efe28cd3587fb1b2ed97506ad981d87ceb3aa998a486303b4d81a613ed86dd2eea787cb7250e233e5cce3990180064
-EBUILD llvm-ocaml-14.0.0_rc4.ebuild 2598 BLAKE2B ece82974470a98526e86f37905d839403c05f53e9674bb5e5a6143389f26330ac2521765d34d90ca0e3e1ca3cfca94298dc17e2381fa43c7ae7b6c0ecaf4536e SHA512 d2386f680a121db6c6b4776a90a70aa8c4efe28cd3587fb1b2ed97506ad981d87ceb3aa998a486303b4d81a613ed86dd2eea787cb7250e233e5cce3990180064
-EBUILD llvm-ocaml-15.0.0.9999.ebuild 2598 BLAKE2B ece82974470a98526e86f37905d839403c05f53e9674bb5e5a6143389f26330ac2521765d34d90ca0e3e1ca3cfca94298dc17e2381fa43c7ae7b6c0ecaf4536e SHA512 d2386f680a121db6c6b4776a90a70aa8c4efe28cd3587fb1b2ed97506ad981d87ceb3aa998a486303b4d81a613ed86dd2eea787cb7250e233e5cce3990180064
+EBUILD llvm-ocaml-14.0.0.9999.ebuild 2573 BLAKE2B 787267e509ba93d2d8cf560dde974ed0f9493afd8128e495466fae101605748058a4ee4db9dbca64cac977bf2084b87d486b4e70ccede831b0d2574de88f0593 SHA512 3a26385a737a12f4d2af2ddbc16d228fd6909cff0fa4bcc90828ea9f52e1b46869de83e1a55c65281c71625d97e4e6a777218529ced6c3637d9c0ae596603cb6
+EBUILD llvm-ocaml-14.0.0.ebuild 2589 BLAKE2B 0c6950ca5cc99a140e53eb08d5de27bf4828638ef68cf795b5ad021c09703518f7fcdb9810154337df912de9a16641e50e38fb9c324e47312f33bb7f60502dd7 SHA512 40f6c41216e9ad68fa1ca31dc49e05f19638e0d3c8da2ba6e3173f336a8bb7a53152760650bee17346e08005cc8524c71a3ee7e9ceba271ecb451662b8b31c39
+EBUILD llvm-ocaml-15.0.0.9999.ebuild 2573 BLAKE2B 787267e509ba93d2d8cf560dde974ed0f9493afd8128e495466fae101605748058a4ee4db9dbca64cac977bf2084b87d486b4e70ccede831b0d2574de88f0593 SHA512 3a26385a737a12f4d2af2ddbc16d228fd6909cff0fa4bcc90828ea9f52e1b46869de83e1a55c65281c71625d97e4e6a777218529ced6c3637d9c0ae596603cb6
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-14.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-14.0.0.9999.ebuild
index 45c941d6ddd7..9263abe8c53e 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-14.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-14.0.0.9999.ebuild
@@ -26,7 +26,6 @@ BDEPEND="
 	dev-lang/perl
 	dev-ml/findlib
 	>=dev-util/cmake-3.16
-	test? ( dev-ml/ounit2 )
 	${PYTHON_DEPS}"
 
 LLVM_COMPONENTS=( llvm cmake third-party )
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-14.0.0_rc4.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-14.0.0.ebuild
index 45c941d6ddd7..40472483c734 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-14.0.0_rc4.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-14.0.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0/${PV}"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
@@ -26,7 +26,6 @@ BDEPEND="
 	dev-lang/perl
 	dev-ml/findlib
 	>=dev-util/cmake-3.16
-	test? ( dev-ml/ounit2 )
 	${PYTHON_DEPS}"
 
 LLVM_COMPONENTS=( llvm cmake third-party )
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-15.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-15.0.0.9999.ebuild
index 45c941d6ddd7..9263abe8c53e 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-15.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-15.0.0.9999.ebuild
@@ -26,7 +26,6 @@ BDEPEND="
 	dev-lang/perl
 	dev-ml/findlib
 	>=dev-util/cmake-3.16
-	test? ( dev-ml/ounit2 )
 	${PYTHON_DEPS}"
 
 LLVM_COMPONENTS=( llvm cmake third-party )
diff --git a/dev-ml/ocamlsdl/Manifest b/dev-ml/ocamlsdl/Manifest
index ad362a5e1aeb..0d4cc9edfe5b 100644
--- a/dev-ml/ocamlsdl/Manifest
+++ b/dev-ml/ocamlsdl/Manifest
@@ -1,5 +1,5 @@
 AUX ocamlsdl-0.9.1-fix-ocaml-4.09.0-compilation.patch 794 BLAKE2B 7a24e2c817b53464c8f1391084b8be3e58f3f95d22da746fbf1a1ee6abdfde8b5198a299ee8ea2fe009a6216890887548cfebf9d3e7de76dcd963a3cb2e81fbf SHA512 3e078c9fa3d22bc7d1471afe93342a5594d8128b6de6097ee67ef0762ca3827f4412fa730c066eb47c1cd25268044905b16e8805945ced2c980ff5ffc2d5b799
 AUX ocamlsdl-0.9.1-ocamlopt.patch 818 BLAKE2B 8b4f66bc97b7aa6defda38324004ac68911708358fd1f8fa736701b19982e983480d804b13ed655dfe185333a5a21c2d6deefbb6c95eaac2226303c063c53dab SHA512 02e9b226073a537f5fc95059fb840c2f4be373470dea81934bea39ed9db5f7132c24d4da81bd64a04b51b9b8ea0d4e0bbc4b0f0f0f352dd61fe74c05d815de73
 DIST ocamlsdl-0.9.1.tar.gz 226085 BLAKE2B 30ee2f12cdc83344d3a8a9d1e187415b30d5ea83cfed4ac4709a0b4350e386961123e9504fc94a2b5643bb161c65d065298e3d6d8904cb55ab5436d243dfe588 SHA512 8be444a3a4d1b56919c7a28fb607cbd33446f8cf30de3768a9926f23f86690d98ebb8ce6f2fb28c167ea76ac138b670283c5c93d72ea2565aa49a0dc92de181a
-EBUILD ocamlsdl-0.9.1.ebuild 1406 BLAKE2B 468f552775947a09ecb479143f245dae69fa402b25de47c604915b21b744a3555d808a1462c6835660587450c97eed97bf1f7da407931808e886494e8032d322 SHA512 b330f3b76136ef5b3a5a0010b8e73db8ce319e414aeb436eec41f82c602baa0810edd7867f4c271e809f1f6e167c98df03270b964e10cdd39b7dc557099c4b0c
-MISC metadata.xml 246 BLAKE2B 37b86c2ed23f287a2670e9a3745993ee3140f3ac5040cc85bd510c44236abf745e3071085d71bda091fe1e0566230201674ae31d7bd1ec1069171ae1c5a1cbee SHA512 851936a2a7df14513bd0f26aec924c0e6414b9c91372f2efd5223b6a8cdefb94d4532c84b6eeb4759ff789662936a7af3b7ba42b27d2ba8dc7bab7300d23eec3
+EBUILD ocamlsdl-0.9.1.ebuild 1501 BLAKE2B 0c045e4df9e4642c1a955d8e36fa8a5155ac65680c665ecf4f7c9cc0071804b72378048dad196a23e5b26b23ec29d1f56f6bad27f6c17f4e16fcab9f7e4948b0 SHA512 9c94bdf4de8b09e5f1966b147b17fefc991b722859ac91c839f002d4dafb1b79f252a0ee9e9e77cd7bd95e2babf6a683e61cecec0feede08c27023fecbdcf657
+MISC metadata.xml 311 BLAKE2B 9eee7d8c5a6887eea15ad62c5bb9aee7df24d4082b8f47d76d378ff0f3c57bba99d54480b2305e49031fe0dd17f9e02fd5ceed03f12a6df705fb81c773871f2c SHA512 48fc533b64c92486d85f711cd9bc9dad8f3211be908e5ea41fc9bd6fc57dbb57936f7c3140a5699542a9251d61cdf3fe7f6bcf2cbbf0078bfd1fb6ed78a0bb25
diff --git a/dev-ml/ocamlsdl/metadata.xml b/dev-ml/ocamlsdl/metadata.xml
index 2ce0fe2f56d9..081e3c7960e1 100644
--- a/dev-ml/ocamlsdl/metadata.xml
+++ b/dev-ml/ocamlsdl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ocamlsdl</remote-id>
 	</upstream>
diff --git a/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild b/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild
index c14aa02de8a6..cdf46a78f078 100644
--- a/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild
+++ b/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild
@@ -50,6 +50,12 @@ src_configure() {
 	econf \
 		$myconf \
 		$(use_enable truetype sdl-ttf)
+	if ! use opengl; then
+		sed -i \
+			-e 's:LABLGLDIR:FALSE:' \
+			src/Makefile \
+			|| die
+	fi
 }
 
 src_install() {