Add gtkstyle USE flag wrt bug #526866.

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

diff --git a/dev-qt/qtwidgets/ChangeLog b/dev-qt/qtwidgets/ChangeLog
index 1aab04bef0c2ec348008cac92eb9dcd1cfe39c97..522f9c575fd1cd97cf7a794c2707168e464ac959 100644 (file)
--- a/dev-qt/qtwidgets/ChangeLog
+++ b/dev-qt/qtwidgets/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-qt/qtwidgets
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwidgets/ChangeLog,v 1.14 2015/04/15 04:40:51 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwidgets/ChangeLog,v 1.15 2015/04/19 18:52:22 kensington Exp $
+
+  19 Apr 2015; Michael Palimaka <kensington@gentoo.org> metadata.xml,
+  qtwidgets-5.4.1.ebuild:
+  Add gtkstyle USE flag wrt bug #526866.
 
   15 Apr 2015; Yixun Lan <dlan@gentoo.org> qtwidgets-5.4.1.ebuild:
   keyword arm64, tested on cortex-a53 hardware

diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 667dfecb49fd490266f930c97fa7db50839d7796..b3d1a631a2030f92a3b0538ee0a709b43b0dbe9b 100644 (file)
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -2,25 +2,24 @@
 Hash: SHA256
 
 DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
-EBUILD qtwidgets-5.4.1.ebuild 1145 SHA256 28594f7e9ac57e7352bcf21aa0f3a1d33600a191d8ef17db489ca81e1e034df7 SHA512 e1e6f3df7a9098a36c55b7d33fc5eb495e29975b959409c82419918346f5496d5899f48f23aa2c547ff038c1c4d77689a811cdedb715716820563e0bd7cce2e8 WHIRLPOOL 41afd7bc4cf49224e847b708f315497eb474a87077c61092d28e13f4f12ecaab643e5ecdf631f27f106b92828cf225a5e01f9f9b466304f4aad838d0bcde4a3c
-MISC ChangeLog 1647 SHA256 b3603a61d47374a6c9ed50c3b181770eeb6f71a4933b0ea6e8ac48d46722ccba SHA512 f6f77a0c4bb284a45055c4c709f99c985a924c6718670d2e5f4a0acd3393b745703ed90317c8137a42431f5b23e1b98c2bb2cebc6ece8a9bb26bb66a73da813f WHIRLPOOL 09988182929423d10fa707435c6c7d5e40ca2628c9ef682476a16f0524aa1a3b300533027ff6b42e8fa4a7d745346f1e5835a656abd2961252e8181822ae6a1f
-MISC metadata.xml 355 SHA256 37c610fed4cc20451c5fd235290f613ee63a107010b6592dc5a4dcd5fdedd952 SHA512 12a6be02dc744fb7e1c713f443d4a65c0c74f03380cf68d9bd82f4e9df1c1d1f922359c215895d1da576b0e953a9673f722e1bb625ceaa96e37954f93d9cb45a WHIRLPOOL 3ea9c317e0458aa08ff6f149b40480a490ef91ef0855cbf28648ecc5aab284d8f1a8b9843c26150a0b24a1bac83d0c7bb47af4400f524624a32b382caa18074c
+EBUILD qtwidgets-5.4.1.ebuild 1191 SHA256 33c6889097088067df0be35986a975bcb17310cb27388280aa2c4726c33159e5 SHA512 f30203fa9a341e4c1da638281e19c7cfa0a7c0dcd410fe8af86cf284d10ccc7676324502fc5b0821427286549c65d88800a24685bdda5b01418bb4541def8808 WHIRLPOOL 13544ab062c07ef01e968a1775740bedd049309a09168e99013bf3694e31a9dbef3711e9963f4c67a0a65addc2025afd3faecbb5cffe387bde34bb8d5dc54271
+MISC ChangeLog 1791 SHA256 a01929ca1c2b5f8360a4c2ba1a3770d39945c307d452f2d50baae022c3206fdc SHA512 cb4e75eb60d76ae1f52f9bfff697bd47b7f5846b761d7365dd47ddbf0763c603a133c4c697f63aa6c758376005dd4fb6f43c7d42a94f0a99afaa67dfc9e22a3f WHIRLPOOL e0f16059581c39bf4f3e9d4eeefd0ec97f57ed805c636709faf7d8e708964a988a46b125e5d52f72686ae7375422440b651c7de5e12d1e15e8a38e7cde71a071
+MISC metadata.xml 452 SHA256 5d837e121d6ab379e09a64c79985530ced8d9a8b655845ba34d60bdc0a9173f7 SHA512 548266812ee648eab15e24b302341a430833dada123c05324f57c240e18ed2e1f840e0597bb17270592459492d67d9ad5b7b774553e5525a3105e02292734fe8 WHIRLPOOL 1fb249049750f49e35f9b98db921cd9ba65051bfc5364e594761278109da33081432e251c7666361aba0509621fb7d5bdaff8ba8410a631abe3ce66343717943
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVLlpdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCNUJBQjhDOUMzMUI3MTE1NjcwMjIzREMz
-MUFBRUE0NzU5NERCQkVEAAoJEDGq6kdZTbvtTQwP/2j8ufJVHV3CpolA0MBhKjJO
-k26GUAwLbgixz33N3FToJ9Te39tJl3gn6oTtYbQfS0kRP+XBKJeMwHn46dkBeGEB
-cwuSy5hsnzrihX7uBDxF7VWSXgynTB6e7OquE6eIORaP3SkapVC6xYxYaM8xisQz
-ic7gjYpBDH+1PQZMun/mnsdvnhzZRYeoAr/jVxsAVuMx/+rax8qKoxK6hsjDShQ1
-LXlPrk0RJpZMu94pjPcCw9MtxwfdfwEEV7TH18JaDq16I5YletCbfhcwQ/8aHca2
-JRpnyjSjvXpXeaf9cdITo6huB/Onwiec0tET9w4OGeV6nDIxYc/dH7KneT1UTZt1
-FmgvmCYGLFwqKEqIbhP24kVlwhfZx8eOA28GDTdnvEIXSpALDTx435h3z8TRvTc2
-/SNCIIcVOHuuT+ePI+vtd7QQ7vn6LVHnVm9fEYNbwbUADEIZN8Zbw7T7wHOl8N/j
-mpJSyO25ZBmALMVnb1klTqNwjsSu42J6F7RtczWe4rhSuXOS0sSyPV5cXrbB/VWq
-90HpHvkCwq1hrJU/zVFdVTIJcwWSf3e6p/jkvJ+/gXQ0FVWmQNlczSFhk3GcQCyT
-nrz0UT774c02qc31/tDW0C3aR2pYp43tzF33W92Ng+a2U3g7BzUq9U2ll+niVPnr
-NtrCcWzXuLxYbT6Md2Ay
-=Hinn
+iQJiBAEBCABMBQJVM/llRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7OUsD/0UrOlXCNMdBTWTHjh6uNVcPCTNPnzVhzmERB8fDqUeYiGcslFdorFYP4oM
+U+d/4GMwPEx3Z3CAkUi1OISGsHwClT1+M09c04NlzFIM0ff8FR4uYe4bcRDe7JCZ
+FN9MUWilK0UJ4DRP5rePr6wxiNqCspccLeUNR8/lYr4bfmCOVbceWKW5qRwqtpit
+TNTfmi8+D6ZkpUXZL7eF4vtALs7xJCoQm5DyRcKtTAfieZOXv7DLgUDgT3kBkdI6
+J5A1/mnPD2RLvEX82TDkpHbg/YeRIi78PjKC7hey+VX3b+9hN3gis2+8iaBWbigM
+ogHki6ENbScK1UlaOioNw8FzuASesVccoiWZgFqFHrI+dNzKVnM/vibEWqcDAfL+
+zNfaWasvA6uwOxhxmWIEOndEgsGWVjhFLEekOA3k6rG8XpjEyY4nPstR+6TpyXP5
+jIiyA1Pf25+UWPbui8BJVfy8akAMRaEFfbnIGFtGnHp4Cj0BbgDC+k1B6laE4uZu
+yhEk6//AW7IgOxqS5mb0j6qYsJ7BJvam88AwAHIv328qMb8uKJPZQjRoixQY4dlF
+aro922Rgr0dbOG02TSqvbut7PuL/q1IbFj8QcI58KepbHZLCLhJjfi3NcRscjvXM
+k6UdhF4mLJSTN1sOFVv7J0+z9f3tb9+4xAxMl/vGuu8EELqQhQ==
+=zuAs
 -----END PGP SIGNATURE-----

