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.

diff --git a/sci-mathematics/coq/coq-8.4_p5.ebuild b/sci-mathematics/coq/coq-8.4_p5.ebuild
index 2cef57428602e8039166cbb570d4b84671cb7444..707a434eecad690acfc7c5a84681b5c3b2753abc 100644 (file)
--- 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 f2ad39107b83084c32e017600c1d50c7d729d281..be183f11229dbc5c7c0d3f60a5cdb848b471c113 100644 (file)
--- 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? (