Pin dev-qt/designer dependency avoid a crash wrt bug #542698.

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

3 files changed, 76 insertions, 17 deletions

diff --git a/dev-qt/qtquick1/ChangeLog b/dev-qt/qtquick1/ChangeLog
index dda7e97c9367..3ed6fe9cb3b2 100644
--- a/dev-qt/qtquick1/ChangeLog
+++ b/dev-qt/qtquick1/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtquick1
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquick1/ChangeLog,v 1.13 2015/03/08 14:02:18 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquick1/ChangeLog,v 1.14 2015/03/17 14:51:06 kensington Exp $
+
+*qtquick1-5.4.1-r1 (17 Mar 2015)
+
+  17 Mar 2015; Michael Palimaka <kensington@gentoo.org>
+  +qtquick1-5.4.1-r1.ebuild:
+  Pin dev-qt/designer dependency avoid a crash wrt bug #542698.
 
   08 Mar 2015; Davide Pesavento <pesa@gentoo.org> qtquick1-5.4.1.ebuild:
   Remove all keywords from "live" branch.
diff --git a/dev-qt/qtquick1/Manifest b/dev-qt/qtquick1/Manifest
index 4ca8c329c79b..4a86a5ebc5e1 100644
--- a/dev-qt/qtquick1/Manifest
+++ b/dev-qt/qtquick1/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA256
 
 DIST qtquick1-opensource-src-5.4.1.tar.xz 15983524 SHA256 eb5324c784eef15b3d0f7e2fc2265b0f2e823a31330e88e09379972313ca432d SHA512 365a57c0b3e4df090471cccdd025224212781730fe791ad258697334df540407cf53efe86ca26d40d8ff6c807860dfb2eacc4e4f7d3745048ed409498d428028 WHIRLPOOL 7a987fe9f61a18fcec5d7f904d28908b9c2785d89308d499eff9578905be682d3152bbc25c888d34a124fd7faf630d578aa3344fb56baed9b7077e94f793dc35
+EBUILD qtquick1-5.4.1-r1.ebuild 1376 SHA256 3c7a6f802c5923bb59947dd7188d3d329d8e8baa515785c9fd6805e397e765ed SHA512 4bf23926da18682f7b0e3f8c85c038bafae5f699868f200efb3cce3f1aa4e0e2461e5431a8d47e7701f879b9ad17037370df85664a517a2b45c579633eb7576f WHIRLPOOL 26a1b45409a5e8069da83a40d986aeefde0fe2e2b33dbfd81e8a2db9f8c02b5a181078ad55897e74d4709af448a17c542ded3abe6f6564297cd6e728168925d1
 EBUILD qtquick1-5.4.1.ebuild 1324 SHA256 d084897ccdafd9c4e574d865338edff51c280d007dd80ba9f84d79c82337b7b4 SHA512 d60491b9ded0bcd23b764c640288e97728779968814588e0f9bf44a9c38e3985168e79921c13a8d41597565974657568b79d61b02ad81d0e97376c400030ecfb WHIRLPOOL 5f9da3a54c58a63fa1d0bef87178cd9dec787b2819afd71ad3b151fb8d9b41e67ab99739d5fccadf8ffa41d5f97078decf07e21ecfa121b3cf921928e42c9667
