diff options
author | Alexis Ballier <aballier@gentoo.org> | 2017-04-01 18:10:41 +0200 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2017-04-02 10:37:49 +0200 |
commit | 04b75286fa95bd3df630f14a6dcd3c2393dc843f (patch) | |
tree | d4c93e8b5eb56b5eb5c8aca050a94329e6cef1bb /dev-ml/core | |
parent | dev-ml/textutils: Bump to 0.9.0 (diff) | |
download | gentoo-04b75286fa95bd3df630f14a6dcd3c2393dc843f.tar.gz gentoo-04b75286fa95bd3df630f14a6dcd3c2393dc843f.tar.bz2 gentoo-04b75286fa95bd3df630f14a6dcd3c2393dc843f.zip |
dev-ml/core: Bump to 0.9.0
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Diffstat (limited to 'dev-ml/core')
-rw-r--r-- | dev-ml/core/Manifest | 2 | ||||
-rw-r--r-- | dev-ml/core/core-0.9.0.ebuild | 36 | ||||
-rw-r--r-- | dev-ml/core/core-113.33.02.ebuild | 57 | ||||
-rw-r--r-- | dev-ml/core/files/oc43.patch | 279 |
4 files changed, 37 insertions, 337 deletions
diff --git a/dev-ml/core/Manifest b/dev-ml/core/Manifest index 453f3ed2f2b4..aae420ca2bfa 100644 --- a/dev-ml/core/Manifest +++ b/dev-ml/core/Manifest @@ -1 +1 @@ -DIST core-113.33.02.tar.gz 806999 SHA256 42f474e7c0b907bc3cd10defbc2de49547aa8c23bb86e39aa7abcc6ea1ff5c06 SHA512 da498c116dc4844455370c28b4cdab9f3dcc576a99f82ed7795cb7a8e65de01364f048588d4be6ca80b979f379d8bc4b4ab46eee17b557bdb75cac1e585badea WHIRLPOOL cb647f13482d4bef7b83fce35434acdeaa2c5df6ebf999b41ba2c8b5dc6754ddf4939d89239be79e120113570bfdd0e839feb7374d9e25457379bfdd1092a3c0 +DIST core-0.9.0.tar.gz 734916 SHA256 3af762b2116225f8544549e81a6ebfd9155f71ba3707eedfa98038aa76bcb4b1 SHA512 733fae8552ddb0842455d625786de4a76979b40bee6503954ff77493bad2d5bad143f39f8091fd3b76562edfd14f2a2c9a4e1ec1a11fcf023aac39308d23083c WHIRLPOOL ebc9e79916dafeac71a412058958a2842ca1346f57c52048c2c1cf2588149df10ae6b130a383bfd844b99fc13fad24f2150006841eee2d36e449f224b2d27190 diff --git a/dev-ml/core/core-0.9.0.ebuild b/dev-ml/core/core-0.9.0.ebuild new file mode 100644 index 000000000000..64835cb4c69c --- /dev/null +++ b/dev-ml/core/core-0.9.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Jane Street's alternative to the standard library" +HOMEPAGE="https://github.com/janestreet/core" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND=" + dev-lang/ocaml:= + dev-ml/base:= + dev-ml/configurator:= + dev-ml/core_kernel:= + dev-ml/ppx_assert:= + dev-ml/ppx_driver:= + dev-ml/ppx_jane:= + dev-ml/sexplib:= + dev-ml/spawn:= + dev-ml/stdio:= + dev-ml/ocaml-migrate-parsetree:= +" +DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder" + +src_install() { + opam-installer -i \ + --prefix="${ED}/usr" \ + --libdir="${D}/$(ocamlc -where)" \ + --docdir="${ED}/usr/share/doc/${PF}" \ + ${PN}.install || die +} diff --git a/dev-ml/core/core-113.33.02.ebuild b/dev-ml/core/core-113.33.02.ebuild deleted file mode 100644 index 6ed7513dffae..000000000000 --- a/dev-ml/core/core-113.33.02.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -OASIS_BUILD_DOCS=1 -OASIS_BUILD_TESTS=1 - -inherit eutils oasis - -MY_P=${P/_/\~} -DESCRIPTION="Jane Street's alternative to the standard library" -HOMEPAGE="http://www.janestreet.com/ocaml" -SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${P}.tar.gz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - >=dev-ml/bin-prot-113.24.00:= - >=dev-ml/core_kernel-113.24.00:= - >=dev-ml/fieldslib-113.24.00:= - dev-ml/ppx_assert:= - dev-ml/ppx_bench:= - dev-ml/ppx_driver:= - dev-ml/ppx_expect:= - dev-ml/ppx_inline_test:= - dev-ml/ppx_jane:= - >=dev-ml/sexplib-113.24.00:= - dev-ml/typerep:= - dev-ml/variantslib:= -" -DEPEND="${RDEPEND}" - -src_prepare() { - has_version '>=dev-lang/ocaml-4.03' && epatch "${FILESDIR}/oc43.patch" -} - -src_configure() { - emake setup.exe - OASIS_SETUP_COMMAND="./setup.exe" oasis_src_configure -} - -src_compile() { - emake -} - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die - dodoc CHANGES.md README.md -} diff --git a/dev-ml/core/files/oc43.patch b/dev-ml/core/files/oc43.patch deleted file mode 100644 index 5e44a4438209..000000000000 --- a/dev-ml/core/files/oc43.patch +++ /dev/null @@ -1,279 +0,0 @@ -diff -uNr core-113.33.02/_oasis core-113.33.02+4.03/_oasis ---- core-113.33.02/_oasis 2016-04-06 11:06:40.000000000 +0200 -+++ core-113.33.02+4.03/_oasis 2016-04-06 12:42:48.000000000 +0200 -@@ -1,8 +1,8 @@ - OASISFormat: 0.4 --OCamlVersion: >= 4.02.3 -+OCamlVersion: >= 4.03.0 - FindlibVersion: >= 1.3.2 - Name: core --Version: 113.33.02 -+Version: 113.33.02+4.03 - Synopsis: Industrial strength alternative to OCaml's standard library - Authors: Jane Street Group, LLC <opensource@janestreet.com> - Copyrights: (C) 2008-2016 Jane Street Group LLC <opensource@janestreet.com> -diff -uNr core-113.33.02/opam core-113.33.02+4.03/opam ---- core-113.33.02/opam 2016-04-06 11:12:24.000000000 +0200 -+++ core-113.33.02+4.03/opam 2016-04-06 12:54:27.000000000 +0200 -@@ -26,4 +26,4 @@ - "typerep" - "variantslib" - ] --available: [ ocaml-version >= "4.02.3" ] -+available: [ ocaml-version >= "4.03.0" ] -diff -uNr core-113.33.02/src/bigstring.ml core-113.33.02+4.03/src/bigstring.ml ---- core-113.33.02/src/bigstring.ml 2016-04-06 11:06:40.000000000 +0200 -+++ core-113.33.02+4.03/src/bigstring.ml 2016-04-06 12:42:48.000000000 +0200 -@@ -29,7 +29,7 @@ - - let length = Array1.dim - --external is_mmapped : t -> bool = "bigstring_is_mmapped_stub" "noalloc" -+external is_mmapped : t -> bool = "bigstring_is_mmapped_stub" [@@noalloc] - - let init n ~f = - let t = create n in -@@ -168,7 +168,7 @@ - - external unsafe_send_nonblocking_no_sigpipe - : file_descr -> pos : int -> len : int -> t -> Syscall_result.Int.t -- = "bigstring_send_nonblocking_no_sigpipe_stub" "noalloc" -+ = "bigstring_send_nonblocking_no_sigpipe_stub" [@@noalloc] - - let send_nonblocking_no_sigpipe fd ?(pos = 0) ?len bstr = - let len = get_opt_len bstr ~pos len in -diff -uNr core-113.33.02/src/core_sys.ml core-113.33.02+4.03/src/core_sys.ml ---- core-113.33.02/src/core_sys.ml 2016-04-06 11:06:40.000000000 +0200 -+++ core-113.33.02+4.03/src/core_sys.ml 2016-04-06 12:42:48.000000000 +0200 -@@ -83,7 +83,7 @@ - *) - external executing_bytecode - : unit -> unit -> unit -> unit -> unit -> unit -> bool -- = "executing_bytecode" "not_executing_bytecode" "noalloc" -+ = "executing_bytecode" "not_executing_bytecode" [@@noalloc] - - let execution_mode () = - if executing_bytecode () () () () () () then `Bytecode else `Native -@@ -95,7 +95,7 @@ - - - (* returns size, in bits, of an [int] type in C *) --external c_int_size : unit -> int = "c_int_size" "noalloc" -+external c_int_size : unit -> int = "c_int_size" [@@noalloc] - - let%test _ = let size = c_int_size () in size >= 16 && size <= Sys.word_size - -diff -uNr core-113.33.02/src/core_sys.mli core-113.33.02+4.03/src/core_sys.mli ---- core-113.33.02/src/core_sys.mli 2016-04-06 11:06:40.000000000 +0200 -+++ core-113.33.02+4.03/src/core_sys.mli 2016-04-06 12:42:48.000000000 +0200 -@@ -134,7 +134,7 @@ - (** [c_int_size] returns the number of bits in a C [int]. Note that this can be - different from [word_size]. For example, Linux x86-64 should have - [word_size = 64], but [c_int_size () = 32] *) --external c_int_size : unit -> int = "c_int_size" "noalloc" -+external c_int_size : unit -> int = "c_int_size" [@@noalloc] - - (** Return the home directory, using the [HOME] environment variable if that is defined, - and if not, using the effective user's information in the Unix password database. *) -diff -uNr core-113.33.02/src/core_unix.ml core-113.33.02+4.03/src/core_unix.ml ---- core-113.33.02/src/core_unix.ml 2016-04-06 11:06:40.000000000 +0200 -+++ core-113.33.02+4.03/src/core_unix.ml 2016-04-06 12:42:48.000000000 +0200 -@@ -393,7 +393,7 @@ - - (* Signal handling *) - --external abort : unit -> 'a = "unix_abort" "noalloc" -+external abort : unit -> 'a = "unix_abort" [@@noalloc] - - (* User id, group id management *) - -@@ -1160,6 +1160,11 @@ - (fun () -> [("src", atom src); ("dst", atom dst)]) - ;; - -+let src_dst' f ?to_dir ~src ~dst = -+ improve (fun () -> f ?to_dir ~src ~dst) -+ (fun () -> [("src", atom src); ("dst", atom dst)]) -+;; -+ - let unlink = unary_filename Unix.unlink - - let rename = src_dst Unix.rename -@@ -1554,7 +1559,7 @@ - Exit_or_signal.of_unix (Unix.close_process_full (c.C.stdout, c.C.stdin, c.C.stderr)) - ;; - --let symlink = src_dst Unix.symlink -+let symlink = src_dst' Unix.symlink - let readlink = unary_filename Unix.readlink - - module Select_fds = struct -diff -uNr core-113.33.02/src/core_unix.mli core-113.33.02+4.03/src/core_unix.mli ---- core-113.33.02/src/core_unix.mli 2016-04-06 11:06:40.000000000 +0200 -+++ core-113.33.02+4.03/src/core_unix.mli 2016-04-06 12:42:48.000000000 +0200 -@@ -910,7 +910,7 @@ - - (** [symlink source dest] creates the file [dest] as a symbolic link - to the file [source]. *) --val symlink : src:string -> dst:string -> unit -+val symlink : ?to_dir:bool -> src:string -> dst:string -> unit - - (** Read the contents of a link. *) - val readlink : string -> string -@@ -2007,7 +2007,7 @@ - caught and the signal handler does not return. If the SIGABRT signal is - blocked or ignored, the abort() function will still override it. - *) --external abort : unit -> _ = "unix_abort" "noalloc" -+external abort : unit -> _ = "unix_abort" [@@noalloc] - - (** {2 User id, group id} *) - -diff -uNr core-113.33.02/src/iobuf.ml core-113.33.02+4.03/src/iobuf.ml ---- core-113.33.02/src/iobuf.ml 2016-04-06 11:06:40.000000000 +0200 -+++ core-113.33.02+4.03/src/iobuf.ml 2016-04-06 12:42:48.000000000 +0200 -@@ -1094,7 +1094,7 @@ - -> (read_write, seek) t array - -> Recvmmsg_context.ctx - -> Unix.Syscall_result.Int.t -- = "iobuf_recvmmsg_assume_fd_is_nonblocking_stub" "noalloc" -+ = "iobuf_recvmmsg_assume_fd_is_nonblocking_stub" [@@noalloc] - - let recvmmsg_assume_fd_is_nonblocking fd { Recvmmsg_context. iobufs; ctx; _ } = - unsafe_recvmmsg_assume_fd_is_nonblocking fd iobufs ctx -diff -uNr core-113.33.02/src/linux_ext.ml core-113.33.02+4.03/src/linux_ext.ml ---- core-113.33.02/src/linux_ext.ml 2016-04-06 11:06:40.000000000 +0200 -+++ core-113.33.02+4.03/src/linux_ext.ml 2016-04-06 12:42:48.000000000 +0200 -@@ -320,7 +320,7 @@ - -> initial : Int63.t - -> interval : Int63.t - -> Syscall_result.Unit.t -- = "linux_timerfd_settime" "noalloc" -+ = "linux_timerfd_settime" [@@noalloc] - - let%test_unit "unsafe_timerfd_settime returning errno" = - let result = -@@ -683,13 +683,13 @@ - type ready_events = Bigstring.t - - external epoll_sizeof_epoll_event -- : unit -> int = "linux_epoll_sizeof_epoll_event" "noalloc" -+ : unit -> int = "linux_epoll_sizeof_epoll_event" [@@noalloc] - - external epoll_offsetof_readyfd -- : unit -> int = "linux_epoll_offsetof_readyfd" "noalloc" -+ : unit -> int = "linux_epoll_offsetof_readyfd" [@@noalloc] - - external epoll_offsetof_readyflags -- : unit -> int = "linux_epoll_offsetof_readyflags" "noalloc" -+ : unit -> int = "linux_epoll_offsetof_readyflags" [@@noalloc] - - let sizeof_epoll_event = epoll_sizeof_epoll_event () - let offsetof_readyfd = epoll_offsetof_readyfd () -diff -uNr core-113.33.02/src/syslog.ml core-113.33.02+4.03/src/syslog.ml ---- core-113.33.02/src/syslog.ml 2016-04-06 11:06:40.000000000 +0200 -+++ core-113.33.02+4.03/src/syslog.ml 2016-04-06 12:42:48.000000000 +0200 -@@ -57,8 +57,8 @@ - - external core_syslog_openlog : string option -> int -> int -> unit = "core_syslog_openlog" - external core_syslog_syslog : int -> string -> unit = "core_syslog_syslog" --external core_syslog_closelog : unit -> unit = "core_syslog_closelog" "noalloc" --external core_syslog_setlogmask : int -> unit = "core_syslog_setlogmask" "noalloc" -+external core_syslog_closelog : unit -> unit = "core_syslog_closelog" [@@noalloc] -+external core_syslog_setlogmask : int -> unit = "core_syslog_setlogmask" [@@noalloc] - - let openlog ?id ?(options = []) ?(facility = Facility.USER) () = - core_syslog_openlog id (Open_option.mask options) (Facility.to_int facility) -diff -uNr core-113.33.02/src/time_stamp_counter.ml core-113.33.02+4.03/src/time_stamp_counter.ml ---- core-113.33.02/src/time_stamp_counter.ml 2016-04-06 11:06:40.000000000 +0200 -+++ core-113.33.02+4.03/src/time_stamp_counter.ml 2016-04-06 12:42:48.000000000 +0200 -@@ -93,7 +93,7 @@ - #if JSC_ARCH_SIXTYFOUR - - (* noalloc on x86_64 only *) --external now : unit -> tsc = "tsc_get" "noalloc" -+external now : unit -> tsc = "tsc_get" [@@noalloc] - - module Calibrator = struct - -diff -uNr core-113.33.02/src/time_stamp_counter.mli core-113.33.02+4.03/src/time_stamp_counter.mli ---- core-113.33.02/src/time_stamp_counter.mli 2016-04-06 11:06:40.000000000 +0200 -+++ core-113.33.02+4.03/src/time_stamp_counter.mli 2016-04-06 12:42:48.000000000 +0200 -@@ -102,7 +102,7 @@ - end - - #if JSC_ARCH_SIXTYFOUR --external now : unit -> t = "tsc_get" "noalloc" -+external now : unit -> t = "tsc_get" [@@noalloc] - #else - external now : unit -> t = "tsc_get" - #endif -diff -uNr core-113.33.02/src/unix_stubs.c core-113.33.02+4.03/src/unix_stubs.c ---- core-113.33.02/src/unix_stubs.c 2016-04-06 11:06:40.000000000 +0200 -+++ core-113.33.02+4.03/src/unix_stubs.c 2016-04-06 12:42:48.000000000 +0200 -@@ -213,7 +213,7 @@ - of strings and fill it will strings contained in the string array - [arg]. Pointers stored in the result points directly inside the - OCaml heap. */ --extern char **cstringvect(value arg); -+extern char **cstringvect(value arg, char* cmdname); - - /* Given v_prog, an O'Caml string value specifying a program name, - v_args, an O'Caml array specifying program arguments (not -@@ -378,7 +378,7 @@ - - /* We don't bother saving/restoring the environment or freeing the - new one since we exit the process in case of error. */ -- environ = cstringvect(v_env); -+ environ = cstringvect(v_env, "ml_create_process"); - - if (Is_block(v_working_dir)) - working_dir = String_val(Field(v_working_dir, 0)); -diff -uNr core-113.33.02/test/bigstring_test.ml core-113.33.02+4.03/test/bigstring_test.ml ---- core-113.33.02/test/bigstring_test.ml 2016-04-06 11:06:40.000000000 +0200 -+++ core-113.33.02+4.03/test/bigstring_test.ml 2016-04-06 12:42:48.000000000 +0200 -@@ -169,7 +169,7 @@ - simple_conversion_test ~n:"single" "1"; - repeat 50 (simple_conversion_test ~n:"random") sg; - ); -- -+(* - "input" >:: - (fun () -> - fd_test really_read_test ~n:"single" (bs_of_s "X"); -@@ -178,6 +178,7 @@ - repeat 100 (fd_test really_read_test ~n:"random big") - (bsg ~size:(fun () -> 100 * png ())); - ); -+*) - - "destruction" >:: - (fun () -> -@@ -209,6 +210,7 @@ - blit_test ~n:"random" ~src_pos ~dst_pos ~len (s1,s2)) - (fun () -> (sg (), sg(),nng (), nng (), nng ())) - ); -+(* - "really write/read pipe" >:: - (fun () -> - let write_read_test = write_read_test Unix.pipe in -@@ -239,6 +241,7 @@ - repeat 500 (output_input_test ~n:"random big") - (bsg ~size:(fun () -> 100 * png ())); - ); -+*) - - "sub" >:: - (fun () -> -diff -uNr core-113.33.02/test/hashtbl/table_new_intf.ml core-113.33.02+4.03/test/hashtbl/table_new_intf.ml ---- core-113.33.02/test/hashtbl/table_new_intf.ml 2016-04-06 11:06:40.000000000 +0200 -+++ core-113.33.02+4.03/test/hashtbl/table_new_intf.ml 2016-04-06 12:42:48.000000000 +0200 -@@ -7,7 +7,7 @@ - compare: 'k -> 'k -> int; - } - --external hash_param : int -> int -> 'a -> int = "caml_hash_univ_param" "noalloc" -+external hash_param : int -> int -> 'a -> int = "caml_hash_univ_param" [@@noalloc] - - let poly = { - hash = (fun z -> hash_param 10 100 z); |