diff --git a/dev-qt/qtwidgets/metadata.xml b/dev-qt/qtwidgets/metadata.xml
index c119af14379fca66c01f5fb132eacf8ee9766fcf..1fed4b142e53f23fcb9206ec2eef28807c058fc9 100644 (file)
--- a/dev-qt/qtwidgets/metadata.xml
+++ b/dev-qt/qtwidgets/metadata.xml
@@ -4,6 +4,8 @@
        <herd>qt</herd>
        <use>
                <flag name="gles2">Use OpenGL ES 2.0 instead of desktop OpenGL</flag>
+               <flag name="gtkstyle">Build a Qt style called GTK+ that mimics the active
+                       GTK+ theme</flag>
        </use>
        <upstream>
                <bugs-to>https://bugreports.qt.io/</bugs-to>

diff --git a/dev-qt/qtwidgets/qtwidgets-5.4.1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.4.1.ebuild
index 3fd4701a12ef67f65e77b6833162c1e002e17e49..45d5efca188bf161b5bae6316b7c6fbf477f3ab7 100644 (file)
--- a/dev-qt/qtwidgets/qtwidgets-5.4.1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.4.1.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/qtwidgets/qtwidgets-5.4.1.ebuild,v 1.3 2015/04/15 04:40:51 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwidgets/qtwidgets-5.4.1.ebuild,v 1.4 2015/04/19 18:52:22 kensington Exp $
 
 EAPI=5
 
@@ -17,14 +17,14 @@ else
 fi
 
 # keep IUSE defaults in sync with qtgui
-IUSE="gles2 +opengl +png +xcb"
+IUSE="gles2 gtkstyle +opengl +png +xcb"
 REQUIRED_USE="
        gles2? ( opengl )
 "
 
 DEPEND="
        ~dev-qt/qtcore-${PV}[debug=]
-       ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl=,png=,xcb?]
+       ~dev-qt/qtgui-${PV}[debug=,gles2=,gtkstyle=,opengl=,png=,xcb?]
 "
 RDEPEND="${DEPEND}"
 
@@ -48,6 +48,7 @@ src_configure() {
        local myconf=(
                # copied from qtgui
                ${gl}
+               $(qt_use gtkstyle)
                $(qt_use png libpng system)
                $(qt_use xcb xcb system)
                $(qt_use xcb xkbcommon system)