summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2016-06-23 10:38:42 +0200
committerAlexis Ballier <aballier@gentoo.org>2016-06-23 13:23:21 +0200
commita254987a6030b4fefdc5989c960772dddd866faf (patch)
tree35fce4a7cb0ca332d9d88a5770a0315da4e53e0a /dev-ml/pxp
parenteclass/myspell-r2.eclass: Fix typo in comment. (diff)
downloadgentoo-a254987a6030b4fefdc5989c960772dddd866faf.tar.gz
gentoo-a254987a6030b4fefdc5989c960772dddd866faf.tar.bz2
gentoo-a254987a6030b4fefdc5989c960772dddd866faf.zip
Revert "dev-ml/*: Remove := slot ops from || deps, #586304"
This reverts commit 2d4ac687fbf44588f764697c9dcb2b960a18d51b. 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-ml/pxp')
-rw-r--r--dev-ml/pxp/pxp-1.2.4.ebuild4
-rw-r--r--dev-ml/pxp/pxp-1.2.7.ebuild4
-rw-r--r--dev-ml/pxp/pxp-1.2.8.ebuild4
3 files changed, 6 insertions, 6 deletions
diff --git a/dev-ml/pxp/pxp-1.2.4.ebuild b/dev-ml/pxp/pxp-1.2.4.ebuild
index f469f2d729bc..e1ce8a240095 100644
--- a/dev-ml/pxp/pxp-1.2.4.ebuild
+++ b/dev-ml/pxp/pxp-1.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -20,7 +20,7 @@ DEPEND=">=dev-ml/pcre-ocaml-4.31:=
>=dev-ml/ulex-0.5:=
>=dev-ml/ocamlnet-0.98:=
>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
- || ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )"
+ || ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )"
RDEPEND="${DEPEND}"
IUSE="examples +ocamlopt"
diff --git a/dev-ml/pxp/pxp-1.2.7.ebuild b/dev-ml/pxp/pxp-1.2.7.ebuild
index 98cac6339ab5..1937ee73d8e9 100644
--- a/dev-ml/pxp/pxp-1.2.7.ebuild
+++ b/dev-ml/pxp/pxp-1.2.7.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$
@@ -20,7 +20,7 @@ DEPEND=">=dev-ml/pcre-ocaml-4.31:=
>=dev-ml/ulex-0.5:=
>=dev-ml/ocamlnet-0.98:=
>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
- || ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )"
+ || ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )"
RDEPEND="${DEPEND}"
IUSE="examples +ocamlopt"
diff --git a/dev-ml/pxp/pxp-1.2.8.ebuild b/dev-ml/pxp/pxp-1.2.8.ebuild
index 6c0f1252be67..77edb0055c3a 100644
--- a/dev-ml/pxp/pxp-1.2.8.ebuild
+++ b/dev-ml/pxp/pxp-1.2.8.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$
@@ -20,7 +20,7 @@ DEPEND=">=dev-ml/pcre-ocaml-4.31:=
>=dev-ml/ulex-0.5:=
>=dev-ml/ocamlnet-4:=
>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
- || ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )"
+ || ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )"
RDEPEND="${DEPEND}"
IUSE="examples +ocamlopt"