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

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)

2 files changed, 60 insertions, 1 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/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
+}