Partial sync with qt overlay: make sure at least one platform plugin is enabled; add dbus USE flag to simplify accessibility and ibus handling; remove support for the obsolete kms plugin.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!

4 files changed, 49 insertions, 31 deletions

diff --git a/dev-qt/qtgui/ChangeLog b/dev-qt/qtgui/ChangeLog
index 4111afd6d0ef..93025cb1cc2c 100644
--- a/dev-qt/qtgui/ChangeLog
+++ b/dev-qt/qtgui/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-qt/qtgui
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.91 2015/07/05 21:13:48 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.92 2015/07/11 18:17:30 pesa Exp $
+
+*qtgui-5.4.2-r1 (11 Jul 2015)
+
+  11 Jul 2015; Davide Pesavento <pesa@gentoo.org> +qtgui-5.4.2-r1.ebuild,
+  -qtgui-5.4.2.ebuild, metadata.xml:
+  Partial sync with qt overlay: make sure at least one platform plugin is
+  enabled; add dbus USE flag to simplify accessibility and ibus handling; remove
+  support for the obsolete kms plugin.
 
   05 Jul 2015; Tobias Klausmann <klausman@gentoo.org> qtgui-4.8.6-r4.ebuild:
   Stable on alpha, bug 530238
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 23208459062f..24b8eba6d06e 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -19,15 +19,25 @@ DIST qtgui-systemtrayicon-plugin-system.patch 51377 SHA256 e8582ebb2a5db99bf8578
 EBUILD qtgui-4.8.5-r4.ebuild 6395 SHA256 b2a5932337fe01247baca27756d6690edb43323d3d2bff29dfc53e52907da122 SHA512 7c3877a1b89068ca36860b71d994da890405aa467bea5b2e4f6fb209e415ff4934496ad4afd0539b6432024fb8b9b2f5a1e70e4910af958a1944a91bd41048ae WHIRLPOOL 5d4a50ba58d147f97a979195e30f01238342bd617679448fe633b970cc15356eee33221ad776817290aab9a1871c77511c2abce76e96dd2937c88b6ace5e8256
 EBUILD qtgui-4.8.6-r4.ebuild 6271 SHA256 6e9d0cc32141e480b63cc66fbae8668813d1f79a3d4be87bb46836285249f4d7 SHA512 fcb29139451ef3411e8e582ba716859e233ca6677172b66429302006ec6b09115608f89eaf012c799566ccdcecfe0f6827ede3ef7f3f9f489f0fffc449ffaba9 WHIRLPOOL efc8476d059aa5ac69cf4702773423d7dd66db11e9dc2ac01246f96c34199f36f7db3d30d58adc6809e72393bd6547a4d55b844e6ea63707b58e2913f5667aeb
 EBUILD qtgui-4.8.7.ebuild 5863 SHA256 9206283348fefbf5539959d2920a31a4d248780c194c86f4f5c8dbeea3b7a3d6 SHA512 8ad343509819f41d4dccf45c3bee06c4b9796f148756b77afeaa5f7aa6403e8ff5c193dce2960f8d5c3d95a1f467b27fbd3e99b74211f3701a2652790752a4f0 WHIRLPOOL 4b77a12dbe556cd78d2d23be411b14fd2ee200bbc2109a3f968b10c3d2f749030a005786d3901929941ace373db2904565c14e890dc37bc5aa7d63c7e9e1b217
