From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-889475-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id E61F11382DE
	for <garchives@archives.gentoo.org>; Wed, 29 Jun 2016 21:15:00 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id BE6AEE0944;
	Wed, 29 Jun 2016 21:14:58 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 489C6E0944
	for <gentoo-commits@lists.gentoo.org>; Wed, 29 Jun 2016 21:14:58 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 21C27340D78
	for <gentoo-commits@lists.gentoo.org>; Wed, 29 Jun 2016 21:14:57 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 88B1097B
	for <gentoo-commits@lists.gentoo.org>; Wed, 29 Jun 2016 21:14:55 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1467234888.52ce482c08e38e356d0706d54bbcfa6cac8123d4.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/lablgtk/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-ml/lablgtk/lablgtk-2.18.3-r1.ebuild dev-ml/lablgtk/lablgtk-2.18.3.ebuild
X-VCS-Directories: dev-ml/lablgtk/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 52ce482c08e38e356d0706d54bbcfa6cac8123d4
X-VCS-Branch: master
Date: Wed, 29 Jun 2016 21:14:55 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 1b7f91f0-989b-4d86-9018-d6981532a2b1
X-Archives-Hash: c148cccd8b431fd0e345db00dd0f6778

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"