public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/ppx_bench/, dev-ml/ppx_bench/files/
@ 2016-05-03 17:44 Alexis Ballier
  0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier @ 2016-05-03 17:44 UTC (permalink / raw
  To: gentoo-commits

commit:     568490c7fd35d06313b26cc09ac30429c7c7e130
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue May  3 14:34:14 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue May  3 17:44:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=568490c7

dev-ml/ppx_bench: bump to 4.03

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

 dev-ml/ppx_bench/files/oc43.patch           | 35 +++++++++++++++++++++++++++++
 dev-ml/ppx_bench/ppx_bench-113.33.00.ebuild |  4 ++++
 2 files changed, 39 insertions(+)

diff --git a/dev-ml/ppx_bench/files/oc43.patch b/dev-ml/ppx_bench/files/oc43.patch
new file mode 100644
index 0000000..7dbc7b4
--- /dev/null
+++ b/dev-ml/ppx_bench/files/oc43.patch
@@ -0,0 +1,35 @@
+diff -uNr ppx_bench-113.33.00/_oasis ppx_bench-113.33.00+4.03/_oasis
+--- ppx_bench-113.33.00/_oasis	2016-03-09 16:44:53.000000000 +0100
++++ ppx_bench-113.33.00+4.03/_oasis	2016-03-22 15:13:49.000000000 +0100
+@@ -1,8 +1,8 @@
+ OASISFormat:      0.4
+-OCamlVersion:     >= 4.02.3
++OCamlVersion:     >= 4.03.0
+ FindlibVersion:   >= 1.3.2
+ Name:             ppx_bench
+-Version:          113.33.00
++Version:          113.33.00+4.03
+ Synopsis:         Syntax extension for writing in-line benchmarks in ocaml code
+ Authors:          Jane Street Group, LLC <opensource@janestreet.com>
+ Copyrights:       (C) 2015-2016 Jane Street Group LLC <opensource@janestreet.com>
+diff -uNr ppx_bench-113.33.00/opam ppx_bench-113.33.00+4.03/opam
+--- ppx_bench-113.33.00/opam	2016-03-18 12:08:01.000000000 +0100
++++ ppx_bench-113.33.00+4.03/opam	2016-03-22 17:51:35.000000000 +0100
+@@ -17,4 +17,4 @@
+   "ppx_inline_test"
+   "ppx_tools"       {>= "0.99.3"}
+ ]
+-available: [ ocaml-version >= "4.02.3" ]
++available: [ ocaml-version >= "4.03.0" ]
+diff -uNr ppx_bench-113.33.00/src/ppx_bench.ml ppx_bench-113.33.00+4.03/src/ppx_bench.ml
+--- ppx_bench-113.33.00/src/ppx_bench.ml	2016-03-09 16:44:53.000000000 +0100
++++ ppx_bench-113.33.00+4.03/src/ppx_bench.ml	2016-03-22 15:13:49.000000000 +0100
+@@ -113,7 +113,7 @@
+   assert_enabled loc;
+   apply_to_descr_bench
+     path "add_bench_module" loc ~inner_loc:m.pmod_loc None ?name_suffix name
+-    (pexp_fun ~loc "" None (punit ~loc)
++    (pexp_fun ~loc Nolabel None (punit ~loc)
+        (pexp_letmodule ~loc (Located.mk ~loc "M")
+           m
+           (eunit ~loc)))

diff --git a/dev-ml/ppx_bench/ppx_bench-113.33.00.ebuild b/dev-ml/ppx_bench/ppx_bench-113.33.00.ebuild
index 52d678d..c54b388 100644
--- a/dev-ml/ppx_bench/ppx_bench-113.33.00.ebuild
+++ b/dev-ml/ppx_bench/ppx_bench-113.33.00.ebuild
@@ -26,6 +26,10 @@ DEPEND="${DEPEND} dev-ml/opam"
 
 S="${WORKDIR}/${MY_P}"
 
+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


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/ppx_bench/, dev-ml/ppx_bench/files/
@ 2017-04-02  8:38 Alexis Ballier
  0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier @ 2017-04-02  8:38 UTC (permalink / raw
  To: gentoo-commits

commit:     fe0ba07adcc32894870a68c8f31e8261cb566c75
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  1 16:41:17 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Apr  2 08:37:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe0ba07a

dev-ml/ppx_bench: Bump to 0.9.0

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-ml/ppx_bench/Manifest                   |  2 +-
 dev-ml/ppx_bench/files/oc43.patch           | 35 ---------------------
 dev-ml/ppx_bench/ppx_bench-0.9.0.ebuild     | 34 ++++++++++++++++++++
 dev-ml/ppx_bench/ppx_bench-113.33.00.ebuild | 48 -----------------------------
 4 files changed, 35 insertions(+), 84 deletions(-)

diff --git a/dev-ml/ppx_bench/Manifest b/dev-ml/ppx_bench/Manifest
index 9d75c7e66f9..78d8db5a86d 100644
--- a/dev-ml/ppx_bench/Manifest
+++ b/dev-ml/ppx_bench/Manifest
@@ -1 +1 @@
-DIST ppx_bench-113.33.00.tar.gz 56870 SHA256 3e694b1ffdeb2139189dcfc544e49e86072a7b46fdcdbb01ea10a7da42844193 SHA512 696a80bf9cdc5dc98ace9dd4fd1c5b61741f1c18af69615110730ec09736b114daa2bcc62fdac231fcf54a527ecd4f7e30d4c331a2d7e3b2aa160ec3bd54995a WHIRLPOOL bcaf4e9079546e58b98ece1495e983fdd25aa578382630d2efb9beb49fb6a6df9334ff7920f5254ab40f18d77972038d36055811e3e566fa8107764dc5911fb5
+DIST ppx_bench-0.9.0.tar.gz 11064 SHA256 e1491b585e1c1a76d05efa2851436d9e389905a65bb53fbfd5cb8b4b7f311ea0 SHA512 c82ae501fb9642e75ba16cc263dde7c18efcf3a5b2f2e91eabe57b85f15fb2ead4c41d9312c2301cb2062a4327db7985421d1503b6c7f7024f80df83075fc3f9 WHIRLPOOL d1eb770731a10c357a5cb0bfdeaa4b017cf7f8dd8beadb3f785534a0afdae26e8b2339f7d600d080aebac16906747a7e258580f7d55cd912e4b636c4af0ad30e

diff --git a/dev-ml/ppx_bench/files/oc43.patch b/dev-ml/ppx_bench/files/oc43.patch
deleted file mode 100644
index 7dbc7b481ff..00000000000
--- a/dev-ml/ppx_bench/files/oc43.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -uNr ppx_bench-113.33.00/_oasis ppx_bench-113.33.00+4.03/_oasis
---- ppx_bench-113.33.00/_oasis	2016-03-09 16:44:53.000000000 +0100
-+++ ppx_bench-113.33.00+4.03/_oasis	2016-03-22 15:13:49.000000000 +0100
-@@ -1,8 +1,8 @@
- OASISFormat:      0.4
--OCamlVersion:     >= 4.02.3
-+OCamlVersion:     >= 4.03.0
- FindlibVersion:   >= 1.3.2
- Name:             ppx_bench
--Version:          113.33.00
-+Version:          113.33.00+4.03
- Synopsis:         Syntax extension for writing in-line benchmarks in ocaml code
- Authors:          Jane Street Group, LLC <opensource@janestreet.com>
- Copyrights:       (C) 2015-2016 Jane Street Group LLC <opensource@janestreet.com>
-diff -uNr ppx_bench-113.33.00/opam ppx_bench-113.33.00+4.03/opam
---- ppx_bench-113.33.00/opam	2016-03-18 12:08:01.000000000 +0100
-+++ ppx_bench-113.33.00+4.03/opam	2016-03-22 17:51:35.000000000 +0100
-@@ -17,4 +17,4 @@
-   "ppx_inline_test"
-   "ppx_tools"       {>= "0.99.3"}
- ]
--available: [ ocaml-version >= "4.02.3" ]
-+available: [ ocaml-version >= "4.03.0" ]
-diff -uNr ppx_bench-113.33.00/src/ppx_bench.ml ppx_bench-113.33.00+4.03/src/ppx_bench.ml
---- ppx_bench-113.33.00/src/ppx_bench.ml	2016-03-09 16:44:53.000000000 +0100
-+++ ppx_bench-113.33.00+4.03/src/ppx_bench.ml	2016-03-22 15:13:49.000000000 +0100
-@@ -113,7 +113,7 @@
-   assert_enabled loc;
-   apply_to_descr_bench
-     path "add_bench_module" loc ~inner_loc:m.pmod_loc None ?name_suffix name
--    (pexp_fun ~loc "" None (punit ~loc)
-+    (pexp_fun ~loc Nolabel None (punit ~loc)
-        (pexp_letmodule ~loc (Located.mk ~loc "M")
-           m
-           (eunit ~loc)))

diff --git a/dev-ml/ppx_bench/ppx_bench-0.9.0.ebuild b/dev-ml/ppx_bench/ppx_bench-0.9.0.ebuild
new file mode 100644
index 00000000000..ef714fdd3fe
--- /dev/null
+++ b/dev-ml/ppx_bench/ppx_bench-0.9.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Syntax extension for writing in-line benchmarks in ocaml code"
+HOMEPAGE="https://github.com/janestreet/ppx_bench"
+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=""
+
+DEPEND="
+	dev-lang/ocaml:=
+	dev-ml/ppx_core:=
+	dev-ml/ppx_driver:=
+	dev-ml/ppx_inline_test:=
+	dev-ml/ppx_metaquot:=
+	dev-ml/ocaml-migrate-parsetree:=
+"
+
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} 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/ppx_bench/ppx_bench-113.33.00.ebuild b/dev-ml/ppx_bench/ppx_bench-113.33.00.ebuild
deleted file mode 100644
index ef656195fb9..00000000000
--- a/dev-ml/ppx_bench/ppx_bench-113.33.00.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit oasis
-
-MY_P=${PN/-/_}-${PV}
-DESCRIPTION="Syntax extension for writing in-line benchmarks in ocaml code"
-HOMEPAGE="http://www.janestreet.com/ocaml"
-SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-ml/ppx_tools:=
-	dev-ml/ppx_driver:=
-	dev-ml/ppx_inline_test:=
-	dev-ml/ppx_core:="
-
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND} dev-ml/opam"
-
-S="${WORKDIR}/${MY_P}"
-
-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
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/ppx_bench/, dev-ml/ppx_bench/files/
@ 2023-02-09 21:04 Alfredo Tupone
  0 siblings, 0 replies; 3+ messages in thread
