From: Ben de Groot <yngwin@gentoo.org>
Date: Sun, 1 Feb 2015 10:37:56 +0000 (+0000)
Subject: Workaround for bug #532140: force rebuild when opengl useflag is toggled in qtgui... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8536977d2754189241677de4ee2a39aa455911e2;p=gentoo.git

Workaround for bug #532140: force rebuild when opengl useflag is toggled in qtgui and qtwidgets.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!
---

diff --git a/dev-qt/qtprintsupport/ChangeLog b/dev-qt/qtprintsupport/ChangeLog
index 55a3e088008e..a18c71ba0ea8 100644
--- a/dev-qt/qtprintsupport/ChangeLog
+++ b/dev-qt/qtprintsupport/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-qt/qtprintsupport
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtprintsupport/ChangeLog,v 1.6 2015/01/08 22:31:42 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtprintsupport/ChangeLog,v 1.7 2015/02/01 10:37:48 yngwin Exp $
+
+  01 Feb 2015; Ben de Groot <yngwin@gentoo.org> qtprintsupport-5.4.0.ebuild:
+  Workaround for bug #532140: force rebuild when opengl useflag is toggled in
+  qtgui and qtwidgets.
 
   08 Jan 2015; Davide Pesavento <pesa@gentoo.org> metadata.xml:
   Update upstream bugtracker URL.
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index 790e1bf5531f..4c25a2ded520 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -4,25 +4,25 @@ Hash: SHA256
 DIST qtbase-opensource-src-5.3.2.tar.xz 46694044 SHA256 9a16095ac46dae99d6ddab8bc07065fbe1c36501ed194a3191d07347d7826cb8 SHA512 c92438ced758557bd3a19aa1ae5b5d1a2c85d8584d7e7279662eda51daf40ec58f1cb4a38d1c98a43c39cb3225a620a9daaec7f89e68a7d8e3e5240bf70210ea WHIRLPOOL b53f71e8980af5e1e176ba9671c6307f7f455bcf73a76f20a777b0e6f6a5e0ba60af1937a3ce9ebc81a60f82ab64f8b3f31ae786653e2213510d0101ec35a210
 DIST qtbase-opensource-src-5.4.0.tar.xz 46109688 SHA256 daea240ba5e77bc2d78ec21a2cb664eed83b3d4ad409b6277a6f7d4c0c8e91d1 SHA512 abab8f342301957555ee2f3c6f4fd8e2bfd98aca5a40bd4aea313f30f706d4f900c62d835f48eb736b79c87af9cd88f52ba71cdc4770546c8560d8d2aa8f2690 WHIRLPOOL 7d9c4ce9cb2c7a7c8dd3d0ade1aa1f140dadc5a723b4369fbd255cc248116ad1c0e26ca166e6e8b0a95979433c9b0a45007133aa9add226d398c9f23d41e852c
 EBUILD qtprintsupport-5.3.2.ebuild 844 SHA256 3bae337b55d412efe01eda738a25ec882c8daa96cff69ea1225745eb32f67a6d SHA512 6e5aaaf301317633c51f212703d5e6104a0ec3fb04ca7bbb5897336457eb81071033b8f454b1e0643f9590a8c9cc95082dd310957417255cbcba941a4f6d2f09 WHIRLPOOL 340075c9dbd7893ce1c8fd3e4e0d6fb7f8690cb88965c42b11e50c457ee93a38cb9d626220126ff035f220a38ef79708085362996e214ff64d4dfa9d0572f2b0
-EBUILD qtprintsupport-5.4.0.ebuild 850 SHA256 0a5b3b3df13d425a8819d0b88bfa463bdbc467938ca229619b43be60ef63477e SHA512 a62f4d96e2b0650e6aac3db12ae38650ffa450e29376775e64d3736c89a5c09d1110c91430b603a9572ccf88ab1d0721fc52b6c95e2f6d300c0e52287c3fd1b0 WHIRLPOOL bbd760e1c6bbf4dfe0139cc1a3b279e66b62a665cef2379b07362cfa458954dfa75e98d44712ddc54fb59f872d56fd93b5434ca57cf2f4153be23191b022cf47
-MISC ChangeLog 793 SHA256 f4aca2959719b3fa19eada4fde939e0dd4e8f97e3b2874c342380ffaffbe6290 SHA512 d7ce486033378c76362c3dac120f2128bff290e6a276fbff53f9eae90a31e0e0a4f705d4048cf9cd4173085c8f1b417d251724caa69ee292bff899f4a30c3560 WHIRLPOOL a7d38672a06af93f5e102ec1786b82b213eef4bd496aa6065e963e94071d3fc3f6b014b5d9b12254adcb1963f19984f7ed1c99ecfef071bfd58b010f7ea7af70
+EBUILD qtprintsupport-5.4.0.ebuild 869 SHA256 1bc9411a049e110d3883ccf7ed63148cbf7f259f30d2038258de0b1a28f302cc SHA512 553c9ac514da35050f48a6a26e32527a219c4ccdfeb334d85729f46d4e2c4df5699c374cb590cb2eabd1ec14b974b3fa4d851091aa1373ac799d12a9996a4fba WHIRLPOOL d28173543ad65f12e5a3f1775cf709e46d823be66f723ca039099285a52220fb51699b8980575eeabbc86db46ce13e52e0ebd278eb218fa838821e9d8d6690e7
+MISC ChangeLog 974 SHA256 35dcfa2ec9a8175fcacd2bc17c95aecde18c455a0cccf7731bbba92d291bb5ff SHA512 32427ce8b3c4afa707c40e749fa80df2a8b21a506cba1222407c4894a51053f0682b765ffa9dcc32969d4c6084bed3e34c978888e955467885e90171a1ddbcb7 WHIRLPOOL add5d7fe7436999f32e94d1cd29d1dc753006cf39ce2d284baf487ead6e41e57c60cbb22519c0a81819f1fc838564dfa6947483a31c525f980a3da0de7f22e88
 MISC metadata.xml 268 SHA256 0976b0efa573f782c96382e8f40ec82944c66ed52a89ebe6b0e905050f01395d SHA512 73ef5d7a382915e844a0cf7f1f05ae64c88500ecffe13265d156960b498ae61a62f29c9789330e5f24c82ddbf3a9ebb98aeff5c4cb0e69af1e8f07099791b806 WHIRLPOOL 19922570bea256c44d78d6f92ef9781be4c177580bb4235d8620139c6cfd759df64fc82f053a685d70fa1378b0fd6f49bb818d393b19105e6069730e9cf44e52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUrwVPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9ML0P/3tYeZFvHsleOD1altp7tIpo
