gentoo resync : 12.05.2022

3 files changed, 2 insertions, 68 deletions

diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 4e7e322f0b2d..0366743c0bdf 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,6 +1,4 @@
-DIST qtbase-5.15.2-f4ac0b55.tar.gz 67967554 BLAKE2B 3e1ece861c195cdaa688f22cac7bbfdb3cce73ac575f72c8adc916face612307553d98da7b757c44980b1ed0ebf5a9ecaa2e993b41e775f511e32bd515c1ca54 SHA512 6160e02505e4d3f9fbd55f442e0a7a4d906feb576c891600232937bc212660b5c8a41072347d9f78dd0a1ca9357af514b5df2b341e181b2c823b36a912e583fa
 DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
 DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
-EBUILD qtwidgets-5.15.2-r12.ebuild 1229 BLAKE2B 7fbd2126ef2e830bbda8f3f4dd83f6a98581f2e671b4946d2247de0e85b398a340e557bb614c69ccd602918acae51cef0ca3961ff968bf7be476fa774cf3c49a SHA512 12a70fe42cae892c9e169b8992fa2cc2bb2884e28c6e977eaf62e18c9e1aaaa570f2cae04471a7c1610c98c5c3b9e98f70d4453803aac71049eaee72f3e61401
-EBUILD qtwidgets-5.15.3.ebuild 1197 BLAKE2B de72dae0d6d8b6d1ab397ae76d67cac4ac016f207eed3e6cb46cb21188e0aa9753a8ac48169880c9bb79c03ac6f7036063d341cdb6a643ec282a5358e1baf78b SHA512 9695428b436501215cf724f401e095e585a8c705dfd9de07c95603269360e2eca7316f0005230d2d55b65edf00e23bf76fdd3825e086812729473d78b3badb23
+EBUILD qtwidgets-5.15.3.ebuild 1195 BLAKE2B 45122f3ba71a6317214797a0caf6ebe0cf904864df95ec158250bbcc082ef473716422a963a9ca8a3e62914e94824e3a873bdb9c0214102c6c189b65eb9c4c1b SHA512 d6ea638d68a94a8131c6be95ae71b6c44db7cc0edc4f5bcc9937589cbfcf8d23bdd213e8aef337eaa23820ecf8743df579224fed76505912ca9d493395e70b14
 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.2-r12.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.2-r12.ebuild
deleted file mode 100644
index 3b8302515b6a..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.15.2-r12.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=f4ac0b55c37f2b594ffbe639db43dac365825c7c
-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.3.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.3.ebuild
index a862a20ec317..6c6b044b5b8f 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.3.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.3.ebuild
@@ -10,7 +10,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 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 # keep IUSE defaults in sync with qtgui