[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, dev-qt/qdbusviewer/

[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, dev-qt/qdbusviewer/

[Davide Pesavento]

commit:     b4058859b5d61f1922b48ab06f57a74e2ac16045
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue Jul  9 08:47:51 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jul  9 08:47:51 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=b4058859

[dev-qt/qdbusviewer] New ebuild, split from qtgui.

---
 dev-qt/qdbusviewer/metadata.xml                | 14 +++++++
 dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild | 51 ++++++++++++++++++++++++++
 dev-qt/qtgui/qtgui-4.8.9999.ebuild             | 22 ++++-------
 3 files changed, 73 insertions(+), 14 deletions(-)

diff --git a/dev-qt/qdbusviewer/metadata.xml b/dev-qt/qdbusviewer/metadata.xml
new file mode 100644
index 0000000..782c134
--- /dev/null
+++ b/dev-qt/qdbusviewer/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>qt</herd>
+	<use>
+		<flag name="c++0x">Build Qt using the C++11 standard</flag>
+		<flag name="exceptions">Add support for exceptions - like catching them
+			inside the event loop (recommended by Nokia)</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt-project.org/</bugs-to>
+		<doc>http://qt-project.org/doc/</doc>
+	</upstream>
+</pkgmetadata>

diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild
new file mode 100644
index 0000000..32c5cf9
--- /dev/null
+++ b/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils qt4-build
+
+DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=]
+	~dev-qt/qtdbus-${PV}[aqua=,debug=]
+	~dev-qt/qtgui-${PV}[aqua=,debug=]
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="tools/qdbus/qdbusviewer"
+	QT4_EXTRACT_DIRECTORIES="
+		include
+		src
+		tools/qdbus"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf+="
+		-system-libpng -system-libjpeg -system-zlib
+		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
+		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
+		-fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
+
+	qt4-build_src_configure
+}
+
+src_install() {
+	qt4-build_src_install
+
+	newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
+	make_desktop_entry qdbusviewer QDBusViewer qdbusviewer 'Qt;Development'
+}

diff --git a/dev-qt/qtgui/qtgui-4.8.9999.ebuild b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
index cb9faae..954576a 100644
--- a/dev-qt/qtgui/qtgui-4.8.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
@@ -14,7 +14,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
-IUSE="+accessibility cups dbus egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
+IUSE="+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
 
 REQUIRED_USE="
 	gtkstyle? ( glib )
@@ -43,7 +43,6 @@ RDEPEND="
 		xv? ( x11-libs/libXv )
 	)
 	cups? ( net-print/cups )
-	dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
 	egl? ( media-libs/mesa[egl] )
 	gtkstyle? (
 		x11-libs/cairo[-qt4]
@@ -82,7 +81,6 @@ pkg_setup() {
 		src"
 
 	use accessibility && QT4_TARGET_DIRECTORIES+=" src/plugins/accessible/widgets"
-	use dbus && QT4_TARGET_DIRECTORIES+=" tools/qdbus/qdbusviewer"
 	use mng && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/mng"
 	use tiff && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/tiff"
 	use trace && QT4_TARGET_DIRECTORIES+=" src/plugins/graphicssystems/trace tools/qttracereplay"
@@ -110,8 +108,6 @@ src_configure() {
 		$(qt_use nas nas-sound system)
 		$(qt_use nis)
 		$(qt_use tiff libtiff system)
-		$(qt_use dbus qdbus)
-		$(qt_use dbus)
 		$(qt_use egl)
 		$(qt_use qt3support)
 		$(qt_use gtkstyle)
@@ -129,11 +125,10 @@ src_configure() {
 	qt4-build_src_configure
 
 	if use gtkstyle; then
-		einfo "patching the Makefile to fix qgtkstyle compilation"
-		sed "s:-I/usr/include/qt4 ::" -i src/gui/Makefile ||
-			die "sed failed"
+		sed -i -e 's:-I/usr/include/qt4 ::' src/gui/Makefile || die "sed failed"
 	fi
-	sed -i -e "s:-I/usr/include/qt4/QtGui ::" src/gui/Makefile || die "sed failed"
+
+	sed -i -e 's:-I/usr/include/qt4/QtGui ::' src/gui/Makefile || die "sed failed"
 }
 
 src_install() {
@@ -187,16 +182,15 @@ src_install() {
 	newicon tools/qtconfig/images/appicon.png qtconfig.png
 	make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings'
 
-	# see bug 388551
+	# bug 388551
 	if use gtkstyle; then
-		cat <<-EOF > "${T}"/qtgui.sh
+		local tempfile=${T}/${PN}${SLOT}.sh
+		cat <<-EOF > "${tempfile}"
 		export GTK2_RC_FILES=\${HOME}/.gtkrc-2.0
 		EOF
 		insinto /etc/profile.d
-		doins "${T}"/qtgui.sh
+		doins "${tempfile}"
 	fi
-
-	use dbus && newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
 }
 
 pkg_postinst() {