gentoo resync : 29.06.2020

3 files changed, 2 insertions, 61 deletions

diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 96664cc4a9f7..fe84bc10d748 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -4,7 +4,6 @@ AUX qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch 3141 BLAKE2B 98aa282
 AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d
 DIST qtdeclarative-everywhere-src-5.14.2.tar.xz 21305980 BLAKE2B 0ccbae8ddc46f4891af6732a4b3cf874c523c7ded5a06f78c7c5cd290fef8e32ad6efe5dcffe947024144128ab2f1108594e4a30da9ca79e1ce3008c73ca2a25 SHA512 48d3a547237514a8bdc2a4c0b3f97732abceacece0e0899d2f33787293eb99f54c28efce35a34b8c46dcd4d78ebbc88bfc820bc68496076eacace40aaceee004
 DIST qtdeclarative-everywhere-src-5.15.0.tar.xz 21493268 BLAKE2B c6b8365caa3e0eef3023d727adf086c16bafc171bcfa839a4dc83132b5c9a76c9a849b387f3815c1a9b12db5824ccc628cad22efd0ce0cb70059971cadfbb00b SHA512 0ec3403286efea6d6ac975ea6bd4464ea656c031f5f27b852235fd69d316a627ac3ff2ea2c3cca0a5375ca278f592df3ecade4e98aa15ec92816a16927f56e5e
-EBUILD qtdeclarative-5.14.2-r2.ebuild 1338 BLAKE2B 1cfe2dc4bb2dc7c9466c0cc2c69d272b3d4fd30be3035ab2999b9fd65f9453d855bab3a3bc79edb3d99038f30c380b1b26dbc7c8232c3f85f8c9142e73bee960 SHA512 f46b45e34b7ab08daa2466b6f5699055539a7901901082afb20d539fe8dedecc8978178f878f0e958612f27da759e448345ceb9e6174b71b6b23f437e6b103da
-EBUILD qtdeclarative-5.14.2-r3.ebuild 1421 BLAKE2B 759cf174be108b8d039158bfb67a82380e18bb6803bdfeac106249c1b80e126e23e2d141b36bd1a2ed74825ba3ceee6a9baa63f370fb4b00f9398698fec85e0c SHA512 9fc7eba36fa39f1cbc799a43aca9f704ea74b27397c950e180e73d87cad81f7280c42e7e7bef5bcefb002d56a3ca4c04755560402369304c80f12f19bbad9400
+EBUILD qtdeclarative-5.14.2-r3.ebuild 1417 BLAKE2B a7f6734e157acb79488a3e3cf283ccd909de12c1ffafdbc293c78179f5c37ac4a605e8916f1e047f7d4847e0391e38639b713904fccf31f8f0de466cad2d7351 SHA512 2a191231c2d9af1cd75adb94e9c1bee95894e75844234308b5169ad8eb4079c395156110a135b84ffb562bf22d7529a9a103adcf3e8832c474945b7770c34dfe
 EBUILD qtdeclarative-5.15.0.ebuild 1360 BLAKE2B 5d66999c92120e357aed3ac2828c8163fbe2f854be4794a4cf793417014a60a16adc794fa9cea50340c8df185c94a7aea5f1b6efd46aa0890765a9684118a816 SHA512 ae0b1468d90fef120f0e22cbe09bc2d33838d30f188167d54addb32f4f286377145b447f6dd4d0e4e914f528182e2b648079c8649ec5f2e0491544e077354fdf
 MISC metadata.xml 700 BLAKE2B 80c5bfdd7c6acd05795c20b36d062b76458fc4b3f83835eef83ed2f304e70dbae9dfe81908bf33e41fd944de4cc754e5f839451cf4c8ef4f06063817730b7cf6 SHA512 f1fbc57d96dc5b481d08da8c73ab9d1e183045ecefeb075a7ee8f1d6733583589077e3650ad5b2d52e4cafc67bf0894ae62fd4500e1974053e46d6a89377f3fd
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r2.ebuild
deleted file mode 100644
index 24d7551a2fd7..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2009-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-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 ~sparc x86"
-fi
-
-IUSE="gles2-only +jit localstorage vulkan +widgets"
-
-BDEPEND="${PYTHON_DEPS}"
-# qtgui[gles2-only=] is needed because of bug 504322
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2-only=,vulkan=]
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qttest-${PV}
-	localstorage? ( ~dev-qt/qtsql-${PV} )
-	widgets? ( ~dev-qt/qtwidgets-${PV}[gles2-only=] )
-"
-RDEPEND="${DEPEND}
-	!<dev-qt/qtquickcontrols-5.7:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
-	"${FILESDIR}/${P}-fix-subpixel-positioned-text.patch" # QTBUG-49646
-)
-
-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
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		-qml-debug
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r3.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r3.ebuild
index e75b8c2887e3..e306c7574439 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r3.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r3.ebuild
@@ -8,7 +8,7 @@ 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 ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE="gles2-only +jit localstorage vulkan +widgets"