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

[Davide Pesavento]

commit:     601d1aa24a1dc4612279044dea825e393717c50c
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue Aug 28 03:05:26 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Aug 28 03:05:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=601d1aa2

[x11-libs/qt-gui:5] Introduce USE=accessibility, add missing deps.

This fixes bug 431320 by Patrick Lauer.

(Portage version: 2.2.0_alpha122/git/Linux x86_64, unsigned Manifest commit)

---
 x11-libs/qt-gui/qt-gui-5.9999.ebuild |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/x11-libs/qt-gui/qt-gui-5.9999.ebuild b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
index 3ad5546..9a17a92 100644
--- a/x11-libs/qt-gui/qt-gui-5.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
@@ -16,7 +16,7 @@ fi
 
 # TODO: directfb, linuxfb, ibus
 
-IUSE="egl eglfs evdev gif gles2 +glib jpeg kms opengl +png udev +xcb"
+IUSE="+accessibility egl eglfs evdev gif gles2 +glib jpeg kms opengl +png udev +xcb"
 REQUIRED_USE="
 	egl? ( gles2 )
 	eglfs? ( egl evdev )
@@ -53,6 +53,10 @@ RDEPEND="
 		x11-libs/xcb-util-keysyms
 		x11-libs/xcb-util-renderutil
 		x11-libs/xcb-util-wm
+		accessibility? (
+			app-accessibility/at-spi2-core
+			~x11-libs/qt-dbus-${PV}[debug=]
+		)
 	)
 "
 DEPEND="${RDEPEND}
@@ -69,7 +73,7 @@ QT5_TARGET_SUBDIRS=(
 
 pkg_setup() {
 	QCONFIG_ADD="
-		accessibility
+		$(usev accessibility)
 		$(usev egl)
 		$(usev eglfs)
 		$(usev evdev)
@@ -88,6 +92,11 @@ pkg_setup() {
 }
 
 src_configure() {
+	local dbus="-no-dbus"
+	if use accessibility && use xcb; then
+		dbus="-dbus"
+	fi
+
 	local opengl="-no-opengl"
 	if use gles2; then
 		opengl="-opengl es2"
@@ -96,7 +105,8 @@ src_configure() {
 	fi
 
 	local myconf=(
-		-accessibility
+		$(qt_use accessibility)
+		${dbus}
 		$(qt_use egl)
 		$(qt_use eglfs)
 		$(qt_use evdev)
@@ -109,7 +119,6 @@ src_configure() {
 		$(qt_use png libpng system)
 		$(use udev || echo -no-libudev)
 		$(use xcb && echo -xcb -xrender)
-		-no-dbus
 	)
 	qt5-build_src_configure
 }