dev-qt/qtcore: move system-doubleconversion handling to the eclass

Gentoo-bug: 581054

diff --git a/dev-qt/qtcore/qtcore-5.7.1-r1.ebuild b/dev-qt/qtcore/qtcore-5.7.1-r2.ebuild
similarity index 93%
rename from dev-qt/qtcore/qtcore-5.7.1-r1.ebuild
rename to dev-qt/qtcore/qtcore-5.7.1-r2.ebuild
index 1b5fd5386e9d7de6679a591e85b98586f86c209a..524443a71bad974e5648c7dba62271867aee390e 100644 (file)
--- a/dev-qt/qtcore/qtcore-5.7.1-r1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.7.1-r2.ebuild
@@ -13,8 +13,8 @@ fi
 
 IUSE="icu systemd"
 
-# TODO after bug 581054: dev-libs/double-conversion:=
 DEPEND="
+       dev-libs/double-conversion:=
        dev-libs/glib:2
        >=dev-libs/libpcre-8.38[pcre16,unicode]
        >=sys-libs/zlib-1.2.5

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index a47752b545f07b14c72a52823cbc482b9d2806d1..4dcd4f29175f1a81b227b420400a58d2a13374ad 100644 (file)
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -564,8 +564,7 @@ qt5_base_configure() {
                # prefer system libraries (only common hard deps here)
                -system-zlib
                -system-pcre
-               # TODO after bug 581054
-               #$([[ ${QT5_MINOR_VERSION} -ge 7 ]] && echo -system-doubleconversion)
+               $([[ ${QT5_MINOR_VERSION} -ge 7 ]] && echo -system-doubleconversion)
 
                # disable everything to prevent automagic deps (part 1)
                -no-mtdev