gentoo resync : 31.10.2017

4 files changed, 2 insertions, 113 deletions

diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 49f62e1b3d79..5c28f823a6fd 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,12 +1,8 @@
 AUX qtdeclarative-5.4.2-disable-jit.patch 547 SHA256 26856b8df7b43aba27ca38ac45c060d4b8e1046d9299fae6b64f1d013d0afe77 SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d WHIRLPOOL e09187b15a79e0f4ce5136eb3aec6ed425b6082b6b0331a0daffefc0ac4a6da4d5e7e7d28ddfcf8fe26ab485ce80ebd5550fed114d473a57b0edcd87e6f996d1
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtdeclarative-opensource-src-5.6.2.tar.xz 18813016 SHA256 0086a986bc36b398ba518c404d08cdff0a0d7978c30aa3fa2ab73d71654209da SHA512 30870f6c40b8c8ecd3b960ece8175f98a42aebc3f4fcada06b4dcc0f844c4acfd955d550d7014fb441f65d7010ced8a6ef394ec3887dc543306b5ef15570c88d WHIRLPOOL ef4ae3f6cebd44528917bd571b1eaa55d07b96f3b005e25eb201ef52477a6dff742fe85b30f491793ea8256489349780adb79a93ccb7d64e1787a7d5d388041e
 DIST qtdeclarative-opensource-src-5.7.1.tar.xz 18976920 SHA256 fd13dd3059d20694a857ed30ee56a2ade908c0cb93246f9804a65f7a2d775d56 SHA512 8c56099a13103f4831a7ceb29223722c1f8efb0e9a87a4c1fdf0b55a3c5b4cedfdac6e06960ea5d03df4184b3d1c6bc3f21bdcdbd2400591143930aa8e32a2ab WHIRLPOOL 36fdf7de44aaef1b5f6a6b7719705422cc4593da1a79e156a797bc86389f96b0bd5658b00ebc7177ecb2e5e17c3beead4205ccb7fb0d0eb2ec8679c5a58ae6fa
 DIST qtdeclarative-opensource-src-5.9.2.tar.xz 21435732 SHA256 0d40fd4de9c73b9173d8308c0dc37952bf5c747d87ff221962dd2f848d820b08 SHA512 49b8b50932b73ea39da14ac3425044193dfd64eabceadba379aa01cf2fc141177f9870c387caf1cf93ce09e8b197828a54b8d9fcefc4d9cdf400a6c6dd9a9e90 WHIRLPOOL 64b9f7d8c1c7930c3695d7cf24c2f6d61556fd9fb69347e04b5c47c8542fbefce385a436e7c68b0a3ee355c301ea8f5c9316256fbc0ac540a4c2e46acdd9012c
