Revert "dev-util/coccinelle: Remove := op from || dep, #586304"

This reverts commit 23c0a5e66e44e35d9854ee94dc0e3b41a2f15035.

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/dev-util/coccinelle/coccinelle-1.0.0.ebuild b/dev-util/coccinelle/coccinelle-1.0.0.ebuild
index 40022f0e57b7a161bf9b300e5cea6a7e1d1b3794..f7b42921a36e987d72c2c69c9a4e92ed92ac893c 100644 (file)
--- a/dev-util/coccinelle/coccinelle-1.0.0.ebuild
+++ b/dev-util/coccinelle/coccinelle-1.0.0.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$
 
@@ -22,7 +22,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 CDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
        dev-ml/sexplib:=[ocamlopt?]
        dev-ml/menhir:=[ocamlopt?]
-       || ( dev-ml/camlp4[ocamlopt?] <dev-lang/ocaml-4.02.0 )
+       || ( dev-ml/camlp4:=[ocamlopt?] <dev-lang/ocaml-4.02.0 )
        dev-ml/parmap:=[ocamlopt?]
        emacs? ( virtual/emacs )
        ocaml? ( dev-ml/findlib:= )

diff --git a/dev-util/coccinelle/coccinelle-1.0.1.ebuild b/dev-util/coccinelle/coccinelle-1.0.1.ebuild
index 69b18e725ac8d0496997c2bfb52ce9f12a34ea20..2a9f559c0a6252ba7ea61e35dc4927876a6e5bfb 100644 (file)
--- a/dev-util/coccinelle/coccinelle-1.0.1.ebuild
+++ b/dev-util/coccinelle/coccinelle-1.0.1.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$
 
@@ -22,7 +22,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 CDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
        dev-ml/sexplib:=[ocamlopt?]
        dev-ml/menhir:=[ocamlopt?]
-       || ( dev-ml/camlp4[ocamlopt?] <dev-lang/ocaml-4.02.0 )
+       || ( dev-ml/camlp4:=[ocamlopt?] <dev-lang/ocaml-4.02.0 )
        dev-ml/parmap:=[ocamlopt?]
        emacs? ( virtual/emacs )
        ocaml? ( dev-ml/findlib:= )

diff --git a/dev-util/coccinelle/coccinelle-1.0.2.ebuild b/dev-util/coccinelle/coccinelle-1.0.2.ebuild
index 09bf8ac14b9326e5eef5e313a6ab85864cf3cb3e..adc67ae5c72d3e40987d5ff0b726ba6b91fdacc1 100644 (file)
--- a/dev-util/coccinelle/coccinelle-1.0.2.ebuild
+++ b/dev-util/coccinelle/coccinelle-1.0.2.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$
 
@@ -22,7 +22,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 CDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
        dev-ml/sexplib:=[ocamlopt?]
        dev-ml/menhir:=[ocamlopt?]
-       || ( dev-ml/camlp4[ocamlopt?] <dev-lang/ocaml-4.02.0 )
+       || ( dev-ml/camlp4:=[ocamlopt?] <dev-lang/ocaml-4.02.0 )
        dev-ml/parmap:=[ocamlopt?]
        emacs? ( virtual/emacs )
        ocaml? ( dev-ml/findlib:= )

diff --git a/dev-util/coccinelle/coccinelle-1.0.4.ebuild b/dev-util/coccinelle/coccinelle-1.0.4.ebuild
index 09bf8ac14b9326e5eef5e313a6ab85864cf3cb3e..adc67ae5c72d3e40987d5ff0b726ba6b91fdacc1 100644 (file)
--- a/dev-util/coccinelle/coccinelle-1.0.4.ebuild
+++ b/dev-util/coccinelle/coccinelle-1.0.4.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$
 
@@ -22,7 +22,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 CDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
        dev-ml/sexplib:=[ocamlopt?]
        dev-ml/menhir:=[ocamlopt?]
-       || ( dev-ml/camlp4[ocamlopt?] <dev-lang/ocaml-4.02.0 )
+       || ( dev-ml/camlp4:=[ocamlopt?] <dev-lang/ocaml-4.02.0 )
        dev-ml/parmap:=[ocamlopt?]
        emacs? ( virtual/emacs )
        ocaml? ( dev-ml/findlib:= )