gentoo resync : 22.10.2018

3 files changed, 38 insertions, 3 deletions

diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
index c532b630b31d..895b7f774661 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1,5 +1,7 @@
 DIST qtconnectivity-everywhere-src-5.11.1.tar.xz 2734864 BLAKE2B 7bd22542f06f6a46689b176181e83a315569690e3e5ce20f95d473af6d8513c03d47f2c7801cfbce522f49e25e1183e7553e104c7aaa7d071b86719236847438 SHA512 3533b117a6d028ef7bf4fe89b9ee42409b7a6eb62e60bca84e5f1323f6cd9892234d2c9b213ac806cda29cf36c8c6c646dec145933534664d376cda5bff94d8d
+DIST qtconnectivity-everywhere-src-5.11.2.tar.xz 2729556 BLAKE2B 02b7fc6e9caeb55dc518637d3b1f8135074868fcec0743a1c8d82003f77ac4bf382a32afc3c93caaa4f2fd0439455be9fb0b7e6d7aa8f025c425b0182ae9555b SHA512 c6fc77554434abcb2e9b8be75e2d2a5c31b5a92aab8dfd29b94e381da9f423cd2530d31fc0e58b8e101b7101dbcb0e6696abb45423199e2deeac3b9a0b11f5f6
 DIST qtconnectivity-opensource-src-5.9.6.tar.xz 2712048 BLAKE2B 8eec7fcbbb90f147c28de44203e1d584f0aa3efef996a3a9ebfcafbba8bc2d2dbee8779610e44dfb293898c79666a0e82b40707802f76887f8f3f3fdc86beb2f SHA512 6503013cccea89d56ea8f31e3d1c6f8928c101cbbe0311ad8463e7c49421015a731c7f33e41bbac608d5714a8821cc82a4d6e5596db86e00e60c79ba9dac4399
-EBUILD qtbluetooth-5.11.1.ebuild 641 BLAKE2B 922e93e07d44ed1f07466bf8f52af6908c2732894630e3920b8046727b03dfdfebe7841c03e66a5f60aaa69502595691748241d76469ece63250ac3fdc6bca16 SHA512 ea8e27764a21856845dbc2b805136b4f1b9386c60b1859d6782f7dd986591eba6af492887b4f56438599e8fda57c38dd64a04019a42c612aa94d463d0e7cffac
+EBUILD qtbluetooth-5.11.1.ebuild 636 BLAKE2B b4f9856710aec096d0b61ad5c7be8da02af6a4ba87b0629de39e056e185d8c046081a65b35cdcf506092807220e4664a183143696fbc32a73ad1e56d04deda0e SHA512 79b6162387e3b3f052d3ac4bb4aaba5453b1e4803cf2bf5276653d025b14070469ebbd1870fd638bb9d8171dde751c51b6f2e6b20d29baeec3fdf42618568127
+EBUILD qtbluetooth-5.11.2.ebuild 638 BLAKE2B 101107b56b9c9e1374aebcc4b8916ffc2977bf443c359dcba798171978516f16353a7ceeb64d5c808b19b7acb4a3d0c51f2284267e34aba1b2b81474321d334d SHA512 9f67b9d1d42075fe0a4e8fb09bd2b09af12c09d6944783c058eb05415c52772edd71d8c8159a38cbdc8e4de3243dd6e1f6e6bb310962dc4437031ff881032656
 EBUILD qtbluetooth-5.9.6.ebuild 639 BLAKE2B cc1e3489fce5a48b5965d387e34597ff602a15ec1834bc4e4f528700e91b3f171c23cce9134938a83205a938df91442e068b8f4ecea148d85e18fc4f9d39a4ef SHA512 8e4a38ede0f82c8ca87421bb297d2cf0023d863c3da155f11f4c7d8b5fe7e587160e8b93d5ac40db21ebc098c52108b81b212aa2756ee16f4160eda185177857
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.11.1.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.11.1.ebuild
index 7f4a8b1b3eb7..f67286f91942 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.11.1.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 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="amd64 ~arm ~arm64 x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.11.2.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.11.2.ebuild
new file mode 100644
index 000000000000..b6610fe444f8
--- /dev/null
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.11.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+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
+}