gentoo resync : 20.10.2021

4 files changed, 2 insertions, 96 deletions

diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 0c96b39ead41..35cd362c8331 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,9 +1,6 @@
 AUX qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch 1566 BLAKE2B b6436c9be0a7de092635e1fc3999c3142fc3e916cbcc69f472691bbd559f611b4d5741f3627c47162a5ac86126382507add72a25a121235e856b1de802ee19be SHA512 dd5193f8d8a051238dabf63306cc77e3a5696fc12241c27f35cadfd30763ddfeb2af7d640849dcc7a810b7087173b8e9af17341ea1b68440906f2c2f1f96fee3
-AUX qtdeclarative-5.15.2-gcc11.patch 950 BLAKE2B 06677d7c96c045eef941279f7bd263ad27fee355ce0c394c9c50a0609a024be3da546e38ac44345202845d151da16b119bbf2c99cbc5feff4062f7973f844e94 SHA512 8c6cc7314f4976f84a3232ab006592136fafe94100c4cd463a5ca94c36705072a7fcf7963ba3d316304bd1085b5b8abfe5af028591a6f95dd9b715083db67ebd
 AUX qtdeclarative-5.15.2-riscv-atomic.patch 426 BLAKE2B 163aecf69229482ca4909ff8e618324388f80314520671a254a265e102cdaf3ae25ab9ed64cac25bb4d04377fb110fce3f38f00660efabab5d2ee0b463edd81c SHA512 3450a3e7676b7e56a97771ecbd6c835bdb2f77e4fd0802927b90d5fecc4c55abe5d9ea2d7a576e3668d8f23d838cf7a5dd25ca77cbdad789056c0fe37b9b5a8f
 AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d
 DIST qtdeclarative-5.15.2-1c33a9d0.tar.gz 24342460 BLAKE2B f83d01c9bd28842f53b5bf9e95d1b83738792ae6969309ef702fef2e943a4e886313445c7332a2a5cb72cd99aa5db7520a04a054b16d8065bc03b95cbe14026d SHA512 a1b6ae66c83cc7385c51845f1cbafb55cadd69c121196cd138abc92e964d0bb594ce20267244e4202a9108d92b9bf0f107536774f2a76da71b434692559c1fb4
-DIST qtdeclarative-everywhere-src-5.15.2.tar.xz 21559880 BLAKE2B 07fa82a55f79c081cf3cb713e6b90274f2b2c420eba958042f58989502e2ae572294c4cd02eb73767e87d84c9173fb154e45370c043f6adfc7fb1a93377e2edc SHA512 a084e4ace0d6868668c95f1b62598a7dd0f455bfb0943ac8956802d7041436686f20c7ccdde7d6fd6c4b8173c936dd8600cf3b87bf8575f55514edfbb51111d3
-EBUILD qtdeclarative-5.15.2-r1.ebuild 1369 BLAKE2B fb3857c567472d259b15bdfb2cdf15f9d2b36cf237a8839051e5dcb1d64310a5760ee180c90b3880e68c6f74b38911f7f9aa7cadbfa596a6d88dfbf9f7d8766d SHA512 fe359a279c42693905970ebbacacd69a246b7710e443b82ec12f781ca667fcdc5b4173887fb19c5c1882cd56a4adac98b444216e320a1af1654eb3b312271ae3
-EBUILD qtdeclarative-5.15.2-r12.ebuild 1426 BLAKE2B 1a89658f717f47c0d89bdfe910b11a110209739e40e2386f470c59ae5367bac79ea9b31c966c59055de5bffc30e703dacb0da64a19119a4249a508358ae76df9 SHA512 a9844c3d223afc4dda2bdf2e0b010b52d4f8b16e754fe75bbf2d6400161354637b5bf57ff67234815b7a6ed7de65b71e7507fc521ea56b5d7eb1d8f1fe3983b3
+EBUILD qtdeclarative-5.15.2-r12.ebuild 1424 BLAKE2B 7c22e422e9f11505017285947604fc663e05639b64f839cee4916a3687741233ed8601a922158b0919f2b9ab2836413fb58a2c7ff52a856f9cc963e26cba18f6 SHA512 e5d64299648370cd10502e6da09582cd259d7b82688bd4658eba9033a4dd50c34c984895591a56cfbf527865599459ddc9dd8cc87ed557433db3747434241916
 MISC metadata.xml 701 BLAKE2B f28878770fe3d7abe7d61ef71306a00ea53f3428c4002a76b484f8d99924567a640f8d091e33485bc46b9644ab1dbf34a19a3329e53040419c402ea70a6f33d2 SHA512 31d0a0f10002da589a2130c16548b36a67bc763aee5b3dbcf6b4ef815a2f0a64ee40b185867adbbc910ae99c2916e83104a91a90e0dba0e0a219e20c24674eb9
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-gcc11.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-gcc11.patch
deleted file mode 100644
index c5dd916912d1..000000000000
--- a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-gcc11.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 543594243ad0006bf4d98998ecfa52b46242f0ed Mon Sep 17 00:00:00 2001
-From: Jeff Law <law@redhat.com>
-Date: Oct 16 2020 21:12:18 +0000
-Subject: Fix missing #include for gcc-11
-
-
-diff --git a/src/qml/jsruntime/qv4regexp.cpp b/src/qml/jsruntime/qv4regexp.cpp
-index 76daead8..4f707703 100644
---- a/src/qml/jsruntime/qv4regexp.cpp
-+++ b/src/qml/jsruntime/qv4regexp.cpp
-@@ -37,6 +37,7 @@
- **
- ****************************************************************************/
- 
-+#include <limits>
- #include "qv4regexp_p.h"
- #include "qv4engine_p.h"
- #include "qv4scopedvalue_p.h"
-diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h
-index a7e37d19..21c3b465 100644
---- a/src/qmldebug/qqmlprofilerevent_p.h
-+++ b/src/qmldebug/qqmlprofilerevent_p.h
-@@ -40,6 +40,8 @@
- #ifndef QQMLPROFILEREVENT_P_H
- #define QQMLPROFILEREVENT_P_H
- 
-+#include <limits>
-+
- #include "qqmlprofilerclientdefinitions_p.h"
- 
- #include <QtCore/qstring.h>
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r1.ebuild
deleted file mode 100644
index 643829a93cc1..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2009-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-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 ~riscv ~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}:5=[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/qtchooser
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
-	"${FILESDIR}/${P}-gcc11.patch" # bug 752093
-	"${FILESDIR}/${P}-riscv-atomic.patch" #bug 790689
-)
-
-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.15.2-r12.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r12.ebuild
index 6e86ee6070b2..7987361ecfdd 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r12.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r12.ebuild
@@ -10,7 +10,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 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="gles2-only +jit localstorage vulkan +widgets"