-EBUILD qtdeclarative-4.8.6-r1.ebuild 1543 SHA256 f2ae5c7ceb02b32aa6f6a30790a87251785ebc247a4ced5d21c172757ab2fbef SHA512 707580b8a99a2ccf2b064b7d4c5f450a95a746be92d7dafbf02a90c1d412b46dc850f817963784ae0f10f75cdf4e8257b3d943459ecdaf19039cf892c70b8742 WHIRLPOOL 23381efe1d73e3f67ba6817a9fb358c59ef7d25ed76b69be2d0af271d57ed7e497197dc4f9ad19e06e6715feb8c29eb0b5f855c212acf129b5e3975722965443
-EBUILD qtdeclarative-4.8.7.ebuild 1492 SHA256 db4d97fbc8f76e60f150836757805372fe2f98497066d41d32fb164fb78c72d7 SHA512 e711fdd4d476b3ded4b19a8a396504b94599eb957553faecbd9c168914118b58b22c2ba43cb23336b53c3c2a41e55f64c3e60908cc24f6f01c7e02c15c384ace WHIRLPOOL a6528d0fb82d5f21404d51d87f6b766208979ba3041b003c91c11007ce44c4babc80725cd18db6a443edab8b4781ca631b8a2f30645177c79a1bdd42e482fcb4
-EBUILD qtdeclarative-5.6.2.ebuild 1254 SHA256 7ee2cfcc66e5e8beb9d753e53fb69489227208c69e0e3d413a547f45648ecdcf SHA512 ee2ad45871d0223e03f6043a3183c8224cc255b5f33f4c6eb6501e23c45b84b53404b1a0433a7fcad381e1074e432da762947436cb5d528d9d97c2cf4990403b WHIRLPOOL ad81c9a35e4da74a3607fce7eb173845215e3c28efdf4fd278e22dc2abb81d68dd4fa911145e59d00e0f27ad262d959bf212f31760a4ce8f00ecb86bb24d1927
+EBUILD qtdeclarative-4.8.7.ebuild 1493 SHA256 e73031c19506f8d72d260d1e81c623daea8fe39d2ec457dd2b84324cfd9e7898 SHA512 b01c643b5d27f41e862260743be6701464ed145063ebb6642f5887b648b2f6e8c92c960d81e221a46c8aa7abc9461588953756390f080a7c6a02c53011338ca1 WHIRLPOOL a0832a8f2bd9a9f0512815ceb5ab9d2154c52c66ded070064388036aa787a4a12f0732f7065afcc1fa128ad4ed07b4ab900294c201fb71f3c57d3a3407fcb22b
 EBUILD qtdeclarative-5.7.1-r1.ebuild 1603 SHA256 b3d896a4d1ae7bb76ac7ea457bc7c58830f4005984da3150a7eff57c6e06e7cf SHA512 a6bbecdf2e505a3ce906f6a84881747655ad44b122439ad7e95a9a61537f9a4360a271b3a8d74288aa498ddf3174b5e7f842f1e64d0c9eb29f9042896cd3add2 WHIRLPOOL a1b5f6cac8bff04681e831df1ce5e09ea0a36801fb31183f2b99edc2e96af520dd4d7e453fe753b68a7dbfd52f1d351c1d5ebc9562186d1773aff63ac7f9dba5
 EBUILD qtdeclarative-5.7.1.ebuild 1327 SHA256 7698e5beb203cd86095cac30ce6db015819adde0bf6eef6ae143de2d847e5184 SHA512 64f80c5f910c30dd09967e2b3dabfb21a4d7b4fb109bdc6512ded41ab6922f3a4034bb4567a7efd065ddd28eb2ca8a9763c283e82829d26e3e44600aa9880942 WHIRLPOOL b3ac40bcbb85375f2ca4fccb4781360eac694d86884876eb20dce946b330001e4a0381e528b2172761ceca9b711255fa3ebc8270fe983ffc5ddfd70d5f2f7987
 EBUILD qtdeclarative-5.9.2.ebuild 1313 SHA256 7186360234d5e3dee430fca782e09af3cc70de7b2fb813d0cc09257a65c4fa2b SHA512 c50d3a2fb7888b99e68d9d1ea379e923d3162a5c736db0bfc9f5c836f89f9f6d0da00859b8ac41a09f1499c339d6e3ed5fa7ca63d282633dc3d167bdf17c4190 WHIRLPOOL 9b01ccfc9af77cb5441fa23015d3e821a05b4cf29322699de142c5b088f431611a61bf1a1ff92eb483a2c6b02a23726770619caeeea0063faa23e50cda4025a2
diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.6-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.6-r1.ebuild
deleted file mode 100644
index fcc4f19abff3..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-build-multilib
-
-DESCRIPTION="The Declarative module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
-else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="+accessibility qt3support webkit"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
-	~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
-	~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
-	~dev-qt/qtsvg-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	qt3support? ( ~dev-qt/qt3support-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}] )
-	webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
-	src/declarative
-	src/imports
-	src/plugins/qmltooling
-	tools/qml
-	tools/qmlplugindump"
-
-QCONFIG_ADD="declarative"
-QCONFIG_DEFINE="QT_DECLARATIVE"
-
-pkg_setup() {
-	use webkit && QT4_TARGET_DIRECTORIES+="
-		src/3rdparty/webkit/Source/WebKit/qt/declarative"
-}
-
-multilib_src_configure() {
-	local myconf=(
-		-declarative -no-gtkstyle
-		$(qt_use accessibility)
-		$(qt_use qt3support)
-		$(qt_use webkit)
-	)
-	qt4_multilib_src_configure
-}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild
index 98bdbce906d8..267b79b445b8 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The Declarative module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="+accessibility qt3support webkit"
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.6.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.6.2.ebuild
deleted file mode 100644
index 7850c893d8bb..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.6.2.ebuild
+++ /dev/null
@@ -1,53 +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
-RDEPEND="
-	~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="${RDEPEND}
-	${PYTHON_DEPS}
-"
-
-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
-}