Revert "dev-ml/ocamlnet: Remove another := slot op from || dep"

This reverts commit 3b1a4cc0f9b9a0a2c70d6bb53cb71bf059e2920e.

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-ml/ocamlnet/ocamlnet-3.7.7.ebuild b/dev-ml/ocamlnet/ocamlnet-3.7.7.ebuild
index 61ad3d6994b245c21949d4534ff7ddf05e61fd45..779f710c2fb5a19811d7c30263fb6aab72eca41f 100644 (file)
--- a/dev-ml/ocamlnet/ocamlnet-3.7.7.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-3.7.7.ebuild
@@ -23,7 +23,7 @@ RESTRICT="installsources"
 DEPEND=">=dev-ml/findlib-1.0
                pcre? ( >=dev-ml/pcre-ocaml-5:= )
                >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-               tk? ( || ( dev-ml/labltk <dev-lang/ocaml-4.02[tk] ) )
+               tk? ( || ( dev-ml/labltk:= <dev-lang/ocaml-4.02[tk] ) )
                cryptokit? ( dev-ml/cryptokit:= )
                gtk? ( >=dev-ml/lablgtk-2:= )
                ssl? ( >=dev-ml/ocaml-ssl-0.4:= )

diff --git a/dev-ml/ocamlnet/ocamlnet-4.0.4.ebuild b/dev-ml/ocamlnet/ocamlnet-4.0.4.ebuild
index db254b69886db43c5bf3b182e61377536e663625..5fe2f7ad68f923745e70bd36d6116f51fa67d0f4 100644 (file)
--- a/dev-ml/ocamlnet/ocamlnet-4.0.4.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-4.0.4.ebuild
@@ -23,7 +23,7 @@ RESTRICT="installsources"
 RDEPEND=">=dev-ml/findlib-1.0
                pcre? ( >=dev-ml/pcre-ocaml-5:= )
                >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-               tk? ( || ( dev-ml/labltk <dev-lang/ocaml-4.02[tk] ) )
+               tk? ( || ( dev-ml/labltk:= <dev-lang/ocaml-4.02[tk] ) )
                ssl? ( net-libs/gnutls:= )
                gtk? ( >=dev-ml/lablgtk-2:= )
                kerberos? ( virtual/krb5 )

diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.1.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.1.ebuild
index dc776089febee3210603d7e1bb2156ea0432013c..5c042a395af2081d0d34903530a3d16082e7d89f 100644 (file)
--- a/dev-ml/ocamlnet/ocamlnet-4.1.1.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-4.1.1.ebuild
@@ -23,7 +23,7 @@ RESTRICT="installsources"
 RDEPEND=">=dev-ml/findlib-1.0
                pcre? ( >=dev-ml/pcre-ocaml-5:= )
                >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-               tk? ( || ( dev-ml/labltk <dev-lang/ocaml-4.02[tk] ) )
+               tk? ( || ( dev-ml/labltk:= <dev-lang/ocaml-4.02[tk] ) )
                ssl? ( net-libs/gnutls:= )
                gtk? ( >=dev-ml/lablgtk-2:= )
                kerberos? ( virtual/krb5 )