commit: 6447ec1f8ab760e25383edc3578e8ca92f6ba5a9
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 6 15:20:26 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct 6 15:20:55 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=6447ec1f
dev-qt/qtdeclarative: python is required at build time
Gentoo-bug: 593250
Package-Manager: portage-2.3.1
dev-qt/qtdeclarative/qtdeclarative-5.6.9999.ebuild | 13 ++++++++++---
dev-qt/qtdeclarative/qtdeclarative-5.7.9999.ebuild | 11 ++++++++---
dev-qt/qtdeclarative/qtdeclarative-5.8.9999.ebuild | 11 ++++++++---
dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild | 11 ++++++++---
4 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.6.9999.ebuild
b/dev-qt/qtdeclarative/qtdeclarative-5.6.9999.ebuild
index cbbb871..3df6e0d 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.6.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.6.9999.ebuild
@@ -3,7 +3,9 @@
# $Id$
EAPI=6
-inherit qt5-build
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+inherit python-any-r1 qt5-build
DESCRIPTION="The QML and Quick modules for the Qt5 framework"
@@ -14,7 +16,7 @@ fi
IUSE="gles2 +jit localstorage +widgets xml"
# qtgui[gles2=] is needed because of bug 504322
-DEPEND="
+COMMON_DEPEND="
~dev-qt/qtcore-${PV}
~dev-qt/qtgui-${PV}[gles2=]
~dev-qt/qtnetwork-${PV}
@@ -26,7 +28,12 @@ DEPEND="
~dev-qt/qtxmlpatterns-${PV}
)
"
-RDEPEND="${DEPEND}"
+DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPS}
+"
+RDEPEND="${COMMON_DEPEND}
+ !<dev-qt/qtquickcontrols-5.7:5
+"
src_prepare() {
use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.7.9999.ebuild
b/dev-qt/qtdeclarative/qtdeclarative-5.7.9999.ebuild
index dd88f47..3df6e0d 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.7.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.7.9999.ebuild
@@ -3,7 +3,9 @@
# $Id$
EAPI=6
-inherit qt5-build
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+inherit python-any-r1 qt5-build
DESCRIPTION="The QML and Quick modules for the Qt5 framework"
@@ -14,7 +16,7 @@ fi
IUSE="gles2 +jit localstorage +widgets xml"
# qtgui[gles2=] is needed because of bug 504322
-DEPEND="
+COMMON_DEPEND="
~dev-qt/qtcore-${PV}
~dev-qt/qtgui-${PV}[gles2=]
~dev-qt/qtnetwork-${PV}
@@ -26,7 +28,10 @@ DEPEND="
~dev-qt/qtxmlpatterns-${PV}
)
"
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPS}
+"
+RDEPEND="${COMMON_DEPEND}
!<dev-qt/qtquickcontrols-5.7:5
"
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.8.9999.ebuild
b/dev-qt/qtdeclarative/qtdeclarative-5.8.9999.ebuild
index dd88f47..3df6e0d 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.8.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.8.9999.ebuild
@@ -3,7 +3,9 @@
# $Id$
EAPI=6
-inherit qt5-build
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+inherit python-any-r1 qt5-build
DESCRIPTION="The QML and Quick modules for the Qt5 framework"
@@ -14,7 +16,7 @@ fi
IUSE="gles2 +jit localstorage +widgets xml"
# qtgui[gles2=] is needed because of bug 504322
-DEPEND="
+COMMON_DEPEND="
~dev-qt/qtcore-${PV}
~dev-qt/qtgui-${PV}[gles2=]
~dev-qt/qtnetwork-${PV}
@@ -26,7 +28,10 @@ DEPEND="
~dev-qt/qtxmlpatterns-${PV}
)
"
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPS}
+"
+RDEPEND="${COMMON_DEPEND}
!<dev-qt/qtquickcontrols-5.7:5
"
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild
b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild
index dd88f47..3df6e0d 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild
@@ -3,7 +3,9 @@
# $Id$
EAPI=6
-inherit qt5-build
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+inherit python-any-r1 qt5-build
DESCRIPTION="The QML and Quick modules for the Qt5 framework"
@@ -14,7 +16,7 @@ fi
IUSE="gles2 +jit localstorage +widgets xml"
# qtgui[gles2=] is needed because of bug 504322
-DEPEND="
+COMMON_DEPEND="
~dev-qt/qtcore-${PV}
~dev-qt/qtgui-${PV}[gles2=]
~dev-qt/qtnetwork-${PV}
@@ -26,7 +28,10 @@ DEPEND="
~dev-qt/qtxmlpatterns-${PV}
)
"
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPS}
+"
+RDEPEND="${COMMON_DEPEND}
!<dev-qt/qtquickcontrols-5.7:5
"
