5 files changed, 92 insertions, 0 deletions
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index d36d9f68d896..6076e0a11d97 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/ocaml-augeas/Manifest b/dev-ml/ocaml-augeas/Manifest
index c02d9bd1eef1..8d9a3578eeec 100644
--- a/dev-ml/ocaml-augeas/Manifest
+++ b/dev-ml/ocaml-augeas/Manifest
@@ -1,3 +1,7 @@
+AUX ocaml-augeas-0.6-flags.patch 593 BLAKE2B a5cd30d66d7ba07b00bd3cf44ceac54c0f3a1325475faaab820c916a36a5f7b43cba1d4c50e80e5357f983521cf794641df2976ef6e69251fd046730a48be22a SHA512 3ee67424e66a720bde0364301e075e680a7170f075572af45bd5d95053f7607fef0f9067f54a3e66c1d3213bc3091fa1bd45ca416885e87150c7be69e7500e35
+AUX ocaml-augeas-0.6-ocaml-4.09.patch 1077 BLAKE2B 531135cbf44d188c819fc9d743b702a5569b525cdbf7267038f53788e75931e1a99d206e2503ff855aed274991f0931c119b5391f64aca0db157966292b23ebe SHA512 1315ed008dd0953dd0922fa75c19b943475335302e683f014d351c4b49882982d7f6c30c245c04a69573a4892e087adb2ca62c4aecc1e24da79e937d8bdd389f
 DIST ocaml-augeas-0.5.tar.gz 59908 BLAKE2B f9f51afa0aec82e95d7bd81811e93e10587f1f2c1905338c0bbe47de61d983c24c0e5ab77aff1ca319834bf2199040a482b453177fa3c774e24ab72c3a534c14 SHA512 dfbad89790c6b5ada0e1239d002cb61a56a15350b2687d0987e0c61108d905e0c03756c08db7a3121eac3966fbeed86500e6f3c3c416cea2b974d9f50b8adabf
+DIST ocaml-augeas-0.6.tar.gz 65180 BLAKE2B d9959e1fbf5ceafabeb76e697abc405c31cffc4e085138613fa067b6e5a482e1fb9fe28b24d90b819cd9531e09d46e6dc0babf1c63dce3170a217631d6eb2487 SHA512 e747f5c09d3821b41d98e3f12c8dfe9bb13a69d6ccaaf954f4bb33e8e4d9d62603ae26fe9f93f10b2705872526b1863a1c20e0c8a53858fdf60f8cb8cbf50b7a
 EBUILD ocaml-augeas-0.5.ebuild 532 BLAKE2B ebecb5e303ecd3d1ed0c9778b72c1eaa94ea35cc3ae0a7f2664ed03c11b5c363b03d34d03cf00ab7a474c9c31f611679742d2062a576f30a3a9c829068cbd661 SHA512 9dd471a2effd9bbb0a7a90f610dfefc10d0fef1b5bf3b45df2f24166422ae1678f37da1945a68b72d2be75507b2521856687d76b071b57652f44a9e00acf1e4a
+EBUILD ocaml-augeas-0.6.ebuild 674 BLAKE2B 512295d5b4f3fc31a2469cc72196bc2364de6c1872e16df1f57776b64326b4809256167748d71f7f21e7b636698c3f1a23e29e0945200b586a5fb67cd281f394 SHA512 0755cb75b7240772cbfaed6b0c776b3a4e3aa077e8338eb0e985f7b3cea820159f8921ac824fde4b34a17af48766a1d203a25a3ae4e0be56457d26630dc584a4
 MISC metadata.xml 222 BLAKE2B ac011adef112641df34a658bdae1755cfdc3c00e7a6611dfd45dbfc701c35addf4f794cf8164bba669533189be43b6a332f179faf1e818f397372a950b137ace SHA512 916afd87448ffc0d212b195c35f7453606815104d3332e8239564334f8230e8ee74ba3b466c1653f9df17dcf8a82d67a9bb642713dae63065053b8d93fe4ca71
