[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, dev-qt/qtcore/, eclass/, dev-qt/qtwidgets/

[Davide Pesavento]

commit:     5fe0e48523ce64aa2fec7f91d62ba97d20329037
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 29 23:39:27 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jul 29 23:39:27 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=5fe0e485

[Qt5] Drop USE=glib and enable it unconditionally.

---
 .../{qtcore-5.3.1.ebuild => qtcore-5.3.1-r1.ebuild}     |  5 ++---
 dev-qt/qtcore/qtcore-5.3.9999.ebuild                    |  5 ++---
 dev-qt/qtcore/qtcore-5.9999.ebuild                      |  5 ++---
 .../qtgui/{qtgui-5.3.1.ebuild => qtgui-5.3.1-r1.ebuild} |  7 +++----
 dev-qt/qtgui/qtgui-5.3.9999.ebuild                      |  7 +++----
 dev-qt/qtgui/qtgui-5.9999.ebuild                        |  7 +++----
 ...idgets-5.3.1-r1.ebuild => qtwidgets-5.3.1-r2.ebuild} |  0
 eclass/qt5-build.eclass                                 | 17 +++++++++++++----
 8 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-5.3.1.ebuild b/dev-qt/qtcore/qtcore-5.3.1-r1.ebuild
similarity index 90%
rename from dev-qt/qtcore/qtcore-5.3.1.ebuild
rename to dev-qt/qtcore/qtcore-5.3.1-r1.ebuild
index f3675ba..ab2aa2e 100644
--- a/dev-qt/qtcore/qtcore-5.3.1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.3.1-r1.ebuild
@@ -16,13 +16,13 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-IUSE="+glib icu"
+IUSE="icu"
 
 DEPEND="
+	dev-libs/glib:2
 	>=dev-libs/libpcre-8.30[pcre16]
 	sys-libs/zlib
 	virtual/libiconv
-	glib? ( dev-libs/glib:2 )
 	icu? ( dev-libs/icu:= )
 "
 RDEPEND="${DEPEND}"
