5 files changed, 3 insertions, 220 deletions
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 11f54e1dd1df..618c0e754ec9 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,10 +1,7 @@
 AUX qt-5.12-gcc-avx2.patch 1038 BLAKE2B cb54308c8ef4df9efaa8727ba292b7e959ae069237f8dbc6c7432556c4697f0263dca098f348b0afe94cc93359f929c564c8201a60d585b5907b6bd497369e24 SHA512 0eb51d41996bf42bc896eef53d2e335777c6c6f56fe027581f8b636a57759c98b3f08a5330c9fdeb0054aaa1955024140b161fd19c6457cc66fe68414b1cd8ff
-AUX qtgui-5.13.2-no-xcb-no-xkbcommon.patch 1327 BLAKE2B d51ed6761d300aec44fc9f1ac86c6f26649fd28f9dfafa0aeb8de4d5b8bb64c46697cfa2089f2a97a22e5cad311c7b372aac12be16c83b3932f2686a240d25c9 SHA512 71433f589554e2fef82d73cf112d7b5d2e2454ec5e3560878d0af05e6721ce4919623175c9355be7c54568da26c68e8c9dfe6cc956465e005b01e3ab974cb310
 AUX qtgui-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b70232722416cb85ecce8a0742b57503c520482aa0386042f43d4cf20926a874b9a92f90c656cfe0bf93883c286b6b08c0ad2568f3a6746c776dcf208995 SHA512 c7ba0bfa6d462504ba9421abfb7f502265fd8c6bd7469326612925cd7b7667daba3350f714aa5a516aa83e5352ec6d18fc02af9ebf5494af10a4b6f8f7c47d5b
-DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
-EBUILD qtgui-5.13.2-r1.ebuild 3840 BLAKE2B 9d71fe389a8661e350cde868aa2ec190d1f9fd94f76183ac7d611e0d328e037ea993959f498337a4621f86202f148ad876dbd9c743626c745e7b5bbd01b20a69 SHA512 e90ba27502e65a967ef27dd4348a6d71cd463e86a36ae76d524ed594e59c83ec7da0c01a732ff8e40312350ea55fddae08a05567fc2d6e0bd85a545a0e2fdb69
 EBUILD qtgui-5.14.1-r4.ebuild 3983 BLAKE2B 65973832eedae78b95fd4e3e1812debab366e8d5828a9f58339472dae8ae1502576365e675553e24f46515e626b2ee061d682cf12f154a68aa73c65ad2e2a13a SHA512 0765481c4f7c2d093c32d765c6f71cd3090304ab18d6265acc3b24e8b3b67e8eaf7c4dea02378d21bd2cf8904f7986e6aa52c5d76287a12503235f1407cbe4b5
