[gentoo-commits] proj/qt:master commit in: dev-qt/qtlocation/

[Jimi Huotari]

commit:     ab640d3d18a90c66125149619d422926409ced65
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 10 00:53:00 2020 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Fri Apr 10 00:53:56 2020 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=ab640d3d

dev-qt/qtlocation: update configure-time workaround

Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 dev-qt/qtlocation/qtlocation-5.14.9999.ebuild    | 5 +++--
 dev-qt/qtlocation/qtlocation-5.15.0_beta3.ebuild | 5 +++--
 dev-qt/qtlocation/qtlocation-5.15.9999.ebuild    | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtlocation/qtlocation-5.14.9999.ebuild 
b/dev-qt/qtlocation/qtlocation-5.14.9999.ebuild
index 838cb1e2..0772e510 100644
--- a/dev-qt/qtlocation/qtlocation-5.14.9999.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.14.9999.ebuild
@@ -40,7 +40,8 @@ QT5_TARGET_SUBDIRS=(
 src_configure() {
        # src/plugins/geoservices requires files that are only generated when
        # qmake is run in the root directory. Bug 633776.
-       mkdir -p "${QT5_BUILD_DIR}" || die
-       qt5_qmake "${QT_BUILD_DIR}"
+       mkdir -p "${QT5_BUILD_DIR}"/src/location || die
+       qt5_qmake "${QT5_BUILD_DIR}"
+       cp "${S}"/src/location/qtlocation-config.pri 
"${QT5_BUILD_DIR}"/src/location || die
        qt5-build_src_configure
 }

diff --git a/dev-qt/qtlocation/qtlocation-5.15.0_beta3.ebuild 
b/dev-qt/qtlocation/qtlocation-5.15.0_beta3.ebuild
index 838cb1e2..0772e510 100644
--- a/dev-qt/qtlocation/qtlocation-5.15.0_beta3.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.15.0_beta3.ebuild
@@ -40,7 +40,8 @@ QT5_TARGET_SUBDIRS=(
 src_configure() {
        # src/plugins/geoservices requires files that are only generated when
        # qmake is run in the root directory. Bug 633776.
-       mkdir -p "${QT5_BUILD_DIR}" || die
-       qt5_qmake "${QT_BUILD_DIR}"
+       mkdir -p "${QT5_BUILD_DIR}"/src/location || die
+       qt5_qmake "${QT5_BUILD_DIR}"
+       cp "${S}"/src/location/qtlocation-config.pri 
"${QT5_BUILD_DIR}"/src/location || die
        qt5-build_src_configure
 }

diff --git a/dev-qt/qtlocation/qtlocation-5.15.9999.ebuild 
b/dev-qt/qtlocation/qtlocation-5.15.9999.ebuild
index 838cb1e2..0772e510 100644
--- a/dev-qt/qtlocation/qtlocation-5.15.9999.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.15.9999.ebuild
@@ -40,7 +40,8 @@ QT5_TARGET_SUBDIRS=(
 src_configure() {
        # src/plugins/geoservices requires files that are only generated when
        # qmake is run in the root directory. Bug 633776.
-       mkdir -p "${QT5_BUILD_DIR}" || die
-       qt5_qmake "${QT_BUILD_DIR}"
+       mkdir -p "${QT5_BUILD_DIR}"/src/location || die
+       qt5_qmake "${QT5_BUILD_DIR}"
+       cp "${S}"/src/location/qtlocation-config.pri 
"${QT5_BUILD_DIR}"/src/location || die
        qt5-build_src_configure
 }