gentoo resync : 20.03.2021

4 files changed, 0 insertions, 104 deletions

diff --git a/dev-ml/camomile/Manifest b/dev-ml/camomile/Manifest
index c6efe5b9f397..bd5a7260f86f 100644
--- a/dev-ml/camomile/Manifest
+++ b/dev-ml/camomile/Manifest
@@ -1,7 +1,3 @@
-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
 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 753 BLAKE2B 84c2adf0696a2473cebd95a1ec46eee9962f9013773b7b8e6644daaebdbf36d11374264969fc552e8d118bad79114123d92574871e42db73878c774d4f71ae19 SHA512 adb5fb1ca40d713e8e463d7f81b15945ebb3a5562bd849195b203695933c745884f5da6dd2f5997c1b08243dfd5a1096a35645a9a0fd4e3ec8ea931125d61062
 MISC metadata.xml 324 BLAKE2B 2b46a676df7d41a06cbd99a35115d57faa6454a4c0294cc27d5bd6f94bccaed255a711f23ad9a64f3ce8f7e7fcf539d21c10a6a24f1c51c43c0ae6aa1979a15a SHA512 f8f74153b96f912754b959ed65319803624dae1505498e462341b751797f44996f04a665f2ed73536c1aa0f1a59e5d271c5eb5c0fedd8431ada345a69c64f291
diff --git a/dev-ml/camomile/camomile-0.8.5-r2.ebuild b/dev-ml/camomile/camomile-0.8.5-r2.ebuild
deleted file mode 100644
index 93b60798ff05..000000000000
--- a/dev-ml/camomile/camomile-0.8.5-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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
deleted file mode 100644
index 49139d61ada4..000000000000
--- a/dev-ml/camomile/files/ocaml-unsafe-string.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
deleted file mode 100644
index 9648708f669f..000000000000
--- a/dev-ml/camomile/files/ocaml405.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit 0fa0a19f15998e89e4b04150dd74529bbd406f42
-Author: Gabriel Scherer <gabriel.scherer@gmail.com>
-Date:   Fri Feb 24 22:30:23 2017 -0500
-
-    4.05 compatibility: use explicit module signatures
-    
-    In 4.05, checking for non-generalizable inference variable ('_a)
-    (forbidden in toplevel modules and functors) happens before checking
-    the .ml file against the .mli signature, so non-generalizable
-    variables that were previously resolved through the .mli constraint
-    are now underspecified and result in a compilation failure
-    (see MPR#7414, GPR#929). This commit adds enough annotations to avoid
-    such underspecified variables in functors.
-
-diff --git a/internal/unimap.ml b/internal/unimap.ml
-index b6fdbde..6a7cc30 100644
---- a/internal/unimap.ml
-+++ b/internal/unimap.ml
-@@ -58,7 +58,7 @@ val of_name : string -> t
- end
- 
- 
--module Make (Config : ConfigInt.Type) = struct
-+module Make (Config : ConfigInt.Type) : Type = struct
- 
- type mapping = {no_char : int; tbl : Tbl31.Bytes.t}
- 
-diff --git a/public/uCharInfo.ml b/public/uCharInfo.ml
-index 69bf141..6a0337a 100644
---- a/public/uCharInfo.ml
-+++ b/public/uCharInfo.ml
-@@ -298,7 +298,7 @@ val load_composition_exclusion_tbl : unit -> UCharTbl.Bool.t
- 
- end
- 
--module Make (Config : ConfigInt.Type) = struct
-+module Make (Config : ConfigInt.Type) : Type = struct
- include Unidata.Make(Config)
- 
- (* General category *)