[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/

["Davide Pesavento" <pesa@gentoo.org>]

commit:     4a53db2477f5e2f9088f20b43830306aa51f3329
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue Oct  1 00:49:41 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Oct  1 00:49:41 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4a53db24

[dev-qt/qtgui:5] Add support for inputcontext plugins.

Package-Manager: portage-2.2.7

---
 dev-qt/qtgui/metadata.xml          |  3 ++-
 dev-qt/qtgui/qtgui-5.2.9999.ebuild | 10 ++++++++--
 dev-qt/qtgui/qtgui-5.9999.ebuild   | 10 ++++++++--
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index 315ddb4..c02d5b6 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -17,7 +17,8 @@
 		<flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> for text shaping
 			(EXPERIMENTAL). If enabled, it can still be disabled at runtime by
 			setting QT_HARFBUZZ environment variable to &quot;old&quot;.</flag>
-		<flag name="kms">Enable KMS-based QPA plugin</flag>
+		<flag name="ibus">Build the IBus input method plugin</flag>
+		<flag name="kms">Build the KMS platform plugin</flag>
 		<flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
 			this does not mean you can compile pure Qt3 programs with Qt4.</flag>
 		<flag name="trace">

diff --git a/dev-qt/qtgui/qtgui-5.2.9999.ebuild b/dev-qt/qtgui/qtgui-5.2.9999.ebuild
index 417d5d1..299d3a8 100644
--- a/dev-qt/qtgui/qtgui-5.2.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.2.9999.ebuild
@@ -16,9 +16,9 @@ else
 	KEYWORDS="~amd64"
 fi
 
-# TODO: directfb, linuxfb, ibus
+# TODO: directfb, linuxfb, offscreen
 
-IUSE="accessibility eglfs evdev gif gles2 +glib harfbuzz jpeg kms opengl +png udev +xcb"
+IUSE="accessibility eglfs evdev gif gles2 +glib harfbuzz ibus jpeg kms opengl +png udev +xcb"
 REQUIRED_USE="
 	eglfs? ( evdev gles2 )
 	gles2? ( opengl )
@@ -37,6 +37,7 @@ RDEPEND="
 	) )
 	glib? ( dev-libs/glib:2 )
 	harfbuzz? ( >=media-libs/harfbuzz-0.9.12:0= )
+	ibus? ( ~dev-qt/qtdbus-${PV}[debug=] )
 	jpeg? ( virtual/jpeg:0 )
 	kms? (
 		media-libs/mesa[gbm]
@@ -65,11 +66,15 @@ DEPEND="${RDEPEND}
 	evdev? ( sys-kernel/linux-headers )
 	test? ( ~dev-qt/qtnetwork-${PV}[debug=] )
 "
+PDEPEND="
+	ibus? ( app-i18n/ibus )
+"
 
 QT5_TARGET_SUBDIRS=(
 	src/gui
 	src/platformsupport
 	src/plugins/imageformats
+	src/plugins/platforminputcontexts/compose
 	src/plugins/platforms
 )
 
@@ -91,6 +96,7 @@ pkg_setup() {
 			$(use gles2 && echo QT_EGL)
 			$(use jpeg && echo QT_IMAGEFORMAT_JPEG)"
 
+	use ibus && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus)
 	use opengl && QT5_TARGET_SUBDIRS+=(src/openglextensions)
 
 	qt5-build_pkg_setup

diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild
index 417d5d1..299d3a8 100644
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild
@@ -16,9 +16,9 @@ else
 	KEYWORDS="~amd64"
 fi
 
-# TODO: directfb, linuxfb, ibus
+# TODO: directfb, linuxfb, offscreen
 
-IUSE="accessibility eglfs evdev gif gles2 +glib harfbuzz jpeg kms opengl +png udev +xcb"
+IUSE="accessibility eglfs evdev gif gles2 +glib harfbuzz ibus jpeg kms opengl +png udev +xcb"
 REQUIRED_USE="
 	eglfs? ( evdev gles2 )
 	gles2? ( opengl )
@@ -37,6 +37,7 @@ RDEPEND="
 	) )
 	glib? ( dev-libs/glib:2 )
 	harfbuzz? ( >=media-libs/harfbuzz-0.9.12:0= )
+	ibus? ( ~dev-qt/qtdbus-${PV}[debug=] )
 	jpeg? ( virtual/jpeg:0 )
 	kms? (
 		media-libs/mesa[gbm]
@@ -65,11 +66,15 @@ DEPEND="${RDEPEND}
 	evdev? ( sys-kernel/linux-headers )
 	test? ( ~dev-qt/qtnetwork-${PV}[debug=] )
 "
+PDEPEND="
+	ibus? ( app-i18n/ibus )
+"
 
 QT5_TARGET_SUBDIRS=(
 	src/gui
 	src/platformsupport
 	src/plugins/imageformats
+	src/plugins/platforminputcontexts/compose
 	src/plugins/platforms
 )
 
@@ -91,6 +96,7 @@ pkg_setup() {
 			$(use gles2 && echo QT_EGL)
 			$(use jpeg && echo QT_IMAGEFORMAT_JPEG)"
 
+	use ibus && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus)
 	use opengl && QT5_TARGET_SUBDIRS+=(src/openglextensions)
 
 	qt5-build_pkg_setup