From: Alfredo Tupone @ 2023-02-09 21:04 UTC (permalink / raw
  To: gentoo-commits

commit:     04fdfae2d6ebd2a3a3b40be041d3db9eda6a1a98
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  9 21:03:50 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Feb  9 21:04:25 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04fdfae2

dev-ml/ppx_bench: fix for ppxlib-0.29.0

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 .../files/ppx_bench-0.15.0-ppxlib0.29.0.patch      | 23 ++++++++++++++++++++++
 ...ch-0.15.0.ebuild => ppx_bench-0.15.0-r1.ebuild} |  9 +++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/dev-ml/ppx_bench/files/ppx_bench-0.15.0-ppxlib0.29.0.patch b/dev-ml/ppx_bench/files/ppx_bench-0.15.0-ppxlib0.29.0.patch
new file mode 100644
index 000000000000..580af9eb4b76
--- /dev/null
+++ b/dev-ml/ppx_bench/files/ppx_bench-0.15.0-ppxlib0.29.0.patch
@@ -0,0 +1,23 @@
+From ce7bcca13aff40dd667e231fc0892c8753d0fc94 Mon Sep 17 00:00:00 2001
+From: Carl Eastlund <ceastlund@janestreet.com>
+Date: Thu, 19 Jan 2023 12:20:01 -0500
+Subject: [PATCH] Stop using [Ppxlib.File_path].
+
+Signed-off-by: Carl Eastlund <ceastlund@janestreet.com>
+---
+ src/ppx_bench.ml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ppx_bench.ml b/src/ppx_bench.ml
+index 0c027e8..b825997 100644
+--- a/src/ppx_bench.ml
++++ b/src/ppx_bench.ml
+@@ -49,7 +49,7 @@ let maybe_drop loc code =
+ ;;
+ 
+ let descr (loc : Location.t) ?(inner_loc = loc) () =
+-  let filename = File_path.get_default_path loc in
++  let filename = loc.loc_start.pos_fname in
+   let line = loc.loc_start.pos_lnum in
+   let start_pos = loc.loc_start.pos_cnum - loc.loc_start.pos_bol in
+   let end_pos = inner_loc.Location.loc_end.pos_cnum - loc.loc_start.pos_bol in

