[gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/

[Michael Palimaka]

commit:     fd78df39dfe6fbc13d8e3358157dcf3201ef12bc
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 25 17:23:51 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> 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