gentoo resync : 11.02.2018

3 files changed, 2 insertions, 53 deletions

diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index ece98d5ee769..f46619eb7d66 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
-DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 EBUILD qtwidgets-5.7.1.ebuild 834 BLAKE2B 4647cabd5daa38c160a9872977a31e84b4761304faf8c68d29c26aa9e76143ffffb6fcaf03e7c348bf75fff60250315b3cf9d100ce3671a896f6d2dd3b244f0c SHA512 29890730308f8bf264098bfb70fabd6d4212290b9090ffede33bd6a4baa3eb9f3a71178850f1355ff6c12a90c7b41793aca224b7b95671fec3142c81e4667832
-EBUILD qtwidgets-5.9.3.ebuild 981 BLAKE2B 313b50d94bd428d27eb92df55021d6d2b627474b0eb81828f44ef0835bac77d137e5e138564615cb779982538826e906a464bc388e794f8c272dd37c81fd5906 SHA512 f48b4ea1e674f2773818a37f6dc5f1691dde365f531f02e07e6bd8bac0425031a4273721cefc9c4489a31a46788f965728cbb781d838b146427e17a0236a18cf
-EBUILD qtwidgets-5.9.4.ebuild 1040 BLAKE2B da7a33d8977ff636f37be5d5cb338964b4bce03ef98d98b6da792e46ef8e100232c009f54cd0bb78646ad36c0a34c1ba0412e3c5d36fea30afaae7c09d3f01b6 SHA512 1bb1b674c875ea7d409432b6e4f315674c09e199b5fa9f442ad6492ffc3db1422a9093f9a5f4e3365a26eb8e458aec2efe27e46bef1982276e777cabdb9008af
+EBUILD qtwidgets-5.9.4-r1.ebuild 1051 BLAKE2B 96d9631ad31c34991365f94bd81e2f6233c5bb3d4a3f79c89eef5b6ef8ee1e4b496706163c192ae2eadc86949f7848b0c0423885c82fbc71f6fd2221ed1272a9 SHA512 e43e4ef8c77ba7b3f765ed55ac2cbe760857051f7418ae219fba5b84e52a8f6e006df7ce6ca590e34e0fd20b829c9558158460c187f78682052c0b894cd2bbff
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtwidgets/qtwidgets-5.9.3.ebuild b/dev-qt/qtwidgets/qtwidgets-5.9.3.ebuild
deleted file mode 100644
index b82ca24ad9f8..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.9.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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 ~x86"
-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:
-	!:no-widgets:
-)
-
-src_configure() {
-	local myconf=(
-		-opengl $(usex gles2 es2 desktop)
-		$(qt_use gtk)
-		$(qt_use png libpng system)
-		$(qt_use xcb xcb system)
-		$(qt_use xcb xkbcommon system)
-		$(usex xcb '-xcb-xlib -xinput2 -xkb' '')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtwidgets/qtwidgets-5.9.4.ebuild b/dev-qt/qtwidgets/qtwidgets-5.9.4-r1.ebuild
index 4b650e6c3d4d..ccb0c529572d 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.9.4.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.9.4-r1.ebuild
@@ -34,6 +34,7 @@ QT5_TARGET_SUBDIRS=(
 
 QT5_GENTOO_CONFIG=(
 	gtk:gtk3:
+	::widgets
 	!:no-widgets:
 )