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 57E5F1387D3 for ; Sun, 26 Oct 2014 01:22:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 699E5E0D2C; Sun, 26 Oct 2014 01:22:58 +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 BDE9FE0D2C for ; Sun, 26 Oct 2014 01:22:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B7F553404C9 for ; Sun, 26 Oct 2014 01:22:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 640898BF1 for ; Sun, 26 Oct 2014 01:22:55 +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: <1414286436.503fc0ecf6e835bff9f8f9a9a524e94b5d517e00.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt4-build-multilib.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 503fc0ecf6e835bff9f8f9a9a524e94b5d517e00 X-VCS-Branch: master Date: Sun, 26 Oct 2014 01:22:55 +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: a4f4fe45-8e69-4926-9c44-a4b1ebfaa09f X-Archives-Hash: d99e64db81f85fc1378664aa82a19d94 commit: 503fc0ecf6e835bff9f8f9a9a524e94b5d517e00 Author: Michał Górny gentoo org> AuthorDate: Mon Oct 20 20:06:16 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sun Oct 26 01:20:36 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=503fc0ec [qt4-build-multilib.eclass] Install configs for qtchooser. --- eclass/qt4-build-multilib.eclass | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass index 9d25622..d677ae5 100644 --- a/eclass/qt4-build-multilib.eclass +++ b/eclass/qt4-build-multilib.eclass @@ -411,6 +411,25 @@ qt4_multilib_src_install() { if [[ ${PN} == qtcore ]]; then einfo "Running emake INSTALL_ROOT=${D} install_{mkspecs,qmake}" emake INSTALL_ROOT="${D}" install_{mkspecs,qmake} + + # install qtchooser configuration file + cat > "${T}/qt4-${CHOST}.conf" <<-_EOF_ + ${QT4_BINDIR} + ${QT4_LIBDIR} + _EOF_ + + ( + insinto /etc/xdg/qtchooser + doins "${T}/qt4-${CHOST}.conf" + ) + + if multilib_is_native_abi; then + # convenience symlinks + dosym qt4-"${CHOST}".conf /etc/xdg/qtchooser/4.conf + dosym qt4-"${CHOST}".conf /etc/xdg/qtchooser/qt4.conf + # TODO bug 522646: write an eselect module to manage default.conf + dosym qt4.conf /etc/xdg/qtchooser/default.conf + fi fi install_qconfigs