gentoo Easter resync : 12.04.2020

5 files changed, 54 insertions, 47 deletions

diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index fc5fbd4fde84..74955dbff2b9 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,10 +1,10 @@
 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.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 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
-EBUILD qtgui-5.12.3-r1.ebuild 3668 BLAKE2B 6620cd32938c814cc597051ce5b3d6f4c0f4f5bf16459d0cd421ef3cb595b360d989b5cc56094ac2d2bee1c38b1f3b2bed9d86ee8b306d90a3fdea0cdd894765 SHA512 3e6443bcd235dfe04df30938fb5350eb4b234a0967914ae6209a8b0251ecae86950f0eb8a69b034cf3d4dd9c174e9ae9ab51a889ac2face27d83b8f6f93e1fae
-EBUILD qtgui-5.13.2.ebuild 3850 BLAKE2B 68a765fa93aafb2db53761863001b0033698b9cb2aab6a8a2b558aa2900460f877629c9a737d886ade16d7b24a170f9b6304c9c441f3e4d85abc03c278b15342 SHA512 4ac90834407dde1d9b95893b8cfec007a876945cf9dc195400fae14dbf7a6d499480857b1705c2a2f71c8f2603454e017ce897ca45b8c94ab1b8d63de57fe0cf
-EBUILD qtgui-5.14.1-r3.ebuild 4191 BLAKE2B 8ee7e6141b86699c9f6cee4c1d5af30ec37314e31a489bddcb0180e0be900e0e296ad91301e2817b96d6733639c20f434dd69c2365bd81fe14d4ff193af61c61 SHA512 44f558779f93d1ec0cf13b0f57088a28c3d00a609400bc1062c562bd9b4ce0be9fc584f828aec38b284645d465c96daf12fbba4ecfcfd406b88f2e0d4e53c212
-MISC metadata.xml 1377 BLAKE2B 132087874ca283b494027301d33206155c3dc496f095de1ab2d740142ff1ab725e7e8fd99e533d813e71782cb4b25452987624139e269a066df5a93f3a176ee1 SHA512 9e7227bb9097e0110dd2780112e6be863c288f88a4884e269100274327b0c7ddbb238f0fb36b4c37779b8b0483718d5921f05668a1962c0b0ee6e431ac96beaf
+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 4216 BLAKE2B 6b161374e2399be7e2c4a3d5a75b322d45f1ffc3dc0a7e895873e7d9044acae135c53338d6a5ba6cf3271fab12f95f33f757b0a4d26aac9a6ac97538e51a48dd SHA512 cafc70227c72bad0fd29ffa0b3e002e4a577a5b0500ad81c50dc9290b6321ba5422db63562529e94d35d922469f08f1e65339b44c04a737963e8f9fc57653620
+EBUILD qtgui-5.14.2.ebuild 3991 BLAKE2B 9e12b0b0f3b8b73031b56cf403da613d4a59f690f959828972d48fd61f698f061844769571b0a654875365ce4de5818747a1a2414fcb91d39338ba4c7949308d SHA512 8cf4e367499acaacbb59798b13d50382bc3c0c625903e8ca37c840f3f50a482a001d54f586a046c2a344f9290df64aaaa65d1e9a7909eb8729c164be613c8d6b
+MISC metadata.xml 1304 BLAKE2B a56dc3850426ef4395e27a093d2f0639444f01fe6595cdd7eadb17681cce17eba664c1df9907ca88e89060c3b37b8ae58d920c0149071de21b44789978c5e51b SHA512 c116aea83cf5d13d8e40d2d330106c07b71bce1e77dd4da10525df3dffdf67552780263ff7cb1eb109fed486648da7e1a6df0be2f07437e110809fd838e1dbc2
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index 0ff1bae4e4d8..f785d85e8c4a 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="egl">Enable EGL integration</flag>
 		<flag name="eglfs">Build the EGL Full Screen/Single Surface platform plugin</flag>
 		<flag name="evdev">Enable support for input devices via evdev</flag>
-		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="ibus">Build the IBus input method plugin</flag>
 		<flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag>
 		<flag name="tslib">Enable support for touchscreen devices via <pkg>x11-libs/tslib</pkg></flag>
