From db8e01d8e45f078d5f44bd3d0a6f32d3941e300a Mon Sep 17 00:00:00 2001 From: Alfredo Tupone Date: Mon, 14 Apr 2025 18:47:04 +0200 Subject: [PATCH] dev-ml/ppx_fields_conv: drop 0.14.1, 0.14.2 Signed-off-by: Alfredo Tupone --- dev-ml/ppx_fields_conv/Manifest | 2 - ...ppx_fields_conv-0.14.1-ppxlib-0.18.0.patch | 60 ------------------- .../ppx_fields_conv-0.14.1.ebuild | 26 -------- .../ppx_fields_conv-0.14.2.ebuild | 24 -------- 4 files changed, 112 deletions(-) delete mode 100644 dev-ml/ppx_fields_conv/files/ppx_fields_conv-0.14.1-ppxlib-0.18.0.patch delete mode 100644 dev-ml/ppx_fields_conv/ppx_fields_conv-0.14.1.ebuild delete mode 100644 dev-ml/ppx_fields_conv/ppx_fields_conv-0.14.2.ebuild diff --git a/dev-ml/ppx_fields_conv/Manifest b/dev-ml/ppx_fields_conv/Manifest index e96dd3a9bd2c2..1eb4bfc28fcc8 100644 --- a/dev-ml/ppx_fields_conv/Manifest +++ b/dev-ml/ppx_fields_conv/Manifest @@ -1,5 +1,3 @@ -DIST ppx_fields_conv-0.14.1.tar.gz 14348 BLAKE2B 09bd2db4dab314ba50bcd5566c4ba4fd834fc34ba15be2132d5cbe3c27e5c76e37b4cccd3bc4cc4a5bd930f95215f6100557b89e44d54e906e382381be1fe257 SHA512 afd0f16b851e2984e46ac1d9347268a1cdb9a9054ea18435a5030dd512ba56f97b54639cc6cc6254498ca3fd2fa4d5c0053c7f2ceddd531ebbd9afef5b5f3e3d -DIST ppx_fields_conv-0.14.2.tar.gz 14314 BLAKE2B d6c28a157c0d5fc73ef6793c23539c9ae6b706445f24b8761a63a932c42e4d75237b4b092122e7049d3526c33bb3fbce52f44deaa8e52ab233b1ede51a02f09f SHA512 19cf14f79bd6425519e08089b6de19a79ed3f435cd453eeae6c7fe88d65ae4de4d5b47cf19d086bb2ba41066b344da7062d5153eaba7389da8dcf95c7284b522 DIST ppx_fields_conv-0.15.0.tar.gz 16432 BLAKE2B 1db37d33228d3090c611b4545cedd8138ae970fde5878d17de740aa231c3c50defcae743bf633e1a42f9610f1815ca9166dd9749ff392fccdf55e16affc07b9e SHA512 5fd20c0bfd0ba9bfd4aad98b0beb2be7978668dea1e6ca4099eeb60f86533b0ea89168af1d5556fea295ea93829c62358c66780550d27177b9f7eb2bd08dd3c8 DIST ppx_fields_conv-0.16.0.tar.gz 21481 BLAKE2B a3a19b935b457fba0aebbe308ee3452df7d698073c1d15fb0e7948f19a64c0d6d5f358d35979e16eaafd220413c1865c22d6dbe197ab6623d30050d72f55b3da SHA512 14bd27628f653aca239c82b528af1dea65446d56ecd2e30c4d9d2f8555854c45e7a0c5c4f6230de7abe3869fe2c8be569b26d6c217296c607c6e8b336a4af575 DIST ppx_fields_conv-0.17.0.tar.gz 23727 BLAKE2B 752b63c1766e831780748e61835494f4837f890ad627ab673dad033b55fb159b6350c4022a92a69c8ad372f10ad89840f8ffb7a3832a8f19badabe8ecfab6869 SHA512 82e782b7472b1b9ee0325698772357af0f75c8a9b65b3731b01bc7ad75f49a423d28c46bd34376f876b713db0d7d105b56125ccd82dbbd24b1eef42359fc255d diff --git a/dev-ml/ppx_fields_conv/files/ppx_fields_conv-0.14.1-ppxlib-0.18.0.patch b/dev-ml/ppx_fields_conv/files/ppx_fields_conv-0.14.1-ppxlib-0.18.0.patch deleted file mode 100644 index 23b5a8be82c21..0000000000000 --- a/dev-ml/ppx_fields_conv/files/ppx_fields_conv-0.14.1-ppxlib-0.18.0.patch +++ /dev/null @@ -1,60 +0,0 @@ -commit f3c6846ad9015de0adb44f519ff010ff0ed51180 (HEAD, origin/upgrade-ppxlib-0.18.0) -Author: Nathan Rebours -Date: Mon Oct 5 18:20:23 2020 +0200 - - Make ppx_fields_conv compatible with ppxlib.0.18.0 - - ppxlib.0.18.0 upgrades to the 4.11 AST which results in a change - in string constants representation. This PR makes ppx_fields_conv - compatible with the latest ppxlib. - - You might want for the actual release of ppxlib.0.18.0 before merging - this! - - Signed-off-by: Nathan Rebours - -diff --git a/ppx_fields_conv.opam b/ppx_fields_conv.opam -index 91a9692..3e2d24a 100644 ---- a/ppx_fields_conv.opam -+++ b/ppx_fields_conv.opam -@@ -15,7 +15,7 @@ depends: [ - "base" {>= "v0.14" & < "v0.15"} - "fieldslib" {>= "v0.14" & < "v0.15"} - "dune" {>= "2.0.0"} -- "ppxlib" {>= "0.14.0"} -+ "ppxlib" {>= "0.18.0"} - ] - synopsis: "Generation of accessor and iteration functions for ocaml records" - description: " -diff --git a/src/ppx_fields_conv.ml b/src/ppx_fields_conv.ml -index 130e82b..87752cb 100644 ---- a/src/ppx_fields_conv.ml -+++ b/src/ppx_fields_conv.ml -@@ -34,9 +34,6 @@ let check_no_collision = - - module A = struct (* Additional AST construction helpers *) - -- let exp_string : (loc:Location.t -> string -> expression) = fun ~loc s -> -- pexp_constant ~loc (Pconst_string (s,None)) -- - let pat_name : (loc:Location.t -> string -> pattern) = fun ~loc name -> - ppat_var ~loc (Loc.make name ~loc) - -@@ -440,7 +437,7 @@ module Gen_struct = struct - [%expr - Fieldslib.Field.Field { Fieldslib.Field.For_generated_code. - force_variance = (fun (_ : [%t perm]) -> ()); -- name = [%e A.exp_string ~loc name]; -+ name = [%e estring ~loc name]; - getter = [%e A.exp_name ~loc name]; - setter = [%e setter_field]; - fset = [%e fset];}] -@@ -725,7 +722,7 @@ module Gen_struct = struct - let getter_and_setters, fields = gen_fields ~private_ ~loc labdecs in - let create = creation_fun ~loc record_name labdecs in - let simple_create = simple_creation_fun ~loc record_name labdecs in -- let names = List.map (Inspect.field_names labdecs) ~f:(A.exp_string ~loc) in -+ let names = List.map (Inspect.field_names labdecs) ~f:(estring ~loc) in - let fields_module = - if String.equal record_name "t" then "Fields" else "Fields_of_" ^ record_name - in diff --git a/dev-ml/ppx_fields_conv/ppx_fields_conv-0.14.1.ebuild b/dev-ml/ppx_fields_conv/ppx_fields_conv-0.14.1.ebuild deleted file mode 100644 index bee1d3012d75d..0000000000000 --- a/dev-ml/ppx_fields_conv/ppx_fields_conv-0.14.1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit dune - -DESCRIPTION="Generation of accessor and iteration functions for ocaml records" -HOMEPAGE="https://github.com/janestreet/ppx_fields_conv" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" -IUSE="+ocamlopt" - -DEPEND=" - >=dev-ml/base-0.14.0:= - >=dev-ml/fieldslib-0.14.0:= - >=dev-ml/ppxlib-0.18.0:= - >=dev-ml/ocaml-migrate-parsetree-2.0.0:= - dev-ml/cinaps:= -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}"/${P}-ppxlib-0.18.0.patch ) diff --git a/dev-ml/ppx_fields_conv/ppx_fields_conv-0.14.2.ebuild b/dev-ml/ppx_fields_conv/ppx_fields_conv-0.14.2.ebuild deleted file mode 100644 index d610d76cf65fd..0000000000000 --- a/dev-ml/ppx_fields_conv/ppx_fields_conv-0.14.2.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit dune - -DESCRIPTION="Generation of accessor and iteration functions for ocaml records" -HOMEPAGE="https://github.com/janestreet/ppx_fields_conv" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" -IUSE="+ocamlopt" - -DEPEND=" - >=dev-ml/base-0.14.0:= - >=dev-ml/fieldslib-0.14.0:= - >=dev-ml/ppxlib-0.18.0:= - >=dev-ml/ocaml-migrate-parsetree-2.0.0:= - dev-ml/cinaps:= -" -RDEPEND="${DEPEND}"