| 1 |
commit: 692d37c05ebe292513576412543214914a464391 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 27 13:36:00 2014 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 27 13:36:00 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=692d37c0 |
| 7 |
|
| 8 |
[dev-qt/qtgui:5] Simplify dbus handling. |
| 9 |
|
| 10 |
qt5_base_configure already passes -no-dbus, no need to repeat it here. |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.10 |
| 13 |
|
| 14 |
--- |
| 15 |
dev-qt/qtgui/qtgui-5.3.1.ebuild | 7 +------ |
| 16 |
dev-qt/qtgui/qtgui-5.3.9999.ebuild | 7 +------ |
| 17 |
dev-qt/qtgui/qtgui-5.9999.ebuild | 7 +------ |
| 18 |
3 files changed, 3 insertions(+), 18 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-qt/qtgui/qtgui-5.3.1.ebuild b/dev-qt/qtgui/qtgui-5.3.1.ebuild |
| 21 |
index 14c0fef..ee936d2 100644 |
| 22 |
--- a/dev-qt/qtgui/qtgui-5.3.1.ebuild |
| 23 |
+++ b/dev-qt/qtgui/qtgui-5.3.1.ebuild |
| 24 |
@@ -121,11 +121,6 @@ pkg_setup() { |
| 25 |
} |
| 26 |
|
| 27 |
src_configure() { |
| 28 |
- local dbus="-no-dbus" |
| 29 |
- if use accessibility && use xcb; then |
| 30 |
- dbus="-dbus" |
| 31 |
- fi |
| 32 |
- |
| 33 |
local gl="-no-opengl" |
| 34 |
if use gles2; then |
| 35 |
gl="-opengl es2" |
| 36 |
@@ -134,7 +129,7 @@ src_configure() { |
| 37 |
fi |
| 38 |
|
| 39 |
local myconf=( |
| 40 |
- ${dbus} |
| 41 |
+ $(use accessibility && use xcb && echo -dbus-linked) |
| 42 |
$(qt_use egl) |
| 43 |
$(qt_use eglfs) |
| 44 |
$(qt_use evdev) |
| 45 |
|
| 46 |
diff --git a/dev-qt/qtgui/qtgui-5.3.9999.ebuild b/dev-qt/qtgui/qtgui-5.3.9999.ebuild |
| 47 |
index 14c0fef..ee936d2 100644 |
| 48 |
--- a/dev-qt/qtgui/qtgui-5.3.9999.ebuild |
| 49 |
+++ b/dev-qt/qtgui/qtgui-5.3.9999.ebuild |
| 50 |
@@ -121,11 +121,6 @@ pkg_setup() { |
| 51 |
} |
| 52 |
|
| 53 |
src_configure() { |
| 54 |
- local dbus="-no-dbus" |
| 55 |
- if use accessibility && use xcb; then |
| 56 |
- dbus="-dbus" |
| 57 |
- fi |
| 58 |
- |
| 59 |
local gl="-no-opengl" |
| 60 |
if use gles2; then |
| 61 |
gl="-opengl es2" |
| 62 |
@@ -134,7 +129,7 @@ src_configure() { |
| 63 |
fi |
| 64 |
|
| 65 |
local myconf=( |
| 66 |
- ${dbus} |
| 67 |
+ $(use accessibility && use xcb && echo -dbus-linked) |
| 68 |
$(qt_use egl) |
| 69 |
$(qt_use eglfs) |
| 70 |
$(qt_use evdev) |
| 71 |
|
| 72 |
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 73 |
index 6bcb9f8..a755ca2 100644 |
| 74 |
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 75 |
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 76 |
@@ -122,11 +122,6 @@ pkg_setup() { |
| 77 |
} |
| 78 |
|
| 79 |
src_configure() { |
| 80 |
- local dbus="-no-dbus" |
| 81 |
- if use accessibility && use xcb; then |
| 82 |
- dbus="-dbus" |
| 83 |
- fi |
| 84 |
- |
| 85 |
local gl="-no-opengl" |
| 86 |
if use gles2; then |
| 87 |
gl="-opengl es2" |
| 88 |
@@ -135,7 +130,7 @@ src_configure() { |
| 89 |
fi |
| 90 |
|
| 91 |
local myconf=( |
| 92 |
- ${dbus} |
| 93 |
+ $(use accessibility && use xcb && echo -dbus-linked) |
| 94 |
$(qt_use egl) |
| 95 |
$(qt_use eglfs) |
| 96 |
$(qt_use evdev) |
Archives