-MISC ChangeLog 1415 SHA256 c7c353c38627d53aa091eac46962f8142248d580e1e49f526f1e72b9261d8f4d SHA512 a24eda21fef784c851afc9068339bb1aebaf03affd3c4b2e0ef34419bf0a6f5d57b6a88d91c26cdd694944714972805b590ac1becd6d64e96dfee11466680323 WHIRLPOOL 8f8ea014ffa00e21de0b855402b7ee5579b8863f15dcc9129de006f80b42c1d5e1fe8151e268e40f51ad392f72f6bf761c70dc5083c2505699997fc3c498abcf
+MISC ChangeLog 1605 SHA256 28e4f480137968bc32cc25529c45f6685036abe1ab2f50302d200b49cfdbaedf SHA512 01044bd57417896a6521e2bc95d41a9664703f3f3a1e87f082b61205ca0b03b7b42fe4fde716491be62fcd91b2ab8cd702723d1dc3834c8f3978642877729b2a WHIRLPOOL c8d764a97502a9baf1511ae8507e105e24e2ec7c11b48e11880f4d8a828758360a0af26a5eaf88e60d8ed38829ad98ad48fdb13138d0d8fc3e5f133363ecbf5d
 MISC metadata.xml 539 SHA256 45394be80debfe5b224d597a6b2a71b4238cf42cfe3923cf9ae289356837ba38 SHA512 644b4bdeda1313daa3444f855364c4be96eaf1f04c1003a1584874e5fb47fd3c477dd16e3abc780a29745fa5f60368edaa41be6c942f5f26f164157078d5459f WHIRLPOOL 9a819121464a7e4bacb7d2c023b8d12926c9d6b3de8d4a09ee040ae60ab974aaabe451e4a7880d6767c95319ef0896648f93ecf88dcb9e13cd1eae9beabe9979
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU/FZrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9aZAP/iuThqqSi6o8aXtXGsoMJZSF
-zSf60HyXxw3r2hM2AeXx6zUmUcjE9m2gMNeT9VSJ8J2oEMWTIWOUvrI8yBKlHKP5
-yx2xtfJa4+gyjQHaw/p7MuIgagMWq+hoo9Ia1R81b5VveCA0lzWYT6BnqZD73D+r
-u8m776/6+8hjKFTqe126pYzpRwWmcxAkamg4btyeGeNW0LeZHnfMyZI5Aj5unMUw
-kJviAznc0SlU9A7SWpw5KJyRAfihlWr6t/3y87WZbQAauTb3NVjG6r29qlIluogJ
-6wBCU5HMgW48U9FwNvEzF/N6L8Lptn/jwrtDrmsZ5wAqBzIlKspekVCN//PCPmEm
-LuzwMq8B54h80oKkGGuAD7da3yTW1t15o/CEIh5SrPY8dC7KFiAZ8kgG3ckAs1bK
-cyXwrClQ5X3NDRlDZskltx4eTHBqD2Bfr7VW3s7ryg5IOlYxL6cWJWlrzPFCxNhF
-2/lBYaNonkA+UBnOx+um+zPAgAeLe5o9XjFciya0zfFoohccnQz+VHkRgTvkhYLr
-QXlQ7+7g1F/fLh4joHWHzpMol2Gha4FIf1M2QFhgz5nj1eQYWqc/SzQaZk4DMtLE
-ZdG/KXr7VTTnMGO2EC13QnvUwomP00ctcJSJyPCdHeVCpbiz6mKm4CzG3+i9Wm3Z
-0voBAHJQyyqhX5Dw5EAm
-=s/sJ
+iQJiBAEBCABMBQJVCD9aRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7N6ID/4h8PRSBtfQPgal/P4WN9jBvmpysfHKCLItQ2xMVji88UTwVOfFddZIDb9k
+gOJnqQ1RLRyehnG9P7UolpWDbmQQX+9TnkRBdGwJV4oPR392bimOCG90V96oK/cK
+OU92qrQKRn+5t9gA6GoFnpGybc7K0lZawjgTE6TriKpEHETNkgNiuNeuAVsnjKse
+sOOhwsF5iAArwL+hlDnJvIjsHU+hDQGPVszaty5/vAQb5HlCu1ZEOnvlBqUjGZAc
+RbQDMavOaN0RHcrN0cEA8JWM4c1YY93/ZRxcmEEOLoX8YWX/oFt/T1OKCxJxX3Gt
++vzh1JkjKRW7oFsnAfNNdpHA4hVG+nVYm/36tPbuQFWJ0pvwEXE7p+xLXzasM7iC
++p12wkLZzPmlws1b0y8CNZvpGSaCkOP5bEsZ2rT4fT8Hht1neSA9EtEMULvhWflx
+DqcDaZ9K5ph19ofQGIRnCO4vfYZVyCFpAFbv/7AJlCHIbUHpH2KBcEAcrm8DSgoM
+Dgg+x9DxIDOf8VBPnHziZsa9LNtriH5EhZe+bVyV/ua2VNhfkIWHCh0S4gFEcv13
+QSwJO1RyXyTRl6vXLf3VZBGr5l4L6uLCziz90c4J6A7JhToo1xfyqNf2vVwYzfpD
+uQl3KJB8Ag4zQTbYmmx2y5K1rK1vBSO4Llsi6beBDx5imkO03A==
+=8Czz
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtquick1/qtquick1-5.4.1-r1.ebuild b/dev-qt/qtquick1/qtquick1-5.4.1-r1.ebuild
new file mode 100644
index 000000000000..0a8fb11fa36b
--- /dev/null
+++ b/dev-qt/qtquick1/qtquick1-5.4.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquick1/qtquick1-5.4.1-r1.ebuild,v 1.1 2015/03/17 14:51:06 kensington Exp $
+
+EAPI=5
+
+inherit qt5-build
+
+DESCRIPTION="Legacy declarative framework for Qt4 compatibility for building dynamic user interfaces"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~hppa ~x86"
+fi
+
+IUSE="designer +opengl webkit xml"
+
+# bug 542698 for pinned designer dependency
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtgui-${PV}:5[debug=]
+	>=dev-qt/qtnetwork-${PV}:5[debug=]
+	>=dev-qt/qtscript-${PV}:5[debug=]
+	>=dev-qt/qtsql-${PV}:5[debug=]
+	>=dev-qt/qtwidgets-${PV}:5[debug=]
+	designer? (
+		~dev-qt/designer-${PV}:5[debug=]
+		>=dev-qt/qtdeclarative-${PV}:5[debug=]
+	)
+	opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
+	webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] )
+	xml? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod designer designer \
+		src/plugins/plugins.pro
+
+	qt_use_disable_mod opengl opengl \
+		src/imports/imports.pro \
+		tools/qml/qml.pri
+
+	qt_use_disable_mod webkit webkitwidgets \
+		src/imports/imports.pro
+
+	qt_use_disable_mod xml xmlpatterns \
+		src/declarative/declarative.pro \
+		src/declarative/util/util.pri
+
+	qt5-build_src_prepare
+}