[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlnet/files/, dev-ml/ocamlnet/

[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlnet/files/, dev-ml/ocamlnet/

[Alexis Ballier]

commit:     5dd6f2696efea4bb767e27f31cd0bfe8d6d02e83
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun May  1 15:46:49 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue May  3 09:13:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dd6f269

dev-ml/ocamlnet: fix build with ocaml 4.03

Package-Manager: portage-2.2.28
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 dev-ml/ocamlnet/files/oc43.patch      | 84 +++++++++++++++++++++++++++++++++++
 dev-ml/ocamlnet/ocamlnet-4.1.1.ebuild |  4 ++
 2 files changed, 88 insertions(+)

diff --git a/dev-ml/ocamlnet/files/oc43.patch b/dev-ml/ocamlnet/files/oc43.patch
new file mode 100644
index 0000000..93c6d3e
--- /dev/null
+++ b/dev-ml/ocamlnet/files/oc43.patch
@@ -0,0 +1,84 @@
+commit 0893920618cec4885b1633fd2f81de84e7a8be72
+Author: Gerd Stolpmann <gerd@gerd-stolpmann.de>
+Date:   Sun May 1 13:24:22 2016 +0200
+
+    Fixes for building against OCaml-4.03
+
+diff --git a/code/src/equeue/uq_engines_compat.ml b/code/src/equeue/uq_engines_compat.ml
+index 512811a..e779410 100644
+--- a/code/src/equeue/uq_engines_compat.ml
++++ b/code/src/equeue/uq_engines_compat.ml
+@@ -7,7 +7,8 @@ class type server_socket_acceptor = server_endpoint_acceptor
+ class type client_socket_connector = client_endpoint_connector
+           
+ 
+-exception Mem_not_supported = Uq_multiplex.Mem_not_supported
++(* exception Mem_not_supported = Uq_multiplex.Mem_not_supported *)
++(* already included from Uq_engines *)
+ 
+ let create_multiplex_controller_for_connected_socket =
+   Uq_multiplex.create_multiplex_controller_for_connected_socket
+diff --git a/code/src/netstring/netasn1.ml b/code/src/netstring/netasn1.ml
+index 05d5d3a..4cada35 100644
+--- a/code/src/netstring/netasn1.ml
++++ b/code/src/netstring/netasn1.ml
+@@ -437,7 +437,7 @@ module Value = struct
+                let hour = int_of_string (Netstring_str.matched_group m 4 s) in
+                let minute = int_of_string (Netstring_str.matched_group m 5 s) in
+                let second = int_of_string (Netstring_str.matched_group m 6 s) in
+-               let zonestr = Netstring_str.matched_group m 8s in
++               let zonestr = Netstring_str.matched_group m 8 s in
+                let zone = get_zone zonestr in
+                if month = 0 || month > 12 || day = 0 || day > 31 ||
+                     hour > 23 || minute > 59 || second > 59 
+diff --git a/code/src/netsys/netlog.ml b/code/src/netsys/netlog.ml
+index 4d87c0e..4633655 100644
+--- a/code/src/netsys/netlog.ml
++++ b/code/src/netsys/netlog.ml
+@@ -8,6 +8,18 @@ type level =
+ type logger =
+     level -> string -> unit
+ 
++type timespec = float * int
++type clock_id
++type clock =
++  (* originally from Netsys_posix *)
++  | CLOCK_REALTIME
++  | CLOCK_MONOTONIC
++  | CLOCK_ID of clock_id
++
++external clock_gettime : clock -> timespec = "netsys_clock_gettime"
++(* originally from Netsys_posix *)
++
++
+ let level_weight =
+   function
+     | `Emerg   -> 0
+@@ -95,7 +107,7 @@ let current_formatter =
+ let channel_logger ch max_lev lev msg = 
+   if level_weight lev <= level_weight max_lev then (
+     let (sec,ns) =
+-      try Netsys_posix.clock_gettime Netsys_posix.CLOCK_REALTIME
++      try clock_gettime CLOCK_REALTIME
+       with Invalid_argument _ ->
+ 	(Unix.gettimeofday(), 0) in
+     let s =   (* Netdate is unavailable here *)
+diff --git a/code/src/netsys/netsys_posix.ml b/code/src/netsys/netsys_posix.ml
+index 1062a6c..602ceae 100644
+--- a/code/src/netsys/netsys_posix.ml
++++ b/code/src/netsys/netsys_posix.ml
+@@ -771,12 +771,14 @@ external readlinkat : Unix.file_descr -> string -> string
+ type timespec = float * int
+ type clock_id
+ type clock =
++  (* also in Netlog *)
+   | CLOCK_REALTIME
+   | CLOCK_MONOTONIC
+   | CLOCK_ID of clock_id
+ 
+ external nanosleep : timespec -> timespec ref -> unit = "netsys_nanosleep"
+ external clock_gettime : clock -> timespec = "netsys_clock_gettime"
++         (* also in Netlog *)
+ external clock_settime : clock -> timespec -> unit = "netsys_clock_settime"
+ external clock_getres : clock -> timespec = "netsys_clock_getres"
+ external clock_getcpuclockid : int -> clock_id = "netsys_clock_getcpuclockid"

diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.1.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.1.ebuild
index 5fe2f7a..5c042a3 100644
--- a/dev-ml/ocamlnet/ocamlnet-4.1.1.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-4.1.1.ebuild
@@ -35,6 +35,10 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	has_version '>=dev-lang/ocaml-4.03' && epatch "${FILESDIR}/oc43.patch"
+}
+
 ocamlnet_use_with() {
 	if use $1; then
 		echo "-with-$2"

[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlnet/files/, dev-ml/ocamlnet/

[Alexis Ballier]

commit:     d8de058518fdbd53dcebd984edc9d406ef983cd7
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 12 10:03:54 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Aug 12 11:03:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8de0585

dev-ml/ocamlnet: drop ocaml 4.03 patch; it is not needed anymore.

Package-Manager: portage-2.3.0

 dev-ml/ocamlnet/files/oc43.patch      | 84 -----------------------------------
 dev-ml/ocamlnet/ocamlnet-4.1.2.ebuild |  4 --
 2 files changed, 88 deletions(-)

diff --git a/dev-ml/ocamlnet/files/oc43.patch b/dev-ml/ocamlnet/files/oc43.patch
deleted file mode 100644
index 93c6d3e..0000000
--- a/dev-ml/ocamlnet/files/oc43.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-commit 0893920618cec4885b1633fd2f81de84e7a8be72
-Author: Gerd Stolpmann <gerd@gerd-stolpmann.de>
-Date:   Sun May 1 13:24:22 2016 +0200
-
-    Fixes for building against OCaml-4.03
-
-diff --git a/code/src/equeue/uq_engines_compat.ml b/code/src/equeue/uq_engines_compat.ml
-index 512811a..e779410 100644
---- a/code/src/equeue/uq_engines_compat.ml
-+++ b/code/src/equeue/uq_engines_compat.ml
-@@ -7,7 +7,8 @@ class type server_socket_acceptor = server_endpoint_acceptor
- class type client_socket_connector = client_endpoint_connector
-           
- 
--exception Mem_not_supported = Uq_multiplex.Mem_not_supported
-+(* exception Mem_not_supported = Uq_multiplex.Mem_not_supported *)
-+(* already included from Uq_engines *)
- 
- let create_multiplex_controller_for_connected_socket =
-   Uq_multiplex.create_multiplex_controller_for_connected_socket
-diff --git a/code/src/netstring/netasn1.ml b/code/src/netstring/netasn1.ml
-index 05d5d3a..4cada35 100644
---- a/code/src/netstring/netasn1.ml
-+++ b/code/src/netstring/netasn1.ml
-@@ -437,7 +437,7 @@ module Value = struct
-                let hour = int_of_string (Netstring_str.matched_group m 4 s) in
-                let minute = int_of_string (Netstring_str.matched_group m 5 s) in
-                let second = int_of_string (Netstring_str.matched_group m 6 s) in
--               let zonestr = Netstring_str.matched_group m 8s in
-+               let zonestr = Netstring_str.matched_group m 8 s in
-                let zone = get_zone zonestr in
-                if month = 0 || month > 12 || day = 0 || day > 31 ||
-                     hour > 23 || minute > 59 || second > 59 
-diff --git a/code/src/netsys/netlog.ml b/code/src/netsys/netlog.ml
-index 4d87c0e..4633655 100644
---- a/code/src/netsys/netlog.ml
-+++ b/code/src/netsys/netlog.ml
-@@ -8,6 +8,18 @@ type level =
- type logger =
-     level -> string -> unit
- 
-+type timespec = float * int
-+type clock_id
-+type clock =
-+  (* originally from Netsys_posix *)
-+  | CLOCK_REALTIME
-+  | CLOCK_MONOTONIC
-+  | CLOCK_ID of clock_id
-+
-+external clock_gettime : clock -> timespec = "netsys_clock_gettime"
-+(* originally from Netsys_posix *)
-+
-+
- let level_weight =
-   function
-     | `Emerg   -> 0
-@@ -95,7 +107,7 @@ let current_formatter =
- let channel_logger ch max_lev lev msg = 
-   if level_weight lev <= level_weight max_lev then (
-     let (sec,ns) =
--      try Netsys_posix.clock_gettime Netsys_posix.CLOCK_REALTIME
-+      try clock_gettime CLOCK_REALTIME
-       with Invalid_argument _ ->
- 	(Unix.gettimeofday(), 0) in
-     let s =   (* Netdate is unavailable here *)
-diff --git a/code/src/netsys/netsys_posix.ml b/code/src/netsys/netsys_posix.ml
-index 1062a6c..602ceae 100644
---- a/code/src/netsys/netsys_posix.ml
-+++ b/code/src/netsys/netsys_posix.ml
-@@ -771,12 +771,14 @@ external readlinkat : Unix.file_descr -> string -> string
- type timespec = float * int
- type clock_id
- type clock =
-+  (* also in Netlog *)
-   | CLOCK_REALTIME
-   | CLOCK_MONOTONIC
-   | CLOCK_ID of clock_id
- 
- external nanosleep : timespec -> timespec ref -> unit = "netsys_nanosleep"
- external clock_gettime : clock -> timespec = "netsys_clock_gettime"
-+         (* also in Netlog *)
- external clock_settime : clock -> timespec -> unit = "netsys_clock_settime"
- external clock_getres : clock -> timespec = "netsys_clock_getres"
- external clock_getcpuclockid : int -> clock_id = "netsys_clock_getcpuclockid"

diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.2.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.2.ebuild
index f0148d8..cdfefa5 100644
--- a/dev-ml/ocamlnet/ocamlnet-4.1.2.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-4.1.2.ebuild
@@ -35,10 +35,6 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
-src_prepare() {
-	has_version '>=dev-lang/ocaml-4.03' && epatch "${FILESDIR}/oc43.patch"
-}
-
 ocamlnet_use_with() {
 	if use $1; then
 		echo "-with-$2"

[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlnet/files/, dev-ml/ocamlnet/

[Alfredo Tupone]

commit:     6370b2d0af414fdd549ab894783a2d19bf63c53a
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 20 22:12:18 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Jan 20 22:13:21 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6370b2d0

dev-ml/ocamlnet: compute dependency better

Closes: https://bugs.gentoo.org/888601
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ml/ocamlnet/files/ocamlnet-4.1.9-shuffle.patch | 11 +++++++++++
 dev-ml/ocamlnet/ocamlnet-4.1.9-r1.ebuild           |  7 +++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/dev-ml/ocamlnet/files/ocamlnet-4.1.9-shuffle.patch b/dev-ml/ocamlnet/files/ocamlnet-4.1.9-shuffle.patch
new file mode 100644
index 000000000000..6b7026faf1e0
--- /dev/null
+++ b/dev-ml/ocamlnet/files/ocamlnet-4.1.9-shuffle.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.rules	2023-01-20 22:52:47.530898157 +0100
++++ b/Makefile.rules	2023-01-20 22:53:09.370565670 +0100
+@@ -210,7 +210,7 @@
+ # Set NODEP to "@true" in order to disable "depend".
+ 
+ depend: $(DEP_FILES)
+-	$(NODEP) $(OCAMLDEP) *.ml *.mli >$@ || { rm -f $@; exit 1; }
++	$(NODEP) $(OCAMLDEP) -ml-synonym .mll *.ml *.mli >$@ || { rm -f $@; exit 1; }
+ 
+ .PHONY: clean
+ clean:: genclean

diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.9-r1.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.9-r1.ebuild
index 0029b1219894..60b4eea78ebf 100644
--- a/dev-ml/ocamlnet/ocamlnet-4.1.9-r1.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-4.1.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,7 +35,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-unboundLexer.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-unboundLexer.patch
+	"${FILESDIR}"/${P}-shuffle.patch
+)
 
 ocamlnet_use_with() {
 	if use $1; then