gentoo resync : 25.11.2020

3 files changed, 11 insertions, 50 deletions

diff --git a/dev-ml/ocurl/Manifest b/dev-ml/ocurl/Manifest
index 4b30499e8ce7..3f29e22beb2a 100644
--- a/dev-ml/ocurl/Manifest
+++ b/dev-ml/ocurl/Manifest
@@ -1,7 +1,5 @@
-DIST ocurl-0.6.1.tgz 101147 BLAKE2B db0ff240e58bc72fbbbbbb661ccc8222bf65db70e85632094c59b3edfeef63e6ff3f2b7df73e8b1662a159b4177c38714ff1a553193dd092e9aae336b90d9f9e SHA512 2c82c9b8e8d6ee26a85add7a2698ab1f61478777f9c7b0b217cacb6491067b619f508b41c22eaa54cf249147d287a77c62a00aef3b19ee6c135426c4559ab7f3
 DIST ocurl-0.7.10.tar.gz 108234 BLAKE2B 17b679e331fa266001744522457cc7f4a3656b97b4558fc9e4458c31abd8700fb0f55ce1f9049de7d95a1df41f6543aa36729bc10d9cb688e5e45c50960d5e3d SHA512 7e7adae7d32a39465d578c0e9a0b3b1d4baed76c41428337e9bdc86f7c948297db22c14bc61b58c28d02871a2f3359767e745891690663b63ee1334a839b49c8
-DIST ocurl-0.7.9.tar.gz 108242 BLAKE2B 0402757e9e08b115e322ad007d8b294127584ccd5470eeb3e1db667aba96dc269616e8a2782f1850ac4550533a51e49b58cdb82b077a8fd516f5c83e03fc616d SHA512 daa571279570fa1e4ecfa213b717149f6be3922c3c904a22912d04afcf01651702c8324b4b06cbff1fcc023a1f7663e8b1b1e7f14dc377e043ecf2ac09122877
-EBUILD ocurl-0.6.1.ebuild 682 BLAKE2B ee47f72af70f4bcc288aee5c3f656fa42868b19cb935190d87a6294c5c104f14d67d41413f2faf27b93a4da2a1c563abaf47f2cc2aa911e6cb0bf071c773088a SHA512 d9ce7e15ddbc0cdd8d4316deea67affb3f2d73dcf4b1864f609aadb52ba9d10b8b95737fd771c00e691de57e3d243570f0c352f016b51c6f7dea3f911cd51385
+DIST ocurl-0.9.1.tar.gz 111393 BLAKE2B 83ec8f5e2e83b5cc519683556ca97818a092a80f41305394cc04088371c1179f256dee3d8a8e80597837fb156299698450c70ca00f1ec336ace46b02b84bb51e SHA512 f4acb596f213ce57e749c9805225330b532e17718f3b228745b438cd1fe6d89b37e56d401a11c329107729dd0e6bdd4a425d547f9a83dabe32edbf18aca585b5
 EBUILD ocurl-0.7.10.ebuild 768 BLAKE2B 1f149546cd5a8f83a1d4d53cda2672d8f32c08d15c5f4e9dd521704175cc36c2852744b4f3058eb500447a49404608d9529a060833fefb32cd4d97c63dd4be75 SHA512 3f59e918a13afe9141041515ee93ee7cbb185918256db46293d8f51d90139226232c1e1f7ac72a4625da9ae18f2ebe8663ec060788953d8cf1bad732c7c400ad
-EBUILD ocurl-0.7.9.ebuild 761 BLAKE2B eac0a936f2bd14139c71209f5eae4a2f59af87e6559643a19befa4d45b5908c3b24859423a6da666534f83c6226c83be9263db136229898fc88724bc591929bd SHA512 984169a875b0225fa636afc1a552e77dcb8027e2172ad46468aad87d7769b76700602e81234d78816cd7d3e2d5a4fc6b5a42282a2b4d5b6ddaabe716460884bd
+EBUILD ocurl-0.9.1.ebuild 792 BLAKE2B c26cb7dbf1f4ee2a2d2227fb8172ec80f4540cd62043451686e27e678a4ac06319c9f8264dabd1a26828ef05960dfd2091c5972eee07727a9cf190d3498a1163 SHA512 a3508cabdbb86f129752c527ed25213cfba6fbc9c21af3a1f7c7b5c8424eb1f89725cae5c37d89904bc38d07555979b5a8b1d9da35b8f051acfc6849e744f3a0
 MISC metadata.xml 248 BLAKE2B fe3026d958889632df0c7f1830afde1cbdb5897819d451db6a083424d0bf8d1e1b4481aa5d015116f6420f40a82270cb833357bddb31fcc2415124d5f81f80de SHA512 31d785847bcf3bdb00d8358b10c988f77c62121b8a287440917b1950fa35ac595527b85b5d3d0bda5abfd1e34802787f6dc6b810adf03a18e87ce4c9f1b30903
diff --git a/dev-ml/ocurl/ocurl-0.6.1.ebuild b/dev-ml/ocurl/ocurl-0.6.1.ebuild
deleted file mode 100644
index 39c4fd5cab5f..000000000000
--- a/dev-ml/ocurl/ocurl-0.6.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="OCaml interface to the libcurl library"
-HOMEPAGE="http://forge.ocamlcore.org/projects/ocurl/"
-LICENSE="MIT"
-SRC_URI="https://forge.ocamlcore.org/frs/download.php/1374/${P}.tgz"
-
-SLOT="0/${PV}"
-IUSE="examples"
-
-RDEPEND=">=net-misc/curl-7.9.8
-		>=dev-lang/ocaml-3.12:=[ocamlopt]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-KEYWORDS="amd64 ppc ~x86"
-
-src_compile()
-{
-	emake -j1 all
-}
-
-src_install()
-{
-	findlib_src_install
-	dodoc CHANGES.txt README
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-ml/ocurl/ocurl-0.7.9.ebuild b/dev-ml/ocurl/ocurl-0.9.1.ebuild
index 978bdea229b6..d21999abf2a9 100644
--- a/dev-ml/ocurl/ocurl-0.7.9.ebuild
+++ b/dev-ml/ocurl/ocurl-0.9.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit findlib
 
@@ -11,23 +11,21 @@ LICENSE="MIT"
 SRC_URI="https://github.com/ygrek/ocurl/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0/${PV}"
-IUSE="examples"
+IUSE="examples +ocamlopt"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND=">=net-misc/curl-7.9.8
 	dev-ml/lwt:=
 	dev-ml/camlp4:=
-	>=dev-lang/ocaml-3.12:=[ocamlopt]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+	>=dev-lang/ocaml-3.12:=[ocamlopt?]"
+DEPEND="${RDEPEND}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
-src_compile()
-{
+src_compile() {
 	emake -j1 all
 }
 
-src_install()
-{
+src_install() {
 	findlib_src_install
 	dodoc CHANGES.txt README.md
 	if use examples; then