gentoo resync : 22.05.2021

3 files changed, 0 insertions, 89 deletions

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 430026495844..2e0cab8e8c28 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,5 +1,3 @@
-AUX unison-2.48.15_p4-ocaml-4.08.patch 1942 BLAKE2B 18cd8c18e0c30156fd3e36aaa987a9ad033ff321edd4f911006bfec958d70884f3575536cfe543e8da0fc10448193bb3514936bab95f3c71c96b75b4f4048c0e SHA512 802b333418513df59fbbf956620f1576141763a898d320a3be06d35d5ad8adf38c13e9bc9dd38cae05f2d7a25c07a3fcc709ace66c6a92d728c25a42688494e9
-AUX unison-2.48.4-Makefile-dep.patch 542 BLAKE2B b32665bd2562c84aae1a801648c9324a0fafe39fb7d7d6be0b6bc52cdcd2f8282cfcde97fe2682b1d41656f65f1df9e32adc03660ef2c5c6a9394709c3d1e838 SHA512 e36704c7ac0fee66a308364ad72443a36ac14c1aacca0728b50f1770df91bf77347b58d218e93943a91cf2e99672840a6c322a5a4a5f238797d440ae16aa2394
 DIST unison-2.51.3_p20201127.tar.gz 1374770 BLAKE2B 83c133f2cb99e10fac96efde333291a671edab5eb45dd6dcf56cb25845385425353a5f413ab752361124ec7bbac21daf3f813d5539b21229d943cf7f0bfae2fd SHA512 4b978a5e3df620317b7a9214054d64f319d09c5617b07ddf3cf76b18c6888841ce791f7b6a4ef70c64b146e3e4f25a5904584fb576703c2de4b17cfcffa8905a
 DIST unison-2.51.4_rc2.tar.gz 1377263 BLAKE2B d403e019f0757f66be5157cff97596c9dae1306a5ba33af27fe55a69fb1ae50d6ef6db54403d14a0afb27cb7a0ebe198021d6cdf58430c530575fc934c837703 SHA512 c61f827490036fbe3074ce5d970e6b4e981a4fde848c307c817f51d73f450d4b5d437503f5392bd2b654121547919b9724112383f71736a9e0e7b308bc3e99b6
 EBUILD unison-2.51.3_p20201127.ebuild 2775 BLAKE2B 5171b9656a9d6d7b624875d172f6bc19204973e62ecb9dd1b3c5a1a30f16d42a16ac4a0bab9dcfee89b30e96ea46d2a0d04ddf7d49c79e9b610d2f0232432dfa SHA512 bbdefdaf03776ba61885984dcbeedbf5e01577787228e5ace678405c038f61813c91dd3cdddae420ecf2cdd2d1ee5f94b18f2e90d5cd7541b38c1eadf725a7d4
diff --git a/net-misc/unison/files/unison-2.48.15_p4-ocaml-4.08.patch b/net-misc/unison/files/unison-2.48.15_p4-ocaml-4.08.patch
deleted file mode 100644
index 8a8205d3cfe3..000000000000
--- a/net-misc/unison/files/unison-2.48.15_p4-ocaml-4.08.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Reworked for v2.48.15v4 ( https://github.com/bcpierce00/unison/commit/29fa058 )
-
-From: Stephane Glondu <steph@glondu.net>
-Date: Mon, 25 Nov 2019 10:52:48 +0100
-Subject: Fix compilation with OCaml 4.08.1
-
----
- files.ml                 | 2 +-
- recon.ml                 | 4 ++--
- system/system_generic.ml | 2 +-
- uigtk2.ml                | 2 +-
- 5 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile.OCaml b/Makefile.OCaml
-index 21610ce..7549907 100644
---- a/files.ml
-+++ b/files.ml
-@@ -722,7 +722,7 @@ let get_files_in_directory dir =
-   with End_of_file ->
-     dirh.System.closedir ()
-   end;
--  Sort.list (<) !files
-+  List.sort String.compare !files
- 
- let ls dir pattern =
-   Util.convertUnixErrorsToTransient
-diff --git a/recon.ml b/recon.ml
-index 5ed358d..a8719c4 100644
---- a/recon.ml
-+++ b/recon.ml
-@@ -651,8 +651,8 @@ let rec reconcile
- 
- (* Sorts the paths so that they will be displayed in order                   *)
- let sortPaths pathUpdatesList =
--  Sort.list
--    (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0)
-+  List.sort
-+    Path.compare
-     pathUpdatesList
- 
- let rec enterPath p1 p2 t =
-diff --git a/system/system_generic.ml b/system/system_generic.ml
-index 9230cdc..ee457c5 100755
---- a/system/system_generic.ml
-+++ b/system/system_generic.ml
-@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen
- let chmod = Unix.chmod
- let chown = Unix.chown
- let utimes = Unix.utimes
--let link = Unix.link
-+let link s d = Unix.link s d
- let openfile = Unix.openfile
- let opendir f =
-   let h = Unix.opendir f in
-diff --git a/uigtk2.ml b/uigtk2.ml
-index 206d8ad..b2a17e2 100644
---- a/uigtk2.ml
-+++ b/uigtk2.ml
-@@ -94,7 +94,7 @@ let icon =
- let icon =
-   let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in
-   Gpointer.blit
--    (Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
-+    (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
-   p
-
- let leftPtrWatch =
diff --git a/net-misc/unison/files/unison-2.48.4-Makefile-dep.patch b/net-misc/unison/files/unison-2.48.4-Makefile-dep.patch
deleted file mode 100644
index f65959dfb4ac..000000000000
--- a/net-misc/unison/files/unison-2.48.4-Makefile-dep.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Makefile.OCaml: fswatch.cmi depends on ubase/prefs.cmi.
-
-  The dependency is needed to compile unison
-  in parallel.
-
-Reference: https://github.com/bcpierce00/unison/pull/100
-
-diff --git a/Makefile.OCaml b/Makefile.OCaml
-index 21610ce..84fe7ad 100644
---- a/Makefile.OCaml
-+++ b/Makefile.OCaml
-@@ -426,6 +426,8 @@ win32rc/unison.res.lib: win32rc/unison.res
- 	@echo "$(CAMLC): $< ---> $@"
- 	$(CAMLC) $(CAMLFLAGS) -c $(CWD)/$<
- 
-+fswatch.cmi : ubase/prefs.cmi
-+
- %.cmo: %.ml
- 	@echo "$(OCAMLC): $< ---> $@"
- 	$(OCAMLC) $(CAMLFLAGS) -c $(CWD)/$<