gentoo resync : 11.05.2021

13 files changed, 56 insertions, 12 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index b4ee8d2a89ba..a46f1a7d6104 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/bos/Manifest b/dev-ml/bos/Manifest
index a537bed94891..eea7f9fe9029 100644
--- a/dev-ml/bos/Manifest
+++ b/dev-ml/bos/Manifest
@@ -1,3 +1,3 @@
 DIST bos-0.1.6.tbz 39822 BLAKE2B 0e10eb14fb5d429b81c67659c936e8b700c4cd417d1f5be000c8bdb0304de8ad9130e597f6e2e7771380c29c148f4339817bacc458e72a8efa894be3b85965bf SHA512 f1f10a97a32da936a7d5a0c70632e723723ee523c79f9dfd23bc42c039a194e8d69658483e6e856c7911332b799a92bf8cabfe96cc387522d7450b8f3f8f8343
-EBUILD bos-0.1.6.ebuild 884 BLAKE2B ad8ffcb05f9018ec63f7aa3c846dc7543b0e3d22a4c50d12ff759ff56fc1ef6ab924841d9e84ed5be3dc41e7ef894ead764f596aa2e289107a565db089527b62 SHA512 e08735f565427dbce020a9d0718a107030d5b331fc2ecd10e1ae2909fb13c70d4866f62b705b2807e09eae3d8753ed7ff34c395353baea4dcf0aef250a90e5f3
+EBUILD bos-0.1.6.ebuild 896 BLAKE2B b2d3bddcf15170e265fe5cf0e2a2a313be867f5fc0b5ec742d2daf965851a3203b66c4502adf87ad7fb0fc8776369a8ad9cc85bbc7d026ad0b34b03c74ba12b9 SHA512 00fcb04ac30ea8e2ab76a7f221e7f19868d48b036d6db20a078d6f426a0b274197717fffd9dfb5535e7583a4716ce42fc3d67039d6c17acae80a2a75e6612a8b
 MISC metadata.xml 244 BLAKE2B 9e12f673e76e7b3faa5cd1c5e0c93aefcadb32fe5392de8774fc54061813b6c92b984d318323f6ab16e65c85f97dc4431566b51c6328dee64366180c0e3f29d4 SHA512 0a7454e598ba26bfcabdf5b4284903e17ce33dafd9d8b84603eba1425e37f3deaf8cffdf5656875b6c596b3fb75a2265f25556b5be2042dac71b82e956039b4b
diff --git a/dev-ml/bos/bos-0.1.6.ebuild b/dev-ml/bos/bos-0.1.6.ebuild
index e5a1293769c4..84de3bee6286 100644
--- a/dev-ml/bos/bos-0.1.6.ebuild
+++ b/dev-ml/bos/bos-0.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://erratique.ch/software/bos/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~ppc64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/fpath/Manifest b/dev-ml/fpath/Manifest
index 06d7dc79af81..1ffa029dbe09 100644
--- a/dev-ml/fpath/Manifest
+++ b/dev-ml/fpath/Manifest
@@ -1,3 +1,3 @@
 DIST fpath-0.7.2.tbz 24142 BLAKE2B 5aa22a33d0155c2a446c3622d6feef0748be3eaa72f07e7e2770fda1993794864072a5f50a052537b9724e39935064967c87f82d860a2da17fbc86279a1930ab SHA512 d8ab8d6f183a1742d74a3a3220cc1d62e7df38a6f3ca1c04fad18426a0897152255382305ad14d058b5b85ab55a27536c39a62deffac8d46984a730a2a18405d
-EBUILD fpath-0.7.2.ebuild 538 BLAKE2B 187d01cf632076e93a4c00183df1552b3e801fd780d16d7ab6df1303e6e4efe0f8f9d9abd0074e6d975d764b6ad01a3df9f0de3bc90fae715baa603aa215a73c SHA512 3cde133ad7a6dfe8b416a23277ec80cd20b1d1cfc16b511d59e11f8194d2bd5281a74e29fd6cd49cb4057582967ea10c45f21b520489dd2b7040c1dc706d242e
+EBUILD fpath-0.7.2.ebuild 550 BLAKE2B fadf12fb58ba99c2e181b8e9be980fc68ce22b57f582518b98f913a8280e8cff555640cac66e3cce09ac5985a9f10586f0bdf5d354a2826ce03e3f324540ff9a SHA512 9e91fb2e35b5d112db7702c079b2c2525446f71e1125df8149f296afd740b73acff494e0e42aff331cbe48823f4f293b6c96d98f88b7f247c06092832eed797f
 MISC metadata.xml 246 BLAKE2B 17b71e35ed0f5d8753cb7f826e2367bb9a9a929f025bf19a294d5e31b813eb935debf8a72f1ff238cef3dcbbaef31acadad3e6ceea7a8e4caf11d865bae696ab SHA512 0edbfb4b267356db598a79479d2019c397d73fb7a976b2f4fc1a0d53f35ee17e4f5976deecef10607c2e50ce7a15677c0d2f61fdacf89be7efdc151922722c6c
