gentoo resync : 20.10.2021

3 files changed, 2 insertions, 31 deletions

diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index c7ea449014a8..eef60c0627ad 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,5 +1,3 @@
 DIST qtwebsockets-5.15.2-e7883bc6.tar.gz 434705 BLAKE2B f8c8fbb0e369ad5ceed40ca62c2a7d6d2cdb3cb74037e9ecb487b0ec31757aae10ed6f61790c566e4431b59585fee423047c4687b41cdfc08e96dd46c2f964b6 SHA512 35b1caed6462083014bbb83c6aa81b441f67da7f0e3813fc47997ca4fecfe5423eaef5dd4ed3c37f42dd311eded0e6b36cce6725c7028047ca21b454ded9257f
-DIST qtwebsockets-everywhere-src-5.15.2.tar.xz 259000 BLAKE2B 1bbc4d5451e70a94b6fb8377a60e43e2fa1aeb0d1224dd04486fcafd7821c3918a887297860e7cfcd18f3afd8dd02a903cf16fb69aeb48a52557af539c79458e SHA512 1b23b79bff4289e785daf51441daaecf6de66ca5a3febfdd8fdb8ce871471bca4faf7663d68b23aaf562b1ebd6e9c8c27b3074f4b93bc9fcd3a0c54f7f79a9c4
-EBUILD qtwebsockets-5.15.2-r10.ebuild 618 BLAKE2B 993d2330acd21c8b20739e8a1fabe5ed419387f9605ad125d73b34020fa544fb68bced4b39e82a2d3ba57d0aa294a8243537fc53b175c37df03ca7bc4cd1a4c6 SHA512 8bee6a4053591699486b1c71806389f319ad81eb139107f4b4f8348d804c7ef84b21cff3e24615be976d2398b7bf8de95dca5848aa0a5cb68af83125d85e0058
-EBUILD qtwebsockets-5.15.2.ebuild 545 BLAKE2B 048aa5d3965f2b03d73cfc0dac6d183419c2dc422f3cc6f8f7e88ce9d916a0995b0aefa1606c3876ee12fc74721fb7bbb60b6e81858042df7fa176c6177ac9d7 SHA512 bf768df2dafbdfe3b866596c5e12d3ab47da1248413e92cd46f032499f5bd2af4911f5d6b2ff8aa7a6fe338304d165a31cc4b27035d925747a85f4002995ee67
+EBUILD qtwebsockets-5.15.2-r10.ebuild 617 BLAKE2B 05ab06a8995f01708e58edbed2cbc158363e226bc04810423bd39fe9538760617da2385d446be907dd98f3a1297a651219259627ecc3667e72183e5a0e9b2918 SHA512 829ca1981fc2b589fc3ea5f9efed6a13fcfcbe0e34d2bfe3bb82246c0d25d24a0113bd9fbe8907657ef9ae656313f88bef761c871077862d54fb76f885250b1b
 MISC metadata.xml 542 BLAKE2B 45db7e0814cd2ecae2053ed664d6af55c1f2c175eeceba4364fc37c558ddb51c8e28309722e8c2404441ca009613c045ddf7e501d4b5ed27d208c027c3aa1573 SHA512 5bc7be4d72823fdb716ce7eee0c36eb2a5fe7ea9a59a95792727efbddbe474fb44dfa0286a3064ee674a41d8d5415fd48c717735b6818cf3c28e1d60193f3ce1
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild
index 5b6000dbc97c..3430a52d80fd 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Implementation of the WebSocket protocol 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="qml +ssl"
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.15.2.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.2.ebuild
deleted file mode 100644
index c47cd625b4a2..000000000000
--- a/dev-qt/qtwebsockets/qtwebsockets-5.15.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="qml +ssl"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtnetwork-${PV}[ssl=]
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}