-EBUILD qtgui-5.14.2.ebuild 3991 BLAKE2B 9e12b0b0f3b8b73031b56cf403da613d4a59f690f959828972d48fd61f698f061844769571b0a654875365ce4de5818747a1a2414fcb91d39338ba4c7949308d SHA512 8cf4e367499acaacbb59798b13d50382bc3c0c625903e8ca37c840f3f50a482a001d54f586a046c2a344f9290df64aaaa65d1e9a7909eb8729c164be613c8d6b
-MISC metadata.xml 1304 BLAKE2B a56dc3850426ef4395e27a093d2f0639444f01fe6595cdd7eadb17681cce17eba664c1df9907ca88e89060c3b37b8ae58d920c0149071de21b44789978c5e51b SHA512 c116aea83cf5d13d8e40d2d330106c07b71bce1e77dd4da10525df3dffdf67552780263ff7cb1eb109fed486648da7e1a6df0be2f07437e110809fd838e1dbc2
+EBUILD qtgui-5.14.2.ebuild 3989 BLAKE2B 6b34744d6bf5c923ad5a05ce5c71eda7c4d8b09e367133111fd14e144c3f769853d24b78aa05aec001947cbb83ca2270d7b88db54b4be159847905c124bd7c51 SHA512 63647c9267b8341d46398b8e08edb0be82fb7850c8d34716123e1a348d969c21404d0eb6044a8ac0af3feec07eacde4bd88a6e1204ff4098e79d6e244c1ccbfb
+MISC metadata.xml 1221 BLAKE2B ddd5982d379222008bfd11c2462de6570c2492635c16a57e7815a23c4870cb35713426fdd4645c7d8d3b32e74afb854e7c8a38ecb5b6c75661136469009fe62c SHA512 d8b994729f64acd05c6269038d41f290885f848b644033e7b8746b35652711a703c313f751e636f6e09e72c360fe107187072c3554e2f9efb1b398a8f7d48bf4
diff --git a/dev-qt/qtgui/files/qtgui-5.13.2-no-xcb-no-xkbcommon.patch b/dev-qt/qtgui/files/qtgui-5.13.2-no-xcb-no-xkbcommon.patch
deleted file mode 100644
index 6f63a6371ad7..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.13.2-no-xcb-no-xkbcommon.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2749833d844b20a9e642b2df2074dfafde8622d3 Mon Sep 17 00:00:00 2001
-From: Jimi Huotari <chiitoo@gentoo.org>
-Date: Wed, 6 Nov 2019 00:54:57 +0200
-Subject: [PATCH] Fix build with -xcb and -no-libinput
-
-Since a34e81ab [1], 'xkbcommon_support' is under
-'src/platformsupport/input', and will not be defined when building
-with -no-libinput, and as such, 'xkbcommon_support-private' added in
-'src/plugins/platforms/xcb/xcb_qpa_lib.pro' will be unknown.
-
-1. https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14&id=a34e81ab
-
-Change-Id: I79563b329623651b462b8fedcfb59ef5f2c2e52a
-Gentoo-bug: https://bugs.gentoo.org/699110
-Suggested-by: Petr Zima <zima@matfyz.cz>
----
- src/platformsupport/platformsupport.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro
-index 6d4f1b93bd1..877665ff06b 100644
---- a/src/platformsupport/platformsupport.pro
-+++ b/src/platformsupport/platformsupport.pro
-@@ -11,7 +11,7 @@ SUBDIRS = \
- qtConfig(freetype)|darwin|win32: \
-     SUBDIRS += fontdatabases
- 
--qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput)|qtConfig(integrityhid) {
-+qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput)|qtConfig(integrityhid)|qtConfig(xkbcommon) {
-     SUBDIRS += input
-     input.depends += devicediscovery
- }
--- 
-2.16.3
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index f785d85e8c4a..b10c1ae50253 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -15,7 +15,6 @@
 		<flag name="tuio">Build plugin to receive touch events over the TUIO protocol</flag>
 		<flag name="vulkan">Enable support for Vulkan</flag>
 		<flag name="wayland">Provide <pkg>dev-qt/qtwayland</pkg> to ensure Qt applications can be run as Wayland clients</flag>
