[gentoo-commits] proj/qt:master commit in: x11-libs/qt-xml/, x11-libs/qt-test/, x11-libs/qt-dbus/, x11-libs/qt-sql/, ...

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-xml/, x11-libs/qt-test/, x11-libs/qt-dbus/, x11-libs/qt-sql/, ...

[Davide Pesavento]

commit:     ec770a3457769981894b572e2c0b6b7ddac6263d
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Jun 29 17:38:06 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jun 29 17:38:06 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ec770a34

Remove problematic configure flags from all Qt5 live ebuilds.

---
 x11-libs/qt-dbus/qt-dbus-5.9999.ebuild       |    4 ++--
 x11-libs/qt-gui/qt-gui-5.9999.ebuild         |    1 -
 x11-libs/qt-network/qt-network-5.9999.ebuild |    3 +--
 x11-libs/qt-sql/qt-sql-5.9999.ebuild         |    3 +--
 x11-libs/qt-test/qt-test-5.9999.ebuild       |    3 +--
 x11-libs/qt-xml/qt-xml-5.9999.ebuild         |    3 +--
 6 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/x11-libs/qt-dbus/qt-dbus-5.9999.ebuild b/x11-libs/qt-dbus/qt-dbus-5.9999.ebuild
index 6050409..8c76abd 100644
--- a/x11-libs/qt-dbus/qt-dbus-5.9999.ebuild
+++ b/x11-libs/qt-dbus/qt-dbus-5.9999.ebuild
@@ -29,12 +29,12 @@ QT5_TARGET_SUBDIRS=(
 	src/tools/qdbuscpp2xml
 	src/dbus
 )
+QCONFIG_ADD="dbus"
 
 src_configure() {
 	local myconf=(
 		-dbus-linked
-		-no-accessibility -no-gui -no-cups
-		-no-xcb -no-eglfs -no-directfb -no-opengl
+		-no-xcb -no-eglfs -no-directfb
 	)
 	qt5-build_src_configure
 }

diff --git a/x11-libs/qt-gui/qt-gui-5.9999.ebuild b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
index 9c8adbd..984bd29 100644
--- a/x11-libs/qt-gui/qt-gui-5.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
@@ -61,7 +61,6 @@ src_configure() {
 		$(qt_use png libpng system)
 		$(use udev || echo -no-libudev)
 		$(qt_use xcb)
-		-no-cups -no-dbus
 		-no-eglfs -no-directfb
 	)
 	qt5-build_src_configure

diff --git a/x11-libs/qt-network/qt-network-5.9999.ebuild b/x11-libs/qt-network/qt-network-5.9999.ebuild
index a3d0921..439a37d 100644
--- a/x11-libs/qt-network/qt-network-5.9999.ebuild
+++ b/x11-libs/qt-network/qt-network-5.9999.ebuild
@@ -44,8 +44,7 @@ src_configure() {
 	local myconf=(
 		$(use connman || use networkmanager && echo -dbus-linked || echo -no-dbus)
 		$(use ssl && echo -openssl-linked || echo -no-openssl)
-		-no-accessibility -no-gui -no-cups
-		-no-xcb -no-eglfs -no-directfb -no-opengl
+		-no-xcb -no-eglfs -no-directfb
 	)
 	qt5-build_src_configure
 }

diff --git a/x11-libs/qt-sql/qt-sql-5.9999.ebuild b/x11-libs/qt-sql/qt-sql-5.9999.ebuild
index 67052c7..e20a182 100644
--- a/x11-libs/qt-sql/qt-sql-5.9999.ebuild
+++ b/x11-libs/qt-sql/qt-sql-5.9999.ebuild
@@ -49,8 +49,7 @@ src_configure() {
 		$(use sqlite && echo -system-sqlite)
 		-no-sql-db2
 		-no-sql-sqlite2
-		-no-accessibility -no-gui -no-cups -no-dbus
-		-no-xcb -no-eglfs -no-directfb -no-opengl
+		-no-xcb -no-eglfs -no-directfb
 	)
 
 	use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" "-L${EPREFIX}/usr/$(get_libdir)/mysql")

diff --git a/x11-libs/qt-test/qt-test-5.9999.ebuild b/x11-libs/qt-test/qt-test-5.9999.ebuild
index 03bda0c..b864f05 100644
--- a/x11-libs/qt-test/qt-test-5.9999.ebuild
+++ b/x11-libs/qt-test/qt-test-5.9999.ebuild
@@ -27,8 +27,7 @@ QT5_TARGET_SUBDIRS=(
 
 src_configure() {
 	local myconf=(
-		-no-accessibility -no-gui -no-cups -no-dbus
-		-no-xcb -no-eglfs -no-directfb -no-opengl
+		-no-xcb -no-eglfs -no-directfb
 	)
 	qt5-build_src_configure
 }

diff --git a/x11-libs/qt-xml/qt-xml-5.9999.ebuild b/x11-libs/qt-xml/qt-xml-5.9999.ebuild
index bfb4b89..fd930c8 100644
--- a/x11-libs/qt-xml/qt-xml-5.9999.ebuild
+++ b/x11-libs/qt-xml/qt-xml-5.9999.ebuild
@@ -27,8 +27,7 @@ QT5_TARGET_SUBDIRS=(
 
 src_configure() {
 	local myconf=(
-		-no-accessibility -no-gui -no-cups -no-dbus
-		-no-xcb -no-eglfs -no-directfb -no-opengl
+		-no-xcb -no-eglfs -no-directfb
 	)
 	qt5-build_src_configure
 }