diff --git a/dev-qt/qtgui/qtgui-5.13.2.ebuild b/dev-qt/qtgui/qtgui-5.13.2-r1.ebuild
index 291c505bf4c8..e296604eeff4 100644
--- a/dev-qt/qtgui/qtgui-5.13.2.ebuild
+++ b/dev-qt/qtgui/qtgui-5.13.2-r1.ebuild
@@ -8,12 +8,12 @@ inherit qt5-build
 DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
+	KEYWORDS="arm"
 fi
 
 # TODO: linuxfb
 
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
+IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus
 	jpeg +libinput +png tslib tuio +udev vnc wayland +xcb"
 REQUIRED_USE="
 	|| ( eglfs xcb )
@@ -21,7 +21,7 @@ REQUIRED_USE="
 	eglfs? ( egl )
 	ibus? ( dbus )
 	libinput? ( udev )
-	xcb? ( gles2? ( egl ) )
+	xcb? ( gles2-only? ( egl ) )
 "
 
 RDEPEND="
@@ -40,7 +40,7 @@ RDEPEND="
 		x11-libs/libdrm
 	)
 	evdev? ( sys-libs/mtdev )
-	gles2? ( media-libs/mesa[gles2] )
+	gles2-only? ( media-libs/mesa[gles2] )
 	jpeg? ( virtual/jpeg:0 )
 	libinput? (
 		dev-libs/libinput:=
@@ -96,8 +96,8 @@ QT5_GENTOO_CONFIG=(
 	:system-freetype:FREETYPE
 	!:no-freetype:
 	!gif:no-gif:
-	gles2::OPENGL_ES
-	gles2:opengles2:OPENGL_ES_2
+	gles2-only::OPENGL_ES
+	gles2-only:opengles2:OPENGL_ES_2
 	!:no-gui:
 	:system-harfbuzz:
 	!:no-harfbuzz:
@@ -165,7 +165,7 @@ src_configure() {
 		-system-harfbuzz
 		$(qt_use jpeg libjpeg system)
 		$(qt_use libinput)
-		-opengl $(usex gles2 es2 desktop)
+		-opengl $(usex gles2-only es2 desktop)
 		$(qt_use png libpng system)
 		$(qt_use tslib)
 		$(qt_use udev libudev)
diff --git a/dev-qt/qtgui/qtgui-5.14.1-r3.ebuild b/dev-qt/qtgui/qtgui-5.14.1-r4.ebuild
index 187c3e0c5035..59370d3b5715 100644
--- a/dev-qt/qtgui/qtgui-5.14.1-r3.ebuild
+++ b/dev-qt/qtgui/qtgui-5.14.1-r4.ebuild
@@ -10,12 +10,12 @@ DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
 SLOT=5/${PV} # 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
 
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus jpeg
+IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
 	+libinput +png tslib tuio +udev vnc vulkan wayland +X"
 REQUIRED_USE="
 	|| ( eglfs X )
@@ -23,7 +23,7 @@ REQUIRED_USE="
 	eglfs? ( egl )
 	ibus? ( dbus )
 	libinput? ( udev )
-	X? ( gles2? ( egl ) )
+	X? ( gles2-only? ( egl ) )
 "
 
 COMMON_DEPEND="
@@ -42,7 +42,7 @@ COMMON_DEPEND="
 		x11-libs/libdrm
 	)
 	evdev? ( sys-libs/mtdev )
-	gles2? ( media-libs/mesa[gles2] )
+	gles2-only? ( media-libs/mesa[gles2] )
 	jpeg? ( virtual/jpeg:0 )
 	libinput? (
 		dev-libs/libinput:=
@@ -106,8 +106,8 @@ QT5_GENTOO_CONFIG=(
 	:system-freetype:FREETYPE
 	!:no-freetype:
 	!gif:no-gif:
-	gles2::OPENGL_ES
-	gles2:opengles2:OPENGL_ES_2
+	gles2-only::OPENGL_ES
+	gles2-only:opengles2:OPENGL_ES_2
 	!:no-gui:
 	:system-harfbuzz:
 	!:no-harfbuzz:
@@ -176,7 +176,7 @@ src_configure() {
 		-system-harfbuzz
 		$(qt_use jpeg libjpeg system)
 		$(qt_use libinput)
-		-opengl $(usex gles2 es2 desktop)
+		-opengl $(usex gles2-only es2 desktop)
 		$(qt_use png libpng system)
 		$(qt_use tslib)
 		$(qt_use vulkan)
diff --git a/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild b/dev-qt/qtgui/qtgui-5.14.2.ebuild
index 276e36311bf9..c35dd63b66a5 100644
--- a/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.14.2.ebuild
@@ -1,32 +1,35 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 QT5_MODULE="qtbase"
 inherit qt5-build
 
 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="x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 # TODO: linuxfb
 
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
-	jpeg +libinput +png tslib tuio +udev vnc +xcb"
+IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
+	+libinput +png tslib tuio +udev vnc vulkan wayland +X"
 REQUIRED_USE="
-	|| ( eglfs xcb )
-	accessibility? ( dbus xcb )
+	|| ( eglfs X )
+	accessibility? ( dbus X )
 	eglfs? ( egl )
 	ibus? ( dbus )
 	libinput? ( udev )
-	xcb? ( gles2? ( egl ) )
+	X? ( gles2-only? ( egl ) )
 "
 
 RDEPEND="
 	dev-libs/glib:2
-	~dev-qt/qtcore-${PV}
+	~dev-qt/qtcore-${PV}:5=
+	dev-util/gtk-update-icon-cache
 	media-libs/fontconfig
 	>=media-libs/freetype-2.6.1:2
 	>=media-libs/harfbuzz-1.6.0:=
@@ -39,18 +42,19 @@ RDEPEND="
 		x11-libs/libdrm
 	)
 	evdev? ( sys-libs/mtdev )
-	gles2? ( media-libs/mesa[gles2] )
+	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 )
+	tslib? ( >=x11-libs/tslib-1.21 )
 	tuio? ( ~dev-qt/qtnetwork-${PV} )
 	udev? ( virtual/libudev:= )
 	vnc? ( ~dev-qt/qtnetwork-${PV} )
-	xcb? (
+	vulkan? ( dev-util/vulkan-headers )
+	X? (
 		x11-libs/libICE
 		x11-libs/libSM
 		x11-libs/libX11
@@ -68,6 +72,7 @@ DEPEND="${RDEPEND}
 "
 PDEPEND="
 	ibus? ( app-i18n/ibus )
+	wayland? ( ~dev-qt/qtwayland-${PV} )
 "
 
 QT5_TARGET_SUBDIRS=(
@@ -94,8 +99,8 @@ QT5_GENTOO_CONFIG=(
 	:system-freetype:FREETYPE
 	!:no-freetype:
 	!gif:no-gif:
-	gles2::OPENGL_ES
-	gles2:opengles2:OPENGL_ES_2
+	gles2-only::OPENGL_ES
+	gles2-only:opengles2:OPENGL_ES_2
 	!:no-gui:
 	:system-harfbuzz:
 	!:no-harfbuzz:
@@ -109,13 +114,14 @@ QT5_GENTOO_CONFIG=(
 	!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:
+	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=(
@@ -123,15 +129,16 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 )
 
 PATCHES=(
-	"${FILESDIR}/qt-5.12-gcc-avx2.patch" # 672946
+	"${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 xcb are enabled
-	use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
+	# 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
@@ -162,14 +169,15 @@ src_configure() {
 		-system-harfbuzz
 		$(qt_use jpeg libjpeg system)
 		$(qt_use libinput)
-		-opengl $(usex gles2 es2 desktop)
+		-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' '')
+		$(qt_use vulkan)
+		$(qt_use X xcb system)
+		$(usex X '-xcb-xlib -xcb-xinput -xkb' '')
 	)
-	if use libinput || use xcb; then
+	if use libinput || use X; then
 		myconf+=( -xkbcommon )
 	fi
 	qt5-build_src_configure