diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2016-06-23 10:56:35 +0200 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2016-06-23 13:23:22 +0200 |
| commit | 378cd55c4f9b11231d1eadb1d688463b9bceb546 (patch) | |
| tree | d01554af6d964ca1fac78aeec592d399836c0801 /sci-mathematics/coq | |
| parent | Revert "dev-ml/*: Remove := slot ops from || deps, #586304" (diff) | |
| download | gentoo-378cd55c4f9b11231d1eadb1d688463b9bceb546.tar.gz gentoo-378cd55c4f9b11231d1eadb1d688463b9bceb546.tar.bz2 gentoo-378cd55c4f9b11231d1eadb1d688463b9bceb546.zip | |
Revert "sci-mathematics/coq: Remove := from || dep, #586304"
This reverts commit 84224f26f9c893299a487431e2ee005b1795f01c.
This commit is wrong in several aspects:
- Such changes should come with a revbump
- Removing := deps causes packages not to be rebuilt on upgrades, causing
barely understandable build failures when upgrading, later on.
Thanks to this commit, people that have installed those packages will
likely experience those failures with the upcoming ocaml 4.03 unmask.
- This is a non maintainer commit where no discussion at all happened with the
maintainers during the 3 days between bug report and mass commit.
Such discussion could have prevented the above mentioned breakage.
Proper fix is to drop the backward compatibility part of the || () dep. This fix
was slowly moving forward whenever possible and noticed. Main blocker for this is
bug #463018 which requires taking extra care for not breaking the stable tree
nor needlessly preventing future stabilization of packages.
Diffstat (limited to 'sci-mathematics/coq')
| -rw-r--r-- | sci-mathematics/coq/coq-8.4_p5.ebuild | 4 | ||||
| -rw-r--r-- | sci-mathematics/coq/coq-8.4_p6.ebuild | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sci-mathematics/coq/coq-8.4_p5.ebuild b/sci-mathematics/coq/coq-8.4_p5.ebuild index 2cef57428602..707a434eecad 100644 --- a/sci-mathematics/coq/coq-8.4_p5.ebuild +++ b/sci-mathematics/coq/coq-8.4_p5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -21,7 +21,7 @@ IUSE="gtk debug +ocamlopt doc camlp5" RDEPEND=" >=dev-lang/ocaml-3.11.2:=[ocamlopt?] camlp5? ( >=dev-ml/camlp5-6.02.3:=[ocamlopt?] ) - !camlp5? ( || ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 ) ) + !camlp5? ( || ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 ) ) gtk? ( >=dev-ml/lablgtk-2.10.1:=[ocamlopt?] )" DEPEND="${RDEPEND} doc? ( diff --git a/sci-mathematics/coq/coq-8.4_p6.ebuild b/sci-mathematics/coq/coq-8.4_p6.ebuild index f2ad39107b83..be183f11229d 100644 --- a/sci-mathematics/coq/coq-8.4_p6.ebuild +++ b/sci-mathematics/coq/coq-8.4_p6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -21,7 +21,7 @@ IUSE="gtk debug +ocamlopt doc camlp5" RDEPEND=" >=dev-lang/ocaml-3.11.2:=[ocamlopt?] camlp5? ( >=dev-ml/camlp5-6.02.3:=[ocamlopt?] ) - !camlp5? ( || ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 ) ) + !camlp5? ( || ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 ) ) gtk? ( >=dev-ml/lablgtk-2.10.1:=[ocamlopt?] )" DEPEND="${RDEPEND} doc? ( |