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

["Davide Pesavento" <pesa@gentoo.org>]

commit:     b9c3b54ae7058423ab3b545a468ff669bff5aad8
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 15 00:23:12 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Mar 15 00:23:31 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=b9c3b54a

dev-qt/qtcore: cleanup iconv handling

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 dev-qt/qtcore/qtcore-5.8.0.ebuild    | 3 ++-
 dev-qt/qtcore/qtcore-5.8.9999.ebuild | 3 ++-
 dev-qt/qtcore/qtcore-5.9999.ebuild   | 3 ++-
 eclass/qt5-build.eclass              | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-5.8.0.ebuild b/dev-qt/qtcore/qtcore-5.8.0.ebuild
index 208ca66e..1c5b1eb7 100644
--- a/dev-qt/qtcore/qtcore-5.8.0.ebuild
+++ b/dev-qt/qtcore/qtcore-5.8.0.ebuild
@@ -36,7 +36,8 @@ QT5_TARGET_SUBDIRS=(
 src_configure() {
 	local myconf=(
 		-system-doubleconversion
-		$(usex icu '-icu -no-iconv' '-iconv -no-icu')
+		$(qt_use icu)
+		$(qt_use !icu iconv)
 		$(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 208ca66e..1c5b1eb7 100644
--- a/dev-qt/qtcore/qtcore-5.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.8.9999.ebuild
@@ -36,7 +36,8 @@ QT5_TARGET_SUBDIRS=(
 src_configure() {
 	local myconf=(
 		-system-doubleconversion
-		$(usex icu '-icu -no-iconv' '-iconv -no-icu')
+		$(qt_use icu)
+		$(qt_use !icu iconv)
 		$(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 208ca66e..1c5b1eb7 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -36,7 +36,8 @@ QT5_TARGET_SUBDIRS=(
 src_configure() {
 	local myconf=(
 		-system-doubleconversion
-		$(usex icu '-icu -no-iconv' '-iconv -no-icu')
+		$(qt_use icu)
+		$(qt_use !icu iconv)
 		$(qt_use systemd journald)
 	)
 	qt5-build_src_configure

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index dc70b831..97659d23 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -627,7 +627,8 @@ qt5_base_configure() {
 		-verbose
 
 		# always enable iconv support
-		-iconv
+		# since 5.8 this is handled in qtcore
+		$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -iconv)
 
 		# disable everything to prevent automagic deps (part 3)
 		-no-cups -no-evdev -no-tslib -no-icu -no-fontconfig -no-dbus