gentoo resync : 25.11.2020

3 files changed, 2 insertions, 61 deletions

diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 72929ce35864..de9bbb0352e5 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,5 +1,3 @@
-DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
-EBUILD qtwidgets-5.14.2.ebuild 1041 BLAKE2B 728671cef741bd25389eb98e85def46f3e9bb878f5df8ff1a4cb08be7edb5b11265978ac3f3af1663879d103224c01e9a8e93b6c85d7af5b76d3bae87eb2a4dc SHA512 12b194ec32e7eb39399e001a8f590ded9b2729a6a8286868a8977798c0821e9b51dc42cb25d1b0f5dc05b32be5ce961006e5c115193e4cabfe5c8add49751624
-EBUILD qtwidgets-5.15.1.ebuild 1023 BLAKE2B d7ef3bfccf7811dcd98e6e5396a1c74ffc2a0ddf946d2d53bdaf4b4cdf2b4302fe2ea8e3ea0c1341a1464903c2c05b101f344955a60c76d5891c0538e232101c SHA512 61e6f7f44674778a41f6e24d9758877cd62cc532cebe58c9d1d5ca1bcbd613608c8282c0005ac6519faf82b93a4f48ce4d100bf5b25cd4f47f26c2d0b7038517
+EBUILD qtwidgets-5.15.1.ebuild 1017 BLAKE2B ecc9e4c3d8776264b7df59643fd1798ac5264e974c7e11eb360d6dace71ba46ec63a57507833f1977e7c0eab7562ccdffeec924ba032715a41d13142ba208610 SHA512 2f0d7a04fda02edd0d8e230e7951c14faf5cc920af48b08d78f0a663e45cb60a87a9c2a1d595f22c7fa4fbd9656d5f2369c2e5d0f3882665f444201b8646f740
 MISC metadata.xml 558 BLAKE2B c7089423680ebf689b6367ece6366ed03a25424b5b85ccecbfbbf0086d3d9bcd36a4fca1c5f4e3fce1c1502c2444d94f30b7b3d0addc1019452aa206d661bf51 SHA512 013a8a653ae20d070ce0cf42797ae05b89510e600b40fd061541c634d4faa24040c3d486ac8c4fe39ba918af57c2aa5d3954f35d3fd4f850dc732521f5a699c5
diff --git a/dev-qt/qtwidgets/qtwidgets-5.14.2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.14.2.ebuild
deleted file mode 100644
index 3704914a9488..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.14.2.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 system)
-		$(usex X '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.1.ebuild
index 30655fc94224..df8813553b9b 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.1.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