-6d29uO1fK6HucsJQRpMdZljQrhga6KuCb3XcmH/0Bxz9XSiSdR0PXYJT4audWsIp
-CEbD6VsUeuZDZeeeFlg8zrhNMSD95vXkjw5Df+KZoFeduf2y2VLa3GsHZzUmV4Mo
-YFmSnAHNlvzYLSP1xAGPeWzK5f2E+jgIMbw2mw/xwqeVscrvjHd1YZU+G8EdR47a
-RUYdltOQBdlsuaXRHnbgqulrEGOP541ASbMWOoaPOZ3qPcsfTORIAd9JsjlUbt0R
-KrxpFiZIuPtP6L4k30b5e/EOxV2D0YgB4HRyh/rr9I8fUHTl2aVNUC9vvSbXz3Nb
-iAha1ExaFNC3GwngfjbMkocXgV+Jwj5X8IgH3K+fv4EXr0iY2yBIYjUFTHZqqqnZ
-6x+QeKLiIhX5vZze18QxWxxEPPo694fmgfBLtj4/rDIfMx1oCgJ8qqU9QucWa7Rk
-kL2Qk3xjinr1P9f4tfHMafyZ1ODgn745fce5ioRI74M7CJWVbcrPNXqbKCXxPWsL
-a51SUASygnimsH+khPffdLx1tIoulTin8QNAH6Fun5rVfkdd2qisjo55xlxgClQK
-MbxY2luLIV8uED7RJmqDL/nBn8mlZnjjIJF5oM7BWMlXBPEbWJiyVP1FlDD4A6zn
-IWzXCYQzdRHNEqMYH20b
-=6pWH
+iQJ8BAEBCABmBQJUzgICXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOEPcQALI/uOt9cKBDE6rr+N1+jvMh
+0YZU3YHO/yU4C9EzUS2tH8E6ktk5w1nwr+4GBe6MWH/gnclbLRTzUxQO8kxAJP7K
+HBVoGiwZMZtBkvnNRhcPc5O98Yt7MexYjoAfkMpqsQUFXRwp4umlAgIU1rFkb4Rc
+L+GcyPFMvRsWA5y3NKWzQ8b542B7BPicEZeCEF26d0iGEtHiKqWgT+xcgoeZGPky
+YJwcDTB4D1j4yL/wmBBFaZ6ckxa+voM77wpfKYHiQYKNXe4SaiJ++kZ1v87BZ2uR
+GwmiPVIQl1PqFjFbM7jyore8NO0qK0afsutULE622s04P9LhAi5DfOroHAlCumvF
+Ct3ZIVfaV46j/S+N4Xeg+bMqBkvtbpolfpzpwI0zK1etF6B3pYLnbKKvEZG5+gvz
+n4LrCOjmabFhAF+IaghqHkpS+DPxq2wcmzlJOxfahEYoRRLuavZFtpTgDSs08w41
+onKbwjExyHz36gQ205Kq7KxqC93YsUuuyfDv1N5Lcf6gc0zgyd43a2cka8/Qqu6V
+TJbz6410s8UJEqM2n+PoBq234qZQxIpIbY+a7nw9NrthEj1I+jkK4gIBfa/01UM6
+KfqQdS+K82hOuw/w4LBzfIBIqctjQm+i8gpZq/oShkJxpSSV+NcA+1uA3PdTCcKp
+IT+7vl+FPPw3hvdpP8gh
+=Nqxq
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.4.0.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.4.0.ebuild
index 9f1560902e52..95020d469efc 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.4.0.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtprintsupport/qtprintsupport-5.4.0.ebuild,v 1.1 2014/12/12 14:30:05 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtprintsupport/qtprintsupport-5.4.0.ebuild,v 1.2 2015/02/01 10:37:48 yngwin Exp $
 
 EAPI=5
 
@@ -17,12 +17,12 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-IUSE="cups"
+IUSE="cups opengl"
 
 RDEPEND="
 	~dev-qt/qtcore-${PV}[debug=]
-	~dev-qt/qtgui-${PV}[debug=]
-	~dev-qt/qtwidgets-${PV}[debug=]
+	~dev-qt/qtgui-${PV}[debug=,opengl=]
+	~dev-qt/qtwidgets-${PV}[debug=,opengl=]
 	cups? ( >=net-print/cups-1.4 )
 "
 DEPEND="${RDEPEND}