gentoo resync : 22.10.2018

3 files changed, 62 insertions, 3 deletions

diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 357ccf0a3aa7..11f8b1b79058 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,6 +1,8 @@
 AUX qtwidgets-5.9.6-QDockWidget-revert-restore-geometry.patch 5533 BLAKE2B 1a4db674e9d65134eaa894e13e2acdeb514eb98d841515e5573543387ffcd2ed6eae46c614aabcf61804a224ffdfcf1089d354c630e8c3186496ddbd6130ddcd SHA512 854c1b18627c5a243ededf28279fa3eb8ac208e495b8db54e7768340b25ffde84de0bd9e4b90044d35784a0bc1443071256eda59eafdab71718dc1c15ceaed0c
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
+DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtwidgets-5.11.1.ebuild 1070 BLAKE2B e6559941e58f529bb08555dfa7d4452d21c8e98393270fee2fee5ca05b42eb311cf84e393a79cf7a486b082c49feafc01a13e8bcd7688f32a60191464a546518 SHA512 9bc6750a0e51dbc327975c78fe83a0cbac8c58792b2ec05796e1801e10e7c5c30f9311174c48272bb00f1d208e3eb5d8f18f64297aae86330723c26c92e6c9b6
+EBUILD qtwidgets-5.11.1.ebuild 1065 BLAKE2B c38be42d57296d420e751e5b2309b734b20f2b7d6a8c4c2cf1125d74431921b0bf6a3db17a96aac09d715ea98313524e734b2e14982300fc4e2ae0e132fed45d SHA512 1f816bd3138f827bdb261cb2a20627d0859c6db99d5860ada4322a44317fa12890583d0c7a2da0e9029681de672910e084fc87c2bb61a7a1b473611a78752109
+EBUILD qtwidgets-5.11.2.ebuild 1067 BLAKE2B 27b34b38540cfeaa4d2db254872cf17623a4eddf5a82f13eba0975a3ea60623f371628bb56da1b29e9a6a2732b1fdde2da35c5b1e9c05f04242b5fa028f609d6 SHA512 5f55a1d3bf881049845f6bc07031c691861714dff9d27ed985ea3e4ad55be5a1e6f1b433a3bfa42f35815fda22aa5d739ddadd3ee631dc1987799b165b75df45
 EBUILD qtwidgets-5.9.6-r1.ebuild 1140 BLAKE2B 6589dfa19127aee73971a333cc4f3a177624f1adef02b80904d4c164bbca8fbf3fbb2068b4306e725ebbe538f706ec83e8e48af7f2c6a0fcfe2b8a60b975bac1 SHA512 1b12d48f414171a38cff101b2a84215a93cb9cc43602c4a50485aabf830e461aeb3dacb9ac145a382ed7752ac6f77fbae3f73adddf4f6e299db604b64d1a1d62
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtwidgets/qtwidgets-5.11.1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.11.1.ebuild
index c386278f6aa6..ae184fd6d395 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.11.1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-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="Set of components for creating classic desktop-style UIs for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 # keep IUSE defaults in sync with qtgui
diff --git a/dev-qt/qtwidgets/qtwidgets-5.11.2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.11.2.ebuild
new file mode 100644
index 000000000000..94499ea10ec4
--- /dev/null
+++ b/dev-qt/qtwidgets/qtwidgets-5.11.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+# keep IUSE defaults in sync with qtgui
+IUSE="gles2 gtk +png +xcb"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=,png=,xcb?]
+	gtk? (
+		~dev-qt/qtgui-${PV}[dbus]
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/pango
+	)
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/uic
+	src/widgets
+	src/plugins/platformthemes
+)
+
+QT5_GENTOO_CONFIG=(
+	gtk:gtk3:
+	::widgets
+	!:no-widgets:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:widgets
+)
+
+src_configure() {
+	local myconf=(
+		-opengl $(usex gles2 es2 desktop)
+		$(qt_use gtk)
+		-gui
+		$(qt_use png libpng system)
+		-widgets
+		$(qt_use xcb xcb system)
+		$(qt_use xcb xkbcommon system)
+		$(usex xcb '-xcb-xlib -xinput2 -xkb' '')
+	)
+	qt5-build_src_configure
+}