gentoo resync : 25.11.2020

5 files changed, 38 insertions, 80 deletions

diff --git a/dev-ml/ocaml-ssl/Manifest b/dev-ml/ocaml-ssl/Manifest
index 66691138a1e7..fe4869fd1e2d 100644
--- a/dev-ml/ocaml-ssl/Manifest
+++ b/dev-ml/ocaml-ssl/Manifest
@@ -1,7 +1,5 @@
 DIST ocaml-ssl-0.5.3.tar.gz 125431 BLAKE2B e95b6757f27fcac16dda1087880bb49ad854108755719210aeeeebd0e14cfee9b6244986f21ddbf86a970ea4b4f9eb2bb8e0a5a888dafe2a7262f004194a26ba SHA512 c0dc38ab21c8adc104a42ec89b8a58de976205887a23a407f1ffee1181d526ddb8aa91877508f8a974c6df8583d6d8611558a995680e313fc78ad0cac184cf52
-DIST ocaml-ssl-0.5.4.tar.gz 125833 BLAKE2B 983f1c1301c2dd313d91c180e8654baef39b1de2f3f3688ba40d920d5c16fd1626b1cf9dc8a6f172045ab4b8cd75b4048b3956ff9835a57c534bacdb1ddce32d SHA512 4a221bd8f5c11871040f6f117d3152ec2fca28f0311dfcc2ac39d2ed55c66203e12ad3242368273d8f17f1ca87c1b5d929ab7fec8ec7a03a564c7c25ade3d289
-DIST ocaml-ssl-0.5.5.tar.gz 125778 BLAKE2B 7be315a349df7948adc69b64cce65d29ce0d7cc8b492d4f3948a3a72e64951c323b8f5d3fa48825fe0119ff5d8c94a03d95e36ec695768aae0751f5f3df4397b SHA512 4e3a78426bc2a5cec0ade43b1b324366b4bf0d93be6e7bc73f1152499f2ab0642d3edcf4484a519ea6ec0b44bc76c0c984b9bba59121f93bc065b1c0355969c0
-EBUILD ocaml-ssl-0.5.3.ebuild 620 BLAKE2B d950526685d55613484cdd474a613bf6d2cc2d93f372580cac89241194ae6ce8c5f6d1645f751fdd702933a8cb431623ebe61fe7d4c6c3c8eb2a8a9150a9d930 SHA512 a9fd93d5eea87121d7f00e4b5b32f4e2a6780e4f60b9bd65e4e2af0db76cea76c20f8b543cd783e3303a1d699e4c51ab48d3f50d0964e88347237c07522e21bf
-EBUILD ocaml-ssl-0.5.4.ebuild 623 BLAKE2B fea8cc83a9b230c65703771659c7c5619de08b0f3db3ba13ee1741a92a5f2a3581ef8b0205a1b4c9f8e4a9f81c2c75d85e5bac7f3b4c391a9f86935e6e7e3016 SHA512 03115ad2f8da6806414183ad50aeed18d941282ddbbf114c552eca7fd9294ca8fecad656666c8f7f7386c27eb910e087f8cabc2ed375225ea1726b8f287f40b1
-EBUILD ocaml-ssl-0.5.5.ebuild 623 BLAKE2B fea8cc83a9b230c65703771659c7c5619de08b0f3db3ba13ee1741a92a5f2a3581ef8b0205a1b4c9f8e4a9f81c2c75d85e5bac7f3b4c391a9f86935e6e7e3016 SHA512 03115ad2f8da6806414183ad50aeed18d941282ddbbf114c552eca7fd9294ca8fecad656666c8f7f7386c27eb910e087f8cabc2ed375225ea1726b8f287f40b1
+DIST ocaml-ssl-0.5.9.tar.gz 32721 BLAKE2B c6b1ec659fddf384005f2cb045c0b0c059daaa93bd782904354e12e1ce63432c04c9bdc823dbfd0cd903ce872c91f0a750975cc69a56c9384ef6d09ed46c22cd SHA512 6826e5a6ab9f51013e8d097900f443d091e085e3d2d232a315a0e3a90ca334c9b9779d20dcae267f9ed961bc4a08fcb80372e669389c59a22d5c7706d37fcd5f
+EBUILD ocaml-ssl-0.5.3-r1.ebuild 619 BLAKE2B 183a3abfc50c321e29ad653cbe2055ba45873e621ffbed38d42008cf311ea3575de8209413b5dc91ed1eef8c2f1be9dfc9036b913e6f759293447dc91333183e SHA512 d6421c2302377ceed8b932b3f1e788ec77a53b6bdc9703f90a494b5cdba3a2f26e9eae81661a245a3cc395e5ffff5b0ae03aa78dad0de96597b5ce039b57c045
+EBUILD ocaml-ssl-0.5.9.ebuild 596 BLAKE2B c59b1a6b280d3506168a501dc5bb1162a276c9ea01873ba8a55351a4a9b769617b30f7918cee802370eee91b0bbad11fc1613df3f9da151146425ad8ece6f332 SHA512 e7f6faed62f89d48d15843779a0746f42d3c5b4dd27320695de4c7dc36a2e884bf693784dca6d4f2fccd3f412e2b5fe81f46941282b0a4b13ded5baaa1c62f33
 MISC metadata.xml 301 BLAKE2B e06adb641ac1eec98b9d60d7b7c8f01bf5d495133b91dd1c6a586a7a212d7f5c1dd27efb42d6807d5e16eea5281379c8dd5abe0b0955ca0552b20bb714909a38 SHA512 1ec6a683ca7f9f8dad10cad74ae7a43770751ebaf4bac889b373285ba8ff4f151a746ca8973c9de0008254596d519f919f1d06beebf813f757f2971c816c0add
