| 1 |
commit: 6447ec1f8ab760e25383edc3578e8ca92f6ba5a9 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 6 15:20:26 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 6 15:20:55 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=6447ec1f |
| 7 |
|
| 8 |
dev-qt/qtdeclarative: python is required at build time |
| 9 |
|
| 10 |
Gentoo-bug: 593250 |
| 11 |
Package-Manager: portage-2.3.1 |
| 12 |
|
| 13 |
dev-qt/qtdeclarative/qtdeclarative-5.6.9999.ebuild | 13 ++++++++++--- |
| 14 |
dev-qt/qtdeclarative/qtdeclarative-5.7.9999.ebuild | 11 ++++++++--- |
| 15 |
dev-qt/qtdeclarative/qtdeclarative-5.8.9999.ebuild | 11 ++++++++--- |
| 16 |
dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild | 11 ++++++++--- |
| 17 |
4 files changed, 34 insertions(+), 12 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.6.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.6.9999.ebuild |
| 20 |
index cbbb871..3df6e0d 100644 |
| 21 |
--- a/dev-qt/qtdeclarative/qtdeclarative-5.6.9999.ebuild |
| 22 |
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.6.9999.ebuild |
| 23 |
@@ -3,7 +3,9 @@ |
| 24 |
# $Id$ |
| 25 |
|
| 26 |
EAPI=6 |
| 27 |
-inherit qt5-build |
| 28 |
+ |
| 29 |
+PYTHON_COMPAT=( python2_7 python3_4 ) |
| 30 |
+inherit python-any-r1 qt5-build |
| 31 |
|
| 32 |
DESCRIPTION="The QML and Quick modules for the Qt5 framework" |
| 33 |
|
| 34 |
@@ -14,7 +16,7 @@ fi |
| 35 |
IUSE="gles2 +jit localstorage +widgets xml" |
| 36 |
|
| 37 |
# qtgui[gles2=] is needed because of bug 504322 |
| 38 |
-DEPEND=" |
| 39 |
+COMMON_DEPEND=" |
| 40 |
~dev-qt/qtcore-${PV} |
| 41 |
~dev-qt/qtgui-${PV}[gles2=] |
| 42 |
~dev-qt/qtnetwork-${PV} |
| 43 |
@@ -26,7 +28,12 @@ DEPEND=" |
| 44 |
~dev-qt/qtxmlpatterns-${PV} |
| 45 |
) |
| 46 |
" |
| 47 |
-RDEPEND="${DEPEND}" |
| 48 |
+DEPEND="${COMMON_DEPEND} |
| 49 |
+ ${PYTHON_DEPS} |
| 50 |
+" |
| 51 |
+RDEPEND="${COMMON_DEPEND} |
| 52 |
+ !<dev-qt/qtquickcontrols-5.7:5 |
| 53 |
+" |
| 54 |
|
| 55 |
src_prepare() { |
| 56 |
use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") |
| 57 |
|
| 58 |
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.7.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.7.9999.ebuild |
| 59 |
index dd88f47..3df6e0d 100644 |
| 60 |
--- a/dev-qt/qtdeclarative/qtdeclarative-5.7.9999.ebuild |
| 61 |
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.7.9999.ebuild |
| 62 |
@@ -3,7 +3,9 @@ |
| 63 |
# $Id$ |
| 64 |
|
| 65 |
EAPI=6 |
| 66 |
-inherit qt5-build |
| 67 |
+ |
| 68 |
+PYTHON_COMPAT=( python2_7 python3_4 ) |
| 69 |
+inherit python-any-r1 qt5-build |
| 70 |
|
| 71 |
DESCRIPTION="The QML and Quick modules for the Qt5 framework" |
| 72 |
|
| 73 |
@@ -14,7 +16,7 @@ fi |
| 74 |
IUSE="gles2 +jit localstorage +widgets xml" |
| 75 |
|
| 76 |
# qtgui[gles2=] is needed because of bug 504322 |
| 77 |
-DEPEND=" |
| 78 |
+COMMON_DEPEND=" |
| 79 |
~dev-qt/qtcore-${PV} |
| 80 |
~dev-qt/qtgui-${PV}[gles2=] |
| 81 |
~dev-qt/qtnetwork-${PV} |
| 82 |
@@ -26,7 +28,10 @@ DEPEND=" |
| 83 |
~dev-qt/qtxmlpatterns-${PV} |
| 84 |
) |
| 85 |
" |
| 86 |
-RDEPEND="${DEPEND} |
| 87 |
+DEPEND="${COMMON_DEPEND} |
| 88 |
+ ${PYTHON_DEPS} |
| 89 |
+" |
| 90 |
+RDEPEND="${COMMON_DEPEND} |
| 91 |
!<dev-qt/qtquickcontrols-5.7:5 |
| 92 |
" |
| 93 |
|
| 94 |
|
| 95 |
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.8.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.8.9999.ebuild |
| 96 |
index dd88f47..3df6e0d 100644 |
| 97 |
--- a/dev-qt/qtdeclarative/qtdeclarative-5.8.9999.ebuild |
| 98 |
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.8.9999.ebuild |
| 99 |
@@ -3,7 +3,9 @@ |
| 100 |
# $Id$ |
| 101 |
|
| 102 |
EAPI=6 |
| 103 |
-inherit qt5-build |
| 104 |
+ |
| 105 |
+PYTHON_COMPAT=( python2_7 python3_4 ) |
| 106 |
+inherit python-any-r1 qt5-build |
| 107 |
|
| 108 |
DESCRIPTION="The QML and Quick modules for the Qt5 framework" |
| 109 |
|
| 110 |
@@ -14,7 +16,7 @@ fi |
| 111 |
IUSE="gles2 +jit localstorage +widgets xml" |
| 112 |
|
| 113 |
# qtgui[gles2=] is needed because of bug 504322 |
| 114 |
-DEPEND=" |
| 115 |
+COMMON_DEPEND=" |
| 116 |
~dev-qt/qtcore-${PV} |
| 117 |
~dev-qt/qtgui-${PV}[gles2=] |
| 118 |
~dev-qt/qtnetwork-${PV} |
| 119 |
@@ -26,7 +28,10 @@ DEPEND=" |
| 120 |
~dev-qt/qtxmlpatterns-${PV} |
| 121 |
) |
| 122 |
" |
| 123 |
-RDEPEND="${DEPEND} |
| 124 |
+DEPEND="${COMMON_DEPEND} |
| 125 |
+ ${PYTHON_DEPS} |
| 126 |
+" |
| 127 |
+RDEPEND="${COMMON_DEPEND} |
| 128 |
!<dev-qt/qtquickcontrols-5.7:5 |
| 129 |
" |
| 130 |
|
| 131 |
|
| 132 |
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild |
| 133 |
index dd88f47..3df6e0d 100644 |
| 134 |
--- a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild |
| 135 |
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild |
| 136 |
@@ -3,7 +3,9 @@ |
| 137 |
# $Id$ |
| 138 |
|
| 139 |
EAPI=6 |
| 140 |
-inherit qt5-build |
| 141 |
+ |
| 142 |
+PYTHON_COMPAT=( python2_7 python3_4 ) |
| 143 |
+inherit python-any-r1 qt5-build |
| 144 |
|
| 145 |
DESCRIPTION="The QML and Quick modules for the Qt5 framework" |
| 146 |
|
| 147 |
@@ -14,7 +16,7 @@ fi |
| 148 |
IUSE="gles2 +jit localstorage +widgets xml" |
| 149 |
|
| 150 |
# qtgui[gles2=] is needed because of bug 504322 |
| 151 |
-DEPEND=" |
| 152 |
+COMMON_DEPEND=" |
| 153 |
~dev-qt/qtcore-${PV} |
| 154 |
~dev-qt/qtgui-${PV}[gles2=] |
| 155 |
~dev-qt/qtnetwork-${PV} |
| 156 |
@@ -26,7 +28,10 @@ DEPEND=" |
| 157 |
~dev-qt/qtxmlpatterns-${PV} |
| 158 |
) |
| 159 |
" |
| 160 |
-RDEPEND="${DEPEND} |
| 161 |
+DEPEND="${COMMON_DEPEND} |
| 162 |
+ ${PYTHON_DEPS} |
| 163 |
+" |
| 164 |
+RDEPEND="${COMMON_DEPEND} |
| 165 |
!<dev-qt/qtquickcontrols-5.7:5 |
| 166 |
" |
Archives