[gentoo-commits] repo/gentoo:master commit in: dev-ml/lablgtk/

[Michał Górny]

commit:     52ce482c08e38e356d0706d54bbcfa6cac8123d4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 20:32:58 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 21:14:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52ce482c

dev-ml/lablgtk: Split stable into old OCaml & camlp4 variants, #586916

Split the stable version into a variant supporting old OCaml and one
supporting camlp4, in order to solve :=-in-|| problem. The old ebuild
is only targeted at stable ia64 & sparc users that do not have camlp4
stable.

 dev-ml/lablgtk/{lablgtk-2.18.3.ebuild => lablgtk-2.18.3-r1.ebuild} | 4 ++--
 dev-ml/lablgtk/lablgtk-2.18.3.ebuild                               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-ml/lablgtk/lablgtk-2.18.3.ebuild 
b/dev-ml/lablgtk/lablgtk-2.18.3-r1.ebuild
similarity index 94%
copy from dev-ml/lablgtk/lablgtk-2.18.3.ebuild
copy to dev-ml/lablgtk/lablgtk-2.18.3-r1.ebuild
index 81b3d6a..53294ba 100644
--- a/dev-ml/lablgtk/lablgtk-2.18.3.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.3-r1.ebuild
@@ -22,13 +22,13 @@ 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:=
        "
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 
 SLOT="2/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux 
~x86-linux"
+KEYWORDS="alpha amd64 ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux 
~x86-linux"
 
 src_configure() {
        econf $(use_enable debug) \

diff --git a/dev-ml/lablgtk/lablgtk-2.18.3.ebuild 
b/dev-ml/lablgtk/lablgtk-2.18.3.ebuild
index 81b3d6a..46dbd4b 100644
--- a/dev-ml/lablgtk/lablgtk-2.18.3.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.3.ebuild
@@ -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-lang/ocaml-4.02.0
        "
 DEPEND="${RDEPEND}
        virtual/pkgconfig"