gentoo resync : 20.10.2021

3 files changed, 2 insertions, 67 deletions

diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 671cf8148247..948d58659159 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,6 +1,3 @@
 DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
-DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qtwidgets-5.15.2-r1.ebuild 1188 BLAKE2B 9c2992011433a9f903dc6380f012f07ae16359e6eeb8b765ca2023c8fe46cf7c4e7d83a9959d0e652c8e75555e76abd17a8e1fe3fbc26a5562ff821fce0ec1b9 SHA512 fb7d0ef11ae6a8a1306c1ff86f47946049280a0de772eca84aab5c003eb5adfba9fd1a65881c2645bcf6ced24910646e67fe8ba199d1020b7964ec6e06e75fc9
-EBUILD qtwidgets-5.15.2-r11.ebuild 1231 BLAKE2B 1d24a8a4455c67fd1e26f5941b0bb3fed9213a0e01b51545e6aade9cfdde40a3de8b213842c7221409cf5c7881de257e1cd7e7d3c2c9d1d0e69cc803eadbeed9 SHA512 0d450aebc38408781387c4094e1dbd36bf4e1b1508f9d043e020a249ee0c062342fc0a6f5e8219e1e5b7af70d6aefae4336d8820fb73ea7201bcd5bb521a90b3
+EBUILD qtwidgets-5.15.2-r11.ebuild 1229 BLAKE2B db15e8e2fc22312f35cd0d0fb6645b19fddaaf34f7ad1cc5ce2931e7af8048034da1a58c6942d8a4657fe593b37472478914f92d25557fcab109385d36b8c3da SHA512 5e871f057f18ac4731c7a07033ed6620ae720de346657933b3617275276ad5b65c996560370907993e27775b74cc252b1c9a0e195fe8df22ee5dea223049d0c6
 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.2-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.2-r1.ebuild
deleted file mode 100644
index 3332a278e385..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 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"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz"
-
-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="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}
-	dev-qt/qtchooser
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/uic
-	src/widgets
-	src/plugins/platformthemes
-)
-
-QT5_GENTOO_CONFIG=(
-	gtk:gtk3:
-	::widgets
-	!:no-widgets:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:widgets
-)
-
-PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012
-
-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-r11.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.2-r11.ebuild
index c7862b854eb7..90eb44f61245 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.2-r11.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.2-r11.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