gentoo (valentine's day) resync : 14.02.2021

3 files changed, 3 insertions, 39 deletions

diff --git a/dev-ml/extlib/Manifest b/dev-ml/extlib/Manifest
index c8b0b529a979..4e0b3e3b626b 100644
--- a/dev-ml/extlib/Manifest
+++ b/dev-ml/extlib/Manifest
@@ -1,7 +1,6 @@
 AUX extlib-1.7.7-no-git.patch 283 BLAKE2B 2cfc23016472905c9dfb28615bce04d607a70b99da69f1ed198c8cfdd677c1dd3d8b8a6756328bf35dbd59f81c7be143a5f5864110adca56cbc2dce8384d597d SHA512 b0b04d0fb6af94d7f54751fd00ab48101fb45d47e2230358edc956fd4d6fe04ce59b8aa6857fc1b07bb544fdade01eca6213de064c7d54b59f02e8265aebfb05
-AUX ocaml405.patch 1539 BLAKE2B d61c8398986a66664810684870351856ca94318a82d07194908c570aefc9b2b3196b95f651717b058e95b853e1862c3a27218afa71a809f766b908cde3e9cece SHA512 664c9b840b77d08095e03dbd398f6af3118237fbffe73499bc2b0ee0dc8e40311337e65f3e0e95b2f87dddb9e75b18d27d2b712b314f725d97fd537f2ca23e52
 DIST extlib-1.7.7.tar.gz 88870 BLAKE2B fff84524ef227718d3908c5b65f4b781360cebc0dca3a8862aa11ea671499b45192c5106769e104d396118e3cdcd904ddce06df784f8fd0eadb7a2372ca3df94 SHA512 088a6c5bbe6530cd60e2276dc02592b69ad7ad685b752f0544c54b6246b8131238c6423ce7bfc81fe3ad1766f605ecf52fd3888d55cca63e22c947afedf610c5
 DIST extlib-1.7.8.tar.gz 90213 BLAKE2B cf78d819c542e84825bea3422d1b9afb46a3f72274ac40c704ae872a5889cbe0793f1e27f2dd8f38dee118590300d3bc6a336bfd29a16dfad00008a63ceeb17c SHA512 4a0d5d82da068c34286a1547e173f2634372d01c201823edfda2b8f72d3ff58fa26da29dde9a8b2fda28989cdb655d5a9cfd71310660e5c593026a75a833e6c6
-EBUILD extlib-1.7.7.ebuild 974 BLAKE2B 088462e2f36d5f72718565c76e6c757192edfb0676328ffdffb025d7584af021f65e9ea5316720c5eab2ef559c99748e2f3433b77ead7e733bb3b85b89e6f153 SHA512 a8a764739942c825d62f05386ecc7b3a355890215133d9084f4bdb0e2b66fec6edae32e7d549926c10986114ef84c72c8baa35a85ff42adda2cd716af072f439
+EBUILD extlib-1.7.7.ebuild 972 BLAKE2B 3ea93051b4da85c3e3b8e6d6e3cf59de2a0ccfdaad6cf2ad4a7fd3cfe9df4e7299e1d48a2d63ba3106b1b90566e04968f944bdaa8d7e164ae4710463f28aeb10 SHA512 b310b40bc4a08d277a89268d746db3f2c6322efae8b0a922d8fa2402bc4154fafe657367fda59976c645a10f3d5a146bfd3a2f12ef92ee7a601ee4954f6df588
 EBUILD extlib-1.7.8.ebuild 923 BLAKE2B 91b5fe6195d9a19cec8b83a630f8feeb8be9d7c5cd4740d7e298e613816865710641aa6c6037e8dc5cc398898b6c878358c9e363d0484c059bc3e13cb9beee2a SHA512 df218e69c6b1b6afda5260ff79f8a0e9f5e66f431134c3b49061e556c6cc16ffb4fefb05640c1af858f3dae8014928c2d6ff6a7f9628c45c1118d6df4ae46cb7
 MISC metadata.xml 384 BLAKE2B 5cf5e456304e88b37a2a9635fecaa5536bb2bd58eda884676f93545969a3361eee4a0c94750352eef6fc7c63117391f58fb4a8bb9eec18ea8eb3dfb3c2f017de SHA512 88ad9b420b173c120be33305275c08becbce8c8490421cafffc1ba64131b27ebd88cfb8b1951d2e780c9eb93b45c38f9de83f2a134812edc38103e28f05f5f05
diff --git a/dev-ml/extlib/extlib-1.7.7.ebuild b/dev-ml/extlib/extlib-1.7.7.ebuild
index 3e4ea690aacb..5a65d9cc6947 100644
--- a/dev-ml/extlib/extlib-1.7.7.ebuild
+++ b/dev-ml/extlib/extlib-1.7.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ygrek/ocaml-extlib/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc +ocamlopt"
 
 # See bug #704146
diff --git a/dev-ml/extlib/files/ocaml405.patch b/dev-ml/extlib/files/ocaml405.patch
deleted file mode 100644
index 4e3b04a1c8e5..000000000000
--- a/dev-ml/extlib/files/ocaml405.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: ocaml-extlib-1.7.1/src/configure.ml
-===================================================================
---- ocaml-extlib-1.7.1.orig/src/configure.ml
-+++ ocaml-extlib-1.7.1/src/configure.ml
-@@ -3,5 +3,6 @@ let () =
-   print_endline (if Sys.ocaml_version >= "4.02.0" then "-D OCAML4_02 " else "");
-   print_endline (if Sys.ocaml_version >= "4.03.0" then "-D OCAML4_03 " else "");
-   print_endline (if Sys.ocaml_version >= "4.04.0" then "-D OCAML4_04 " else "");
-+  print_endline (if Sys.ocaml_version >= "4.05.0" then "-D OCAML4_05 " else "");
-   let (_:int) = Sys.command "ocamlfind query -format \"-D WITH_BYTES\" bytes" in ();
-   exit 0
-Index: ocaml-extlib-1.7.1/src/extHashtbl.mli
-===================================================================
---- ocaml-extlib-1.7.1.orig/src/extHashtbl.mli
-+++ ocaml-extlib-1.7.1/src/extHashtbl.mli
-@@ -132,6 +132,9 @@ module type S =
-     val add : 'a t -> key -> 'a -> unit
-     val remove : 'a t -> key -> unit
-     val find : 'a t -> key -> 'a
-+#ifdef OCAML4_05
-+    val find_opt:  'a t -> key -> 'a option
-+#endif
-     val find_all : 'a t -> key -> 'a list
-     val replace : 'a t -> key -> 'a -> unit
-     val mem : 'a t -> key -> bool
-@@ -167,6 +170,9 @@ module type SeededS =
-     val add : 'a t -> key -> 'a -> unit
-     val remove : 'a t -> key -> unit
-     val find : 'a t -> key -> 'a
-+#ifdef OCAML4_05
-+    val find_opt : 'a t -> key -> 'a option
-+#endif
-     val find_all : 'a t -> key -> 'a list
-     val replace : 'a t -> key -> 'a -> unit
-     val mem : 'a t -> key -> bool