diff --git a/dev-ml/fpath/fpath-0.7.2.ebuild b/dev-ml/fpath/fpath-0.7.2.ebuild
index e3f27b5fd02b..180f39a36ea6 100644
--- a/dev-ml/fpath/fpath-0.7.2.ebuild
+++ b/dev-ml/fpath/fpath-0.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/fpath/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~ppc64"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index a9c20cc0e0c0..0891f6bd73f0 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -2,5 +2,5 @@ AUX 50merlin-gentoo.el 195 BLAKE2B a5bcca9e3af1810b18337680b4878dcfc41296b98a4b9
 DIST merlin-3.4.2.tar.gz 11016272 BLAKE2B 6fa55423df7ae8f7a8056e90be630f148dd101194de1921605843caf805bd6c9694fa3fe5b8c2f8eff5d57d7d0e9d8653036b6165a49af655158925c7af87d2f SHA512 8225366ebf27ca656ca89fe00d5aec581487ae332aeab81568e7606eaf575648a7614d4d2de8e0757a4e69c6f4014fefa4574c95da13d42acb310c9dd58a468a
 DIST merlin-4.1.tar.gz 2136082 BLAKE2B 3e7e1996611f0cefb3a33b2a78cd36b6e8b84d48bc48f46c45ba340c4be1b93b4a1876f8f4192e911c1c384c416ad7502ba3c7a2abb72eff01215f9fb26bfaf0 SHA512 f0f3ada007f8214b97a8557bddca87eded48ee01a8bb88aba6476e52881ead52d9f47e2666a9292b5c6a490e4cfdc7d8bb322e8489f78eaac7b0f80b6d1e87bc
 EBUILD merlin-3.4.2-r1.ebuild 1265 BLAKE2B a12e5b68da2899f57ecb73de9ff4558a2069fef7056f7a6775616801bd809d058e8c457afe7c659e16f31861786311871860ce2ef58460f50a738939ffab9750 SHA512 355c89138e3838407d9f05d1d393411307700deb38fca7f17efb6cce553f2a4d159fb2b13568704bca3c655dfb975e50afa52f314f7c8815370f3ebf1cf74188
-EBUILD merlin-4.1-r1.ebuild 1290 BLAKE2B f72028d7744e4612eaaabad95c79db31b1bed9e1ce044ca8ab5104e6276dc25112d3704756b23dd33a70086fd98737c48181f6c3c68902bd1eee20352dcdf65d SHA512 ea01cee166bb3ebb274eae2f2890649279b0231829ee1a112e28e6f902d0cc4cd24344da95ad1e48f49762ead0a3fd9e74762e7e2a3e8e7fdbec882644bb87e8
+EBUILD merlin-4.1-r1.ebuild 1307 BLAKE2B f0f4b329c156b08f39aa817c297ac353c14f7faea5faff2ca4f9f0d96b0cc4deefafc912e3d119a40457fe157295b6969fc5ecda3b0d339c7c807db5d2f227c9 SHA512 8ee7ec6ee0453d6e8d4646c05e35ea168ff10a5716c1b7fa8f1d730b5179955a11316a7ae4b9af41bca3fe67eb2555bb12c2536feb0917b8d9fa00ef7f4e4b19
 MISC metadata.xml 309 BLAKE2B 3d87e255533b30e9d93961fd4e19b7811eeec76ca1d0a23d2e5c2dbaf7702f19b4d1825ef5f4a8673dcbe99a7c283cd6cc0c380ebedf121757a1536a90eab129 SHA512 9f83661d41366e8a258849f199e738f8ead98612c0e444f5c1221fb4d5ab803b75d0d63a7c288f5714635faae33e8669da1598b932a7c2ec8e620cb232def482
