From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B28C813832F for ; Fri, 12 Aug 2016 11:05:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CCCD921C0DF; Fri, 12 Aug 2016 11:05:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 41FEE21C0DF for ; Fri, 12 Aug 2016 11:05:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0511433FE7D for ; Fri, 12 Aug 2016 11:05:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 31A0B7CB for ; Fri, 12 Aug 2016 11:05:22 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1470999833.d8de058518fdbd53dcebd984edc9d406ef983cd7.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlnet/files/, dev-ml/ocamlnet/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ml/ocamlnet/files/oc43.patch dev-ml/ocamlnet/ocamlnet-4.1.2.ebuild X-VCS-Directories: dev-ml/ocamlnet/files/ dev-ml/ocamlnet/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: d8de058518fdbd53dcebd984edc9d406ef983cd7 X-VCS-Branch: master Date: Fri, 12 Aug 2016 11:05:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 140a5e77-1caa-482a-8f50-0d8d93cf11fc X-Archives-Hash: 9e103dc593e46af29f708287139c70ce commit: d8de058518fdbd53dcebd984edc9d406ef983cd7 Author: Alexis Ballier gentoo org> AuthorDate: Fri Aug 12 10:03:54 2016 +0000 Commit: Alexis Ballier gentoo 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 -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"