gentoo resync : 03.03.2021

4 files changed, 55 insertions, 10 deletions

diff --git a/dev-ml/dune/Manifest b/dev-ml/dune/Manifest
index bf046f175286..818821707863 100644
--- a/dev-ml/dune/Manifest
+++ b/dev-ml/dune/Manifest
@@ -1,7 +1,9 @@
+DIST dune-1.11.4.tar.gz 849090 BLAKE2B 4dace2d998dd00dd8fd51fef6bf0048fd7d0c7941794b4c775f8a1a6c8f694af52ebae2bee17fb531b3f4332fe49167422508a91efcbda61f5420ffee7e89750 SHA512 0afd7ba4d66ba742b6485546d6b7e07096f38f516c12c4fc506a151b6fc97805859d736fee3a0a5dcf8008af0e2a678f1fe7286f6d0a941c999f7d3d5b9a9ccb
 DIST dune-2.1.0.tar.gz 1170295 BLAKE2B 16ee2c34e0183bd255d23410f70001ca008b8e82815f93ad727079da00b8592d219e7664c93bed7b97b3a1e997306d60672b7d6c45fe6dae7371b4025df06722 SHA512 24afb44e458f819dfde3775b76c3ccf43f3fa5d8ce9a14ee9bf6658c1c116f95659c21a9ea208e5711c844fabc661cc434070bce6c9307154d506b6599ffb57f
 DIST dune-2.7.1.tar.gz 1290915 BLAKE2B 85a2dee92d1ead03b43b80742c291f4470dd9e1d843fdb257754c567e2329c101d11b42573da19de537f0d8591ebdacfcaab1099e0f46bdeebcd8421eb1bbcb2 SHA512 b77d0e207263107365e5a6e94423e8ab4ddbab1f920872d915e4014b7cc69915274b53fe946bb4b29dfe3de2bf5573ab3b2bffb4db8eb50b472e7dfb6cab88b7
 DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d9935912f035061c1107b47be8752daeb9c49bb2af4877e419a6c8bc30f846db6d773cf5267d3d761272a872 SHA512 fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7
-EBUILD dune-2.1.0.ebuild 684 BLAKE2B 4b50322912687fb84f6636dddde7a61b89c4147a9a92c8bb03619adab13a23098473380076e84c2e1e5ed5c8f7c8250ee21c4ffc749433847216c272270a5756 SHA512 e9543ae6e8e26cea642dd709242076b6860ac584df7fdd005bc73fa441b551f566f64611008bad1d9875b2c09c5e941c71eb08df158d8e0a0359d8e7cb889b4c
+EBUILD dune-1.11.4.ebuild 688 BLAKE2B cdf2a8f91b21e32ebf3c0f22c05b4f61560c0adfac4e67c17c1729506216919a4013c26ab1556d47e3e4722d9a81c01c84170b5dd914f4a4c70b3a1ec5fd8115 SHA512 5e3dd0d2e81006816ee09005891644f252bfaa2e37d800a0a3d9892ff7fd59ec80cfcbd581ba60e34a202afc940f0c6461bdf0c155a4e42ce54b31614e2881a3
+EBUILD dune-2.1.0.ebuild 693 BLAKE2B f29523daba28750f07a15e6e6acfb47bce3d0793fda6fd95af855f9cfe19b534059f3824bc0f66af3d6bcaa9f728b94ff6e0d1aa6f64989d4957515c9dcaed5b SHA512 453c4ed9686b9e33b237d977cfefe5d920487318f0a29e14bc70ea829cab78508e59c7e876fa9bb7edafffe8b6e4d24b71b0b9c88b6679c845f950e6bdf512d1
 EBUILD dune-2.7.1.ebuild 760 BLAKE2B 78f494098d67c0f08aa9076186b2641bbfaa082c3e14f767f8b6e399c2ba503eaed3d4400b5831b353483ecfb6b1216e64099a0d2dca2108fc68928860fd7476 SHA512 b5cec406cc7f8dd2ef0186f73aee3cd9d4feae1319ef2ff26d2d48b1755c530efa08e356a12c3c52cfedc2685f1482087b443a7825f71891840e76cc9d1ba3e4
