[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michael Palimaka]

commit:     bdee917110456aabe70233a5832446f9fa2de622
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  1 18:56:10 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Feb  3 13:36:57 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdee9171

qt5-build.eclass: use a subshell for insinto+newins

 eclass/qt5-build.eclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 963dba571cb..28d303e2a11 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -804,10 +804,11 @@ qt5_install_module_qconfigs() {
                doins "${T}"/${PN}-qconfig.pri
        )
 
-       if [[ ${PN} == qtcore && ${QT5_MINOR_VERSION} -ge 9 ]]; then
+       # install also the original qconfig.pri
+       [[ ${PN} == qtcore && ${QT5_MINOR_VERSION} -ge 9 ]] && (
                insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo
                newins "${D}${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/qconfig.pri 
qconfig-qtcore.pri
-       fi
+       )
 }
 
 # @FUNCTION: qt5_regenerate_global_qconfigs