commit: 12dcad9d79582d0822656571a0523839f716e889 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Sun May 1 14:41:20 2016 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Tue May 3 09:13:52 2016 +0000 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 <aballier <AT> 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 0000000..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/" \
