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

[Michael Palimaka]

commit:     7536ec0475e6339a5ff706677a096814d750e072
Author:     i.Dark_Templar <darktemplar <AT> dark-templar-archives <DOT> net>
AuthorDate: Thu Oct 19 20:58:00 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jan 25 12:10:20 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=7536ec04

qt5-build.eclass: fix qconfig.pri regeneration.

Closes: https://github.com/gentoo/gentoo/pull/5991

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

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 82855656..54e4b321 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -803,6 +803,11 @@ qt5_install_module_qconfigs() {
 		insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo
 		doins "${T}"/${PN}-qconfig.pri
 	)
+
+	if [[ ${PN} = qtcore ]]; then
+		insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo
+		newins "${D}${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/qconfig.pri qconfig-qtcore.pri
+	fi
 }
 
 # @FUNCTION: qt5_regenerate_global_qconfigs
@@ -824,9 +829,10 @@ qt5_regenerate_global_qconfigs() {
 	einfo "Updating QT_CONFIG in qconfig.pri"
 
 	local qconfig_pri=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/qconfig.pri
-	if [[ -f ${qconfig_pri} ]]; then
+	local qconfig_pri_orig=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/gentoo/qconfig-qtcore.pri
+	if [[ -f ${qconfig_pri} && -f ${qconfig_pri_orig} ]]; then
 		local x qconfig_add= qconfig_remove=
-		local qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri}")
+		local qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri_orig}")
 		local new_qt_config=
 
 		# generate list of QT_CONFIG entries from the existing list,
@@ -847,6 +853,6 @@ qt5_regenerate_global_qconfigs() {
 		sed -i -e "s/^QT_CONFIG\s*+=.*/QT_CONFIG +=${new_qt_config}/" \
 			"${qconfig_pri}" || eerror "Failed to sed QT_CONFIG in ${qconfig_pri}"
 	else
-		ewarn "${qconfig_pri} does not exist or is not a regular file"
+		ewarn "${qconfig_pri} or ${qconfig_pri_orig} does not exist or is not a regular file"
 	fi
 }