diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2017-03-15 01:31:40 +0100 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2017-03-15 01:31:45 +0100 |
| commit | 3351afb360c87bb9d0596bff371536b710886375 (patch) | |
| tree | 8cbe7e9ed25549eedf6443e455e0b750e16026be | |
| parent | dev-qt/qtcore: cleanup iconv handling (diff) | |
| download | qt-3351afb360c87bb9d0596bff371536b710886375.tar.gz qt-3351afb360c87bb9d0596bff371536b710886375.tar.bz2 qt-3351afb360c87bb9d0596bff371536b710886375.zip | |
dev-qt/qtcore: move system-doubleconversion handling to the eclass
And enable it for 5.7 as well
Package-Manager: Portage-2.3.4, Repoman-2.3.2
| -rw-r--r-- | dev-qt/qtcore/qtcore-5.7.9999.ebuild | 4 | ||||
| -rw-r--r-- | dev-qt/qtcore/qtcore-5.8.0.ebuild | 1 | ||||
| -rw-r--r-- | dev-qt/qtcore/qtcore-5.8.9999.ebuild | 1 | ||||
| -rw-r--r-- | dev-qt/qtcore/qtcore-5.9999.ebuild | 1 | ||||
| -rw-r--r-- | eclass/qt5-build.eclass | 3 |
5 files changed, 3 insertions, 7 deletions
diff --git a/dev-qt/qtcore/qtcore-5.7.9999.ebuild b/dev-qt/qtcore/qtcore-5.7.9999.ebuild index 4d79aa12..42e33d83 100644 --- a/dev-qt/qtcore/qtcore-5.7.9999.ebuild +++ b/dev-qt/qtcore/qtcore-5.7.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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/dev-qt/qtcore/qtcore-5.8.0.ebuild b/dev-qt/qtcore/qtcore-5.8.0.ebuild index 1c5b1eb7..6e111d62 100644 --- a/dev-qt/qtcore/qtcore-5.8.0.ebuild +++ b/dev-qt/qtcore/qtcore-5.8.0.ebuild @@ -35,7 +35,6 @@ QT5_TARGET_SUBDIRS=( src_configure() { local myconf=( - -system-doubleconversion $(qt_use icu) $(qt_use !icu iconv) $(qt_use systemd journald) diff --git a/dev-qt/qtcore/qtcore-5.8.9999.ebuild b/dev-qt/qtcore/qtcore-5.8.9999.ebuild index 1c5b1eb7..6e111d62 100644 --- a/dev-qt/qtcore/qtcore-5.8.9999.ebuild +++ b/dev-qt/qtcore/qtcore-5.8.9999.ebuild @@ -35,7 +35,6 @@ QT5_TARGET_SUBDIRS=( src_configure() { local myconf=( - -system-doubleconversion $(qt_use icu) $(qt_use !icu iconv) $(qt_use systemd journald) diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild index 1c5b1eb7..6e111d62 100644 --- a/dev-qt/qtcore/qtcore-5.9999.ebuild +++ b/dev-qt/qtcore/qtcore-5.9999.ebuild @@ -35,7 +35,6 @@ QT5_TARGET_SUBDIRS=( src_configure() { local myconf=( - -system-doubleconversion $(qt_use icu) $(qt_use !icu iconv) $(qt_use systemd journald) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 97659d23..eea388d8 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -593,8 +593,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 |