@@ -36,7 +36,6 @@ QT5_TARGET_SUBDIRS=(
 
 src_configure() {
 	local myconf=(
-		$(qt_use glib)
 		$(qt_use icu)
 	)
 	qt5-build_src_configure

diff --git a/dev-qt/qtcore/qtcore-5.3.9999.ebuild b/dev-qt/qtcore/qtcore-5.3.9999.ebuild
index f3675ba..ab2aa2e 100644
--- a/dev-qt/qtcore/qtcore-5.3.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.3.9999.ebuild
@@ -16,13 +16,13 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-IUSE="+glib icu"
+IUSE="icu"
 
 DEPEND="
+	dev-libs/glib:2
 	>=dev-libs/libpcre-8.30[pcre16]
 	sys-libs/zlib
 	virtual/libiconv
-	glib? ( dev-libs/glib:2 )
 	icu? ( dev-libs/icu:= )
 "
 RDEPEND="${DEPEND}"
@@ -36,7 +36,6 @@ QT5_TARGET_SUBDIRS=(
 
 src_configure() {
 	local myconf=(
-		$(qt_use glib)
 		$(qt_use icu)
 	)
 	qt5-build_src_configure

diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index f3675ba..ab2aa2e 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -16,13 +16,13 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-IUSE="+glib icu"
+IUSE="icu"
 
 DEPEND="
+	dev-libs/glib:2
 	>=dev-libs/libpcre-8.30[pcre16]
 	sys-libs/zlib
 	virtual/libiconv
-	glib? ( dev-libs/glib:2 )
 	icu? ( dev-libs/icu:= )
 "
 RDEPEND="${DEPEND}"
@@ -36,7 +36,6 @@ QT5_TARGET_SUBDIRS=(
 
 src_configure() {
 	local myconf=(
-		$(qt_use glib)
 		$(qt_use icu)
 	)
 	qt5-build_src_configure

diff --git a/dev-qt/qtgui/qtgui-5.3.1.ebuild b/dev-qt/qtgui/qtgui-5.3.1-r1.ebuild
similarity index 94%
rename from dev-qt/qtgui/qtgui-5.3.1.ebuild
rename to dev-qt/qtgui/qtgui-5.3.1-r1.ebuild
index a82e0eb..b76db5c 100644
--- a/dev-qt/qtgui/qtgui-5.3.1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.3.1-r1.ebuild
@@ -18,7 +18,7 @@ fi
 
 # TODO: directfb, linuxfb, offscreen (auto-depends on X11)
 
-IUSE="accessibility egl eglfs evdev +gif gles2 +glib harfbuzz ibus jpeg kms +opengl +png udev +xcb"
+IUSE="accessibility egl eglfs evdev +gif gles2 harfbuzz ibus jpeg kms +opengl +png udev +xcb"
 REQUIRED_USE="
 	egl? ( evdev opengl )
 	eglfs? ( egl )
@@ -27,14 +27,14 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	~dev-qt/qtcore-${PV}[debug=,glib=]
+	dev-libs/glib:2
+	~dev-qt/qtcore-${PV}[debug=]
 	media-libs/fontconfig
 	media-libs/freetype:2
 	sys-libs/zlib
 	egl? ( media-libs/mesa[egl] )
 	evdev? ( sys-libs/mtdev )
 	gles2? ( media-libs/mesa[gles2] )
-	glib? ( dev-libs/glib:2 )
 	harfbuzz? ( >=media-libs/harfbuzz-0.9.12:0= )
 	ibus? ( ~dev-qt/qtdbus-${PV}[debug=] )
 	jpeg? ( virtual/jpeg:0 )
@@ -139,7 +139,6 @@ src_configure() {
 		-system-freetype
 		$(use gif || echo -no-gif)
 		${gl}
-		$(qt_use glib)
 		$(qt_use harfbuzz harfbuzz system)
 		$(qt_use jpeg libjpeg system)
 		$(qt_use kms)

diff --git a/dev-qt/qtgui/qtgui-5.3.9999.ebuild b/dev-qt/qtgui/qtgui-5.3.9999.ebuild
index a82e0eb..b76db5c 100644
--- a/dev-qt/qtgui/qtgui-5.3.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.3.9999.ebuild
@@ -18,7 +18,7 @@ fi
 
 # TODO: directfb, linuxfb, offscreen (auto-depends on X11)
 
-IUSE="accessibility egl eglfs evdev +gif gles2 +glib harfbuzz ibus jpeg kms +opengl +png udev +xcb"
+IUSE="accessibility egl eglfs evdev +gif gles2 harfbuzz ibus jpeg kms +opengl +png udev +xcb"
 REQUIRED_USE="
 	egl? ( evdev opengl )
 	eglfs? ( egl )
@@ -27,14 +27,14 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	~dev-qt/qtcore-${PV}[debug=,glib=]
+	dev-libs/glib:2
+	~dev-qt/qtcore-${PV}[debug=]
 	media-libs/fontconfig
 	media-libs/freetype:2
 	sys-libs/zlib
 	egl? ( media-libs/mesa[egl] )
 	evdev? ( sys-libs/mtdev )
 	gles2? ( media-libs/mesa[gles2] )
-	glib? ( dev-libs/glib:2 )
 	harfbuzz? ( >=media-libs/harfbuzz-0.9.12:0= )
 	ibus? ( ~dev-qt/qtdbus-${PV}[debug=] )
 	jpeg? ( virtual/jpeg:0 )
@@ -139,7 +139,6 @@ src_configure() {
 		-system-freetype
 		$(use gif || echo -no-gif)
 		${gl}
-		$(qt_use glib)
 		$(qt_use harfbuzz harfbuzz system)
 		$(qt_use jpeg libjpeg system)
 		$(qt_use kms)

diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild
index abb068c..1a468bb 100644
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild
@@ -18,7 +18,7 @@ fi
 
 # TODO: directfb, linuxfb, offscreen (auto-depends on X11)
 
-IUSE="accessibility egl eglfs evdev +gif gles2 +glib harfbuzz ibus jpeg kms +opengl +png udev +xcb"
+IUSE="accessibility egl eglfs evdev +gif gles2 harfbuzz ibus jpeg kms +opengl +png udev +xcb"
 REQUIRED_USE="
 	egl? ( evdev opengl )
 	eglfs? ( egl )
@@ -27,14 +27,14 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	~dev-qt/qtcore-${PV}[debug=,glib=]
+	dev-libs/glib:2
+	~dev-qt/qtcore-${PV}[debug=]
 	media-libs/fontconfig
 	media-libs/freetype:2
 	sys-libs/zlib
 	egl? ( media-libs/mesa[egl] )
 	evdev? ( sys-libs/mtdev )
 	gles2? ( media-libs/mesa[gles2] )
-	glib? ( dev-libs/glib:2 )
 	harfbuzz? ( >=media-libs/harfbuzz-0.9.12:0= )
 	ibus? ( ~dev-qt/qtdbus-${PV}[debug=] )
 	jpeg? ( virtual/jpeg:0 )
@@ -140,7 +140,6 @@ src_configure() {
 		-system-freetype
 		$(use gif || echo -no-gif)
 		${gl}
-		$(qt_use glib)
 		$(qt_use harfbuzz harfbuzz system)
 		$(qt_use jpeg libjpeg system)
 		$(qt_use kms)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.3.1-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.3.1-r2.ebuild
similarity index 100%
rename from dev-qt/qtwidgets/qtwidgets-5.3.1-r1.ebuild
rename to dev-qt/qtwidgets/qtwidgets-5.3.1-r2.ebuild

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 464e2d0..96c3d77 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -483,9 +483,18 @@ qt5_base_configure() {
 		#-no-gif
 
 		# disable everything to prevent automagic deps (part 1)
-		-no-mtdev -no-journald -no-libpng -no-libjpeg
-		-no-freetype -no-harfbuzz -no-openssl -no-xinput2
-		-no-xcb-xlib -no-glib -no-pulseaudio -no-alsa
+		-no-mtdev
+		-no-journald
+		-no-libpng -no-libjpeg
+		-no-freetype -no-harfbuzz
+		-no-openssl
+		-no-xinput2 -no-xcb-xlib
+
+		# always enable glib event loop support
+		-glib
+
+		# disable everything to prevent automagic deps (part 2)
+		-no-pulseaudio -no-alsa
 
 		# disable gtkstyle because it adds qt4 include paths to the compiler
 		# command line if x11-libs/cairo is built with USE=qt4 (bug 433826)
@@ -511,7 +520,7 @@ qt5_base_configure() {
 		# always enable iconv support
 		-iconv
 
-		# disable everything to prevent automagic deps (part 2)
+		# disable everything to prevent automagic deps (part 3)
 		-no-cups -no-evdev -no-icu -no-fontconfig -no-dbus
 
 		# don't strip