gentoo auto-resync : 16:08:2023 - 21:30:25

3 files changed, 2 insertions, 67 deletions

diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 04d5c7de5132..f37f47145956 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B ef1f11ea63084b834e19a9bd4c4a146e0d47f10e6c1f540a23db64ba6b0d42f46d63f54f93587deae9ac528f6824fa0e88177fe109a53aaee7d8328d49e364cd SHA512 1ae6630cef6bead9187aaaf7c420566b2c1f946bfa22cb983c52267c098e9b1c7b82c99204cbd3eed5eb6ebde0359726e260fd449618802735af465ca39f0a1d
-DIST qtbase-5.15.10-gentoo-kde-1.tar.xz 725208 BLAKE2B 14e82b0f26d0e0de47e9e3c4c54dd6649f983b9468c9f5790fb206a823a77ef22fc02546e39ff0ba68aa589ba811629bb4c4615223af9e8bec7c7b96ae13bef6 SHA512 efc93c451577f6389ffd58690ce2e1a2d2f3b85072cb8d542c5db0ddee2b60e80f2f937fb815a63db9973cc88ef35f8adc47a5ec98c2ec0b01ac5320ac635a5b
 DIST qtbase-5.15.10-gentoo-kde-2.tar.xz 740184 BLAKE2B 0b76c6515425b45de65993a54e6b72afc620300c711e75720fd1283b964aee564a780845f52c033794f6fdca9a13ca863e52a91f7eda5d436f9a668356af82b2 SHA512 474fd27c13cd1b58c688c063ca119769cda9a5de8c97ae04fba81cba9e176126ac71107c6536cf825617c27aadcaf53732d4181c772fbae3c04988f85490fd74
 DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B 2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53 SHA512 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef
-EBUILD qtwidgets-5.15.10-r1.ebuild 1203 BLAKE2B 73b92b4362a209529c2d8f03a68ce6b192937a3e278f61501c969c396781ce9a80576c03500f9f3f21b126183ddb991aa869d954ad2a14cc24d55fd042cbe5c1 SHA512 19a22957b9cb230a8b5d64a55bf1473a5a4750583a8f0c6aa8e6d344d42c2c0d824dd08dd5122a1813db60c21bd8ce62725717895974065e902d04e902d7d7d3
-EBUILD qtwidgets-5.15.10-r2.ebuild 1207 BLAKE2B a1a576f84086b51ebe10887181e0e6f89ad1c67136c0d314a16d1650d8cf1eeb7132dcc3b5d7c5ce61328fdf9e290e4c26990f3e0bc7a47ea40c3648d1c8b32d SHA512 e87c94807e29a099460d03bd5b87c8a9bbc414746d5738a37ed62365be9a1951b7f1f3ee08dbf028213300f34fb72f422d40b0ba0f3b01c83e433b8ea23bbdc1
+EBUILD qtwidgets-5.15.10-r2.ebuild 1203 BLAKE2B 5421b122e1c557089e2f461efe1aed2e3746f3d33439c836bb2c4d9bdba69a9cc97aa28e3f999dad39a94efbb7ef857c728193f8bc340a542f28e40a01d3fade SHA512 4e1017dee29b6597d9e9d3f3ab4601c6e01e7c8f66f0bbb88233a16843c97cfe8544c767a84a01fccb5c287145e5e427bc75b9afb58c7422ef2bdf92ef62d3ee
 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.10-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.10-r1.ebuild
deleted file mode 100644
index 37e22466f060..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.15.10-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
-
-# 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[X]
-		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)
-		$(usev dbus -dbus-linked)
-		$(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.10-r2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.10-r2.ebuild
index 24113d660d55..41070bbe224d 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.10-r2.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.10-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=2
-	KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"