diff --git a/dev-ml/ppx_bench/ppx_bench-0.15.0.ebuild b/dev-ml/ppx_bench/ppx_bench-0.15.0-r1.ebuild
similarity index 73%
rename from dev-ml/ppx_bench/ppx_bench-0.15.0.ebuild
rename to dev-ml/ppx_bench/ppx_bench-0.15.0-r1.ebuild
index a286901987c3..3f92979b1d2f 100644
--- a/dev-ml/ppx_bench/ppx_bench-0.15.0.ebuild
+++ b/dev-ml/ppx_bench/ppx_bench-0.15.0-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=8
@@ -14,5 +14,10 @@ SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
-DEPEND="dev-ml/ppx_inline_test:${SLOT}"
+DEPEND="
+	dev-ml/ppx_inline_test:${SLOT}
+	>=dev-ml/ppxlib-0.23.0:=
+"
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-ppxlib0.29.0.patch )


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-02-09 21:04 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-02  8:38 [gentoo-commits] repo/gentoo:master commit in: dev-ml/ppx_bench/, dev-ml/ppx_bench/files/ Alexis Ballier
  -- strict thread matches above, loose matches on Subject: below --
2023-02-09 21:04 Alfredo Tupone
2016-05-03 17:44 Alexis Ballier

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox