gentoo resync : 25.11.2020

5 files changed, 18 insertions, 114 deletions

diff --git a/dev-ml/pcre-ocaml/Manifest b/dev-ml/pcre-ocaml/Manifest
index 2c3727ad51a6..23fe40d2910f 100644
--- a/dev-ml/pcre-ocaml/Manifest
+++ b/dev-ml/pcre-ocaml/Manifest
@@ -1,9 +1,5 @@
 DIST pcre-ocaml-7.2.3.tar.gz 88307 BLAKE2B 1024a0d7a490fb31927f67af4c9a5e90c8d3788b3998a8af1ecaba9d6d12d1a1be91dcb2bdc1c49e6e81f0909d1dd9b6bc200f908c68427650985491f35685c9 SHA512 3df4bdbbed5e1ecf4bdf15fc461f2ea65e1556af9c1683e194c8824e21da5274dd80c22c1f6676fca203305ec4244d47e09f0ef8c601bfa95f7237bb07c1ee65
-DIST pcre-ocaml-7.3.0.tbz 38126 BLAKE2B a129f263ab623827f491f573141a3c1da033ba853c115dbc853c942c64554028ac5e9c83a17123513522bebbd56cd5533fdb6ef17545761d1fde6063021def1b SHA512 bf2a5d188183a7f73d5a7eace98f225165e6b50828b061649e88922ca4d4705022551bce15b9b8319fc91734c77ee48182677cdb1abd754ae44c6f9412bd11e3
-DIST pcre-ocaml-7.3.2.tbz 38445 BLAKE2B 1858ce78abc760e99e34e88c590a23b79f20ed2f31abdb991f60a124b2beee140ec3e712990ced3529bf5efb5e38d231190cf9ac0f9ee2d39c1a33687b770266 SHA512 727b129172c8c119fcb0d4ae249a3842109e3b9ab412e674af156e7bcdf0fce0bcb9561cbfe52d99002a668f0e5f145fa54d052b67a5c2eb30a1881ad4217767
-DIST pcre-ocaml-7.3.3.tbz 38412 BLAKE2B 3c9538f5fc8bc6dea0c6ceda3a2b30a48302943d53a83a4876c31dbe600752ac68498a4db9546698424b34bbd55c6c3254d47148233a845376887c30dc6fd429 SHA512 569e323dea83f33212a2aa9482e55f7491c8f83382fad13dfaf9fe624307ca261baf255db7c5837e1c6b5c64445daf05b64b9929cbd6d311d06278826bb788e3
-EBUILD pcre-ocaml-7.2.3.ebuild 724 BLAKE2B 4ca3b1461aaec1dc42b5e797ce7b2a741051d2b5354f4eec873fd5a4103b5f91a23009ecc700438456db32c134638d37693af2fc682088386cd320a451f8fa65 SHA512 cd931aa45d38323deee1a566b3b5f65bb014138d0970d841325d7538f58ae8ac9d956293a1ceeb222f816c2b7699ba5135f4142803e74c76b5de91feb1b8acc0
-EBUILD pcre-ocaml-7.3.0.ebuild 838 BLAKE2B 5456386e762ef62f2a1352d817e663974cd48a8afad40e94e00598840e40c677b4995e4a5d845ee2ae2a5b7fb8f2a892e1d3ceb20af445cb39b7a50c186afb8e SHA512 b4e11062f62d07f489c299a2ce603f7ad34329f2d8a2f3cebbed19128ebd98de35b43d1f03fdc6bbfbc8894f2606bf1701e9df7b3c99bdab2ca056e1d973b6ee
-EBUILD pcre-ocaml-7.3.2.ebuild 838 BLAKE2B 5456386e762ef62f2a1352d817e663974cd48a8afad40e94e00598840e40c677b4995e4a5d845ee2ae2a5b7fb8f2a892e1d3ceb20af445cb39b7a50c186afb8e SHA512 b4e11062f62d07f489c299a2ce603f7ad34329f2d8a2f3cebbed19128ebd98de35b43d1f03fdc6bbfbc8894f2606bf1701e9df7b3c99bdab2ca056e1d973b6ee
-EBUILD pcre-ocaml-7.3.3.ebuild 838 BLAKE2B 5456386e762ef62f2a1352d817e663974cd48a8afad40e94e00598840e40c677b4995e4a5d845ee2ae2a5b7fb8f2a892e1d3ceb20af445cb39b7a50c186afb8e SHA512 b4e11062f62d07f489c299a2ce603f7ad34329f2d8a2f3cebbed19128ebd98de35b43d1f03fdc6bbfbc8894f2606bf1701e9df7b3c99bdab2ca056e1d973b6ee
+DIST pcre-ocaml-7.4.6.tbz 41027 BLAKE2B 1faecd96cb6f7af248e8ace7409a49131f5c654320f8ac432fd4aff602d0c4187733419e9cc73ca52cf0a3e5b725afa9357fe9ec191bf1ca42d4dc47a36e45b7 SHA512 a356c78dc19d3b3741d1fa0277c4fb0cb545f12499165526fae80a0ff8a7b1f1e6e5e916b16f8336bcec3661de811686b814fe4afc677965fec7a63d4fc53b1f
+EBUILD pcre-ocaml-7.2.3.ebuild 709 BLAKE2B dbf57cfee3ff256ded13d85881ad747fee1802499172f20528cb30ddecd9d37f7b9adcf81419d042ab72d3924856559189b4416044b368b450b403968cd02995 SHA512 2c6e5106604be7c0f0e686fca818c618e64660c0bee5584fdc8072c9a94180c037663219d5453bf47b821c65aa3a12b7b1e0d891b79f2bf20d3c84e0f323138c
+EBUILD pcre-ocaml-7.4.6-r1.ebuild 720 BLAKE2B 66d17f763019820e0ed6a0024e1e7244b0dce99993bfdefabc10364d7ea87bc8ef768b4d63c31c4caf349292dd594cdc548629dd4056f739e2ceff536ba689b6 SHA512 69449d3d54a73122fd9f65ac519642ee77acc994eb1df83f542d01c933774ffaaef81c171482318738beb8426193c00b886a6d2d00a5d0dbcaad44619426108d
 MISC metadata.xml 316 BLAKE2B c47754948a843c41e96ff4f56536fa7f1c9cfda9e55a6d710aec847762093d99e40363fd9ec1bb8f3a6fd00701564d38a88c872d6c5d84fa0152429be8c7b371 SHA512 3bd6c5b9e74890d4bb901aab45b5c2313143606189de938157b74a453cfd768bd6a6df592ac86b00c14a6df408c87a3a97ec347aebf5333ab49b9883117d531f
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-7.2.3.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-7.2.3.ebuild
index f4be028e4ee5..eb845aa29a3c 100644
--- a/dev-ml/pcre-ocaml/pcre-ocaml-7.2.3.ebuild
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-7.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,7 +24,7 @@ DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" )
 src_install() {
 	oasis_src_install
 	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
+		docinto examples
+		dodoc -r examples
 	fi
 }
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-7.3.2.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-7.3.2.ebuild
deleted file mode 100644
index 47033ef2b054..000000000000
--- a/dev-ml/pcre-ocaml/pcre-ocaml-7.3.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit opam
-
-DESCRIPTION="Perl Compatibility Regular Expressions for O'Caml"
-HOMEPAGE="http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml"
-SRC_URI="https://github.com/mmottl/pcre-ocaml/releases/download/${PV}/pcre-${PV}.tbz -> ${P}.tbz"
-LICENSE="LGPL-2.1-with-linking-exception"
-IUSE="examples"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND=">=dev-libs/libpcre-4.5"
-DEPEND="${RDEPEND}
-	dev-ml/jbuilder
-	dev-ml/base
-	dev-ml/stdio
-	dev-ml/configurator
-"
-
-S="${WORKDIR}/pcre-${PV}"
-
-src_compile() {
-	jbuilder build @install || die
-}
-
-src_test() {
-	jbuilder runtest || die
-}
-
-src_install() {
-	opam_src_install pcre
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-7.3.3.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-7.3.3.ebuild
deleted file mode 100644
index 47033ef2b054..000000000000
--- a/dev-ml/pcre-ocaml/pcre-ocaml-7.3.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit opam
-
-DESCRIPTION="Perl Compatibility Regular Expressions for O'Caml"
-HOMEPAGE="http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml"
-SRC_URI="https://github.com/mmottl/pcre-ocaml/releases/download/${PV}/pcre-${PV}.tbz -> ${P}.tbz"
-LICENSE="LGPL-2.1-with-linking-exception"
-IUSE="examples"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND=">=dev-libs/libpcre-4.5"
-DEPEND="${RDEPEND}
-	dev-ml/jbuilder
-	dev-ml/base
-	dev-ml/stdio
-	dev-ml/configurator
-"
-
-S="${WORKDIR}/pcre-${PV}"
-
-src_compile() {
-	jbuilder build @install || die
-}
-
-src_test() {
-	jbuilder runtest || die
-}
-
-src_install() {
-	opam_src_install pcre
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-7.3.0.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-7.4.6-r1.ebuild
index 47033ef2b054..9463a69362fd 100644
--- a/dev-ml/pcre-ocaml/pcre-ocaml-7.3.0.ebuild
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-7.4.6-r1.ebuild
@@ -1,41 +1,31 @@
-# 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 opam
+inherit dune
 
 DESCRIPTION="Perl Compatibility Regular Expressions for O'Caml"
 HOMEPAGE="http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml"
 SRC_URI="https://github.com/mmottl/pcre-ocaml/releases/download/${PV}/pcre-${PV}.tbz -> ${P}.tbz"
+S="${WORKDIR}/pcre-${PV}"
+
 LICENSE="LGPL-2.1-with-linking-exception"
-IUSE="examples"
+IUSE="examples +ocamlopt"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 
+BDEPEND="dev-ml/dune-configurator"
 RDEPEND=">=dev-libs/libpcre-4.5"
-DEPEND="${RDEPEND}
-	dev-ml/jbuilder
-	dev-ml/base
+DEPEND="
+	${RDEPEND}
 	dev-ml/stdio
-	dev-ml/configurator
 "
 
-S="${WORKDIR}/pcre-${PV}"
-
-src_compile() {
-	jbuilder build @install || die
-}
-
-src_test() {
-	jbuilder runtest || die
-}
-
 src_install() {
-	opam_src_install pcre
+	dune_src_install pcre
 
 	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
+		dodoc -r examples
 	fi
 }