From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 72DFF1381F3 for ; Mon, 12 Nov 2012 04:36:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B14B21C084; Mon, 12 Nov 2012 04:35:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 929FA21C084 for ; Mon, 12 Nov 2012 04:35:52 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9747233D9BB for ; Mon, 12 Nov 2012 04:35:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 10F75E5436 for ; Mon, 12 Nov 2012 04:35:50 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1352694839.38ba740cc97915b41aaea6d0a8871a37b1371f90.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 38ba740cc97915b41aaea6d0a8871a37b1371f90 X-VCS-Branch: master Date: Mon, 12 Nov 2012 04:35:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 78602840-f2dc-44db-a8b4-60350bc721b5 X-Archives-Hash: 5016871ec92bc7ab822fb81acc3a9a9a commit: 38ba740cc97915b41aaea6d0a8871a37b1371f90 Author: Davide Pesavento gmail com> AuthorDate: Mon Nov 12 04:33:59 2012 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Mon Nov 12 04:33:59 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=38ba740c [qt5-build.eclass] Fix path to mkspecs, they are installed under $archdatadir now. --- eclass/qt5-build.eclass | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 95ae1e7..87ae26a 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -496,7 +496,7 @@ qt5_install_module_qconfigs() { [[ -n ${!x} ]] && echo "${x}=${!x}" >> "${T}"/${PN}-qconfig.pri done [[ -s ${T}/${PN}-qconfig.pri ]] && ( - insinto "${QT5_DATADIR#${EPREFIX}}"/mkspecs/gentoo + insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo doins "${T}"/${PN}-qconfig.pri ) } @@ -518,7 +518,7 @@ qt5_regenerate_global_qconfigs() { einfo "Updating QT_CONFIG in qconfig.pri" - local qconfig_pri=${ROOT}${QT5_DATADIR}/mkspecs/qconfig.pri + local qconfig_pri=${ROOT}${QT5_ARCHDATADIR}/mkspecs/qconfig.pri if [[ -f ${qconfig_pri} ]]; then local x qconfig_add= qconfig_remove= local qt_config=$(sed -n 's/^QT_CONFIG +=//p' "${qconfig_pri}") @@ -527,7 +527,7 @@ qt5_regenerate_global_qconfigs() { # generate list of QT_CONFIG entries from the existing list, # appending QCONFIG_ADD and excluding QCONFIG_REMOVE eshopts_push -s nullglob - for x in "${ROOT}${QT5_DATADIR}"/mkspecs/gentoo/qt-*-qconfig.pri; do + for x in "${ROOT}${QT5_ARCHDATADIR}"/mkspecs/gentoo/qt-*-qconfig.pri; do qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")" qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")" done