[gentoo-commits] proj/qt:master commit in: eclass/, dev-qt/qtcore/

[Davide Pesavento]

commit:     d1cd6fe09289146151c5c69a5a2817f2d90612f6
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 24 15:34:25 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 15:35:14 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=d1cd6fe0

dev-qt/qtcore: add TODO note on new dev-libs/double-conversion dep

Package-Manager: portage-2.2.28

 dev-qt/qtcore/qtcore-5.7.0_beta.ebuild | 1 +
 dev-qt/qtcore/qtcore-5.7.9999.ebuild   | 1 +
 dev-qt/qtcore/qtcore-5.9999.ebuild     | 1 +
 eclass/qt5-build.eclass                | 8 +++++---
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-5.7.0_beta.ebuild 
b/dev-qt/qtcore/qtcore-5.7.0_beta.ebuild
index c19d231..df7d48e 100644
--- a/dev-qt/qtcore/qtcore-5.7.0_beta.ebuild
+++ b/dev-qt/qtcore/qtcore-5.7.0_beta.ebuild
@@ -14,6 +14,7 @@ fi
 
 IUSE="icu systemd"
 
+# TODO after bug 581054: dev-libs/double-conversion:=
 DEPEND="
        dev-libs/glib:2
        >=dev-libs/libpcre-8.35[pcre16]

diff --git a/dev-qt/qtcore/qtcore-5.7.9999.ebuild 
b/dev-qt/qtcore/qtcore-5.7.9999.ebuild
index c19d231..df7d48e 100644
--- a/dev-qt/qtcore/qtcore-5.7.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.7.9999.ebuild
@@ -14,6 +14,7 @@ fi
 
 IUSE="icu systemd"
 
+# TODO after bug 581054: dev-libs/double-conversion:=
 DEPEND="
        dev-libs/glib:2
        >=dev-libs/libpcre-8.35[pcre16]

diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild 
b/dev-qt/qtcore/qtcore-5.9999.ebuild
index c19d231..df7d48e 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -14,6 +14,7 @@ fi
 
 IUSE="icu systemd"
 
+# TODO after bug 581054: dev-libs/double-conversion:=
 DEPEND="
        dev-libs/glib:2
        >=dev-libs/libpcre-8.35[pcre16]

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index ba3f5bf..30ef6db 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -84,7 +84,7 @@ case ${PV} in
                QT5_BUILD_TYPE="release"
                MY_P=${QT5_MODULE}-opensource-src-${PV/_/-}
                
SRC_URI="https://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz";
-               S=${WORKDIR}/${MY_P%-alpha}
+               S=${WORKDIR}/${MY_P}
                ;;
        *)
                # official stable release
@@ -557,9 +557,11 @@ qt5_base_configure() {
                # use pkg-config to detect include and library paths
                -pkg-config
 
-               # prefer system libraries (only common deps here)
+               # prefer system libraries (only common hard deps here)
                -system-zlib
                -system-pcre
+               # TODO after bug 581054
+               #$([[ ${QT5_MINOR_VERSION} -ge 7 ]] && echo 
-system-doubleconversion)
 
                # disable everything to prevent automagic deps (part 1)
                -no-mtdev
@@ -571,7 +573,7 @@ qt5_base_configure() {
                -no-xkbcommon-x11 -no-xkbcommon-evdev
                -no-xinput2 -no-xcb-xlib
 
-               # don't specify -no-gif because there is no way to override it 
later
+               # cannot use -no-gif because there is no way to override it 
later
                #-no-gif
 
                # always enable glib event loop support