| 1 |
commit: ec770a3457769981894b572e2c0b6b7ddac6263d |
| 2 |
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Jun 29 17:38:06 2012 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 29 17:38:06 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ec770a34 |
| 7 |
|
| 8 |
Remove problematic configure flags from all Qt5 live ebuilds. |
| 9 |
|
| 10 |
--- |
| 11 |
x11-libs/qt-dbus/qt-dbus-5.9999.ebuild | 4 ++-- |
| 12 |
x11-libs/qt-gui/qt-gui-5.9999.ebuild | 1 - |
| 13 |
x11-libs/qt-network/qt-network-5.9999.ebuild | 3 +-- |
| 14 |
x11-libs/qt-sql/qt-sql-5.9999.ebuild | 3 +-- |
| 15 |
x11-libs/qt-test/qt-test-5.9999.ebuild | 3 +-- |
| 16 |
x11-libs/qt-xml/qt-xml-5.9999.ebuild | 3 +-- |
| 17 |
6 files changed, 6 insertions(+), 11 deletions(-) |
| 18 |
|
| 19 |
diff --git a/x11-libs/qt-dbus/qt-dbus-5.9999.ebuild b/x11-libs/qt-dbus/qt-dbus-5.9999.ebuild |
| 20 |
index 6050409..8c76abd 100644 |
| 21 |
--- a/x11-libs/qt-dbus/qt-dbus-5.9999.ebuild |
| 22 |
+++ b/x11-libs/qt-dbus/qt-dbus-5.9999.ebuild |
| 23 |
@@ -29,12 +29,12 @@ QT5_TARGET_SUBDIRS=( |
| 24 |
src/tools/qdbuscpp2xml |
| 25 |
src/dbus |
| 26 |
) |
| 27 |
+QCONFIG_ADD="dbus" |
| 28 |
|
| 29 |
src_configure() { |
| 30 |
local myconf=( |
| 31 |
-dbus-linked |
| 32 |
- -no-accessibility -no-gui -no-cups |
| 33 |
- -no-xcb -no-eglfs -no-directfb -no-opengl |
| 34 |
+ -no-xcb -no-eglfs -no-directfb |
| 35 |
) |
| 36 |
qt5-build_src_configure |
| 37 |
} |
| 38 |
|
| 39 |
diff --git a/x11-libs/qt-gui/qt-gui-5.9999.ebuild b/x11-libs/qt-gui/qt-gui-5.9999.ebuild |
| 40 |
index 9c8adbd..984bd29 100644 |
| 41 |
--- a/x11-libs/qt-gui/qt-gui-5.9999.ebuild |
| 42 |
+++ b/x11-libs/qt-gui/qt-gui-5.9999.ebuild |
| 43 |
@@ -61,7 +61,6 @@ src_configure() { |
| 44 |
$(qt_use png libpng system) |
| 45 |
$(use udev || echo -no-libudev) |
| 46 |
$(qt_use xcb) |
| 47 |
- -no-cups -no-dbus |
| 48 |
-no-eglfs -no-directfb |
| 49 |
) |
| 50 |
qt5-build_src_configure |
| 51 |
|
| 52 |
diff --git a/x11-libs/qt-network/qt-network-5.9999.ebuild b/x11-libs/qt-network/qt-network-5.9999.ebuild |
| 53 |
index a3d0921..439a37d 100644 |
| 54 |
--- a/x11-libs/qt-network/qt-network-5.9999.ebuild |
| 55 |
+++ b/x11-libs/qt-network/qt-network-5.9999.ebuild |
| 56 |
@@ -44,8 +44,7 @@ src_configure() { |
| 57 |
local myconf=( |
| 58 |
$(use connman || use networkmanager && echo -dbus-linked || echo -no-dbus) |
| 59 |
$(use ssl && echo -openssl-linked || echo -no-openssl) |
| 60 |
- -no-accessibility -no-gui -no-cups |
| 61 |
- -no-xcb -no-eglfs -no-directfb -no-opengl |
| 62 |
+ -no-xcb -no-eglfs -no-directfb |
| 63 |
) |
| 64 |
qt5-build_src_configure |
| 65 |
} |
| 66 |
|
| 67 |
diff --git a/x11-libs/qt-sql/qt-sql-5.9999.ebuild b/x11-libs/qt-sql/qt-sql-5.9999.ebuild |
| 68 |
index 67052c7..e20a182 100644 |
| 69 |
--- a/x11-libs/qt-sql/qt-sql-5.9999.ebuild |
| 70 |
+++ b/x11-libs/qt-sql/qt-sql-5.9999.ebuild |
| 71 |
@@ -49,8 +49,7 @@ src_configure() { |
| 72 |
$(use sqlite && echo -system-sqlite) |
| 73 |
-no-sql-db2 |
| 74 |
-no-sql-sqlite2 |
| 75 |
- -no-accessibility -no-gui -no-cups -no-dbus |
| 76 |
- -no-xcb -no-eglfs -no-directfb -no-opengl |
| 77 |
+ -no-xcb -no-eglfs -no-directfb |
| 78 |
) |
| 79 |
|
| 80 |
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" "-L${EPREFIX}/usr/$(get_libdir)/mysql") |
| 81 |
|
| 82 |
diff --git a/x11-libs/qt-test/qt-test-5.9999.ebuild b/x11-libs/qt-test/qt-test-5.9999.ebuild |
| 83 |
index 03bda0c..b864f05 100644 |
| 84 |
--- a/x11-libs/qt-test/qt-test-5.9999.ebuild |
| 85 |
+++ b/x11-libs/qt-test/qt-test-5.9999.ebuild |
| 86 |
@@ -27,8 +27,7 @@ QT5_TARGET_SUBDIRS=( |
| 87 |
|
| 88 |
src_configure() { |
| 89 |
local myconf=( |
| 90 |
- -no-accessibility -no-gui -no-cups -no-dbus |
| 91 |
- -no-xcb -no-eglfs -no-directfb -no-opengl |
| 92 |
+ -no-xcb -no-eglfs -no-directfb |
| 93 |
) |
| 94 |
qt5-build_src_configure |
| 95 |
} |
| 96 |
|
| 97 |
diff --git a/x11-libs/qt-xml/qt-xml-5.9999.ebuild b/x11-libs/qt-xml/qt-xml-5.9999.ebuild |
| 98 |
index bfb4b89..fd930c8 100644 |
| 99 |
--- a/x11-libs/qt-xml/qt-xml-5.9999.ebuild |
| 100 |
+++ b/x11-libs/qt-xml/qt-xml-5.9999.ebuild |
| 101 |
@@ -27,8 +27,7 @@ QT5_TARGET_SUBDIRS=( |
| 102 |
|
| 103 |
src_configure() { |
| 104 |
local myconf=( |
| 105 |
- -no-accessibility -no-gui -no-cups -no-dbus |
| 106 |
- -no-xcb -no-eglfs -no-directfb -no-opengl |
| 107 |
+ -no-xcb -no-eglfs -no-directfb |
| 108 |
) |
| 109 |
qt5-build_src_configure |
| 110 |
} |
Archives