gentoo resync : 22.12.2021

3 files changed, 4 insertions, 70 deletions

diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 0c652a789ef8..e889f683fe6e 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,5 +1,3 @@
-DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-c9fde86b.tar.gz 67960262 BLAKE2B d1a6a7dac78abce189a753c0a00185fbe03f9de97b226790535af73a9bc009b353fe1edeb754d2098a7beeb7cd1c6e7efb949797658269ef0d0f200f11909820 SHA512 99026537dd4da678bcb04214ebb717907422e373b44fd3b3716798565c330f8d492ec1fc67d936c5125292b30e44f23abe4bf6434b58b9fa76bada3680dfc9f8
-EBUILD qtwidgets-5.15.2-r11.ebuild 1229 BLAKE2B db15e8e2fc22312f35cd0d0fb6645b19fddaaf34f7ad1cc5ce2931e7af8048034da1a58c6942d8a4657fe593b37472478914f92d25557fcab109385d36b8c3da SHA512 5e871f057f18ac4731c7a07033ed6620ae720de346657933b3617275276ad5b65c996560370907993e27775b74cc252b1c9a0e195fe8df22ee5dea223049d0c6
-EBUILD qtwidgets-5.15.2-r12.ebuild 1235 BLAKE2B b79a99f06628085efa5e6722d6fd06fd5d96928c43f32f52e3633b8565f3b195cdb6f9f10d4f3a2863bd6091cb598e6eae0df5808597f448a6df1fd38c8b400d SHA512 ff866f68c309f9ea78560ce75fa74b815877907e411915f9f5ee3c31a2e126a4ff16f85ecd9b2e15dcd5ed871c6f9f310ca2871b352f25fc7475529fd797997c
+DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B 623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b SHA512 eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc
+EBUILD qtwidgets-5.15.2-r12.ebuild 1229 BLAKE2B d28d4f73de795d09da67f77f8c450e7f8f33dc6809f3113c8983ae430aeb817d179ad6cc16cdae7587d491ece5cca0ac66a84fd4bcd79d8f3206340a1828194c SHA512 34e5daa36f26b531052bb5829ac7fe4794c0ba492c14c195389cbccd92393693160000b6e5c5785673d4437c0c07e265f9c30915f2ce1e5ae4f26b32e745a261
 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.2-r11.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.2-r11.ebuild
deleted file mode 100644
index 90eb44f61245..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.15.2-r11.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
-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 ~riscv ~sparc x86"
-fi
-
-# keep IUSE defaults in sync with qtgui
-IUSE="dbus gles2-only gtk +png +X"
-
-REQUIRED_USE="gtk? ( dbus )"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,png=,X?]
-	dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
-	gtk? (
-		dev-libs/glib:2
-		=dev-qt/qtgui-${QT5_PV}*:5=[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=(
-	dbus:xdgdesktopportal:
-	gtk:gtk3:
-	::widgets
-	!:no-widgets:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:widgets
-)
-
-src_configure() {
-	local myconf=(
-		-opengl $(usex gles2-only es2 desktop)
-		$(qt_use dbus)
-		$(qt_use gtk)
-		-gui
-		$(qt_use png libpng system)
-		-widgets
-		$(qt_use X xcb)
-		$(usev X '-xcb-xlib -xkbcommon')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.2-r12.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.2-r12.ebuild
index 1ad9cc0c3aef..f2855eb3220b 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.2-r12.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.2-r12.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=8
 
-KDE_ORG_COMMIT=c9fde86b0a2440133bc08f4811b6ca793be47f0a
+KDE_ORG_COMMIT=7c6c0030cf80ef7b9ace42996b0e0c3a72f76860
 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 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 # keep IUSE defaults in sync with qtgui