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/batteries/
Date: Fri, 06 May 2016 13:06:22
Message-Id: 1462538887.ee40a808229ad9d50e5afbf25585c8e098655c30.aballier@gentoo
1 commit: ee40a808229ad9d50e5afbf25585c8e098655c30
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 6 12:48:07 2016 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Fri May 6 12:48:07 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee40a808
7
8 dev-ml/batteries: make ocaml 4.03 patches conditional to having ocaml 4.03.
9
10 It fails to build with older versions otherwise, bug #582246
11
12 Package-Manager: portage-2.2.28
13
14 dev-ml/batteries/batteries-2.4.0.ebuild | 12 +++++++-----
15 1 file changed, 7 insertions(+), 5 deletions(-)
16
17 diff --git a/dev-ml/batteries/batteries-2.4.0.ebuild b/dev-ml/batteries/batteries-2.4.0.ebuild
18 index 7ea0d79..b5a7c8f 100644
19 --- a/dev-ml/batteries/batteries-2.4.0.ebuild
20 +++ b/dev-ml/batteries/batteries-2.4.0.ebuild
21 @@ -22,8 +22,10 @@ DEPEND="${RDEPEND}
22 DOCS=( "ChangeLog" "FAQ" "README.folders" "README.md" )
23
24 S="${WORKDIR}/${PN}-included-${PV}"
25 -PATCHES=(
26 - "${FILESDIR}/oc43-1.patch"
27 - "${FILESDIR}/oc43-2.patch"
28 - "${FILESDIR}/oc43-3.patch"
29 -)
30 +
31 +src_prepare() {
32 + has_version '>=dev-lang/ocaml-4.03' && epatch \
33 + "${FILESDIR}/oc43-1.patch" \
34 + "${FILESDIR}/oc43-2.patch" \
35 + "${FILESDIR}/oc43-3.patch"
36 +}