From 7fdfc0644cff524dd3f1fa8b2979367164cbe645 Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Thu, 23 Jun 2016 01:54:18 +1000 Subject: dev-qt: upstream respun 5.6.1 tarballs qtdeclarative was revbumped due to the inclusion of an important patch. All other modules had either trivial or no changes. Gentoo-bug: 586646 --- dev-qt/qtdeclarative/Manifest | 2 +- dev-qt/qtdeclarative/qtdeclarative-5.6.1-r1.ebuild | 51 ++++++++++++++++++++++ dev-qt/qtdeclarative/qtdeclarative-5.6.1.ebuild | 51 ---------------------- 3 files changed, 52 insertions(+), 52 deletions(-) create mode 100644 dev-qt/qtdeclarative/qtdeclarative-5.6.1-r1.ebuild delete mode 100644 dev-qt/qtdeclarative/qtdeclarative-5.6.1.ebuild (limited to 'dev-qt/qtdeclarative') diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest index 91ceff62f413..b2edfee3bf5b 100644 --- a/dev-qt/qtdeclarative/Manifest +++ b/dev-qt/qtdeclarative/Manifest @@ -2,4 +2,4 @@ DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e0 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2 DIST qtdeclarative-opensource-src-5.5.1.tar.xz 18627840 SHA256 5fd14eefb83fff36fb17681693a70868f6aaf6138603d799c16466a094b26791 SHA512 e8c25eeaca66cfb8b8bd014487ad81b8b9780e2f3e898b967d0923dbb40b54cd32c35859b7419e964319401995c27a229ed0ec9d1ec6d2aba84002b59abefddf WHIRLPOOL cb8f03750db20350eadf8dc4b80eee91a2accb10ea425ea71c4fb703d9c4443e5a6a9e341aabbab15d2a43af29da1369eff22e7854cd8637ec1915f9dd7439c3 DIST qtdeclarative-opensource-src-5.6.0.tar.xz 18865300 SHA256 8c55f053f0e348577b56da541af74d02d0f2b61c9a6c15152b03dad03dfde04c SHA512 f222549c9664bb4862b972354b57ce2918a691d4015948d0133a007567e6e9ae7e8ffded35649f07ab4a97c00531dcf43aaae96fc1d0ffa315e063da32be9e80 WHIRLPOOL f3fb0867bbde3c0d5b47554e3a622cc372b915b84cff589cc33a1624d1b9e9e0b8b22e192412f6f3b34524faac61c6a137b20ef9e04b312b17bc3b3a81847bd9 -DIST qtdeclarative-opensource-src-5.6.1.tar.xz 18803076 SHA256 12fcfd4bc4bad469f07f8c5404d98646f88f61200b014d4fbcb3a0d9e70942b4 SHA512 4d00e43338e458c0d5e9fe909f71813c1a6e842d2f81be361b3216ead0404c5e172b3fb2836d5d37b5a2619625420ec870b6a38161fab0db452b1fd531479e66 WHIRLPOOL 0fe0a704384556e3da924af371b498d157f0b5ff94760f2ec5049c7870759fac8e36995da4aa39b8c7b90df8d9ae057a438ffe0886f1a08e42d1355313af2591 +DIST qtdeclarative-opensource-src-5.6.1-1.tar.xz 18802904 SHA256 1cdf60b52509972ac001f5402a42d9b144b344010ec6e34f528f7dfc6be98f24 SHA512 ddff875d9567f71fd70f0353b27add05a0e2525adee61e46aa3cc896782053dd24276f25d51673e43bd8cf8a4c0e590f894dd92a244788c42d6e0630f48e8648 WHIRLPOOL 06d879413200edf4e23011781e0782da93b30d95b9bb8fe276b49556fe5f65fea9068fbd9c3d2cd33c8a29ef84120ad99395468224b8442c1c0307aac17aa0ed diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.6.1-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.6.1-r1.ebuild new file mode 100644 index 000000000000..cbbb87161d31 --- /dev/null +++ b/dev-qt/qtdeclarative/qtdeclarative-5.6.1-r1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit qt5-build + +DESCRIPTION="The QML and Quick modules for the Qt5 framework" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" +fi + +IUSE="gles2 +jit localstorage +widgets xml" + +# qtgui[gles2=] is needed because of bug 504322 +DEPEND=" + ~dev-qt/qtcore-${PV} + ~dev-qt/qtgui-${PV}[gles2=] + ~dev-qt/qtnetwork-${PV} + ~dev-qt/qttest-${PV} + localstorage? ( ~dev-qt/qtsql-${PV} ) + widgets? ( ~dev-qt/qtwidgets-${PV}[gles2=] ) + xml? ( + ~dev-qt/qtnetwork-${PV} + ~dev-qt/qtxmlpatterns-${PV} + ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") + + use localstorage || sed -i -e '/localstorage/d' \ + src/imports/imports.pro || die + + qt_use_disable_mod widgets widgets \ + src/src.pro \ + src/qmltest/qmltest.pro \ + tests/auto/auto.pro \ + tools/tools.pro \ + tools/qmlscene/qmlscene.pro \ + tools/qml/qml.pro + + qt_use_disable_mod xml xmlpatterns \ + src/imports/imports.pro \ + tests/auto/quick/quick.pro \ + tests/auto/quick/examples/examples.pro + + qt5-build_src_prepare +} diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.6.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.6.1.ebuild deleted file mode 100644 index cbbb87161d31..000000000000 --- a/dev-qt/qtdeclarative/qtdeclarative-5.6.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -inherit qt5-build - -DESCRIPTION="The QML and Quick modules for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" -fi - -IUSE="gles2 +jit localstorage +widgets xml" - -# qtgui[gles2=] is needed because of bug 504322 -DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}[gles2=] - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qttest-${PV} - localstorage? ( ~dev-qt/qtsql-${PV} ) - widgets? ( ~dev-qt/qtwidgets-${PV}[gles2=] ) - xml? ( - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qtxmlpatterns-${PV} - ) -" -RDEPEND="${DEPEND}" - -src_prepare() { - use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") - - use localstorage || sed -i -e '/localstorage/d' \ - src/imports/imports.pro || die - - qt_use_disable_mod widgets widgets \ - src/src.pro \ - src/qmltest/qmltest.pro \ - tests/auto/auto.pro \ - tools/tools.pro \ - tools/qmlscene/qmlscene.pro \ - tools/qml/qml.pro - - qt_use_disable_mod xml xmlpatterns \ - src/imports/imports.pro \ - tests/auto/quick/quick.pro \ - tests/auto/quick/examples/examples.pro - - qt5-build_src_prepare -} -- cgit v1.2.3-65-gdbad