commit: efdcc72fba7a1140422277426d2cca29c24f5e23
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 18 06:44:57 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Mar 18 06:46:02 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efdcc72f
dev-qt/qtcore: move system-doubleconversion handling to the eclass
Gentoo-bug: 581054
dev-qt/qtcore/{qtcore-5.7.1-r1.ebuild => qtcore-5.7.1-r2.ebuild} | 2 +-
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
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 1b5fd5386e9..524443a71ba 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 a47752b545f..4dcd4f29175 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
