gentoo resync : 25.11.2020

3 files changed, 28 insertions, 42 deletions

diff --git a/dev-ml/camomile/Manifest b/dev-ml/camomile/Manifest
index 007b8a45be01..48dac99c5e2d 100644
--- a/dev-ml/camomile/Manifest
+++ b/dev-ml/camomile/Manifest
@@ -1,6 +1,7 @@
 AUX ocaml-unsafe-string.patch 374 BLAKE2B ad6bb3eb9e34b567809b153e1c20f4fb9f6fd87d72f7d42ef423193a213740fe4805cf4e27ab4e8eebda17d6d768ab4768fc5cfde50c0356ac5c2ed07553d7d0 SHA512 8e8efeccc3568cf28ca5caf4a8f77ec34875202efdf536ed8f9ed6dcd1eb6aeb7f88ab20f3c37afcd9b564cac961b8c5b68753eba127222ad2aab5a08495b574
 AUX ocaml405.patch 1397 BLAKE2B 027d67a10f57c205c46fb443f2e6a8e1fa6790d9452b70bc09f74d26826aa4acbe99b91841db69900146041450ffc5d2aa3850e10ccedce6e8203b3ceed96f2d SHA512 e4b2bbd651c151d4822a72d8cf9d272493df450fbace1c693accec575ac810402fe15a39d7e579b421b4b42723840236e54d5e092e91108a6da8c7a8e5ebfc0e
 DIST camomile-0.8.5.tar.bz2 2607084 BLAKE2B 5e0ff51cdd6d7ce41ee024189a793f3d3e4bec1bd9849e7c01d2722ff22ca2cb5f0d5bd5f95820e741469ebda2996edf3611827535df5fe095d3f6617ecfdd42 SHA512 ef4da32f955e69e0b2958b4b2bf12ae94e210d8aa7cee5a9030607b79ac43a884758549f3164c223fb07d987a4a50b15f0bc5083ff67120270409f7fb9928014
-EBUILD camomile-0.8.5-r1.ebuild 888 BLAKE2B 3b08a60d1798ce21950e2ded5212d28f39792710024e8cb3a2fd882639ae1cff6f1eee635cabe5cafeea018f59ee5e65468597303075a0a0e7f7966a4784ea56 SHA512 8adaa7baea01f24cec23a0ef28efd92a33d910a2b9eb3b3920fe2f180ef397198b9055f4f8880c5dab793295a59238fa13488e8c5f50b0fabfbabda97166f2c6
+DIST camomile-1.0.2.tar.gz 7032339 BLAKE2B 8cd60c74821c2c8e7084e752d1e4d67428c935859e02a8630f3f5563b53b3ce444071fa26153950f6a410b2743073692c7061e4f1f902c23e5fa54c50a89383c SHA512 d62ecaa297058b52674f98e513a6d776148fe62651b2b4a2dac4bb3e05abb8b7684960e889f68c6dab60aee669fbab715a2d6a9206645e24d10d8aaaf7cedf0e
 EBUILD camomile-0.8.5-r2.ebuild 960 BLAKE2B 8200c4a38975432cc86a3f0d968b9ca6a7514793952bb07b14553373ec52c742d6ef2c0e2dfa681337b9c1d8d001752ac9a42561cd60a8d40041727fc6a0612f SHA512 c3b1b0ee8e815f315ca5021fee8193647fca36e649557f307c2d33d56ff0adbf09ad786ffd12567265331a247c79326247d65f71dd49848d4aee10e2040e4960
+EBUILD camomile-1.0.2.ebuild 756 BLAKE2B 6f41b23d1a1da5c87c7bf33845147b05f37d6f5b8df38397ed1041ba5735608d819dd6f7c09099b77b11fc36f48e7389e188b2043d37896fd9f97512e3086638 SHA512 4c04ad6e91e98fe3513ebf2980f8104c4ddf081b32ff3266ad094a910c85c916600514196775615b3510927562b1ad3f6ad5ccb4a9e8b6cd295c6bba2b120529
 MISC metadata.xml 254 BLAKE2B 659f90317098f9ca6081145d61e53c8f7848dd0ef86b61b73f1c4c9362495a0704e02dacaaf53533dd92ace5ad0974c39abf0fb9d45dca258f4f58476931d43e SHA512 287ad112c67330f5f9f3c6e534b1d4f46d446c5b0469bddd58f9da886d02a243b8dd215ab36af9e2b1a100186d6f7ac61e988dbe62defc5cd31450ae38c24d40
diff --git a/dev-ml/camomile/camomile-0.8.5-r1.ebuild b/dev-ml/camomile/camomile-0.8.5-r1.ebuild
deleted file mode 100644
index 68d9d15dcc3e..000000000000
--- a/dev-ml/camomile/camomile-0.8.5-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="Camomile is a comprehensive Unicode library for ocaml"
-HOMEPAGE="https://github.com/yoriyuki/Camomile/wiki"
-SRC_URI="https://github.com/yoriyuki/Camomile/releases/download/rel-${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug +ocamlopt"
-
-RDEPEND="
-	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-	dev-ml/camlp4:=
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	has_version '>=dev-lang/ocaml-4.05_beta' && epatch "${FILESDIR}/ocaml405.patch"
-}
-
-src_configure() {
-	econf $(use_enable debug)
-}
-
-src_compile() {
-	emake -j1 byte unidata unimaps charmap_data locale_data
-	if use ocamlopt; then
-		emake -j1 opt
-	fi
-}
-
-src_install() {
-	dodir /usr/bin
-	findlib_src_install DATADIR="${D}/usr/share" BINDIR="${D}/usr/bin"
-}
diff --git a/dev-ml/camomile/camomile-1.0.2.ebuild b/dev-ml/camomile/camomile-1.0.2.ebuild
new file mode 100644
index 000000000000..ca76723d7189
--- /dev/null
+++ b/dev-ml/camomile/camomile-1.0.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Camomile is a comprehensive Unicode library for ocaml"
+HOMEPAGE="https://github.com/yoriyuki/Camomile/wiki"
+SRC_URI="https://github.com/yoriyuki/Camomile/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="LGPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+# Unbound module errors
+RESTRICT="test"
+
+src_compile() {
+	# Amend standard dune_src_compile with -p camomile
+	# Needed to workaround: https://github.com/yoriyuki/Camomile/issues/83
+	# (https://dune.readthedocs.io/en/stable/faq.html#how-to-make-warnings-non-fatal)
+	dune build -p camomile @install || die
+}