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/lablgtk
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/lablgtk')
-rw-r--r--dev-ml/lablgtk/lablgtk-2.18.3.ebuild4
-rw-r--r--dev-ml/lablgtk/lablgtk-2.18.4.ebuild4
2 files changed, 4 insertions, 4 deletions
diff --git a/dev-ml/lablgtk/lablgtk-2.18.3.ebuild b/dev-ml/lablgtk/lablgtk-2.18.3.ebuild
index 5a82c4099430..81b3d6abe490 100644
--- a/dev-ml/lablgtk/lablgtk-2.18.3.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.3.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$
@@ -22,7 +22,7 @@ RDEPEND=">=x11-libs/gtk+-2.10:2
>=x11-libs/gtkglarea-1.9:2 )
spell? ( app-text/gtkspell:2 )
sourceview? ( x11-libs/gtksourceview:2.0 )
- || ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )
+ || ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )
"
DEPEND="${RDEPEND}
virtual/pkgconfig"
diff --git a/dev-ml/lablgtk/lablgtk-2.18.4.ebuild b/dev-ml/lablgtk/lablgtk-2.18.4.ebuild
index 695cffe23f0b..4994848a0c2b 100644
--- a/dev-ml/lablgtk/lablgtk-2.18.4.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.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$
@@ -22,7 +22,7 @@ RDEPEND=">=x11-libs/gtk+-2.10:2
>=x11-libs/gtkglarea-1.9:2 )
spell? ( app-text/gtkspell:2 )
sourceview? ( x11-libs/gtksourceview:2.0 )
- || ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )
+ || ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )
"
DEPEND="${RDEPEND}
virtual/pkgconfig"