gentoo resync : 15.12.2017

3 files changed, 2 insertions, 60 deletions

diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index e18c00c47474..a287d89ab3b8 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,11 +1,9 @@
 AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtdeclarative-opensource-src-5.7.1.tar.xz 18976920 BLAKE2B f451622bd896445b21db99c0896a58051b8cd78b98062ff9ae71285ea66a692b7f236e0c8b69ee9b7a2685f46344525554caf73f6a9d5b45ef7d6df15f8e4b17 SHA512 8c56099a13103f4831a7ceb29223722c1f8efb0e9a87a4c1fdf0b55a3c5b4cedfdac6e06960ea5d03df4184b3d1c6bc3f21bdcdbd2400591143930aa8e32a2ab
-DIST qtdeclarative-opensource-src-5.9.2.tar.xz 21435732 BLAKE2B e807fa3b1c37148615ee522b995377e91cfe467acbfd6a3da217c1681e5ee9f5af4a4e8659872530cd67c49ad90541825f65b80276306baeb29978fc53e27fb7 SHA512 49b8b50932b73ea39da14ac3425044193dfd64eabceadba379aa01cf2fc141177f9870c387caf1cf93ce09e8b197828a54b8d9fcefc4d9cdf400a6c6dd9a9e90
 DIST qtdeclarative-opensource-src-5.9.3.tar.xz 21443328 BLAKE2B acf201966b55f748e516d0f32c2fae0c3990d00ff5b2f31d72d012840ecff4328ba693eb96a800fa6eaefad285a72edfbaae93343e4d664792c561e78ba56882 SHA512 933caf5848437cde45b4bbf0c70b6cafbc690657c651508b28138b2f90d2f823f4842bc709f4726e2c88d3913a92240b0dcd9248d83af0d06d7127b9a8211b24
 EBUILD qtdeclarative-4.8.7.ebuild 1493 BLAKE2B 1fc9ba56b9dd67fb840611e38e19a5bbc4b5f50d16cf7afbf9f384367ea03728f2d44aa1d14adf11ab44f8fba5532ce5f742803a5139f3ed25cf4f404e117d51 SHA512 b01c643b5d27f41e862260743be6701464ed145063ebb6642f5887b648b2f6e8c92c960d81e221a46c8aa7abc9461588953756390f080a7c6a02c53011338ca1
 EBUILD qtdeclarative-5.7.1-r1.ebuild 1599 BLAKE2B 4eb6b7c1e0908d58b3d2d354c46896abb86a82166ef36283465ee5738949584fd35ea8a613e383988bf2910faf5f0bacadeeba032c7f29b7e9451f8a5498b907 SHA512 6d73bf168ea19e07999cbc9b74957415485e176597c5d706afe55f884aab186bda425bc247aaa343fbb04c1d3836d973306441c05dd213c5d119cddbc2dc6864
 EBUILD qtdeclarative-5.7.1.ebuild 1327 BLAKE2B d9cd172eda38ee091a4e40d603425f2d3abbf0a8850c06676fabe94dcc09867f9944239fb3776c8ce942cb5dd0f1bd96e425ab25d48a5a7adaa06356d201a0ad SHA512 64f80c5f910c30dd09967e2b3dabfb21a4d7b4fb109bdc6512ded41ab6922f3a4034bb4567a7efd065ddd28eb2ca8a9763c283e82829d26e3e44600aa9880942
-EBUILD qtdeclarative-5.9.2.ebuild 1313 BLAKE2B 385770b06a9a43bc6a1a53aac6e0d6ee55ffe97b72efa7a4afddc83ae3387a536eaeb6d19b8b6598313a83d835a47369dcbc4b57ac4bcb0d6890fde3c50a7d53 SHA512 c50d3a2fb7888b99e68d9d1ea379e923d3162a5c736db0bfc9f5c836f89f9f6d0da00859b8ac41a09f1499c339d6e3ed5fa7ca63d282633dc3d167bdf17c4190
-EBUILD qtdeclarative-5.9.3.ebuild 1313 BLAKE2B 385770b06a9a43bc6a1a53aac6e0d6ee55ffe97b72efa7a4afddc83ae3387a536eaeb6d19b8b6598313a83d835a47369dcbc4b57ac4bcb0d6890fde3c50a7d53 SHA512 c50d3a2fb7888b99e68d9d1ea379e923d3162a5c736db0bfc9f5c836f89f9f6d0da00859b8ac41a09f1499c339d6e3ed5fa7ca63d282633dc3d167bdf17c4190
+EBUILD qtdeclarative-5.9.3.ebuild 1315 BLAKE2B ccb4987e5e25a416e766d1d072684c6d37e693d1d986be94cab18aad30fffdc9204aa936a8554b8bb99cc5789d73f9898a20b2d4dd9d8b04f242c2f4ab0b2d72 SHA512 669613878211da2684dfa59a72a69a932e0a984dc8d2eb4a38b8868e7d6f6fa15d8ab5a45366d3fd2c42123db3eafa7e72bd5fce288aa89b6cb0319b8dc75ffc
 MISC metadata.xml 1154 BLAKE2B 838bd6238e0b647adb40c4e0d73221104b2f26f160039a014c4576fbbbf51648ec1497e1833987ff298c4d42159c8ad2b2264b8f8a1a5c1d509e321e543709fc SHA512 fe0fdc462c9337726df24de8b8a13660da81a2cbd7cd3d122fadb3a6926e2cd6213d8eedc12185bf4dd1012ab1062ac59fa3cad3055b32e71012072aa31ef415
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9.2.ebuild
deleted file mode 100644
index 23c47148b11e..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.9.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-inherit python-any-r1 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
-COMMON_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}
-	)
-"
-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")
-
-	qt_use_disable_mod localstorage sql \
-		src/imports/imports.pro
-
-	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.9.3.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9.3.ebuild
index 23c47148b11e..f3759a5dc3f6 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.9.3.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.9.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit python-any-r1 qt5-build
 
 DESCRIPTION="The QML and Quick modules for the Qt5 framework"