-		<flag name="xcb">Build the XCB platform plugin and enable X11 integration</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
diff --git a/dev-qt/qtgui/qtgui-5.13.2-r1.ebuild b/dev-qt/qtgui/qtgui-5.13.2-r1.ebuild
deleted file mode 100644
index e296604eeff4..000000000000
--- a/dev-qt/qtgui/qtgui-5.13.2-r1.ebuild
+++ /dev/null
@@ -1,179 +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="The GUI module and platform plugins for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm"
-fi
-
-# TODO: linuxfb
-
-IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus
-	jpeg +libinput +png tslib tuio +udev vnc wayland +xcb"
-REQUIRED_USE="
-	|| ( eglfs xcb )
-	accessibility? ( dbus xcb )
-	eglfs? ( egl )
-	ibus? ( dbus )
-	libinput? ( udev )
-	xcb? ( gles2-only? ( egl ) )
-"
-
-RDEPEND="
-	dev-libs/glib:2
-	~dev-qt/qtcore-${PV}
-	dev-util/gtk-update-icon-cache
-	media-libs/fontconfig
-	>=media-libs/freetype-2.6.1:2
-	>=media-libs/harfbuzz-1.6.0:=
-	sys-libs/zlib:=
-	virtual/opengl
-	dbus? ( ~dev-qt/qtdbus-${PV} )
-	egl? ( media-libs/mesa[egl] )
-	eglfs? (
-		media-libs/mesa[gbm]
-		x11-libs/libdrm
-	)
-	evdev? ( sys-libs/mtdev )
-	gles2-only? ( media-libs/mesa[gles2] )
-	jpeg? ( virtual/jpeg:0 )
-	libinput? (
-		dev-libs/libinput:=
-		>=x11-libs/libxkbcommon-0.5.0
-	)
-	png? ( media-libs/libpng:0= )
-	tslib? ( x11-libs/tslib )
-	tuio? ( ~dev-qt/qtnetwork-${PV} )
-	udev? ( virtual/libudev:= )
-	vnc? ( ~dev-qt/qtnetwork-${PV} )
-	xcb? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		>=x11-libs/libxcb-1.12:=[xkb]
-		>=x11-libs/libxkbcommon-0.5.0[X]
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-"
-DEPEND="${RDEPEND}
-	evdev? ( sys-kernel/linux-headers )
-	udev? ( sys-kernel/linux-headers )
-"
-PDEPEND="
-	ibus? ( app-i18n/ibus )
-	wayland? ( ~dev-qt/qtwayland-${PV} )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/qvkgen
-	src/gui
-	src/openglextensions
-	src/platformheaders
-	src/platformsupport
-	src/plugins/generic
-	src/plugins/imageformats
-	src/plugins/platforms
-	src/plugins/platforminputcontexts
-)
-
-QT5_GENTOO_CONFIG=(
-	accessibility:accessibility-atspi-bridge
-	egl:egl:
-	eglfs:eglfs:
-	eglfs:eglfs_egldevice:
-	eglfs:eglfs_gbm:
-	evdev:evdev:
-	evdev:mtdev:
-	:fontconfig:
-	:system-freetype:FREETYPE
-	!:no-freetype:
-	!gif:no-gif:
-	gles2-only::OPENGL_ES
-	gles2-only:opengles2:OPENGL_ES_2
-	!:no-gui:
-	:system-harfbuzz:
-	!:no-harfbuzz:
-	jpeg:system-jpeg:IMAGEFORMAT_JPEG
-	!jpeg:no-jpeg:
-	libinput
-	libinput:xkbcommon:
-	:opengl
-	png:png:
-	png:system-png:IMAGEFORMAT_PNG
-	!png:no-png:
-	tslib:tslib:
-	udev:libudev:
-	xcb:xcb:
-	xcb:xcb-glx:
-	xcb:xcb-plugin:
-	xcb:xcb-render:
-	xcb:xcb-sm:
-	xcb:xcb-xlib:
-	xcb:xcb-xinput:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:gui
-)
-
-PATCHES+=(
-	"${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
-	"${FILESDIR}/${P}-no-xcb-no-xkbcommon.patch" # bug 699110
-)
-
-src_prepare() {
-	# don't add -O3 to CXXFLAGS, bug 549140
-	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
-
-	# egl_x11 is activated when both egl and xcb are enabled
-	use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
-
-	qt_use_disable_config dbus dbus \
-		src/platformsupport/themes/genericunix/genericunix.pri
-
-	qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
-
-	qt_use_disable_mod ibus dbus \
-		src/plugins/platforminputcontexts/platforminputcontexts.pro
-
-	use vnc || sed -i -e '/SUBDIRS += vnc/d' \
-		src/plugins/platforms/platforms.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(usex dbus -dbus-linked '')
-		$(qt_use egl)
-		$(qt_use eglfs)
-		$(usex eglfs '-gbm -kms' '')
-		$(qt_use evdev)
-		$(qt_use evdev mtdev)
-		-fontconfig
-		-system-freetype
-		$(usex gif '' -no-gif)
-		-gui
-		-system-harfbuzz
-		$(qt_use jpeg libjpeg system)
-		$(qt_use libinput)
-		-opengl $(usex gles2-only es2 desktop)
-		$(qt_use png libpng system)
-		$(qt_use tslib)
-		$(qt_use udev libudev)
-		$(qt_use xcb xcb system)
-		$(usex xcb '-xcb-xlib -xcb-xinput -xkb' '')
-	)
-	if use libinput || use xcb; then
-		myconf+=( -xkbcommon )
-	fi
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtgui/qtgui-5.14.2.ebuild b/dev-qt/qtgui/qtgui-5.14.2.ebuild
index c35dd63b66a5..46c80da5c92d 100644
--- a/dev-qt/qtgui/qtgui-5.14.2.ebuild
+++ b/dev-qt/qtgui/qtgui-5.14.2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
 SLOT=5/$(ver_cut 1-3) # bug 707658
 
 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
 
 # TODO: linuxfb