From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
Date: Thu, 6 Oct 2016 15:21:07 +0000 (UTC) [thread overview]
Message-ID: <1475767255.6447ec1f8ab760e25383edc3578e8ca92f6ba5a9.kensington@gentoo> (raw)
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
"
next reply other threads:[~2016-10-06 15:21 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-06 15:21 Michael Palimaka [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-11-21 18:12 [gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/ Andreas Sturmlechner
2023-10-08 11:58 Andreas Sturmlechner
2022-11-05 16:39 Andreas Sturmlechner
2022-09-24 21:24 Andreas Sturmlechner
2022-09-24 17:03 Andreas Sturmlechner
2022-08-03 9:12 Andreas Sturmlechner
2022-06-22 6:34 Jimi Huotari
2022-06-21 21:32 Andreas Sturmlechner
2022-06-21 20:15 Jimi Huotari
2022-06-20 18:03 Jimi Huotari
2022-06-18 14:27 Andreas Sturmlechner
2022-04-01 18:23 Andreas Sturmlechner
2022-03-21 10:06 Andreas Sturmlechner
2021-12-24 23:08 Andreas Sturmlechner
2021-09-30 11:35 Andreas Sturmlechner
2021-09-22 7:19 Andreas Sturmlechner
2020-12-26 23:56 Andreas Sturmlechner
2020-11-17 21:20 Andreas Sturmlechner
2020-07-30 9:22 Andreas Sturmlechner
2020-05-26 15:00 Andreas Sturmlechner
2020-04-16 19:33 Andreas Sturmlechner
2020-04-03 20:03 Andreas Sturmlechner
2020-03-21 13:50 Andreas Sturmlechner
2020-02-28 10:15 Andreas Sturmlechner
2020-01-06 0:05 Andreas Sturmlechner
2019-10-13 21:56 Andreas Sturmlechner
2019-03-16 19:09 Andreas Sturmlechner
2018-12-06 12:29 Andreas Sturmlechner
2018-01-01 3:49 Michael Palimaka
2018-01-01 3:12 Michael Palimaka
2017-09-13 12:12 Michael Palimaka
2017-09-12 15:28 Michael Palimaka
2017-09-11 13:11 Michael Palimaka
2017-07-23 2:34 Michael Palimaka
2016-10-12 11:57 Davide Pesavento
2016-10-06 15:23 Michael Palimaka
2016-05-29 23:58 Davide Pesavento
2016-05-29 23:19 Davide Pesavento
2016-01-20 17:35 Davide Pesavento
2015-10-09 15:52 Michael Palimaka
2014-08-02 22:45 Davide Pesavento
2013-10-01 22:46 Davide Pesavento
2013-09-29 11:16 Davide Pesavento
2013-09-04 17:53 Michael Palimaka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1475767255.6447ec1f8ab760e25383edc3578e8ca92f6ba5a9.kensington@gentoo \
--to=kensington@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox