gentoo resync : 14.05.2020

3 files changed, 2 insertions, 60 deletions

diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 9f4410c21483..f3cf29822767 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,7 +1,5 @@
-DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
-EBUILD qtwidgets-5.13.2-r1.ebuild 1006 BLAKE2B d34843531e4c93e02a155f59e7761a57b4f6ebab6de7016f535069ede742b11deb521f3b011aa6b47fe1345a20176d10785265e0743292c6fd2ba377e8a3c5f5 SHA512 0cea2656e06802d1a6709485c13ec42b2a4b32eefd93d022390afd6b38e711af9381509ebaced15a2c37b0356276ffad1faff66277e0f42932830dd85a606d55
 EBUILD qtwidgets-5.14.1-r1.ebuild 1039 BLAKE2B 714f6d303c4f87e2ca3b265de66beba491691ffdc7367bc624109baf8e2c424b35c8d6a38a0ad9a1de827376b6abd720c00ed606f6c454e545150269e1775a48 SHA512 854c6e5c399d921e30485de86f86e8d654cd6ddefa6808f085d39a08b925bc818e0114dcd7c38fbd4b3a36ec9da4e23b0908770c07d69e5a013ba3a693ef166c
-EBUILD qtwidgets-5.14.2.ebuild 1047 BLAKE2B 14d8eea560a3e59880f6cf26be68b8b998e98b5736ab029f5ba19ed9e8ea84d70f32f5ec7bc59513caabbf1ebf1062e5298c1255dcf4311375ad7e054c6ded2f SHA512 845222cd336cf00009a003f914c4cb06a34eb2954b2d3950597132d65fa7825b9959c115eeb582f1a173e1f7472ac10c2724f599a589d48366bc29997b91fde1
+EBUILD qtwidgets-5.14.2.ebuild 1045 BLAKE2B b22656442e966e717f56195976b419f878da1cf397d3392f41afd4d24d55b70fdcbde48c1ca13a55bea27bcb6aea2fbff8596b7f140e8c0779c966811f5eb338 SHA512 1a094741fd424a0e5a0e6cff49ef4ed8391680304b6efd0c5819895a2da650e28b242770c57bffeb3d93f87c400d17ec02926358cf6c5d3af97b387a196532f2
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtwidgets/qtwidgets-5.13.2-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.13.2-r1.ebuild
deleted file mode 100644
index 7df5bdeef388..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.13.2-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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="arm"
-fi
-
-# keep IUSE defaults in sync with qtgui
-IUSE="gles2-only gtk +png +xcb"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2-only=,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-only es2 desktop)
-		$(qt_use gtk)
-		-gui
-		$(qt_use png libpng system)
-		-widgets
-		$(qt_use xcb xcb system)
-		$(usex xcb '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtwidgets/qtwidgets-5.14.2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.14.2.ebuild
index 26bc4f95f022..b8ce2ba581db 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.14.2.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.14.2.ebuild
@@ -9,7 +9,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"
+	KEYWORDS="~amd64 arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
 fi
 
 # keep IUSE defaults in sync with qtgui