From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-920524-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 43F95139085
	for <garchives@archives.gentoo.org>; Sun,  1 Jan 2017 17:19:24 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 7CF1CE0C9D;
	Sun,  1 Jan 2017 17:19:23 +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 542DBE0C9D
	for <gentoo-commits@lists.gentoo.org>; Sun,  1 Jan 2017 17:19:23 +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 76D7E340C97
	for <gentoo-commits@lists.gentoo.org>; Sun,  1 Jan 2017 17:19:22 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 1969025C9
	for <gentoo-commits@lists.gentoo.org>; Sun,  1 Jan 2017 17:19:21 +0000 (UTC)
From: "Lars Wendler" <polynomial-c@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, "Lars Wendler" <polynomial-c@gentoo.org>
Message-ID: <1483291155.3b1fdd95b31b863a0d8e3e60353ea675eb61422e.polynomial-c@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: games-simulation/openttd/
X-VCS-Repository: repo/gentoo
X-VCS-Files: games-simulation/openttd/openttd-1.6.0.ebuild
X-VCS-Directories: games-simulation/openttd/
X-VCS-Committer: polynomial-c
X-VCS-Committer-Name: Lars Wendler
X-VCS-Revision: 3b1fdd95b31b863a0d8e3e60353ea675eb61422e
X-VCS-Branch: master
Date: Sun,  1 Jan 2017 17:19:21 +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: 49014ccf-5a4b-4663-a217-d0c0c843f1ce
X-Archives-Hash: 854c7b2bd0c131d9322ebb8d0f464144

commit:     3b1fdd95b31b863a0d8e3e60353ea675eb61422e
Author:     Alexander Golubev <fatzer2 <AT> gmail <DOT> com>
AuthorDate: Sat Dec 31 00:51:08 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Jan  1 17:19:15 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b1fdd95

games-simulation/openttd: require icu-layoutex alongside with recent icu

Gentoo bug: 601302
Closes: https://github.com/gentoo/gentoo/pull/3289

 games-simulation/openttd/openttd-1.6.0.ebuild | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/games-simulation/openttd/openttd-1.6.0.ebuild b/games-simulation/openttd/openttd-1.6.0.ebuild
index debc52b..6a080a0 100644
--- a/games-simulation/openttd/openttd-1.6.0.ebuild
+++ b/games-simulation/openttd/openttd-1.6.0.ebuild
@@ -17,7 +17,17 @@ RESTRICT="test" # needs a graphics set in order to test
 
 RDEPEND="!dedicated? (
 		media-libs/libsdl[sound,X,video]
-		icu? ( dev-libs/icu:= )
+		icu? (
+			|| (
+				(
+					dev-libs/icu-layoutex
+					dev-libs/icu-le-hb
+					>=dev-libs/icu-58.1
+				)
+				<dev-libs/icu-58.1
+			)
+			dev-libs/icu:=
+		)
 		truetype? (
 			media-libs/fontconfig
 			media-libs/freetype:2