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 155D4138010 for ; Mon, 3 Sep 2012 08:11:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C0B84E0123; Mon, 3 Sep 2012 08:11:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 820F1E0123 for ; Mon, 3 Sep 2012 08:11:32 +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 E30EA33D8B3 for ; Mon, 3 Sep 2012 08:11:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 7AFF4E543D for ; Mon, 3 Sep 2012 08:11:30 +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: <1346659881.42acd288e4e7b27a54d4428926aeda8d8cb02e7a.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/ X-VCS-Repository: proj/qt X-VCS-Files: x11-libs/qt-gui/qt-gui-4.8.9999.ebuild X-VCS-Directories: x11-libs/qt-gui/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 42acd288e4e7b27a54d4428926aeda8d8cb02e7a X-VCS-Branch: master Date: Mon, 3 Sep 2012 08:11:30 +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: cf96fa19-7e88-40ca-a196-f3c9a8d47254 X-Archives-Hash: f131da749a74c19041c49d93698efeae commit: 42acd288e4e7b27a54d4428926aeda8d8cb02e7a Author: Davide Pesavento gmail com> AuthorDate: Mon Sep 3 08:11:21 2012 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Mon Sep 3 08:11:21 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=42acd288 [x11-libs/qt-gui:4] Sync with portage. (Portage version: 2.2.0_alpha123-r2/git/Linux x86_64, unsigned Manifest commit) --- x11-libs/qt-gui/qt-gui-4.8.9999.ebuild | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild index eb7cbb2..f77df95 100644 --- a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild +++ b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild @@ -198,7 +198,7 @@ src_install() { # which are located under tools/designer/src/lib/* # So instead of installing both, we create the private folder # and drop tools/designer/src/lib/* headers in it. - if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then + if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then insinto "${QTLIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/ else insinto "${QTHEADERDIR#${EPREFIX}}"/QtDesigner/private/ @@ -207,14 +207,14 @@ src_install() { doins "${S}"/tools/designer/src/lib/sdk/* # install private headers - if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then + if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/ else insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private fi find "${S}"/src/gui -type f -name '*_p.h' -exec doins {} + - if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then + if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then # rerun to get links to headers right fix_includes fi @@ -226,20 +226,22 @@ src_install() { doicon tools/designer/src/designer/images/designer.png \ tools/linguist/linguist/images/icons/linguist-128-32.png + use dbus && doicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner' make_desktop_entry linguist Linguist linguist-128-32 'Qt;Development;GUIDesigner' } pkg_postinst() { - # raster is the default graphicssystems, set it if first install + # raster is the default graphicssystems, set it on first install eselect qtgraphicssystem set raster --use-old - elog "Starting with Qt 4.8.0, you may choose the active Qt Graphics System" + + elog "Starting with Qt 4.8, you may choose the active Qt Graphics System" elog "by using a new eselect module called qtgraphicssystem." - elog "Run" - elog " eselect qtgraphicssystem" - elog "for more information." - if use gtkstyle ; then + elog "Run \`eselect qtgraphicssystem\` for more information." + + if use gtkstyle; then # see bug 388551 + elog elog "For Qt's GTK style to work, you need to either export" elog "the following variable into your environment:" elog ' GTK2_RC_FILES="$HOME/.gtkrc-2.0"'