Add gtkstyle USE flag by Harvey Mittens <teknocratdefunct@riseup.net> and Davide Pesavento <pesa@gentoo.org> wrt bug #526866.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

3 files changed, 35 insertions, 23 deletions

diff --git a/dev-qt/qtgui/ChangeLog b/dev-qt/qtgui/ChangeLog
index dbec5f433778..529a9c40aacb 100644
--- a/dev-qt/qtgui/ChangeLog
+++ b/dev-qt/qtgui/ChangeLog
@@ -1,6 +1,10 @@
 # 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.76 2015/04/15 03:47:56 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.77 2015/04/19 18:49:57 kensington Exp $
+
+  19 Apr 2015; Michael Palimaka <kensington@gentoo.org> qtgui-5.4.1-r1.ebuild:
+  Add gtkstyle USE flag by Harvey Mittens <teknocratdefunct@riseup.net> and
+  Davide Pesavento <pesa@gentoo.org> wrt bug #526866.
 
   15 Apr 2015; Yixun Lan <dlan@gentoo.org> qtgui-4.8.6-r2.ebuild:
   keyword arm64, tested on cortex-a53 hardware
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 379c976c34b5..b056739662ff 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -16,25 +16,24 @@ DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430f
 DIST qtgui-systemtrayicon-plugin-system.patch 51377 SHA256 e8582ebb2a5db99bf85789585516459ace42fc2b57fc7d5ff6156a2819bda282 SHA512 0d74b61e23af2e8ef0619ee616c4b775761514f53ba79bcb25b32b7e55beab3575c0d279ba1b016498804023bb78f8cff61964ce56f80642f648406f7c303679 WHIRLPOOL 03cc247a2a0e3b77fc541fa0b47abb125c8f7b304037f2067488861f12fdab25d3b3b3a7cf90626c229aa85a2d43ae4319c0f838b6eeb5ecdfe838a365ed8a58
 EBUILD qtgui-4.8.5-r4.ebuild 6395 SHA256 b2a5932337fe01247baca27756d6690edb43323d3d2bff29dfc53e52907da122 SHA512 7c3877a1b89068ca36860b71d994da890405aa467bea5b2e4f6fb209e415ff4934496ad4afd0539b6432024fb8b9b2f5a1e70e4910af958a1944a91bd41048ae WHIRLPOOL 5d4a50ba58d147f97a979195e30f01238342bd617679448fe633b970cc15356eee33221ad776817290aab9a1871c77511c2abce76e96dd2937c88b6ace5e8256
 EBUILD qtgui-4.8.6-r2.ebuild 6175 SHA256 6481b8b53f0ca3179958eb14e3299584558a58916ba1e2e80a18d56377a9cb3c SHA512 5627b06f19b323876d5d710ea99cacb72096195fd883c48360ec3d589298ee93e19c861bfc71fd15f11c1f8efa3c74b3f11aa6234e7c648a99b2c4bb36a6f1cb WHIRLPOOL 1fff94d561ad13429a904e6acd7ec9250ebda1971ad60449950ecf85d82e89a62c9d7ba420687857cd688a191ceecd922a73e33ac391dbfb3e43cde9ada0a41b
