From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 D53F0139085 for ; Wed, 25 Jan 2017 17:24:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 27A63E0CB6; Wed, 25 Jan 2017 17:24:32 +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 D724FE0CB6 for ; Wed, 25 Jan 2017 17:24:31 +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 D5C42341656 for ; Wed, 25 Jan 2017 17:24:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4C35A2F30 for ; Wed, 25 Jan 2017 17:24:29 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1485365057.fd78df39dfe6fbc13d8e3358157dcf3201ef12bc.kensington@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtcore/qtcore-5.8.0.ebuild dev-qt/qtcore/qtcore-5.8.9999.ebuild dev-qt/qtcore/qtcore-5.9999.ebuild X-VCS-Directories: dev-qt/qtcore/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: fd78df39dfe6fbc13d8e3358157dcf3201ef12bc X-VCS-Branch: master Date: Wed, 25 Jan 2017 17:24:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 796413e3-047b-4cf5-93f9-b234bd2f1df2 X-Archives-Hash: 58586945ad13dceeb9bc72029efa796e commit: fd78df39dfe6fbc13d8e3358157dcf3201ef12bc Author: Michael Palimaka gentoo org> AuthorDate: Wed Jan 25 17:23:51 2017 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed Jan 25 17:24:17 2017 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=fd78df39 dev-qt/qtcore: disable iconv if icu is enabled See qtbase commit fd9e5d90333c385ad191a289b2e95e918c58b242. Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-qt/qtcore/qtcore-5.8.0.ebuild | 4 ++-- dev-qt/qtcore/qtcore-5.8.9999.ebuild | 6 +++--- dev-qt/qtcore/qtcore-5.9999.ebuild | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dev-qt/qtcore/qtcore-5.8.0.ebuild b/dev-qt/qtcore/qtcore-5.8.0.ebuild index 02eb34e..79ce95f 100644 --- a/dev-qt/qtcore/qtcore-5.8.0.ebuild +++ b/dev-qt/qtcore/qtcore-5.8.0.ebuild @@ -19,8 +19,8 @@ DEPEND=" dev-libs/glib:2 >=dev-libs/libpcre-8.38[pcre16,unicode] >=sys-libs/zlib-1.2.5 - virtual/libiconv icu? ( dev-libs/icu:= ) + !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) " RDEPEND="${DEPEND}" @@ -36,7 +36,7 @@ QT5_TARGET_SUBDIRS=( src_configure() { local myconf=( - $(qt_use icu) + $(usex icu '-icu -no-iconv' '-iconv -no-icu') $(qt_use systemd journald) ) qt5-build_src_configure diff --git a/dev-qt/qtcore/qtcore-5.8.9999.ebuild b/dev-qt/qtcore/qtcore-5.8.9999.ebuild index ad9f43c..79ce95f 100644 --- a/dev-qt/qtcore/qtcore-5.8.9999.ebuild +++ b/dev-qt/qtcore/qtcore-5.8.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -19,8 +19,8 @@ DEPEND=" dev-libs/glib:2 >=dev-libs/libpcre-8.38[pcre16,unicode] >=sys-libs/zlib-1.2.5 - virtual/libiconv icu? ( dev-libs/icu:= ) + !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) " RDEPEND="${DEPEND}" @@ -36,7 +36,7 @@ QT5_TARGET_SUBDIRS=( src_configure() { local myconf=( - $(qt_use icu) + $(usex icu '-icu -no-iconv' '-iconv -no-icu') $(qt_use systemd journald) ) qt5-build_src_configure diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild index ad9f43c..79ce95f 100644 --- a/dev-qt/qtcore/qtcore-5.9999.ebuild +++ b/dev-qt/qtcore/qtcore-5.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -19,8 +19,8 @@ DEPEND=" dev-libs/glib:2 >=dev-libs/libpcre-8.38[pcre16,unicode] >=sys-libs/zlib-1.2.5 - virtual/libiconv icu? ( dev-libs/icu:= ) + !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) " RDEPEND="${DEPEND}" @@ -36,7 +36,7 @@ QT5_TARGET_SUBDIRS=( src_configure() { local myconf=( - $(qt_use icu) + $(usex icu '-icu -no-iconv' '-iconv -no-icu') $(qt_use systemd journald) ) qt5-build_src_configure