[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michael Palimaka]

commit:     78d6f0fab21a8c806f399b1d47a44efed35f4b4f
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 15 00:23:12 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Oct  8 01:46:23 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78d6f0fa

qt5-build.eclass: cleanup iconv handling

 eclass/qt5-build.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 6f46b2e7b8d..f905a7ab273 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -612,7 +612,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