-EBUILD qtgui-5.4.1-r1.ebuild 3438 SHA256 808969499a1a19c849b30e495ff302b0c99cea08b5109878bc3ee5d56e371fb2 SHA512 19d61fdf25e5cc666d2d153e5dd365e20c8851cb8f42498520af2d9e72377b0ba02783ea5340bf0106e90469a745174ad4def1f4779d5276c2facb32ebff8af4 WHIRLPOOL 8954a8bd034d8d97bac92a63ba5136a2e56decea737a3d28364902aa4282c17baf6b30b5d8a90695862fb4c85dcd0b35bef68a130b63470958c3ce6b19100ae4
-MISC ChangeLog 43081 SHA256 58bed80349bc178a3756562f63a85b9c7680f7c18bcdfb9fbe6a52e38f07e739 SHA512 140d0ef28f970237b5b53a5e07800173f02eb07983f75e653946c343333a50ac6fbebc8d413028ea4cea71df8e0c161b9978cf41d854e61c59bfff14c79af242 WHIRLPOOL 658b4956544cec5e2409819590dde904403e1a3df1690e34371c36a93a8b59832f932aa4eb2e8ed48dcfa78246d3dedd9736a7bdafb6ef90099fa21f60d47473
+EBUILD qtgui-5.4.1-r1.ebuild 3665 SHA256 98b16fdaffd8220389489117d00ff6bcac165a1aecac294b9dd99fd8fed4f4d3 SHA512 831191d651ca2c0c77dab92d83ae89738edbf066a382dd9e1548c92f3040d038eb6395c6fa0f0a133a51e1396212e882f5321418da2729c0a8fa7dea0c1d54d6 WHIRLPOOL ed5be31a585a9ead5d512a00784314dac334b0727be9a427ada2f92d49797073c7f8ec3eae9b597012a395b0fe9a586ddeb6927bf8f2c1fd320096f2e311f14f
+MISC ChangeLog 43297 SHA256 793b0d19d91a5da58759691cfa9cb88b303cf8f69910d5a587b356b5ab94246a SHA512 f7edbf05090261c3939073c031b1e332b62b9754289989a4e5961728d50fb4a1c074818ee6ae10a689937c5906467fd9bfafde97eb528f0cc0d28daf3d9c1f5e WHIRLPOOL 115c0ca4509c3d9526047f8cbfdd3a75ad4ee3635c624a1727027e3302f680705e9f6d38fe1f60df0eea28f26b2c1f887f2591b2a712f9d064da16232650cb34
 MISC metadata.xml 1431 SHA256 40799d067d2838a90818644ba38a4af47880194285c0627658b6d6798219ca17 SHA512 51e5b41ecc5584a3bda4f595bc5dd43ab89070ce356d2c03406479ed36490d46fa235eefd07707e30e9cdd952cd77bcf626423c5453725d442e769eb14c0e130 WHIRLPOOL 56c82cccefe2dd43b577456fcc90ed99ceb020b78d24f93f0c7a7618274f2025837c4142d75569f5894a2cacb45ca42c34e5e74d73e03aa6a9f9e2fb84b9c149
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVLk33XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCNUJBQjhDOUMzMUI3MTE1NjcwMjIzREMz
-MUFBRUE0NzU5NERCQkVEAAoJEDGq6kdZTbvtj/MP/3esyXVFCu3utVklc1gUcxQ0
-lfWYsVTDsQLt/5r4Ir2M5U8vaHZ8BrwuNk5K8eaF1SeIH8gwZ/YaD4snqCR1QwYW
-oHbjr9mOBn8i8/CWAikAzJCxpxMAbPl5jCcS8wMOj9kpGQ+7gHjIJ3Hzxv+3IGIi
-r3De8dbbi83FbYMlvdAqH0b+PbRRnPzjwqa9QPpUFLIsS8XlnyT2GoB4LVZ5v4hf
-aui6lE2lHdran8K3yAAA2UWUcJMtgc5qrUGKqKsKf9Wgi+eYI6n6QiI+0pzbjagP
-xL2I/BHkOzrJ0uZcqeuEc73ayScGN3DHBdLfQnMdTpBxxo058DaWZ4A/NNJv9bfm
-xEFNl7q1hu/PzXDx25hqyt32plRs3ZF7UyRpS+n+gEIY7UXPdcALjJLerrUyUBqo
-UnFKxIaNlBIXpp3aQVLCxNJ25fQR9NkWmbrRbgzoVdaHPAIV7cai3K2FNiiwKvjb
-eo2NaeZy9bC78NtE70Nq5C6RcvfNAiIjJfHLxYID5TgRNygXB8/HA4jBgwAPnE+r
-XOTszUwdJnKHrnVxGqrq/Ibreeebt/ZHxCU0rYDbjoMdr99GNIUQTnakWdG5mEB+
-MB+p2Zaui5LF51Ca5lSAfdeazOAL0MfQtIrjJdGO1ofM5qHa/JXtdG+rEaq4t2bJ
-L9/20uZPIqIZcG/GZrvg
-=r2kq
+iQJiBAEBCABMBQJVM/jbRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7EyHD/44KjMnBp/B/hZIE+BYzNdcvF12ZiGTP1nNXbsXftEA4SCvxShyhqQqTdVh
+SJ8W0Mp7cnYZmRzikfsMDlK/1Ix/15Aok9/1c9JPfFx8ZTnyfGXuHmdyNE9RBZWf
+hgJskZjpkdjghG4eY5NCqklCNQ9j6zEjYeboZe48NFk2HgF5jjZqpzHtaLWwNsuW
+OfWX3aRPT54Y2TI55gMPj1fTK1TwF96mXnrvIVWRRaTNLCP/StEKnRa59Z/ChcQh
+CTqvoi9bSwYTEdtCU/EzO7YPlBmr2tSvb1ilOkteyzLvFi+1qAkeGTodBuHD6oY4
+2BXWuKyUE/muB8GeBKBDsfIvhaDVSXaeuoat/p/leZ5G/RWgMlJBgh7FB+VO7oGX
+ZksKUr7mAGom4suJSIBvUCLwSvitUUZqp5B5wIhSNmdxQUaqmKeahbKueD+/nbAC
+CL3nUXVyZy4iieVkI1ns2Jq/YdBvHYbOANnjLS7E8cOz+suOxjUuFcxBV6PI7v6V
+qOukNykJPRrMrQ7X3EQ9ga34C/q7e60dJbDL1XZvS4xYZRFKIMJsFUMYKauCSr3Z
+Sdzxmiuin1hM3kB2nuQeSI4deont4d5zUt5NET7qYVlVkENJ81qHIcDaypdlXKds
+9nzTq5Uox1G4TZ9STPZe34CkkvjP5r91UvFGM6ZVu4fr9kUGiQ==
+=DSUx
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtgui/qtgui-5.4.1-r1.ebuild b/dev-qt/qtgui/qtgui-5.4.1-r1.ebuild
index c9ae802db828..1a4f3e42209c 100644
--- a/dev-qt/qtgui/qtgui-5.4.1-r1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.4.1-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.1-r1.ebuild,v 1.1 2015/03/17 14:24:12 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-5.4.1-r1.ebuild,v 1.2 2015/04/19 18:49:57 kensington Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ fi
 
 # TODO: directfb, linuxfb, offscreen (auto-depends on X11)
 
