[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/, dev-qt/qtscript/

[Davide Pesavento]

commit:     2a78d6eaf28a7ad6b0e17e756c8dc94c429bce69
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 24 19:27:27 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 19:27:27 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=2a78d6ea

dev-qt/qt{declarative,script}: sync with gentoo.git wrt USE=jit

Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qtdeclarative/qtdeclarative-5.5.0.ebuild    | 4 +++-
 dev-qt/qtdeclarative/qtdeclarative-5.5.9999.ebuild | 4 +++-
 dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild   | 4 +++-
 dev-qt/qtscript/qtscript-5.5.0.ebuild              | 9 ++++++++-
 dev-qt/qtscript/qtscript-5.5.9999.ebuild           | 9 ++++++++-
 dev-qt/qtscript/qtscript-5.9999.ebuild             | 9 ++++++++-
 6 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.5.0.ebuild 
b/dev-qt/qtdeclarative/qtdeclarative-5.5.0.ebuild
index 70af74e..6e560db 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.5.0.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.5.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="gles2 localstorage +widgets xml"
+IUSE="gles2 +jit localstorage +widgets xml"
 
 # qtgui[gles2=] is needed because of bug 504322
 DEPEND="
@@ -26,6 +26,8 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+       use jit || epatch "${FILESDIR}"/${PN}-5.4.2-disable-jit.patch
+
        use localstorage || sed -i -e '/localstorage/d' \
                src/imports/imports.pro || die
 

diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.5.9999.ebuild 
b/dev-qt/qtdeclarative/qtdeclarative-5.5.9999.ebuild
index 70af74e..6e560db 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.5.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.5.9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="gles2 localstorage +widgets xml"
+IUSE="gles2 +jit localstorage +widgets xml"
 
 # qtgui[gles2=] is needed because of bug 504322
 DEPEND="
@@ -26,6 +26,8 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+       use jit || epatch "${FILESDIR}"/${PN}-5.4.2-disable-jit.patch
+
        use localstorage || sed -i -e '/localstorage/d' \
                src/imports/imports.pro || die
 

diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild 
b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild
index 70af74e..6e560db 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="gles2 localstorage +widgets xml"
+IUSE="gles2 +jit localstorage +widgets xml"
 
 # qtgui[gles2=] is needed because of bug 504322
 DEPEND="
@@ -26,6 +26,8 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+       use jit || epatch "${FILESDIR}"/${PN}-5.4.2-disable-jit.patch
+
        use localstorage || sed -i -e '/localstorage/d' \
                src/imports/imports.pro || die
 

diff --git a/dev-qt/qtscript/qtscript-5.5.0.ebuild 
b/dev-qt/qtscript/qtscript-5.5.0.ebuild
index 3912f2f..2eadc8c 100644
--- a/dev-qt/qtscript/qtscript-5.5.0.ebuild
+++ b/dev-qt/qtscript/qtscript-5.5.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="scripttools"
+IUSE="+jit scripttools"
 
 DEPEND="
        >=dev-qt/qtcore-${PV}:5
@@ -28,3 +28,10 @@ src_prepare() {
 
        qt5-build_src_prepare
 }
+
+src_configure() {
+       local myqmakeargs=(
+               $(usex jit '' JAVASCRIPTCORE_JIT=no)
+       )
+       qt5-build_src_configure
+}

diff --git a/dev-qt/qtscript/qtscript-5.5.9999.ebuild 
b/dev-qt/qtscript/qtscript-5.5.9999.ebuild
index 3912f2f..2eadc8c 100644
--- a/dev-qt/qtscript/qtscript-5.5.9999.ebuild
+++ b/dev-qt/qtscript/qtscript-5.5.9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="scripttools"
+IUSE="+jit scripttools"
 
 DEPEND="
        >=dev-qt/qtcore-${PV}:5
@@ -28,3 +28,10 @@ src_prepare() {
 
        qt5-build_src_prepare
 }
+
+src_configure() {
+       local myqmakeargs=(
+               $(usex jit '' JAVASCRIPTCORE_JIT=no)
+       )
+       qt5-build_src_configure
+}

diff --git a/dev-qt/qtscript/qtscript-5.9999.ebuild 
b/dev-qt/qtscript/qtscript-5.9999.ebuild
index 3912f2f..2eadc8c 100644
--- a/dev-qt/qtscript/qtscript-5.9999.ebuild
+++ b/dev-qt/qtscript/qtscript-5.9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="scripttools"
+IUSE="+jit scripttools"
 
 DEPEND="
        >=dev-qt/qtcore-${PV}:5
@@ -28,3 +28,10 @@ src_prepare() {
 
        qt5-build_src_prepare
 }
+
+src_configure() {
+       local myqmakeargs=(
+               $(usex jit '' JAVASCRIPTCORE_JIT=no)
+       )
+       qt5-build_src_configure
+}