[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/

["Davide Pesavento" <pesa@gentoo.org>]

commit:     42acd288e4e7b27a54d4428926aeda8d8cb02e7a
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Sep  3 08:11:21 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> 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"'