gentoo resync : 25.08.2020

4 files changed, 69 insertions, 7 deletions

diff --git a/dev-ml/camomile/Manifest b/dev-ml/camomile/Manifest
index 049c01f6e4cf..aba3a8f639d1 100644
--- a/dev-ml/camomile/Manifest
+++ b/dev-ml/camomile/Manifest
@@ -1,4 +1,6 @@
-AUX ocaml405.patch 1469 BLAKE2B 06ef619b7dd82b584e192eea1818de0b95e5005a9c5492bd2c8ee4430728a6577b0f125e63ba483d40593f08ec7e885e279bbf815896d1b36d4177910a95f9bf SHA512 b8951a401ee8b4c4e49e4a144c6ea5e0cc3c50ab62c95f34a4766fd46a4a93d9eea13c5d30b00eabaee00d70a3cc82a8251d110e622e00c623c8467867cc95ba
+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
+EBUILD camomile-0.8.5-r2.ebuild 963 BLAKE2B 34dee01403fb2c0071019d5620c60454f54f03c64eeacc2f5efb1eb0f8175cc8c9ac771fb515e95e0dbdc567f063270d51bcdd00a07b50ea85f9d7a00fb1dc5d SHA512 96f90c0a557f46c81f6006b25765c2a5faea757f4e6ba08a0269accf92334c8b745fb57b1f8aced766bd4c3ff3f76ec77d4b4990198fd0bafeacbce6cf76d7ba
 MISC metadata.xml 254 BLAKE2B 659f90317098f9ca6081145d61e53c8f7848dd0ef86b61b73f1c4c9362495a0704e02dacaaf53533dd92ace5ad0974c39abf0fb9d45dca258f4f58476931d43e SHA512 287ad112c67330f5f9f3c6e534b1d4f46d446c5b0469bddd58f9da886d02a243b8dd215ab36af9e2b1a100186d6f7ac61e988dbe62defc5cd31450ae38c24d40
diff --git a/dev-ml/camomile/camomile-0.8.5-r2.ebuild b/dev-ml/camomile/camomile-0.8.5-r2.ebuild
new file mode 100644
index 000000000000..437035c55c9e
--- /dev/null
+++ b/dev-ml/camomile/camomile-0.8.5-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+PATCHES=( "${FILESDIR}"/ocaml-unsafe-string.patch )
+
+RDEPEND="
+	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+	dev-ml/camlp4:=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	if has_version '>=dev-lang/ocaml-4.05_beta'; then
+		eapply "${FILESDIR}/ocaml405.patch"
+	fi
+}
+
+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/files/ocaml-unsafe-string.patch b/dev-ml/camomile/files/ocaml-unsafe-string.patch
new file mode 100644
index 000000000000..49139d61ada4
--- /dev/null
+++ b/dev-ml/camomile/files/ocaml-unsafe-string.patch
@@ -0,0 +1,13 @@
+--- a/Makefile.in  2013-09-15 02:48:38.000000000 -0500
++++ b/Makefile.in      2020-07-03 00:43:13.639039206 -0500
+@@ -48,8 +48,8 @@
+ OCAMLMKLIB = @OCAMLMKLIB@
+
+ # compiler options
+-BOPTIONS = @DEBUG@ @ASSERT@
+-OOPTIONS = @COPTIONS@ @PROFILE@ @ASSERT@
++BOPTIONS =@DEBUG@ @ASSERT@ -unsafe-string
++OOPTIONS =@COPTIONS@ @PROFILE@ @ASSERT@ -unsafe-string
+
+ #
+ PACKAGE = camomile
diff --git a/dev-ml/camomile/files/ocaml405.patch b/dev-ml/camomile/files/ocaml405.patch
index 3fec6955a27c..9648708f669f 100644
--- a/dev-ml/camomile/files/ocaml405.patch
+++ b/dev-ml/camomile/files/ocaml405.patch
@@ -12,10 +12,10 @@ Date:   Fri Feb 24 22:30:23 2017 -0500
     (see MPR#7414, GPR#929). This commit adds enough annotations to avoid
     such underspecified variables in functors.
 
-diff --git a/Camomile/internal/unimap.ml b/Camomile/internal/unimap.ml
+diff --git a/internal/unimap.ml b/internal/unimap.ml
 index b6fdbde..6a7cc30 100644
---- a/Camomile/internal/unimap.ml
-+++ b/Camomile/internal/unimap.ml
+--- a/internal/unimap.ml
++++ b/internal/unimap.ml
 @@ -58,7 +58,7 @@ val of_name : string -> t
  end
  
@@ -25,10 +25,10 @@ index b6fdbde..6a7cc30 100644
  
  type mapping = {no_char : int; tbl : Tbl31.Bytes.t}
  
-diff --git a/Camomile/public/uCharInfo.ml b/Camomile/public/uCharInfo.ml
+diff --git a/public/uCharInfo.ml b/public/uCharInfo.ml
 index 69bf141..6a0337a 100644
---- a/Camomile/public/uCharInfo.ml
-+++ b/Camomile/public/uCharInfo.ml
+--- a/public/uCharInfo.ml
++++ b/public/uCharInfo.ml
 @@ -298,7 +298,7 @@ val load_composition_exclusion_tbl : unit -> UCharTbl.Bool.t
  
  end