gentoo resync : 05.02.2020

4 files changed, 6 insertions, 41 deletions

diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
index 6778ddc3c637..3999e737b202 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1,9 +1,7 @@
 DIST qtconnectivity-everywhere-src-5.12.3.tar.xz 2750144 BLAKE2B 1c287d15713fc2155cb5b07517fdedf566a686601681efde84b096f8e052dc36a872a8c9d263d54ac38dee0c69b8966f877fd698144b5ef897ff290a50ee0aa5 SHA512 4da406d88c3cf216d53c524d3896f50b19dae124baec904233dbb67163a30a955dee29148b5f5b71c35cb28638912423bb1cf4d38c62aeefa7353bd29e97a269
-DIST qtconnectivity-everywhere-src-5.12.5.tar.xz 2752252 BLAKE2B 0e2da5249206bb7064b65d1c7ed0a9c2be6e44908102e9b421c0c03a3cbb5eb895b538b0b32f6b48ac9ade548ada83103d4ec9b654f397d57d27d3909d282dc5 SHA512 96cdb27aa0e439094e3f1de0c7a680973c3ce2c65bbbff38affe25a3708c9e4e3c1c6a403d698303f77a5f261b44ac657e01a769b62a1565e0a8c64c8ac80bd5
 DIST qtconnectivity-everywhere-src-5.13.2.tar.xz 2777504 BLAKE2B 96fa60f6685907a2f6a97548bea70551dfd5fb2a1a3d4ffe5b68fe6629f90a52cacb29432f6f64caf8a7426238a37222eaedd515502ec3ade85260e5689b17ca SHA512 ec5269430ce548911f9af44f028bb8032163827d588da6914e9a721ad833277d88bfad43b1cfb4f844443c7a2af6cdbcf2951a339a127c22274612a4e3b90f38
-DIST qtconnectivity-everywhere-src-5.14.0.tar.xz 2791788 BLAKE2B d53ee45cf7be0bba2894115cf8a7c325b325d72084d62aad7dc343faf0348517d5037c52a01d893c2ab4be05ff6635eb9c25488097b577279939d3a060e028db SHA512 9e27cd7315f2d5abacb73f4de132ced31c340c075a876729f4567ccd2f47cc11610aabfc347d7b7325d76f530ac3470262fbdd9bee428ddb68b13b4c129e3366
-EBUILD qtbluetooth-5.12.3.ebuild 634 BLAKE2B e41988e55e399b7b52687ff0820a48424ab9486521e581ba26ab9cf53d0413ab67dd5ab4020a4a40932d9ded99e61c1a6062b29811c302079c522759f84db721 SHA512 933d984dc16a6f0a1b47f78d935da6be477ea71d57d836779ce31f123558fc6d854df3c4990245918c5f8b35db0968c37bcf68c9236342a78f3eeb019634e521
-EBUILD qtbluetooth-5.12.5.ebuild 636 BLAKE2B e5aee87359ac957c414ffaa1f03c1c27a5a9aed402129b86d756715e311e437cf71e3b9d086a332b0eb9557fc12336ce6210e1df2ac983145e180f34922ccf9c SHA512 540ddd258a7ddb47ff7b2e5fc8cd197255dabdcadad72c345e957167131047039c88b2fbb5b352edcdbb367339d90c13c95b6f1b974b68c337e62791bfb8e9bd
+DIST qtconnectivity-everywhere-src-5.14.1.tar.xz 2803040 BLAKE2B 0a13fd0def6d65c0dde5a13a4c53c3ea4b8aa05da05c35093658a6de8ba30e28a6ead9a72c7918251ca3613ac7d7c498434051bde540b8a6780305c1895ee3e1 SHA512 bebffcda3949d798289fcbf8df99afe8fecb6bf410de3fca278f4290f561b75f667ac1f929e62ec423a56c3d80db06ce53d8992f360201e05ed6953af07ceb1a
+EBUILD qtbluetooth-5.12.3.ebuild 622 BLAKE2B 3647d0266b87f2d6e0b91dee2f8891e982ae7479420d1d0a49a10c958a1e8e5121bbed983e4d31a94f123125a78355ed93928a3c2e47327ee37a82fbace595be SHA512 69613604296d93bb1df6792acc9cf57b18d48bbccc96e436af3cef5772976fc71344c9ebc6de575a6c033795d7b50486a8202527ffe9bcc6aa2b3112de899d87
 EBUILD qtbluetooth-5.13.2.ebuild 636 BLAKE2B e5aee87359ac957c414ffaa1f03c1c27a5a9aed402129b86d756715e311e437cf71e3b9d086a332b0eb9557fc12336ce6210e1df2ac983145e180f34922ccf9c SHA512 540ddd258a7ddb47ff7b2e5fc8cd197255dabdcadad72c345e957167131047039c88b2fbb5b352edcdbb367339d90c13c95b6f1b974b68c337e62791bfb8e9bd
-EBUILD qtbluetooth-5.14.0.ebuild 638 BLAKE2B 51221cb9850e3ee69fc8415aeebd0c0dde4c8008af1fd1357bd12ee7e6039fab3de625018c1c5ffddba2f4278b31d6d53961cd3bc7a4b2b80f5910623180d551 SHA512 0c1dab9c3373787f80d19674523e0371ee19f21847a2665d267431cffc5985fc39a0ed4fa3450f88ceb37fcb92d1992c22f712670ffced5c9d329cee220ba39b
+EBUILD qtbluetooth-5.14.1.ebuild 638 BLAKE2B eb466960d85f88d33193b5df81afa005536657725bf9ecb4210325f8767bdb638dc0c65ac14975f4ad5eb518853e10a1a06953207f1122a8266c0da78ecbd27a SHA512 ab17fefe047787d4b024d894846e2d8c42030d45008d8b0a4b6ea533c554a98596ef3d5dd13861250c319f461c77ec4878ec7b8767c4b97c6fd094db1d1bef12
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.12.3.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.12.3.ebuild
index c37c1bd62752..ac5b2bcc5a71 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.12.3.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-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
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Bluetooth support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 x86"
+	KEYWORDS="arm x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.12.5.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.12.5.ebuild
deleted file mode 100644
index 00bc4a1b3056..000000000000
--- a/dev-qt/qtbluetooth/qtbluetooth-5.12.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtconnectivity"
-inherit qt5-build
-
-DESCRIPTION="Bluetooth support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~x86"
-fi
-
-IUSE="qml"
-
-RDEPEND="
-	~dev-qt/qtconcurrent-${PV}
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdbus-${PV}
-	>=net-wireless/bluez-5:=
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-DEPEND="${RDEPEND}
-	~dev-qt/qtnetwork-${PV}
-"
-
-src_prepare() {
-	sed -i -e 's/nfc//' src/src.pro || die
-
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.14.0.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.14.1.ebuild
index 6f8451cd6b64..7ded615ebf54 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.14.0.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-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