-IUSE="accessibility egl eglfs evdev +gif gles2 +harfbuzz ibus jpeg kms +opengl +png udev +xcb"
+IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +opengl +png udev +xcb"
 REQUIRED_USE="
 	egl? ( evdev opengl )
 	eglfs? ( egl )
@@ -34,6 +34,11 @@ RDEPEND="
 	sys-libs/zlib
 	egl? ( media-libs/mesa[egl] )
 	evdev? ( sys-libs/mtdev )
+	gtkstyle? (
+		x11-libs/gtk+:2
+		x11-libs/pango
+		!!x11-libs/cairo[qt4]
+	)
 	gles2? ( media-libs/mesa[gles2] )
 	harfbuzz? ( >=media-libs/harfbuzz-0.9.32:= )
 	ibus? ( ~dev-qt/qtdbus-${PV}[debug=] )
@@ -92,6 +97,8 @@ QT5_GENTOO_CONFIG=(
 	!gif:no-gif:
 	gles2::OPENGL_ES
 	gles2:opengles2:OPENGL_ES_2
+	gtkstyle:gtkstyle:
+	gtkstyle:gtk2:STYLE_GTK
 	!:no-gui:
 	harfbuzz:system-harfbuzz:HARFBUZZ
 	!harfbuzz:no-harfbuzz:
@@ -114,9 +121,10 @@ QT5_GENTOO_CONFIG=(
 )
 
 pkg_setup() {
-	use opengl && QT5_TARGET_SUBDIRS+=(src/openglextensions)
-	use ibus   && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus)
-	use xcb	   && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose)
+	use opengl   && QT5_TARGET_SUBDIRS+=(src/openglextensions)
+	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)
 
 	# 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)
@@ -141,6 +149,7 @@ src_configure() {
 		-system-freetype
 		$(use gif || echo -no-gif)
 		${gl}
+		$(qt_use gtkstyle)
 		$(qt_use harfbuzz harfbuzz system)
 		$(qt_use jpeg libjpeg system)
 		$(qt_use kms)