diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2016-10-07 02:20:26 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2016-10-07 02:20:55 +1100 |
| commit | 6447ec1f8ab760e25383edc3578e8ca92f6ba5a9 (patch) | |
| tree | a1c1ab48384db3fcfb73de0a4a9c0553df99e6e2 | |
| parent | Merge pull request #131 from waltercool (diff) | |
| download | qt-6447ec1f8ab760e25383edc3578e8ca92f6ba5a9.tar.gz qt-6447ec1f8ab760e25383edc3578e8ca92f6ba5a9.tar.bz2 qt-6447ec1f8ab760e25383edc3578e8ca92f6ba5a9.zip | |
dev-qt/qtdeclarative: python is required at build time
Gentoo-bug: 593250
Package-Manager: portage-2.3.1
| -rw-r--r-- | dev-qt/qtdeclarative/qtdeclarative-5.6.9999.ebuild | 13 | ||||
| -rw-r--r-- | dev-qt/qtdeclarative/qtdeclarative-5.7.9999.ebuild | 11 | ||||
| -rw-r--r-- | dev-qt/qtdeclarative/qtdeclarative-5.8.9999.ebuild | 11 | ||||
| -rw-r--r-- | 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 cbbb8716..3df6e0d9 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 dd88f47d..3df6e0d9 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 dd88f47d..3df6e0d9 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 dd88f47d..3df6e0d9 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 " |