Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocaml-gettext/files/, dev-ml/ocaml-gettext/
Date: Tue, 03 May 2016 09:14:21
Message-Id: 1462266832.12dcad9d79582d0822656571a0523839f716e889.aballier@gentoo
1 commit: 12dcad9d79582d0822656571a0523839f716e889
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 1 14:41:20 2016 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Tue May 3 09:13:52 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12dcad9d
7
8 dev-ml/ocaml-gettext: fix build with ocaml 4.03
9
10 Package-Manager: portage-2.2.28
11 Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
12
13 dev-ml/ocaml-gettext/files/oc43.patch | 12 ++++++++++++
14 dev-ml/ocaml-gettext/ocaml-gettext-0.3.5.ebuild | 6 +++++-
15 2 files changed, 17 insertions(+), 1 deletion(-)
16
17 diff --git a/dev-ml/ocaml-gettext/files/oc43.patch b/dev-ml/ocaml-gettext/files/oc43.patch
18 new file mode 100644
19 index 0000000..41996b9
20 --- /dev/null
21 +++ b/dev-ml/ocaml-gettext/files/oc43.patch
22 @@ -0,0 +1,12 @@
23 +Index: ocaml-gettext-0.3.5/ocaml-gettext/Makefile
24 +===================================================================
25 +--- ocaml-gettext-0.3.5.orig/ocaml-gettext/Makefile
26 ++++ ocaml-gettext-0.3.5/ocaml-gettext/Makefile
27 +@@ -64,7 +64,6 @@ uninstall: ocaml-xgettext-uninstall
28 + ocaml-xgettext: $(BUILDBIN)
29 + $(OCAMLC) \
30 + -I +camlp4 dynlink.cma camlp4lib.cma \
31 +- unix.cma \
32 + `$(OCAMLFIND) query -r -predicates byte gettext.extract -i-format` \
33 + `$(OCAMLFIND) query -r -predicates byte gettext.extract -a-format` \
34 + `$(OCAMLFIND) query -r -predicates byte gettext.extract -o-format` \
35
36 diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.5.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.5.ebuild
37 index bb0e145..788bd15 100644
38 --- a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.5.ebuild
39 +++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.5.ebuild
40 @@ -4,7 +4,7 @@
41
42 EAPI=5
43
44 -inherit findlib
45 +inherit findlib eutils
46
47 DESCRIPTION="Provides support for internationalization of OCaml program"
48 HOMEPAGE="http://forge.ocamlcore.org/projects/ocaml-gettext"
49 @@ -25,6 +25,10 @@ DEPEND="${RDEPEND}
50 doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt )
51 test? ( dev-ml/ounit )"
52
53 +src_prepare() {
54 + has_version '>=dev-lang/ocaml-4.03' && epatch "${FILESDIR}/oc43.patch"
55 +}
56 +
57 src_configure() {
58 econf \
59 --with-docbook-stylesheet="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets/" \