qt5-build.eclass: ${D}${QT5_ARCHDATADIR#${EPREFIX}}: keep EPREFIX.

  ${D}${QT5_ARCHDATADIR#${EPREFIX}} mean no EPREFIX at all.
  ${D}${QT5_ARCHDATADIR} is cleaner than
  ${ED}${QT5_ARCHDATADIR#${EPREFIX}}, so use it.

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 939a048d3d426d9d8d57f80c0ad76565f9fcdea8..1a20b3dace606460db5e1be4e07846823bcf95ea 100644 (file)
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -844,8 +844,8 @@ qt5_install_module_config() {
        # 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
-               newins "${D}${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/qmodule.pri qmodule-qtcore.pri
+               newins "${D}${QT5_ARCHDATADIR}"/mkspecs/qconfig.pri qconfig-qtcore.pri
+               newins "${D}${QT5_ARCHDATADIR}"/mkspecs/qmodule.pri qmodule-qtcore.pri
        )
 }