-EBUILD qtgui-5.4.2.ebuild 3383 SHA256 0b9b890e1b341c0f459676aff2f262f804e7dcaa680543e7943dd71a43063909 SHA512 5edae517ba6a83d4141196212e173c7d3a933e1f0ee52f10aa56e2667676451a19d938026b2f3c1d5c4b0f69f0fb2b7fae03c82743be419cc6604dc9d3ea53b5 WHIRLPOOL 4e2428b4813c883581e969836f21b4f9797302e413b5cdd311b0fc6c7c3f34d0ce7d9e51cea9476cc980c34683654ba5256972f9edb06de8dca0a19f9a254a27
-MISC ChangeLog 45423 SHA256 fb7e6e875d60b90d843290d5aa3c765f28970152cd33ca30ba2ba6e674623a55 SHA512 7c44f7a8978bd6ddd39237b12976e6b495f1b6f3b76141440d1ec6b36616d0462c22f985b6fa29eb387013e3d899ce3de83f45a593d91eb7ed7aa1a7a703d880 WHIRLPOOL d41eec1c45fdcf6bd26fda4e64b3d683ef6ff53530aeb9b893eab3e1fa93be9f2290bb1b434e1e3d9975047d02a4c8ac84fdad757793c19aacfbf211648685fa
-MISC metadata.xml 1423 SHA256 e4b1b2dd0f615c80e227a4c0d85cc633006264906ec24ede10d4580644029acc SHA512 e86a3f92c6df0d0de971ba70cd84a8751ec7b5df07eaaa46ac87b87f0292c334712e2263b06a5daaddfebb4bb07aabf7b85661ec5a6ed17c07ade5d424dc5181 WHIRLPOOL af2a48984b17c492b6c7cfe1d1021064457a80ba787a2942d207654ad73cb24c20f0164df184aec2852e9b58bfbb030d9380567f196f59061d1dbbedf98dc432
+EBUILD qtgui-5.4.2-r1.ebuild 3333 SHA256 462bc64b0c5f423dcd23fb5a0850b8da229290f3bebba13dc62845090aa5f1e9 SHA512 bca2d284396bd660dd07e84ec7561b090568935ad536431c2d6fc35b6371eacf08c1a0b5b85692c3e69b391bfbb2f0d20e9737e827c15af63c75bd29db0d9799 WHIRLPOOL 5150a655a57b9d39bbed5cd3043b142b340cc302de2622266a4aa7c12fbcf0b15a2b267794f6c8551349b3bdd1e25c83aa2de0f67a8aebdfa001992678b3eb51
+MISC ChangeLog 45756 SHA256 d03cec96533f19f85a617f264b9a5b822970ebd6dfb809855e87dcdd0f6371e1 SHA512 9439e63f0c57932f3e57c1cc2a4c1defa794d8dfe860b0199bb2bd40cd7a08ce26335d76701deb134ab8118b6ee13b1a9e1cdb0a0ecbe844c6a522e9ba9661e0 WHIRLPOOL b5ef06080292da645835cbf20a1265946ae48593712f1cca92cd77ee008f629523b094ff62ae651cb3f6847aba998d1c48ce5ce719dc88a20046676a11b56ab6
+MISC metadata.xml 1367 SHA256 4ba1a4cae7a23ac197be9d6ad9ce7fbe7fb1f7df749001cad6bf1fcb7facab50 SHA512 2b12d92d89b7b0a72dba147310e19041e18d98e31a3fa1fa7fccf25fe501faf0aa35572dfadb0405eb27f5e60aa11593be3a48b95161c9b539825449e28e854b WHIRLPOOL 12540e126a333edb380b2aeb2428b32f4f7892ede902b6ba2e50cd3d8fb354172a5a1b4c0d3d8e36aeeb1f28f4e3b79a8930f0dc82564345ab7dfa273127b7bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iKYEAREIAGYFAlWZng1fFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDFGNDg1MzU4NjMzRTAyNzA3RkY0ODA1QzAz
-RUUwM0ExQ0U1RDU0RTgACgkQA+4Doc5dVOjvlQCgjbjfCC3Y4U5BuKzpger98X7n
-GmAAoJBHu7oFTzsB7OvHWYtcpkiqeCSH
-=fpC1
+iQJ8BAEBCABmBQJVoV28XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9xr4QALtMdUIZakkcMkSxCSsNRkRx
+SD0Zkvjdah67e1OmP+7enBAK1nRI3t1pIXCJzQRasUgjADuGvFuGVRUJdCNR+Npa
+cZ/SwAGQbtvWDSo2pO3ctsjj2DAnNHjK3dOSIN5HjYo82KSH8H87nsXHXyCq7X3G
+w2U1Bq7xY0Mh/VqVILDtMSePLKoejeJg6TnQ+fH3zhLbpWUHZNEZntUgvcJw1iLE
+/Mpiu4ae3xa5rHM4Qph4+UMK5AkVDTXYrwfLC/RA7ZQbfmQdc17mE6x0/jSZyGco
+kRkQkgJ3T7CSSty7VCHJCwqLPC8HkMIcnWb4pLyrTcwn8c3xxb+8BjpttWOfFWj+
+HP3tixc7E0gGI+O2JpeNtzWdL9AdDB66O9KklChwon1yJGXj1ljYo80BKlWHKPlX
+XY/HnAqn4XHoLAoqp7WH7c9Q4qnhGMFkqlDA6QdtPtnMIkPTcr04K+qsQJOOErse
+DuaDPcX8NHCu0Cj+p3LQVC8xvxGulrA6CoXOtkYdgvY1ioMFQj//DVMr2NmhED2B
+GZR2v/EMWZkST1sXjtHj5QA90UVf6MuvfNtmd3VV65PXb0IO64phgd/nwO/L0/8V
+fZ7R6MsgE242xyINuRfdVpgMcS7r5gkYrF9rxLOkNhJZQTy4mTLiDML89owBwaOS
+fFOxLLO4AuHQ4DLieGPS
+=r70Y
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index ce6b0b5326d1..b85699b26290 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -14,7 +14,6 @@
 			GTK+ theme</flag>
 		<flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> for text shaping</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.4.2.ebuild b/dev-qt/qtgui/qtgui-5.4.2-r1.ebuild
