gentoo resync : 05.02.2020

4 files changed, 6 insertions, 35 deletions

diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index 198c5bb1056d..d663c87e10cf 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,9 +1,7 @@
 DIST qtwebsockets-everywhere-src-5.12.3.tar.xz 235312 BLAKE2B aabe93119aedf18987b4c2211e1cd312a785592ddd0ac371b23e6d5649849bfe231aa24c2de91c20655df7f3a92a614371846060f5b70e09a14f4f7607242fd8 SHA512 212a98d987b4fd16216ac9a1c98e061be6a5bd2e2c4ec8be80424d6f23afeace790fe666abe8a11e2116dc20f17a41ad0c817fceacdfa5f766b93068ac614817
-DIST qtwebsockets-everywhere-src-5.12.5.tar.xz 235468 BLAKE2B ad2418ea447490ab3ad7accc2850b448558c978389925e4c26cd3280ea20e543478fdd3af3db982cbd668a4074ce1b01a488d89313e9b9ff3ceface0fdafdc0f SHA512 970ad232ad1258630404d5e7347721505a780497e1775f88591098f11bca48cbf62c4f02491b133d31e4304eb9e16f923292c5b778e22d530d7a5a4e95d422ba
 DIST qtwebsockets-everywhere-src-5.13.2.tar.xz 244668 BLAKE2B a8a0b6327673e8746939e903814adb7194f61eae6954d96bdf25dfe93e15ea7853c4605bef77ba28205afffb1048f11c3b80f6818663681e12cfb1adc064ff2a SHA512 c4d3b31e8110b74485e7fb1d6d82039efe176e8b626209485fbe3843f7a4b9f11708c9b978623d45e45263e6ae9990e927a3f7a9a48ced4dbcb5e954c60f593d
-DIST qtwebsockets-everywhere-src-5.14.0.tar.xz 246892 BLAKE2B ad4ed07bc16434a17c38eb0f75cc9ad948aac4d9ab8d215bb6c0999d5737f7d5649d820e9ede3e9eb5aed64086d33737d3cfb99898716cbee63c575ca83d6da8 SHA512 4951fa4d757ec908fbd759ad48d531ca4d006950ed0318a2d478cc807b0bd3601465407d6a0b53c217946a2b8fa8bd5bb8f0b46435e3a7aea95f2496fe45bcd0
-EBUILD qtwebsockets-5.12.3.ebuild 538 BLAKE2B f75736bad52bd3169726e57d7213c3fe5ee759d49dc3b248fbe0a91ef28795058b18235ae851d391aa3b6491fcbcc1273501f9beea20f9543307cae549264836 SHA512 24780fbf2896565fbb196a44b010b41f78e5d017064ce0257bf38479899361f6dc75252db770a6f2b2dd4d534f20dfc2f142c4494bcc227afce29ae3e1a167cd
-EBUILD qtwebsockets-5.12.5.ebuild 540 BLAKE2B 62d2d4535af4839dc9252e50d9a2e7ec6293beb60b2f7ba0de156db1e5ec11520a2ac29e48bdf2108313ad07e467d44ac1ce8e2d299717ba18599762a5a51269 SHA512 410f07a7aa3def8fb7c216c195a6a570c7f243155c1c403e56776c659e97e50e591c077c9e4512fbd330bd7a1e3579dcfcc8280d14e89eb995dcb2285516b9bb
+DIST qtwebsockets-everywhere-src-5.14.1.tar.xz 252616 BLAKE2B 94fa6ee635760f3e09c771731ecbb464f25a66bf836d08afe6d206d1b4cd26a90b8b80bef18e62e105e550f409192c4b9e75c02b3b1810d3993b795000548378 SHA512 ce8926f0c8022182504184141c64897c5c71e430d6366b1d0802247e81445934db419ff61625b046b624de7b459c74f9634ae2a13e2d646a1b1811c4dbe177eb
+EBUILD qtwebsockets-5.12.3.ebuild 502 BLAKE2B 8e4177dae5c6c2e875e641ac96b3595bb237e9cd56a73c0b155aec3f493cfaf7f84f44f188f526b1b6fd91d281e94743acc35a530e3054bfbaefb874ac3ac890 SHA512 f9f2bb2683f193beff3fd952b564ce30f8670b9acf35e468d693bd8563f98a9389d164f62783c0288ba20ee5d3fc693ed40b42813b167219af7d5da580b3be55
 EBUILD qtwebsockets-5.13.2.ebuild 540 BLAKE2B 62d2d4535af4839dc9252e50d9a2e7ec6293beb60b2f7ba0de156db1e5ec11520a2ac29e48bdf2108313ad07e467d44ac1ce8e2d299717ba18599762a5a51269 SHA512 410f07a7aa3def8fb7c216c195a6a570c7f243155c1c403e56776c659e97e50e591c077c9e4512fbd330bd7a1e3579dcfcc8280d14e89eb995dcb2285516b9bb
-EBUILD qtwebsockets-5.14.0.ebuild 543 BLAKE2B 29c1368206ce4e435cc915e99c3c43420a1a0b5601edd9f78277177e0c7b075116beb81965167e011c03ed86da5e07760e6eaffcccd81a70a3e87094cf4c60b8 SHA512 2e9486c7f237deeeb57f0c8e9e4da335ee81182ecd193b021fc751574915793402ab5c153074051f09f26cbb8396f9dc900ab42dc2486b8b63817cc4378faf96
+EBUILD qtwebsockets-5.14.1.ebuild 543 BLAKE2B 81ee48cda5fa05343a359d6458e2209496f2e180533db2c4947118d66bdff6dd281ccbf2383ea2176c1b3829bd0c07f1ae0b95e50c4813123c3e23c47614428a SHA512 ed527ddf617aa7def7f2eb8793b56a83627c0a034993b767c0358835ca4b7dda3aeef5ffa483131f69279448893615873ad9768d2bfd8fb5c973ee9bfc22b473
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.12.3.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.12.3.ebuild
index d999e123ec1c..116ef775f5a9 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.12.3.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.12.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,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 ~sparc x86"
+	KEYWORDS="arm x86"
 fi
 
 IUSE="qml +ssl"
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.12.5.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.12.5.ebuild
deleted file mode 100644
index 0470c9ca9563..000000000000
--- a/dev-qt/qtwebsockets/qtwebsockets-5.12.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 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 ~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
-}
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.14.0.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.14.1.ebuild
index 097f97a9d7a4..bb21ea253730 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.14.0.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7