gentoo resync : 25.11.2020

4 files changed, 25 insertions, 50 deletions

diff --git a/dev-ml/parmap/Manifest b/dev-ml/parmap/Manifest
index 76655276667b..5758fe513c7a 100644
--- a/dev-ml/parmap/Manifest
+++ b/dev-ml/parmap/Manifest
@@ -1,5 +1,5 @@
-DIST parmap-1.0_rc7-ocaml-4.03.tar.gz 98262 BLAKE2B 829553c5a8a16776588b7fc74304e189945367ddc4988e529b08857fe307b8e05db58fb73819554e88afa2405d8818d2c95fc4dc96e0a47ff782bfd78b912e90 SHA512 c8b7678fede76d35b299ef0548ef3819f9ec056cde4d5498e11f2400b96149b17ce58c35d197d10dba5fd4a702b94fe78090e1f330791b0f470891f0bbf7a544
 DIST parmap-1.0_rc8.tar.gz 98699 BLAKE2B 755208d0b380c200c5fb2a38334bcd422ea3e3c86bd8a52db37e256dd45c22c05e8577a5f13ae14d4ad553d16c212ae2a1b299e0870ac71a52e0bf11ddf2ecc4 SHA512 96bbe49f06dc3611577e87d9e6f5ca32e10271d6a14a0970bd4548fcaf268f833b3143258e14328237a60578e2355687e4bff031a021903f3e2280ef1713cc65
-EBUILD parmap-1.0_rc7-r1.ebuild 1095 BLAKE2B 060fa7b4eb1c3af5b9984125ce945599b5c27cb5463ae884a723a63ac2b39469456c6487b2d117f26306523150100289f9a0b0e226a6ab0be45b26f5fb298a8f SHA512 f8403ed8186993626d39e91d8f0c97b9827654fd6ca3b6c66ca670c95e7bfc604b10f0a029cad4f52013ef8f7d88d3a09100997224c4f9ffe3fd6dfca341c20f
-EBUILD parmap-1.0_rc8.ebuild 1082 BLAKE2B d30c880b75c2f84b73724f351d964bdfcbdec71d8a824f2bd6012e03be0160a0c20221a6810bed877b8d407caf6cb6868c6b0aae58faf67b57dd27da081a0675 SHA512 c0d27175d13c6f6f21b1d46453d1a463b9ac5ab03230aab5a0fe591bb519e6280e73bd8b0af721774a1dfaacd224a65ab3a8e5c7f9bc5942f5feba93a9059711
+DIST parmap-1.1.1.tar.gz 44311 BLAKE2B db80056b2207d0e6723486b930bd0636171e0f2d710706b5348f2f098eb866fe9ab5dc516754e70bc81641484d4403868950ed6b35abd926d3212402f91ca41f SHA512 8333337b4f58496dad7c3417449ad6ba319c84d5cdb8434772479c9bde5708af95c230c9e1a9a31e4276d88cce3d827b1655c42a110ccd889d1735fcfecf0c20
+EBUILD parmap-1.0_rc8.ebuild 1089 BLAKE2B 0936f97f0d2464868df7ddd870b141e7689aeb612c279a1d3521f9c8c3b903dac29cc38f9b31e7e27c1b8e995e29852dec86ea92e2fc818c0ad51b3be8a9e575 SHA512 43b7b44ee2580f63037a136436bc30e4eb57544eefab41beb041424c19666ff2b063556ab2acf2c5980acaa8396ed348178e6b465afd500f810636c538428847
+EBUILD parmap-1.1.1.ebuild 608 BLAKE2B 024dd9b769c4db08d09efd56d471bf617f08b1aad57c0ba75210a35a161bcd7e2e3122f681c8fde8edcb1f2ac54df78ee0d666b5cd87ce8ddf92b0d5f43d5a7d SHA512 be0ce8c1b8ef873dd5291665649a2245cd4a92d6b804bdaf2aa89e2ccdb8cac5795a67caadf4edfef19cda92722186065ebf8e197e91d96ba304c2ec4dba3d61
 MISC metadata.xml 252 BLAKE2B f4ca811a46e4c4d8138a2d55e501d8a11cb06e5a967ace489cfb7f5dc1e995773397b42aac371c88e846f223c2fed3a1fa202250f858610b4939bcb093b7333e SHA512 aa58d5e26ea4359f6e81c4e6292ca3fc91f74326810eee7905179665efc89fe23c72860b2821d8be6f97595f84abbc30dfaa423f5f530c30640105d22b16cb19
diff --git a/dev-ml/parmap/parmap-1.0_rc7-r1.ebuild b/dev-ml/parmap/parmap-1.0_rc7-r1.ebuild
deleted file mode 100644
index 442a609b95ea..000000000000
--- a/dev-ml/parmap/parmap-1.0_rc7-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-MY_PV="${PV/_/-}-fix-for4.03+3"
-DESCRIPTION="Library to exploit multicore architectures for OCaml programs"
-HOMEPAGE="https://www.dicosmo.org/code/parmap/"
-SRC_URI="https://github.com/rdicosmo/parmap/archive/${MY_PV}.tar.gz -> ${P}-ocaml-4.03.tar.gz"
-
-LICENSE="LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]"
-DEPEND="${RDEPEND}
-	dev-ml/findlib
-	dev-ml/ocamlbuild
-	dev-ml/ocaml-autoconf"
-S="${WORKDIR}/${PN}-${MY_PV/+/-}"
-
-src_test() {
-	mkdir "${WORKDIR}/tmpinstall" || die
-	emake \
-		OCAMLLIBDIR="ocaml" \
-		DESTDIR="${WORKDIR}/tmpinstall" \
-		install
-	export OCAMLPATH="${WORKDIR}/tmpinstall/ocaml"
-	emake tests
-	cd _build/tests || die
-	for i in $(find . -type f -executable) ; do
-		${i} || die
-	done
-}
-
-src_install() {
-	emake \
-		OCAMLLIBDIR="$(get_libdir)/ocaml" \
-		MANDIR="${ED}/usr/share/man/man3o" \
-		DESTDIR="${ED}/usr" \
-		install
-	dodoc AUTHORS Changelog README
-}
diff --git a/dev-ml/parmap/parmap-1.0_rc8.ebuild b/dev-ml/parmap/parmap-1.0_rc8.ebuild
index 594ea9593feb..1f698332db44 100644
--- a/dev-ml/parmap/parmap-1.0_rc8.ebuild
+++ b/dev-ml/parmap/parmap-1.0_rc8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rdicosmo/parmap/archive/${MY_PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]"
diff --git a/dev-ml/parmap/parmap-1.1.1.ebuild b/dev-ml/parmap/parmap-1.1.1.ebuild
new file mode 100644
index 000000000000..7290a63d2d42
--- /dev/null
+++ b/dev-ml/parmap/parmap-1.1.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+MY_PV="${PV/_/-}"
+DESCRIPTION="Library to exploit multicore architectures for OCaml programs"
+HOMEPAGE="https://www.dicosmo.org/code/parmap/"
+SRC_URI="https://github.com/rdicosmo/parmap/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV/+/-}"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+BDEPEND="dev-ml/dune-configurator"
+RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]"
+DEPEND="${RDEPEND}"