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

[Davide Pesavento]

commit:     692d37c05ebe292513576412543214914a464391
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 27 13:36:00 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jul 27 13:36:00 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=692d37c0

[dev-qt/qtgui:5] Simplify dbus handling.

qt5_base_configure already passes -no-dbus, no need to repeat it here.

Package-Manager: portage-2.2.10

---
 dev-qt/qtgui/qtgui-5.3.1.ebuild    | 7 +------
 dev-qt/qtgui/qtgui-5.3.9999.ebuild | 7 +------
 dev-qt/qtgui/qtgui-5.9999.ebuild   | 7 +------
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/dev-qt/qtgui/qtgui-5.3.1.ebuild b/dev-qt/qtgui/qtgui-5.3.1.ebuild
index 14c0fef..ee936d2 100644
--- a/dev-qt/qtgui/qtgui-5.3.1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.3.1.ebuild
@@ -121,11 +121,6 @@ pkg_setup() {
 }
 
 src_configure() {
-       local dbus="-no-dbus"
-       if use accessibility && use xcb; then
-               dbus="-dbus"
-       fi
-
        local gl="-no-opengl"
        if use gles2; then
                gl="-opengl es2"
@@ -134,7 +129,7 @@ src_configure() {
        fi
 
        local myconf=(
-               ${dbus}
+               $(use accessibility && use xcb && echo -dbus-linked)
                $(qt_use egl)
                $(qt_use eglfs)
                $(qt_use evdev)

diff --git a/dev-qt/qtgui/qtgui-5.3.9999.ebuild 
b/dev-qt/qtgui/qtgui-5.3.9999.ebuild
index 14c0fef..ee936d2 100644
--- a/dev-qt/qtgui/qtgui-5.3.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.3.9999.ebuild
@@ -121,11 +121,6 @@ pkg_setup() {
 }
 
 src_configure() {
-       local dbus="-no-dbus"
-       if use accessibility && use xcb; then
-               dbus="-dbus"
-       fi
-
        local gl="-no-opengl"
        if use gles2; then
                gl="-opengl es2"
@@ -134,7 +129,7 @@ src_configure() {
        fi
 
        local myconf=(
-               ${dbus}
+               $(use accessibility && use xcb && echo -dbus-linked)
                $(qt_use egl)
                $(qt_use eglfs)
                $(qt_use evdev)

diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild
index 6bcb9f8..a755ca2 100644
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild
@@ -122,11 +122,6 @@ pkg_setup() {
 }
 
 src_configure() {
-       local dbus="-no-dbus"
-       if use accessibility && use xcb; then
-               dbus="-dbus"
-       fi
-
        local gl="-no-opengl"
        if use gles2; then
                gl="-opengl es2"
@@ -135,7 +130,7 @@ src_configure() {
        fi
 
        local myconf=(
-               ${dbus}
+               $(use accessibility && use xcb && echo -dbus-linked)
                $(qt_use egl)
                $(qt_use eglfs)
                $(qt_use evdev)