gentoo resync : 22.01.2021

3 files changed, 3 insertions, 62 deletions

diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 75eb151a94dc..4d8562b91a91 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,5 +1,3 @@
-DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qtwidgets-5.15.1.ebuild 1017 BLAKE2B ecc9e4c3d8776264b7df59643fd1798ac5264e974c7e11eb360d6dace71ba46ec63a57507833f1977e7c0eab7562ccdffeec924ba032715a41d13142ba208610 SHA512 2f0d7a04fda02edd0d8e230e7951c14faf5cc920af48b08d78f0a663e45cb60a87a9c2a1d595f22c7fa4fbd9656d5f2369c2e5d0f3882665f444201b8646f740
-EBUILD qtwidgets-5.15.2.ebuild 1042 BLAKE2B 7fe80952d4900dc7415734fb5c13db89ad34689bf0f577367b6f7ceabe99f0d18b5ccb778fe0d875ad52462f195e2df03beaad6cde2affdaf70a8b646cba7cc5 SHA512 253a3d46697813da069aad89ace8ca60ad6ef02cc4eb07a1381b32a41fed225f31ca1a7eba9977f44bb11fb8edd0d0512ff68f4f8a41f9c5edad39acd50ce7e4
+EBUILD qtwidgets-5.15.2.ebuild 1036 BLAKE2B 248da708ebd5ba3f8574e171c1e05675fe857156dad6b3befd93cc3b30b1e697036989bc0ef390038966256670f5670d69dac62af1ff1cf2fde5779bc24b9d17 SHA512 fd980db363e6eba65a6638a88aedcb5381d252909988af44c844b370c098862fd89bde5cf62520a4055c6eba963a3c62b875546cabe662c95f34c7381bd7b51e
 MISC metadata.xml 558 BLAKE2B c7089423680ebf689b6367ece6366ed03a25424b5b85ccecbfbbf0086d3d9bcd36a4fca1c5f4e3fce1c1502c2444d94f30b7b3d0addc1019452aa206d661bf51 SHA512 013a8a653ae20d070ce0cf42797ae05b89510e600b40fd061541c634d4faa24040c3d486ac8c4fe39ba918af57c2aa5d3954f35d3fd4f850dc732521f5a699c5
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.1.ebuild
deleted file mode 100644
index df8813553b9b..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.15.1.ebuild
+++ /dev/null
@@ -1,57 +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="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-# keep IUSE defaults in sync with qtgui
-IUSE="gles2-only gtk +png +X"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}[gles2-only=,png=,X?]
-	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 X xcb)
-		$(usex X '-xcb-xlib -xkbcommon' '')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.2.ebuild
index d2e557d0304c..e0ac54d48404 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.2.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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