diff --git a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.3.ebuild b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.3-r1.ebuild
index cc7ee2277b7b..efafebb5ce0a 100644
--- a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.3.ebuild
+++ b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.3-r1.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 inherit findlib eutils
 
-IUSE="doc"
-
 DESCRIPTION="OCaml bindings for OpenSSL"
 SRC_URI="https://github.com/savonet/ocaml-ssl/releases/download/${PV}/${P}.tar.gz"
 HOMEPAGE="https://github.com/savonet/ocaml-ssl"
 
-DEPEND="dev-libs/openssl:0=
-	>=dev-lang/ocaml-3.10:="
-RDEPEND="${DEPEND}"
-
 SLOT="0/${PV}"
 LICENSE="LGPL-2.1"
 KEYWORDS="amd64 ~arm ppc x86"
+IUSE="doc"
+
+DEPEND="
+	dev-libs/openssl:0=
+	<dev-lang/ocaml-4.09.0:="
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	emake -j1
diff --git a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.4.ebuild b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.4.ebuild
deleted file mode 100644
index f01f839f8aea..000000000000
--- a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils
-
-IUSE="doc"
-
-DESCRIPTION="OCaml bindings for OpenSSL"
-SRC_URI="https://github.com/savonet/ocaml-ssl/releases/download/${PV}/${P}.tar.gz"
-HOMEPAGE="https://github.com/savonet/ocaml-ssl"
-
-DEPEND="dev-libs/openssl:0=
-	>=dev-lang/ocaml-3.10:="
-RDEPEND="${DEPEND}"
-
-SLOT="0/${PV}"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	findlib_src_preinst
-	emake install
-
-	if use doc; then
-		dohtml -r doc/html/*
-	fi
-	dodoc CHANGES README.md
-}
diff --git a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.5.ebuild b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.5.ebuild
deleted file mode 100644
index f01f839f8aea..000000000000
--- a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils
-
-IUSE="doc"
-
-DESCRIPTION="OCaml bindings for OpenSSL"
-SRC_URI="https://github.com/savonet/ocaml-ssl/releases/download/${PV}/${P}.tar.gz"
-HOMEPAGE="https://github.com/savonet/ocaml-ssl"
-
-DEPEND="dev-libs/openssl:0=
-	>=dev-lang/ocaml-3.10:="
-RDEPEND="${DEPEND}"
-
-SLOT="0/${PV}"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	findlib_src_preinst
-	emake install
-
-	if use doc; then
-		dohtml -r doc/html/*
-	fi
-	dodoc CHANGES README.md
-}
diff --git a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.9.ebuild b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.9.ebuild
new file mode 100644
index 000000000000..dfac745fb556
--- /dev/null
+++ b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.9.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DUNE_PKG_NAME="ssl"
+inherit dune
+
+DESCRIPTION="OCaml bindings for OpenSSL"
+SRC_URI="https://github.com/savonet/ocaml-ssl/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/savonet/ocaml-ssl"
+
+IUSE="+ocamlopt"
+
+BDEPEND="dev-ml/dune-configurator"
+DEPEND="dev-libs/openssl:0=
+	>=dev-lang/ocaml-3.10:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+
+SLOT="0/${PV}"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+src_install() {
+	dune_src_install
+
+	dodoc CHANGES README.md
+}