-EBUILD dune-2.8.2.ebuild 786 BLAKE2B 608586b99dbbe36692c567e6c6a481c4568b611f5509241e17d730fb2f36e07348c475a8f776056d3d7ef6e601a748f163172651c81c867947213d16ee258b87 SHA512 cb7ae85aa930f9324a9c585a68c68b036a60561267bd281c98021088ea9d55dcc11691049ba4b8c9d86ea53cc41db26e6f3b08f414d58e5e6ede85b997796b85
+EBUILD dune-2.8.2.ebuild 900 BLAKE2B 132d47e58970f5f83582ce66afed4b18f0ed04609eb2e16a100a1567fcd2e495aec3ab0e8dce2485d1dbb0e1d833e8af6a5a0912a70506baf3e5a82254b98e05 SHA512 194fc12384a78243c5402cd769fa5736d5a02096cb555c0b7d8ccd23a3d1aa5300b9d8fd4a3e338ebf865c04c91f547c2313681e82d02a8c23b386c45dd60db1
 MISC metadata.xml 412 BLAKE2B 1ac46aa4fe2b5f531debe5c283c36db66a98d2120ceaa389bb2fe5c9c989a8185d0c66df879bfcd65f89e6e304359beadd632e445220a633887237bc9159ad8d SHA512 74df6c8368d4283dbda004fba147e5fa5c82165dc6a7553bf61f49d93ef7283160f6c193505d42f4043e2d3ac3227d4d29ee99827845726f146603088a61d76a
diff --git a/dev-ml/dune/dune-1.11.4.ebuild b/dev-ml/dune/dune-1.11.4.ebuild
new file mode 100644
index 000000000000..e767836ab78c
--- /dev/null
+++ b/dev-ml/dune/dune-1.11.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multiprocessing
+
+DESCRIPTION="A composable build system for OCaml"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+
+DEPEND="dev-lang/ocaml"
+RDEPEND="${DEPEND}
+	!dev-ml/jbuilder"
+BDEPEND=""
+
+RESTRICT="test"
+
+src_configure() {
+	ocaml configure.ml --libdir "${EPREFIX}/usr/$(get_libdir)/ocaml" || die
+}
+
+src_install() {
+	default
+	mv "${D}"/usr/doc "${D}"/usr/share/doc/${PF}
+	mv "${D}"/usr/man "${D}"/usr/share/man
+}
diff --git a/dev-ml/dune/dune-2.1.0.ebuild b/dev-ml/dune/dune-2.1.0.ebuild
index ab02564875e1..beec8b498b00 100644
--- a/dev-ml/dune/dune-2.1.0.ebuild
+++ b/dev-ml/dune/dune-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 KEYWORDS="amd64 arm arm64 x86"
 IUSE="test"
 
-DEPEND="dev-lang/ocaml"
+DEPEND=">=dev-lang/ocaml-4.07:="
 RDEPEND="${DEPEND}
 	!dev-ml/jbuilder"
 BDEPEND=""
diff --git a/dev-ml/dune/dune-2.8.2.ebuild b/dev-ml/dune/dune-2.8.2.ebuild
index 1a098b5da747..17398ac571ea 100644
--- a/dev-ml/dune/dune-2.8.2.ebuild
+++ b/dev-ml/dune/dune-2.8.2.ebuild
@@ -11,12 +11,23 @@ SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-RDEPEND=">=dev-lang/ocaml-4.08:=
-	!dev-ml/jbuilder"
-DEPEND="${RDEPEND}
-	dev-ml/findlib"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.08:=
+	!dev-ml/jbuilder
+"
+DEPEND="
+	${RDEPEND}
+	dev-ml/findlib
+	test? (
+		dev-ml/core_bench
+		dev-ml/ppx_bench
+		dev-ml/ppx_expect
+	)
+"
 
 QA_FLAGS_IGNORED=/usr/bin/dune