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 15AB81381FA for ; Tue, 3 Jun 2014 15:05:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0F836E0804; Tue, 3 Jun 2014 15:05:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8DDE5E0804 for ; Tue, 3 Jun 2014 15:05:07 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 952FE33FDD0 for ; Tue, 3 Jun 2014 15:05:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 0D208181A9 for ; Tue, 3 Jun 2014 15:05:03 +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: <1401807859.7651be23a9d3c0d0b230001c727b882a9039bbaa.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/, eclass/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtcore/qtcore-4.8.6.ebuild dev-qt/qtcore/qtcore-4.8.9999.ebuild eclass/qt4-build-multilib.eclass X-VCS-Directories: dev-qt/qtcore/ eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 7651be23a9d3c0d0b230001c727b882a9039bbaa X-VCS-Branch: master Date: Tue, 3 Jun 2014 15:05:03 +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: d48a02c9-f2d0-459b-a0f4-4e43da76302b X-Archives-Hash: ae365decc2f5e99e1dd2f6d77dab4146 commit: 7651be23a9d3c0d0b230001c727b882a9039bbaa Author: Davide Pesavento gentoo org> AuthorDate: Tue Jun 3 15:04:19 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Tue Jun 3 15:04:19 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7651be23 [dev-qt/qtcore:4] Move mkspecs and qmake installation to eclass. --- dev-qt/qtcore/qtcore-4.8.6.ebuild | 2 -- dev-qt/qtcore/qtcore-4.8.9999.ebuild | 2 -- eclass/qt4-build-multilib.eclass | 6 ++++++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild b/dev-qt/qtcore/qtcore-4.8.6.ebuild index 783bbdb..c446934 100644 --- a/dev-qt/qtcore/qtcore-4.8.6.ebuild +++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild @@ -86,8 +86,6 @@ src_configure() { src_install() { qt4-build-multilib_src_install - emake INSTALL_ROOT="${D}" install_{mkspecs,qmake} - # List all the multilib libdirs local libdirs= for libdir in $(get_all_libdirs); do diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild index 783bbdb..c446934 100644 --- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild +++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild @@ -86,8 +86,6 @@ src_configure() { src_install() { qt4-build-multilib_src_install - emake INSTALL_ROOT="${D}" install_{mkspecs,qmake} - # List all the multilib libdirs local libdirs= for libdir in $(get_all_libdirs); do diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass index 86285af..5511995 100644 --- a/eclass/qt4-build-multilib.eclass +++ b/eclass/qt4-build-multilib.eclass @@ -396,12 +396,18 @@ multilib_src_install() { qt4_foreach_target_subdir emake INSTALL_ROOT="${D}" install + if [[ ${PN} == qtcore ]]; then + einfo "Running emake INSTALL_ROOT=${D} install_{mkspecs,qmake}" + emake INSTALL_ROOT="${D}" install_{mkspecs,qmake} + fi + # install private headers of a few modules if has ${PN} qtcore qtdeclarative qtgui qtscript; then local moduledir=${PN#qt} local modulename=Qt$(tr 'a-z' 'A-Z' <<< ${moduledir:0:1})${moduledir:1} [[ ${moduledir} == core ]] && moduledir=corelib + einfo "Installing private headers into ${QT4_HEADERDIR}/${modulename}/private" insinto "${QT4_HEADERDIR#${EPREFIX}}"/${modulename}/private find "${S}"/src/${moduledir} -type f -name '*_p.h' -exec doins '{}' + || die fi