dev-qt/qtgui: sync

2 files changed, 1 insertions, 187 deletions

diff --git a/dev-qt/qtgui/qtgui-5.15.2-r15.ebuild b/dev-qt/qtgui/qtgui-5.15.2-r15.ebuild
deleted file mode 100644
index c970f17..0000000
--- a/dev-qt/qtgui/qtgui-5.15.2-r15.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=c9fde86b0a2440133bc08f4811b6ca793be47f0a
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-SLOT=5/${QT5_PV} # bug 707658
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
-	+libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X"
-REQUIRED_USE="
-	|| ( eglfs linuxfb vnc wayland X )
-	accessibility? ( dbus X )
-	eglfs? ( egl )
-	ibus? ( dbus )
-	libinput? ( udev )
-	X? ( gles2-only? ( egl ) )
-"
-
-RDEPEND="
-	dev-libs/glib:2
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	dev-util/gtk-update-icon-cache
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/harfbuzz:=
-	sys-libs/zlib:=
-	dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
-	eglfs? (
-		media-libs/mesa[gbm(+)]
-		x11-libs/libdrm
-	)
-	evdev? ( sys-libs/mtdev )
-	jpeg? ( virtual/jpeg )
-	gles2-only? ( media-libs/libglvnd )
-	!gles2-only? ( media-libs/libglvnd[X] )
-	libinput? (
-		dev-libs/libinput:=
-		x11-libs/libxkbcommon
-	)
-	png? ( media-libs/libpng:= )
-	tslib? ( >=x11-libs/tslib-1.21 )
-	tuio? ( =dev-qt/qtnetwork-${QT5_PV}* )
-	udev? ( virtual/libudev:= )
-	vnc? ( =dev-qt/qtnetwork-${QT5_PV}* )
-	vulkan? ( dev-util/vulkan-headers )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libxcb:=[xkb]
-		x11-libs/libxkbcommon[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 )
-	linuxfb? ( sys-kernel/linux-headers )
-	udev? ( sys-kernel/linux-headers )
-"
-PDEPEND="
-	ibus? ( app-i18n/ibus )
-	wayland? ( =dev-qt/qtwayland-${QT5_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:
-	vulkan:vulkan:
-	X:xcb:
-	X:xcb-glx:
-	X:xcb-plugin:
-	X:xcb-render:
-	X:xcb-sm:
-	X:xcb-xlib:
-	X:xcb-xinput:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:gui
-)
-
-PATCHES=(
-	"${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
-	"${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
-)
-
-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 X are enabled
-	use egl && QT5_GENTOO_CONFIG+=(X: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=(
-		$(usev dbus -dbus-linked)
-		$(qt_use egl)
-		$(qt_use eglfs)
-		$(usev eglfs '-gbm -kms')
-		$(qt_use evdev)
-		$(qt_use evdev mtdev)
-		-fontconfig
-		-system-freetype
-		$(usev !gif -no-gif)
-		-gui
-		-system-harfbuzz
-		$(qt_use jpeg libjpeg system)
-		$(qt_use libinput)
-		$(qt_use linuxfb)
-		-opengl $(usex gles2-only es2 desktop)
-		$(qt_use png libpng system)
-		$(qt_use tslib)
-		$(qt_use udev libudev)
-		$(qt_use vulkan)
-		$(qt_use X xcb)
-		$(usev X '-xcb-xlib')
-	)
-	if use libinput || use X; then
-		myconf+=( -xkbcommon )
-	fi
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtgui/qtgui-5.15.2-r16.ebuild b/dev-qt/qtgui/qtgui-5.15.3.ebuild
index b5a67c2..441add6 100644
--- a/dev-qt/qtgui/qtgui-5.15.2-r16.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-KDE_ORG_COMMIT=38ad2f39daec09168728033969265834b6a2d924
+QT5_KDEPATCHSET_REV=1
 QT5_MODULE="qtbase"
 inherit qt5-build
 
@@ -17,7 +17,6 @@ fi
 IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
 	+libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X"
 REQUIRED_USE="
-	|| ( eglfs linuxfb vnc wayland X )
 	accessibility? ( dbus X )
 	eglfs? ( egl )
 	ibus? ( dbus )
@@ -129,7 +128,6 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 
 PATCHES=(
 	"${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
-	"${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
 )
 
 src_prepare() {