diff --git a/dev-ml/merlin/merlin-4.1-r1.ebuild b/dev-ml/merlin/merlin-4.1-r1.ebuild
index 2197e4695f95..7bd1055d4404 100644
--- a/dev-ml/merlin/merlin-4.1-r1.ebuild
+++ b/dev-ml/merlin/merlin-4.1-r1.ebuild
@@ -20,6 +20,7 @@ RDEPEND="
 	app-emacs/company-mode
 	dev-ml/csexp:=
 	dev-ml/yojson:=
+	dev-ml/menhir:=
 	=dev-lang/ocaml-4.11*:=
 	emacs? (
 		>=app-editors/emacs-23.1:*
diff --git a/dev-ml/ocaml-base64/Manifest b/dev-ml/ocaml-base64/Manifest
index e013507bfe9c..29652a53caaa 100644
--- a/dev-ml/ocaml-base64/Manifest
+++ b/dev-ml/ocaml-base64/Manifest
@@ -1,3 +1,3 @@
 DIST ocaml-base64-3.5.0.tar.gz 18888 BLAKE2B e35d6331f163a066169455ea3dac304cedd7ca47fac0a2cbda26b8bd9620b4e49e144d5a06a8a2c6085501e531b2be98f6b24002880d83d6d57025ee055e0887 SHA512 a3886701943a9b165a74e45f66c3d8279b381927774217f5e042494811bc17a08f8933292335d4b76f01c6b1d3c496b4cfca650faa5848ddbf6150ac87386038
-EBUILD ocaml-base64-3.5.0.ebuild 506 BLAKE2B d1bd416946c65e6dcbd5f2f4c63cc8e2a1a8066d2a757d2d7fb55df5b933288d4b0a1d7374c82cff5e8d882562413021b692e695cead7af6f1bfc36c038a9233 SHA512 c09a79195972a31142411ff26e44d97d452b434f578f0823e0110a6fda824c9e0ad3d662e1b67c93cc9d0ae287eb7ab0b916e03c8b065c39ebf398dcee8d5383
+EBUILD ocaml-base64-3.5.0.ebuild 518 BLAKE2B beec8e73135c093232545211d08acde011595aaaa6fa96a59c94d58bf63caaab9c32a690f1affd2395d9215f219b2667355279bca6c103f5faf76a1510f94ca2 SHA512 3994756d43b337f7af3767be7b9f49632134bf1a2ebc7e6625d34eb62d7a165bd61974e6e6f062a99bfb226f3f515574686777dea03a57f379e1aa0cb95ce4ef
 MISC metadata.xml 256 BLAKE2B ddfc488e2a70d6a59644fa6a5e2784cca07d8d5df2f3baaf423f6aa403b3bda45b4a04d0a0c205c0074ba0259165dba018ba9aa23d557458649f2c402437bec1 SHA512 8ef5b252f09bd9bfba680fb70d33ac887a9d2917570d190ef759afe57c52bef6e99cdc81012bfbe72d55ee359ca8ca70e64af3bc314d9eee041871a514cea508
diff --git a/dev-ml/ocaml-base64/ocaml-base64-3.5.0.ebuild b/dev-ml/ocaml-base64/ocaml-base64-3.5.0.ebuild
index abfff50eb629..44996f98fa84 100644
--- a/dev-ml/ocaml-base64/ocaml-base64-3.5.0.ebuild
+++ b/dev-ml/ocaml-base64/ocaml-base64-3.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mirage/ocaml-base64/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~ppc64"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index 964e69169a45..f561d2a100b7 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -1,3 +1,4 @@
 DIST opam-full-2.0.8.tar.gz 8006252 BLAKE2B 26348bdbb8bdc2fbf9d736286c1f4134ce065e8c15e34d51c8d2c6e5338fd6db089df38a19b07cde70770724fc4cc3dbd9e7d75628e5435ca8a2f8c0d4d3f2f0 SHA512 f08893ad0c1e124368168f28dcb5c3293e443da712d7b12db432c21ff72f7e1440bcc7156f49661d286360a16dcd166d3d02ecdebf8b1cda7c7df2b22e48f80f
 EBUILD opam-installer-2.0.8-r1.ebuild 1029 BLAKE2B 53066e7d4fe28f77ae2cbc1a1eb3056a60d04ada7eb72c0589498815c8ad3937ef6335b73a675bcf7060c6bf85534b3b497b55ac782c1f7a0d3e32537c1489cd SHA512 df08f41985fd16842021dc0e5c8a361a1d8376d1b716f3fb2aff8bdc007ff311ba51844894325e76657a688a03021fe7360c9522ac6f41231ef499de214d469e
+EBUILD opam-installer-2.0.8-r2.ebuild 1020 BLAKE2B a2b8afb4a80a772b812f7394aef05b7d1d8a30c23c8e6f8fc9d6d46de38b8389e8fe975be391f620f94586e459712c5522289bf74b1aee15a9e0a9da1a28404c SHA512 e8a63747de673e5fae11313803192c585d94e91c5d99eb36f8816013e905c305a5bfc21833a40f9291670201288aabe427454d4731d609e6702a891876925717
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild b/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
new file mode 100644
index 000000000000..fa67d1f64afb
--- /dev/null
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+OPAM_SKIP_VALIDATION=yes
+inherit opam
+
+DESCRIPTION="Core installer for opam packages"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz"
+S="${WORKDIR}/opam-full-${PV/_/-}"
+OPAM_INSTALLER="${S}/opam-installer"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.02.3
+	dev-ml/cmdliner:=
+	~dev-ml/opam-format-${PV}
+"
+DEPEND="${RDEPEND}
+	dev-ml/findlib"
+
+src_configure() {
+	econf \
+		--prefix="${EPREFIX}/usr" \
+		--with-mccs \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--mandir="${EPREFIX}/usr/share/man"
+}
+
+src_compile() {
+	sed -e 's/DUNE = .*$/DUNE = /' -i Makefile.config
+	#passing -jX to the dune build leads to errors
+	#see: https://github.com/ocaml/opam/issues/3585
+	emake DUNE_PROMOTE_ARG="" -j1
+}
diff --git a/dev-ml/rresult/Manifest b/dev-ml/rresult/Manifest
index 448508ee9f67..3267ebd1094b 100644
--- a/dev-ml/rresult/Manifest
+++ b/dev-ml/rresult/Manifest
@@ -1,3 +1,3 @@
 DIST rresult-0.5.0.tbz 9185 BLAKE2B efe8d248aa3d68b13b011dccb98cb04127dfec9d659dfe8619f658b254cfcdca833e125310553dee54ef4be239c308e762d2290386f4fd08a5f2c1835faa9ef1 SHA512 45787b61adb7daedf72e4ff632cf3d4917bccb3e83613dabf93437982887d9a0ed3b6cbefb2b17cb341a825346cb0609286df581c6ff379583dc83672ee25efc
-EBUILD rresult-0.5.0.ebuild 513 BLAKE2B 21dd4542989954b35f58c4966d3051a4cef1e947c621b6f9a5f7a5f3269c94c8392b6c4370c3366a3e4c684b5a1fbb02be763594a6c862a940294eada3bce66b SHA512 9335b5a1437f592ddae9d75e30817b351a58884f034d35530f5e57df61a434a233cc362ee44a8cbf1a702b9dab61a60e0c6b1696ea577eb5c905e32a123ddb2d
+EBUILD rresult-0.5.0.ebuild 525 BLAKE2B 92814ec5ff65c5b1a7af77ec6e7857004c9a4c618373eef1f7e1dd98010eeb1d50dc17c3aa96277869e96d3e16d4c3bdb0debef317e66698fe845f83aeae33f5 SHA512 72c7c4a06dd062c24b963cf37ac3daa0573e4ee629d7c00e92288891500f93df303c90701b9094e36b74dab88697f7b63fc3c6c267475256f364fd044d74eabf
 MISC metadata.xml 248 BLAKE2B 697636aca44c2ca561954f73b42c842e97b7e42ad63bd4e47bf2980b4adebb7a39da518c65759ef114c0853c20da975b165935e2c8c25fa97783cb251d6bee1b SHA512 7656fbee46b0d966970f89195615419d2aa5d8ba013f46c023b679161b766449b18cfd72e3d932945925054729cd121ea35d3351d469b7a2b2d25d4e85479da3
diff --git a/dev-ml/rresult/rresult-0.5.0.ebuild b/dev-ml/rresult/rresult-0.5.0.ebuild
index dc85569f5066..c6e04c85052f 100644
--- a/dev-ml/rresult/rresult-0.5.0.ebuild
+++ b/dev-ml/rresult/rresult-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/rresult/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~ppc64"
 IUSE=""
 
 RDEPEND="dev-ml/result:="