index bc349afba193..ac6bea721e5b 100644
--- a/dev-qt/qtgui/qtgui-5.4.2.ebuild
+++ b/dev-qt/qtgui/qtgui-5.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-5.4.2.ebuild,v 1.1 2015/06/17 15:21:03 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-5.4.2-r1.ebuild,v 1.1 2015/07/11 18:17:30 pesa Exp $
 
 EAPI=5
 QT5_MODULE="qtbase"
@@ -12,13 +12,16 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
-# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
+# TODO: directfb, linuxfb, kms integration in eglfs
 
-IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +png udev +xcb"
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle
+	+harfbuzz ibus jpeg +png +udev +xcb"
 REQUIRED_USE="
+	|| ( eglfs xcb )
+	accessibility? ( dbus xcb )
 	egl? ( evdev )
 	eglfs? ( egl )
-	kms? ( egl gles2 )
+	ibus? ( dbus )
 "
 
 RDEPEND="
@@ -28,6 +31,7 @@ RDEPEND="
 	media-libs/freetype:2
 	>=sys-libs/zlib-1.2.5
 	virtual/opengl
+	dbus? ( ~dev-qt/qtdbus-${PV} )
 	egl? ( media-libs/mesa[egl] )
 	evdev? ( sys-libs/mtdev )
 	gtkstyle? (
@@ -37,13 +41,7 @@ RDEPEND="
 	)
 	gles2? ( media-libs/mesa[gles2] )
 	harfbuzz? ( >=media-libs/harfbuzz-0.9.32:= )
-	ibus? ( ~dev-qt/qtdbus-${PV} )
 	jpeg? ( virtual/jpeg:0 )
-	kms? (
-		media-libs/mesa[gbm]
-		virtual/libudev:=
-		x11-libs/libdrm
-	)
 	png? ( media-libs/libpng:0= )
 	udev? ( virtual/libudev:= )
 	xcb? (
@@ -58,12 +56,11 @@ RDEPEND="
 		x11-libs/xcb-util-keysyms
 		x11-libs/xcb-util-renderutil
 		x11-libs/xcb-util-wm
-		accessibility? ( ~dev-qt/qtdbus-${PV} )
 	)
 "
 DEPEND="${RDEPEND}
 	evdev? ( sys-kernel/linux-headers )
-	test? ( ~dev-qt/qtnetwork-${PV} )
+	udev? ( sys-kernel/linux-headers )
 "
 PDEPEND="
 	ibus? ( app-i18n/ibus )
@@ -77,6 +74,8 @@ QT5_TARGET_SUBDIRS=(
 	src/plugins/generic
 	src/plugins/imageformats
 	src/plugins/platforms
+	src/plugins/platforminputcontexts
+	src/plugins/platformthemes
 )
 
 QT5_GENTOO_CONFIG=(
@@ -98,7 +97,6 @@ QT5_GENTOO_CONFIG=(
 	!harfbuzz:no-harfbuzz:
 	jpeg:system-jpeg:IMAGEFORMAT_JPEG
 	!jpeg:no-jpeg:
-	kms:kms:
 	:opengl
 	png:png:
 	png:system-png:IMAGEFORMAT_PNG
@@ -114,19 +112,23 @@ QT5_GENTOO_CONFIG=(
 	xcb::XKB
 )
 
-pkg_setup() {
-	use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2)
-	use ibus     && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus)
-	use xcb	     && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose)
-
+src_prepare() {
 	# egl_x11 is activated when both egl and xcb are enabled
 	use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11)
+
+	# avoid automagic dep on qtdbus
+	use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \
+		src/platformsupport/platformsupport.pro || die
+
+	qt_use_disable_mod ibus dbus \
+		src/plugins/platforminputcontexts/platforminputcontexts.pro
+
+	qt5-build_src_prepare
 }
 
 src_configure() {
 	local myconf=(
-		$(use accessibility && usex xcb -dbus-linked '')
-		$(usex ibus -dbus-linked '')
+		$(usex dbus -dbus-linked '')
 		$(qt_use egl)
 		$(qt_use eglfs)
 		$(qt_use evdev)
@@ -137,7 +139,6 @@ src_configure() {
 		$(qt_use gtkstyle)
 		$(qt_use harfbuzz harfbuzz system)
 		$(qt_use jpeg libjpeg system)
-		$(qt_use kms)
 		-opengl $(usex gles2 es2 desktop)
 		$(qt_use png libpng system)
 		$(qt_use udev libudev)