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

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

[Davide Pesavento]

commit:     d711bc7ebc06c1e8df7927b2721ccb6eef8beb78
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Jul 22 07:21:11 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jul 23 18:10:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d711bc7e

[Qt5] Disable all SQL drivers and platform plugins in common eclass code.

Simplifies ebuild code and avoids performing useless configure tests.

---
 eclass/qt5-build.eclass                      |    7 +++++++
 x11-libs/qt-core/qt-core-5.9999.ebuild       |    1 -
 x11-libs/qt-dbus/qt-dbus-5.9999.ebuild       |    1 -
 x11-libs/qt-gui/qt-gui-5.9999.ebuild         |    3 +--
 x11-libs/qt-network/qt-network-5.9999.ebuild |    1 -
 x11-libs/qt-opengl/qt-opengl-5.9999.ebuild   |    1 -
 x11-libs/qt-sql/qt-sql-5.9999.ebuild         |    3 ---
 x11-libs/qt-test/qt-test-5.9999.ebuild       |    7 -------
 x11-libs/qt-widgets/qt-widgets-5.9999.ebuild |    1 -
 x11-libs/qt-xml/qt-xml-5.9999.ebuild         |    7 -------
 10 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index d088b06..768c7bd 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -259,6 +259,13 @@ qt5-build_src_configure() {
 		# requires GNU ld >= 2.18
 		-reduce-relocations
 
+		# disable all SQL drivers by default, override in qt-sql
+		-no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-odbc
+		-no-sql-psql -no-sql-sqlite -no-sql-sqlite2 -no-sql-tds
+
+		# disable all platform plugins by default, override in qt-gui
+		-no-xcb -no-xrender -no-eglfs -no-directfb -no-linuxfb -no-kms
+
 		# package-specific options
 		"${myconf[@]}"
 	)

diff --git a/x11-libs/qt-core/qt-core-5.9999.ebuild b/x11-libs/qt-core/qt-core-5.9999.ebuild
index 7a5ec17..d406c35 100644
--- a/x11-libs/qt-core/qt-core-5.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-5.9999.ebuild
@@ -48,7 +48,6 @@ src_configure() {
 		$(qt_use glib)
 		-iconv
 		$(qt_use icu)
-		-no-xcb -no-eglfs -no-directfb
 	)
 	qt5-build_src_configure
 }

diff --git a/x11-libs/qt-dbus/qt-dbus-5.9999.ebuild b/x11-libs/qt-dbus/qt-dbus-5.9999.ebuild
index 5ce81ea..d19b5a4 100644
--- a/x11-libs/qt-dbus/qt-dbus-5.9999.ebuild
+++ b/x11-libs/qt-dbus/qt-dbus-5.9999.ebuild
@@ -34,7 +34,6 @@ QCONFIG_ADD="dbus dbus-linked"
 src_configure() {
 	local myconf=(
 		-dbus-linked
-		-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 33824a7..4cea36d 100644
--- a/x11-libs/qt-gui/qt-gui-5.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
@@ -14,7 +14,7 @@ else
 	KEYWORDS="~amd64"
 fi
 
-# TODO: directfb, eglfs, kms, evdev, ibus
+# TODO: directfb, eglfs, kms, linuxfb, evdev, ibus
 
 IUSE="egl +fontconfig gif +glib jpeg opengl +png udev +xcb"
 
@@ -76,7 +76,6 @@ src_configure() {
 		$(use udev || echo -no-libudev)
 		$(qt_use xcb)
 		-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 439a37d..3413942 100644
--- a/x11-libs/qt-network/qt-network-5.9999.ebuild
+++ b/x11-libs/qt-network/qt-network-5.9999.ebuild
@@ -44,7 +44,6 @@ src_configure() {
 	local myconf=(
 		$(use connman || use networkmanager && echo -dbus-linked || echo -no-dbus)
 		$(use ssl && echo -openssl-linked || echo -no-openssl)
-		-no-xcb -no-eglfs -no-directfb
 	)
 	qt5-build_src_configure
 }

diff --git a/x11-libs/qt-opengl/qt-opengl-5.9999.ebuild b/x11-libs/qt-opengl/qt-opengl-5.9999.ebuild
index d22c8b6..87e63b3 100644
--- a/x11-libs/qt-opengl/qt-opengl-5.9999.ebuild
+++ b/x11-libs/qt-opengl/qt-opengl-5.9999.ebuild
@@ -34,7 +34,6 @@ src_configure() {
 		-accessibility
 		$(qt_use egl)
 		-opengl
-		-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 e20a182..0a16a47 100644
--- a/x11-libs/qt-sql/qt-sql-5.9999.ebuild
+++ b/x11-libs/qt-sql/qt-sql-5.9999.ebuild
@@ -47,9 +47,6 @@ src_configure() {
 		$(qt_use postgres sql-psql   plugin)
 		$(qt_use sqlite   sql-sqlite plugin)
 		$(use sqlite && echo -system-sqlite)
-		-no-sql-db2
-		-no-sql-sqlite2
-		-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 f2c8097..ddc661a 100644
--- a/x11-libs/qt-test/qt-test-5.9999.ebuild
+++ b/x11-libs/qt-test/qt-test-5.9999.ebuild
@@ -29,10 +29,3 @@ DEPEND="${RDEPEND}
 QT5_TARGET_SUBDIRS=(
 	src/testlib
 )
-
-src_configure() {
-	local myconf=(
-		-no-xcb -no-eglfs -no-directfb
-	)
-	qt5-build_src_configure
-}

diff --git a/x11-libs/qt-widgets/qt-widgets-5.9999.ebuild b/x11-libs/qt-widgets/qt-widgets-5.9999.ebuild
index 28cbb70..d48296a 100644
--- a/x11-libs/qt-widgets/qt-widgets-5.9999.ebuild
+++ b/x11-libs/qt-widgets/qt-widgets-5.9999.ebuild
@@ -29,7 +29,6 @@ QT5_TARGET_SUBDIRS=(
 src_configure() {
 	local myconf=(
 		-accessibility
-		-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 ec5ddd2..d273f7b 100644
--- a/x11-libs/qt-xml/qt-xml-5.9999.ebuild
+++ b/x11-libs/qt-xml/qt-xml-5.9999.ebuild
@@ -26,10 +26,3 @@ DEPEND="${RDEPEND}
 QT5_TARGET_SUBDIRS=(
 	src/xml
 )
-
-src_configure() {
-	local myconf=(
-		-no-xcb -no-eglfs -no-directfb
-	)
-	qt5-build_src_configure
-}