diff options
| -rw-r--r-- | dev-qt/qtcore/qtcore-5.7.1-r2.ebuild (renamed from dev-qt/qtcore/qtcore-5.7.1-r1.ebuild) | 2 | ||||
| -rw-r--r-- | eclass/qt5-build.eclass | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/dev-qt/qtcore/qtcore-5.7.1-r1.ebuild b/dev-qt/qtcore/qtcore-5.7.1-r2.ebuild index 1b5fd5386e9d..524443a71bad 100644 --- 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 a47752b545f0..4dcd4f29175f 100644 --- 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 |