diff --git a/dev-ml/ocaml-augeas/files/ocaml-augeas-0.6-flags.patch b/dev-ml/ocaml-augeas/files/ocaml-augeas-0.6-flags.patch
new file mode 100644
index 000000000000..931324e5046d
--- /dev/null
+++ b/dev-ml/ocaml-augeas/files/ocaml-augeas-0.6-flags.patch
@@ -0,0 +1,21 @@
+http://git.annexia.org/?p=ocaml-augeas.git;a=patch;h=56c0602e972f1fae336198eb9587d71f1e36daff
+
+From 56c0602e972f1fae336198eb9587d71f1e36daff Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Tue, 20 Aug 2019 15:06:57 +0100
+Subject: [PATCH] Use ocamlopt -g option.
+
+Originally from Fedora.
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -34,8 +34,8 @@ LIBS		= @AUGEAS_LIBS@ @LIBXML2_LIBS@ @LIBS@
+ 
+ OCAMLCFLAGS	= -g
+ OCAMLCPACKAGES	=
+-OCAMLOPTFLAGS	=
+-OCAMLOPTPACKAGES =
++OCAMLOPTFLAGS	= $(OCAMLCFLAGS)
++OCAMLOPTPACKAGES = $(OCAMLCPACKAGES)
+ 
+ OCAMLDOCFLAGS	= -html -sort
+ 
diff --git a/dev-ml/ocaml-augeas/files/ocaml-augeas-0.6-ocaml-4.09.patch b/dev-ml/ocaml-augeas/files/ocaml-augeas-0.6-ocaml-4.09.patch
new file mode 100644
index 000000000000..937f1bb9c799
--- /dev/null
+++ b/dev-ml/ocaml-augeas/files/ocaml-augeas-0.6-ocaml-4.09.patch
@@ -0,0 +1,28 @@
+http://git.annexia.org/?p=ocaml-augeas.git;a=commit;h=1cf5aef99b26a46529ca797547c0b49627fffe78
+https://bugs.gentoo.org/750209
+
+From 1cf5aef99b26a46529ca797547c0b49627fffe78 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Sat, 7 Dec 2019 11:08:54 +0000
+Subject: [PATCH] caml_named_value returns const value pointer in OCaml 4.09+
+
+--- a/augeas-c.c
++++ b/augeas-c.c
+@@ -86,7 +86,7 @@ static const int error_map_len = sizeof error_map / sizeof error_map[0];
+ static void
+ raise_error_and_maybe_close (augeas_t t, const char *msg, bool close_handle)
+ {
+-  value *exn = caml_named_value ("Augeas.Error");
++  const value *exn = caml_named_value ("Augeas.Error");
+   value args[5];
+   const int code = aug_error (t);
+   const char *aug_err_msg;
+@@ -132,7 +132,7 @@ raise_error_and_maybe_close (augeas_t t, const char *msg, bool close_handle)
+ static void
+ raise_init_error (const char *msg)
+ {
+-  value *exn = caml_named_value ("Augeas.Error");
++  const value *exn = caml_named_value ("Augeas.Error");
+   value args[5];
+ 
+   args[0] = caml_alloc (1, 0);
diff --git a/dev-ml/ocaml-augeas/ocaml-augeas-0.6.ebuild b/dev-ml/ocaml-augeas/ocaml-augeas-0.6.ebuild
new file mode 100644
index 000000000000..86d56ae426d5
--- /dev/null
+++ b/dev-ml/ocaml-augeas/ocaml-augeas-0.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit findlib
+
+DESCRIPTION="Ocaml bindings for Augeas"
+HOMEPAGE="http://augeas.net/"
+#SRC_URI="http://augeas.net/download/ocaml/${P}.tar.gz"
+SRC_URI="https://people.redhat.com/~rjones/augeas/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	app-admin/augeas
+	dev-libs/libxml2
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-ml/findlib
+	dev-ml/ocaml-autoconf
+	dev-lang/ocaml[ocamlopt]
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-flags.patch
+	"${FILESDIR}"/${P}-ocaml-4.09.patch
+)
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	findlib_src_install
+}