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

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

[Alfredo Tupone]

commit:     baa79e3d7e06a1c155ba6d4cdc3e36c63885dd46
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 07:46:46 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 07:47:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baa79e3d

dev-ml/ocaml-ctypes: fix shuffle

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

 dev-ml/ocaml-ctypes/files/ocaml-ctypes-0.20.0-shuffle.patch | 13 +++++++++++++
 dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.0.ebuild              |  4 +++-
 dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.1.ebuild              |  4 +++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/dev-ml/ocaml-ctypes/files/ocaml-ctypes-0.20.0-shuffle.patch b/dev-ml/ocaml-ctypes/files/ocaml-ctypes-0.20.0-shuffle.patch
new file mode 100644
index 000000000000..51bad2efdd7c
--- /dev/null
+++ b/dev-ml/ocaml-ctypes/files/ocaml-ctypes-0.20.0-shuffle.patch
@@ -0,0 +1,13 @@
+--- a/Makefile	2023-01-24 08:35:02.515456277 +0100
++++ b/Makefile	2023-01-24 08:35:45.459755298 +0100
+@@ -161,7 +161,9 @@
+                    $(INSTALL_HEADERS) \
+                    $(if $(filter yes,$($(PROJECT).install_native_objects)),$(NATIVE_OBJECTS)))
+ 
+-install: META-install $(PROJECTS:%=install-%)
++install:
++	$(MAKE) META-install
++	$(MAKE) $(PROJECTS:%=install-%)
+ 
+ uninstall:
+ 	$(OCAMLFIND) remove ctypes

diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.0.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.0.ebuild
index a3fbc4c28994..46407af9f60c 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.0.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.0.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
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
 	test? ( dev-ml/ounit2 dev-ml/lwt )"
 REQUIRED_USE="ocamlopt"
 
+PATCHES=( "${FILESDIR}"/${P}-shuffle.patch )
+
 src_prepare() {
 	sed -e 's/oUnit/ounit2/g' -i Makefile.tests || die
 	default

diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.1.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.1.ebuild
index 3b3fce5d0eaf..78e08ed8b8f7 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.1.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.1.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
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
 	test? ( dev-ml/ounit2 dev-ml/lwt )"
 REQUIRED_USE="ocamlopt"
 
+PATCHES=( "${FILESDIR}"/${PN}-0.20.0-shuffle.patch )
+
 src_prepare() {
 	sed -e 's/oUnit/ounit2/g' -i Makefile.tests || die
 	default

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

[Alfredo Tupone]

commit:     67597398df2977f42379813d4292dcf6fc7c3c60
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  5 18:22:24 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Jun  5 18:22:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67597398

dev-ml/ocaml-ctypes: fix make

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

 .../files/ocaml-ctypes-0.20.1-shuffle.patch        | 29 ++++++++++++++++++++++
 dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.1.ebuild     |  7 ++++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/dev-ml/ocaml-ctypes/files/ocaml-ctypes-0.20.1-shuffle.patch b/dev-ml/ocaml-ctypes/files/ocaml-ctypes-0.20.1-shuffle.patch
new file mode 100644
index 000000000000..1b56526f2abf
--- /dev/null
+++ b/dev-ml/ocaml-ctypes/files/ocaml-ctypes-0.20.1-shuffle.patch
@@ -0,0 +1,29 @@
+--- a/Makefile	2023-01-24 08:35:02.515456277 +0100
++++ b/Makefile	2023-01-24 08:35:45.459755298 +0100
+@@ -81,7 +81,7 @@
+ cstubs.public = cstubs_structs cstubs cstubs_inverted
+ cstubs.dir = src/cstubs
+ cstubs.subproject_deps = ctypes
+-cstubs.deps = str integers
++cstubs.deps = bigarray-compat str integers
+ cstubs.install = yes
+ cstubs.install_native_objects = yes
+ cstubs.extra_hs = $(package_integers_path)/ocaml_integers.h
+@@ -93,7 +93,7 @@
+ ctypes-foreign.public = dl libffi_abi foreign
+ ctypes-foreign.dir = src/ctypes-foreign
+ ctypes-foreign.subproject_deps = ctypes
+-ctypes-foreign.deps = integers
++ctypes-foreign.deps = bigarray-compat integers
+ ctypes-foreign.install = yes
+ ctypes-foreign.install_native_objects = yes
+ ctypes-foreign.extra_cs = dl_stubs.c
+@@ -111,7 +111,7 @@
+ ctypes-top.public = ctypes_printers
+ ctypes-top.dir = src/ctypes-top
+ ctypes-top.install = yes
+-ctypes-top.deps = compiler-libs integers
++ctypes-top.deps = bigarray-compat compiler-libs integers
+ ctypes-top.subproject_deps = ctypes
+ ctypes-top.install_native_objects = yes
+ 

diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.1.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.1.ebuild
index f321f7db9334..e088849da77f 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.1.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,7 +25,10 @@ DEPEND="${RDEPEND}
 	test? ( dev-ml/ounit2 dev-ml/lwt )"
 REQUIRED_USE="ocamlopt"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.20.0-shuffle.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.20.0-shuffle.patch
+	"${FILESDIR}"/${P}-shuffle.patch
+)
 
 src_prepare() {
 	sed -e 's/oUnit/ounit2/g' -i Makefile.tests || die