summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2016-06-23 10:59:06 +0200
committerAlexis Ballier <aballier@gentoo.org>2016-06-23 13:23:23 +0200
commit4c5e801495b57bfcf580f8d3192699f599722bdc (patch)
tree1fda2fb96953c527035f6961dce046b59fdade6e /dev-util/coccinelle
parentRevert "sci-mathematics/coq: Remove := from || dep, #586304" (diff)
downloadgentoo-4c5e801495b57bfcf580f8d3192699f599722bdc.tar.gz
gentoo-4c5e801495b57bfcf580f8d3192699f599722bdc.tar.bz2
gentoo-4c5e801495b57bfcf580f8d3192699f599722bdc.zip
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.
Diffstat (limited to 'dev-util/coccinelle')
-rw-r--r--dev-util/coccinelle/coccinelle-1.0.0.ebuild4
-rw-r--r--dev-util/coccinelle/coccinelle-1.0.1.ebuild4
-rw-r--r--dev-util/coccinelle/coccinelle-1.0.2.ebuild4
-rw-r--r--dev-util/coccinelle/coccinelle-1.0.4.ebuild4
4 files changed, 8 insertions, 8 deletions
diff --git a/dev-util/coccinelle/coccinelle-1.0.0.ebuild b/dev-util/coccinelle/coccinelle-1.0.0.ebuild
index 40022f0e57b7..f7b42921a36e 100644
--- 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 69b18e725ac8..2a9f559c0a62 100644
--- 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 09bf8ac14b93..adc67ae5c72d 100644
--- 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 09bf8ac14b93..adc67ae5c72d 100644
--- 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:= )