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

[Joonas Niilola]

commit: 194d1dd0e0ad9a5f55cd3aa0878a8b39fc9e7b0e
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Nov 15 18:38:44 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Nov 20 10:34:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=194d1dd0

dev-ml/ocaml-gettext: remove unused patch

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18270
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-ml/ocaml-gettext/files/oc43.patch | 12 
 1 file changed, 12 deletions(-)

diff --git a/dev-ml/ocaml-gettext/files/oc43.patch 
b/dev-ml/ocaml-gettext/files/oc43.patch
deleted file mode 100644
index 41996b94112..000
--- a/dev-ml/ocaml-gettext/files/oc43.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: ocaml-gettext-0.3.5/ocaml-gettext/Makefile
-===
 ocaml-gettext-0.3.5.orig/ocaml-gettext/Makefile
-+++ ocaml-gettext-0.3.5/ocaml-gettext/Makefile
-@@ -64,7 +64,6 @@ uninstall: ocaml-xgettext-uninstall
- ocaml-xgettext: $(BUILDBIN)
-   $(OCAMLC)\
--I +camlp4 dynlink.cma camlp4lib.cma  \
--   unix.cma  \
-   `$(OCAMLFIND) query -r -predicates byte gettext.extract -i-format` \
-   `$(OCAMLFIND) query -r -predicates byte gettext.extract -a-format` \
-   `$(OCAMLFIND) query -r -predicates byte gettext.extract -o-format` \

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

[Alexis Ballier]

commit: 12dcad9d79582d0822656571a0523839f716e889
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sun May  1 14:41:20 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue May  3 09:13:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12dcad9d

dev-ml/ocaml-gettext: fix build with ocaml 4.03

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

 dev-ml/ocaml-gettext/files/oc43.patch   | 12 
 dev-ml/ocaml-gettext/ocaml-gettext-0.3.5.ebuild |  6 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/dev-ml/ocaml-gettext/files/oc43.patch 
b/dev-ml/ocaml-gettext/files/oc43.patch
new file mode 100644
index 000..41996b9
--- /dev/null
+++ b/dev-ml/ocaml-gettext/files/oc43.patch
@@ -0,0 +1,12 @@
+Index: ocaml-gettext-0.3.5/ocaml-gettext/Makefile
+===
+--- ocaml-gettext-0.3.5.orig/ocaml-gettext/Makefile
 ocaml-gettext-0.3.5/ocaml-gettext/Makefile
+@@ -64,7 +64,6 @@ uninstall: ocaml-xgettext-uninstall
+ ocaml-xgettext: $(BUILDBIN)
+   $(OCAMLC)\
+-I +camlp4 dynlink.cma camlp4lib.cma  \
+-   unix.cma  \
+   `$(OCAMLFIND) query -r -predicates byte gettext.extract -i-format` \
+   `$(OCAMLFIND) query -r -predicates byte gettext.extract -a-format` \
+   `$(OCAMLFIND) query -r -predicates byte gettext.extract -o-format` \

diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.5.ebuild 
b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.5.ebuild
index bb0e145..788bd15 100644
--- a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.5.ebuild
+++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.5.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit findlib
+inherit findlib eutils
 
 DESCRIPTION="Provides support for internationalization of OCaml program"
 HOMEPAGE="http://forge.ocamlcore.org/projects/ocaml-gettext;
@@ -25,6 +25,10 @@ DEPEND="${RDEPEND}
doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt )
test? ( dev-ml/ounit )"
 
+src_prepare() {
+   has_version '>=dev-lang/ocaml-4.03' && epatch "${FILESDIR}/oc43.patch"
+}
+
 src_configure() {
econf \

--with-docbook-stylesheet="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets/" \