From 4baeef9480ed2b767b8dfe2e1292a5542534ef2f Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Sun, 13 Oct 2019 18:45:43 +0200 Subject: [PATCH] dev-ml/camlp5: ocaml version upper bound Closes: https://github.com/gentoo/gentoo/pull/13275 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Alessandro Barbieri Signed-off-by: David Seifert --- dev-ml/camlp5/camlp5-6.17.ebuild | 9 ++++++--- dev-ml/camlp5/camlp5-7.00.ebuild | 9 ++++++--- dev-ml/camlp5/camlp5-7.01.ebuild | 9 ++++++--- dev-ml/camlp5/camlp5-7.03.ebuild | 9 ++++++--- 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/dev-ml/camlp5/camlp5-6.17.ebuild b/dev-ml/camlp5/camlp5-6.17.ebuild index 9f3df08d5fbe..96b44eda9170 100644 --- a/dev-ml/camlp5/camlp5-6.17.ebuild +++ b/dev-ml/camlp5/camlp5-6.17.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -16,7 +16,10 @@ SLOT="0/${PV}" KEYWORDS="alpha amd64 ppc x86" IUSE="doc +ocamlopt" -DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt?]" +DEPEND=" + >=dev-lang/ocaml-3.10:=[ocamlopt?] + <=dev-lang/ocaml-4.4.2 +" RDEPEND="${DEPEND}" PATCHLEVEL=${PV#*_p} @@ -44,7 +47,7 @@ src_configure() { ./configure \ --strict \ -prefix /usr \ - -bindir /usr/bin \ + -bindir /usr/bin \ -libdir /usr/$(get_libdir)/ocaml \ -mandir /usr/share/man || die "configure failed" } diff --git a/dev-ml/camlp5/camlp5-7.00.ebuild b/dev-ml/camlp5/camlp5-7.00.ebuild index 547a32353afb..2ead52bac719 100644 --- a/dev-ml/camlp5/camlp5-7.00.ebuild +++ b/dev-ml/camlp5/camlp5-7.00.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -16,7 +16,10 @@ SLOT="0/${PV}" KEYWORDS="~alpha ~amd64 ~ppc ~x86" IUSE="doc +ocamlopt" -DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt?]" +DEPEND=" + >=dev-lang/ocaml-3.10:=[ocamlopt?] + <=dev-lang/ocaml-4.6.0 +" RDEPEND="${DEPEND}" PATCHLEVEL=${PV#*_p} @@ -40,7 +43,7 @@ src_configure() { ./configure \ --strict \ -prefix /usr \ - -bindir /usr/bin \ + -bindir /usr/bin \ -libdir /usr/$(get_libdir)/ocaml \ -mandir /usr/share/man || die "configure failed" } diff --git a/dev-ml/camlp5/camlp5-7.01.ebuild b/dev-ml/camlp5/camlp5-7.01.ebuild index 547a32353afb..2ead52bac719 100644 --- a/dev-ml/camlp5/camlp5-7.01.ebuild +++ b/dev-ml/camlp5/camlp5-7.01.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -16,7 +16,10 @@ SLOT="0/${PV}" KEYWORDS="~alpha ~amd64 ~ppc ~x86" IUSE="doc +ocamlopt" -DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt?]" +DEPEND=" + >=dev-lang/ocaml-3.10:=[ocamlopt?] + <=dev-lang/ocaml-4.6.0 +" RDEPEND="${DEPEND}" PATCHLEVEL=${PV#*_p} @@ -40,7 +43,7 @@ src_configure() { ./configure \ --strict \ -prefix /usr \ - -bindir /usr/bin \ + -bindir /usr/bin \ -libdir /usr/$(get_libdir)/ocaml \ -mandir /usr/share/man || die "configure failed" } diff --git a/dev-ml/camlp5/camlp5-7.03.ebuild b/dev-ml/camlp5/camlp5-7.03.ebuild index 547a32353afb..2ead52bac719 100644 --- a/dev-ml/camlp5/camlp5-7.03.ebuild +++ b/dev-ml/camlp5/camlp5-7.03.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -16,7 +16,10 @@ SLOT="0/${PV}" KEYWORDS="~alpha ~amd64 ~ppc ~x86" IUSE="doc +ocamlopt" -DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt?]" +DEPEND=" + >=dev-lang/ocaml-3.10:=[ocamlopt?] + <=dev-lang/ocaml-4.6.0 +" RDEPEND="${DEPEND}" PATCHLEVEL=${PV#*_p} @@ -40,7 +43,7 @@ src_configure() { ./configure \ --strict \ -prefix /usr \ - -bindir /usr/bin \ + -bindir /usr/bin \ -libdir /usr/$(get_libdir)/ocaml \ -mandir /usr/share/man || die "configure failed" } -- 2.26.2