From 032a3dbb5d4ea63ec6c2ceb39c067ea6424b5792 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 20 Jan 2020 19:28:42 +0000
Subject: gentoo resync : 20.01.2020
---
dev-qt/Manifest.gz | Bin 10013 -> 10017 bytes
dev-qt/qtgui/Manifest | 3 +-
dev-qt/qtgui/qtgui-5.14.0-r1.ebuild | 186 --------------------
dev-qt/qtgui/qtgui-5.14.0-r2.ebuild | 187 --------------------
dev-qt/qtgui/qtgui-5.14.0-r3.ebuild | 188 +++++++++++++++++++++
dev-qt/qtvirtualkeyboard/Manifest | 2 +-
.../qtvirtualkeyboard-5.14.0-r1.ebuild | 43 +++++
.../qtvirtualkeyboard-5.14.0.ebuild | 42 -----
dev-qt/qtwidgets/Manifest | 2 +-
dev-qt/qtwidgets/qtwidgets-5.14.0-r1.ebuild | 57 +++++++
dev-qt/qtwidgets/qtwidgets-5.14.0.ebuild | 56 ------
dev-qt/qtx11extras/Manifest | 2 +-
dev-qt/qtx11extras/qtx11extras-5.14.0-r1.ebuild | 22 +++
dev-qt/qtx11extras/qtx11extras-5.14.0.ebuild | 21 ---
14 files changed, 314 insertions(+), 497 deletions(-)
delete mode 100644 dev-qt/qtgui/qtgui-5.14.0-r1.ebuild
delete mode 100644 dev-qt/qtgui/qtgui-5.14.0-r2.ebuild
create mode 100644 dev-qt/qtgui/qtgui-5.14.0-r3.ebuild
create mode 100644 dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.14.0-r1.ebuild
delete mode 100644 dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.14.0.ebuild
create mode 100644 dev-qt/qtwidgets/qtwidgets-5.14.0-r1.ebuild
delete mode 100644 dev-qt/qtwidgets/qtwidgets-5.14.0.ebuild
create mode 100644 dev-qt/qtx11extras/qtx11extras-5.14.0-r1.ebuild
delete mode 100644 dev-qt/qtx11extras/qtx11extras-5.14.0.ebuild
(limited to 'dev-qt')
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index df9729b442d7..6bc57643b561 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 47271bcfc4d0..fbe26f5c7a92 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -8,6 +8,5 @@ DIST qtbase-everywhere-src-5.14.0.tar.xz 49713412 BLAKE2B b59a98b12ade13ef27a055
EBUILD qtgui-5.12.3-r1.ebuild 3707 BLAKE2B b73f820eded407365f5cb7d3a0938dd938a8e5e0573ec7051bb8375424accb8c1d84d50e4673f7504ed76d53d9bc57f9b1ceb64da3f0e883a729d06ad082b9ac SHA512 8afedb468ff74a47d1974858a2d6e67a5a158bd1540195a7211f3109c48c7ce62a293eeb47215eddca0c4126c0729ae5282fb0b9ebd3482fc2262bc9521f2877
EBUILD qtgui-5.12.5.ebuild 3792 BLAKE2B 865e36e7dc7c5686bdcea6005063b83d8489291e5541b93d53b2ce8b66f2120f5c6e7c9b773c6edfbdcf7759bf11071252ee0a889eae7eae05f88a6a3f971c85 SHA512 279f7cbd934cea6fa8e6230a6407eb264212178c43617536f720074e02cf2a55aeab533544e2649ae067147074a28775707efba8e268a0f6bb0ff6a13b02e719
EBUILD qtgui-5.13.2.ebuild 3851 BLAKE2B ed81578d7ec0459dd2d55d7b9236a14ade1cac2ceee5b046d7010327fbb09437dad1f2603bbccd8fee0bf42f51e6d0e0e40f05c73b9558e20cfbb8a25f7b96ac SHA512 2d66bc1a4f942d8d425cbb90937d081aa58cd704075ddcd220cec91933e1942e2cd6bdc688bee82d284bb3b672e6668b18c40daaa334d29e93fa242e1a79d749
-EBUILD qtgui-5.14.0-r1.ebuild 4111 BLAKE2B 978a7d785a9e7ca67782b5e22bc892e56ef5b8f888d2c014d37770c88582cace01128d65917958633e329f6ab04e97f0b049385a8d8cf47fa1ab73e4422e2b7d SHA512 de76c010cf14b1663283c6242ae750bbd6b0492176f7f651d6fa1bfb185ba0518b032b303c6aa6c1602e4cb98819186c6fd489321c7b1924893c7bced57ef7a5
-EBUILD qtgui-5.14.0-r2.ebuild 4181 BLAKE2B ffac194264e284458686143ad8ec8136b52bf39033815343650d84d2b7b855ac1b3519e216f78f45bdab39f39fc9b3592293091ce11fdd67e5f8856bd66b4d54 SHA512 5ef16ffece81c1a6a70bcc11ea12316373be9c0023e34500bf9454439f0b40c5d8502a337fc706216f774f7026f67c4cff6dc37b19eed55569890f7211a3386d
+EBUILD qtgui-5.14.0-r3.ebuild 4148 BLAKE2B 7f9caf89a08ffcd59d1997a266d29c80ec286823cf505c5c3ee9a32f077ed891d99055218e95ecca5ebb421f5d977347a92ab20613bbaa5657d3892b10ac9d33 SHA512 8c78b621af7156cc75f19514569fd3cf227938d2d46bf3ab43f353a9badfe0241f80f7c75bf0ca1c73cbba402bd3895cc8a9be209fd7a7d2eb2cbcaf5f22af3c
MISC metadata.xml 1322 BLAKE2B b6161b568e3a4c34a8fce62a8cce9e1bd7cabbc0d2d2baa0e5e41295974b877d59adff4983b731bb359040f3662999a7915a1527bedeca9de09eb702541d1ae7 SHA512 dcfcdc8f5622e5d6b8488f07b6de62aae829b564ecdb9fb8b9f273bc2593c312f5265849bb3d2175d0ab468977ac2afb8099519cfb66224d8e5df0efec01ae4a
diff --git a/dev-qt/qtgui/qtgui-5.14.0-r1.ebuild b/dev-qt/qtgui/qtgui-5.14.0-r1.ebuild
deleted file mode 100644
index 592b885552ca..000000000000
--- a/dev-qt/qtgui/qtgui-5.14.0-r1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2019 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="~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 wayland +xcb"
-REQUIRED_USE="
- || ( eglfs xcb )
- accessibility? ( dbus xcb )
- eglfs? ( egl )
- ibus? ( dbus )
- libinput? ( udev )
- xcb? ( gles2? ( egl ) )
-"
-
-COMMON_DEPEND="
- 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? ( 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-1.21 )
- 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="${COMMON_DEPEND}
- evdev? ( sys-kernel/linux-headers )
- udev? ( sys-kernel/linux-headers )
-"
-# bug 703306, _populate_Gui_plugin_properties breaks installed cmake modules
-RDEPEND="${COMMON_DEPEND}
- !<dev-qt/qtimageformats-5.14.0:5
- !<dev-qt/qtsvg-5.14.0:5
- !<dev-qt/qtvirtualkeyboard-5.14.0:5
- !<dev-qt/qtwayland-5.14.0:5
-"
-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::OPENGL_ES
- gles2: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}/${PN}-5.13.2-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 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.0-r2.ebuild b/dev-qt/qtgui/qtgui-5.14.0-r2.ebuild
deleted file mode 100644
index 1f814dd0fe50..000000000000
--- a/dev-qt/qtgui/qtgui-5.14.0-r2.ebuild
+++ /dev/null
@@ -1,187 +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="~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 wayland +xcb"
-REQUIRED_USE="
- || ( eglfs xcb )
- accessibility? ( dbus xcb )
- eglfs? ( egl )
- ibus? ( dbus )
- libinput? ( udev )
- xcb? ( gles2? ( egl ) )
-"
-
-COMMON_DEPEND="
- 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? ( 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-1.21 )
- 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="${COMMON_DEPEND}
- evdev? ( sys-kernel/linux-headers )
- udev? ( sys-kernel/linux-headers )
-"
-# bug 703306, _populate_Gui_plugin_properties breaks installed cmake modules
-RDEPEND="${COMMON_DEPEND}
- !<dev-qt/qtimageformats-5.14.0:5
- !<dev-qt/qtsvg-5.14.0:5
- !<dev-qt/qtvirtualkeyboard-5.14.0:5
- !<dev-qt/qtwayland-5.14.0:5
-"
-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::OPENGL_ES
- gles2: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}/${PN}-5.13.2-no-xcb-no-xkbcommon.patch" # bug 699110
- "${FILESDIR}/${P}-restore-scaling.patch" # QTBUG-80967, in Qt 5.14.1
-)
-
-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 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.0-r3.ebuild b/dev-qt/qtgui/qtgui-5.14.0-r3.ebuild
new file mode 100644
index 000000000000..8ab48c846dd5
--- /dev/null
+++ b/dev-qt/qtgui/qtgui-5.14.0-r3.ebuild
@@ -0,0 +1,188 @@
+# 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="~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 wayland +X"
+REQUIRED_USE="
+ || ( eglfs X )
+ accessibility? ( dbus X )
+ eglfs? ( egl )
+ ibus? ( dbus )
+ libinput? ( udev )
+ X? ( gles2? ( egl ) )
+"
+
+COMMON_DEPEND="
+ 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? ( 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-1.21 )
+ tuio? ( ~dev-qt/qtnetwork-${PV} )
+ udev? ( virtual/libudev:= )
+ vnc? ( ~dev-qt/qtnetwork-${PV} )
+ X? (
+ 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="${COMMON_DEPEND}
+ evdev? ( sys-kernel/linux-headers )
+ udev? ( sys-kernel/linux-headers )
+"
+# bug 703306, _populate_Gui_plugin_properties breaks installed cmake modules
+RDEPEND="${COMMON_DEPEND}
+ !<dev-qt/qtimageformats-5.14.0:5
+ !<dev-qt/qtsvg-5.14.0:5
+ !<dev-qt/qtvirtualkeyboard-5.14.0:5
+ !<dev-qt/qtwayland-5.14.0:5
+"
+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::OPENGL_ES
+ gles2: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:
+ 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.13.2-no-xcb-no-xkbcommon.patch" # bug 699110
+ "${FILESDIR}/${P}-restore-scaling.patch" # QTBUG-80967, in Qt 5.14.1
+)
+
+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=(
+ $(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 es2 desktop)
+ $(qt_use png libpng system)
+ $(qt_use tslib)
+ $(qt_use udev libudev)
+ $(qt_use X xcb system)
+ $(usex X '-xcb-xlib -xcb-xinput -xkb' '')
+ )
+ if use libinput || use X; then
+ myconf+=( -xkbcommon )
+ fi
+ qt5-build_src_configure
+}
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index 6d553e8cdb5d..6e25433ce238 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -5,5 +5,5 @@ DIST qtvirtualkeyboard-everywhere-src-5.14.0.tar.xz 10961900 BLAKE2B 8e3192c8d37
EBUILD qtvirtualkeyboard-5.12.3.ebuild 1199 BLAKE2B c2edad058bdd8de12d1f5f6afe4f2529084ec5880d0ebabfee4b2d0a3737bf371fc7a852edbdfe5349a6063b5e46350cf7fe37c3561e38e6245e9f1018e4521c SHA512 f38a81b8f2e1da30a05ea83a4b8ad490729f6018bdbe256170a7cd2e530cac848a4173cc7cfd1213ea7f8cd4e906406f5f47d9ada4585e131aa9fd462b535a8f
EBUILD qtvirtualkeyboard-5.12.5.ebuild 1200 BLAKE2B a90c2a830d1010c4f78af473978f14b4186384089fccf24629f2d70243bcd3be788953953775fed2d64d54992581559ab28a8a550e414465e8dbb63b90918bae SHA512 32c4c395c77cca28c6d46050061f3076ec8008149c6b767133045a94848d2081432bf13cc208cba1646b725b45d99c74b46e11f3a2d12b83a39ad7f97ece54c3
EBUILD qtvirtualkeyboard-5.13.2.ebuild 1200 BLAKE2B a90c2a830d1010c4f78af473978f14b4186384089fccf24629f2d70243bcd3be788953953775fed2d64d54992581559ab28a8a550e414465e8dbb63b90918bae SHA512 32c4c395c77cca28c6d46050061f3076ec8008149c6b767133045a94848d2081432bf13cc208cba1646b725b45d99c74b46e11f3a2d12b83a39ad7f97ece54c3
-EBUILD qtvirtualkeyboard-5.14.0.ebuild 1202 BLAKE2B 9eb68e2b2780e532f8e342112fb30508659ec5003d372619c7a781a2382fac8a9dc1484f9fbe6ed8f2631eada20a1ae843bd16331567a24c419630ea836d8d36 SHA512 c5dbf8f58734cd98865e2613b17eb43a17b083ab1b2017cc3c42d6fc5f3aeaadcf8452afa148e46fb215937c6852f32e348cdf0bdaf5d3945d1fd5c367027270
+EBUILD qtvirtualkeyboard-5.14.0-r1.ebuild 1197 BLAKE2B 921cb0538cfea482bff81752c4b7cb1a76d1a37acac1ee7195861500daa2aa17bd8153c5c7319debc8c4e7f6cc1ee429469b7047bfe77b43f3e56ddc17af7807 SHA512 cfa688f4d7a2fea8e4bda3f6c535b3f095ba2c34dd666625936b0e3483f3b1f911bf78f7c3f0d5dfe238d2521ccbe46e4bd5ea238bf8cf3f960aa08bb9f35330
MISC metadata.xml 579 BLAKE2B 831918738315acf3bdb4e5f0b7946cfda2c0a2c772f586e2605af277111b21eb32f818d73388f965c204d0b263faf500f44ea270155b15069de4be454d69ac92 SHA512 96b897699828afe8027d30da6a77ab6ac2ffb40c4496564a1f0d7db51078303bc5af940c462ebaa4409c0aaeb70e3215584f0d8fb664837757603f7a535868e3
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.14.0-r1.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.14.0-r1.ebuild
new file mode 100644
index 000000000000..36d34ee4fe23
--- /dev/null
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.14.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qt5-build
+
+DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+# TODO: unbudle libraries for more layouts
+IUSE="handwriting +spell +X"
+
+DEPEND="
+ ~dev-qt/qtcore-${PV}
+ ~dev-qt/qtdeclarative-${PV}
+ ~dev-qt/qtgui-${PV}
+ ~dev-qt/qtsvg-${PV}
+ spell? ( app-text/hunspell:= )
+ X? ( x11-libs/libxcb:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local myqmakeargs=(
+ $(usex handwriting CONFIG+=lipi-toolkit '')
+ $(usex spell '' CONFIG+=disable-hunspell)
+ $(usex X '' CONFIG+=disable-desktop)
+ CONFIG+="lang-ar_AR lang-bg_BG lang-cs_CZ lang-da_DK lang-de_DE \
+ lang-el_GR lang-en_GB lang-en_US lang-es_ES lang-es_MX \
+ lang-et_EE lang-fa_FA lang-fi_FI lang-fr_CA lang-fr_FR \
+ lang-he_IL lang-hi_IN lang-hr_HR lang-hu_HU lang-id_ID \
+ lang-it_IT lang-ms_MY lang-nb_NO lang-nl_NL lang-pl_PL \
+ lang-pt_BR lang-pt_PT lang-ro_RO lang-ru_RU lang-sk_SK \
+ lang-sl_SI lang-sq_AL lang-sr_SP lang-sv_SE lang-tr_TR \
+ lang-uk_UA lang-vi_VN"
+ )
+
+ qt5-build_src_configure
+}
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.14.0.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.14.0.ebuild
deleted file mode 100644
index d950674827c1..000000000000
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.14.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-# TODO: unbudle libraries for more layouts
-IUSE="handwriting +spell +xcb"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtdeclarative-${PV}
- ~dev-qt/qtgui-${PV}
- ~dev-qt/qtsvg-${PV}
- spell? ( app-text/hunspell:= )
- xcb? ( x11-libs/libxcb:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local myqmakeargs=(
- $(usex handwriting CONFIG+=lipi-toolkit '')
- $(usex spell '' CONFIG+=disable-hunspell)
- $(usex xcb '' CONFIG+=disable-desktop)
- CONFIG+="lang-ar_AR lang-bg_BG lang-cs_CZ lang-da_DK lang-de_DE \
- lang-el_GR lang-en_GB lang-en_US lang-es_ES lang-es_MX \
- lang-et_EE lang-fa_FA lang-fi_FI lang-fr_CA lang-fr_FR \
- lang-he_IL lang-hi_IN lang-hr_HR lang-hu_HU lang-id_ID \
- lang-it_IT lang-ms_MY lang-nb_NO lang-nl_NL lang-pl_PL \
- lang-pt_BR lang-pt_PT lang-ro_RO lang-ru_RU lang-sk_SK \
- lang-sl_SI lang-sq_AL lang-sr_SP lang-sv_SE lang-tr_TR \
- lang-uk_UA lang-vi_VN"
- )
-
- qt5-build_src_configure
-}
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index a2b647a14907..79bfca0d3ea3 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -6,5 +6,5 @@ DIST qtbase-everywhere-src-5.14.0.tar.xz 49713412 BLAKE2B b59a98b12ade13ef27a055
EBUILD qtwidgets-5.12.3.ebuild 1030 BLAKE2B 0582dabaf02a597221a8abafb5b07d77685761148ea87bccb88bf3752123b27989de1336bad4485d5ba7614c14a1d009f3196f9c2c92bc86afe55b87f5872991 SHA512 7a5aca1706c910fe55f4483f0d62ebff18cbbbaa4d4cb925f76c9b0b9b0892a1514f3801549c52fba9c7294c84f645b58cf547d1de6cbac3116d2ec508b2a1f0
EBUILD qtwidgets-5.12.5-r1.ebuild 1202 BLAKE2B b96a33f7eab3aa14a967f4cc81d369b299a68ef3d2bf1fb84e6af79e3828c02a21c5c5d92f4816301c3712c0896df74c231ff630ea543719ff2e2e79bc54ab7f SHA512 fff5711006507d7aef36227bd8daa99a763ee7d0cfd4809690e15167b7fdd89815c830ea8332ea9391f27a8fc4ea4297ecb1de6cc674f20215faff62d206bfe4
EBUILD qtwidgets-5.13.2.ebuild 1032 BLAKE2B bbd59aa9736292b65591d9eef265f6526a1f78458290afcba9d0da62b43ce38ea90c81c1259b138ddb528c000969bcac182e5bdb79fe492d5bcfb5cf8e28e223 SHA512 9c12a756137c48a7aebdc15f78a5dea59400104ed985516e34224a07cca081dd3cdbaaafdbbd590deb22d837436e8ae34cab3a1f3a7583c74206dd493ce5986f
-EBUILD qtwidgets-5.14.0.ebuild 1036 BLAKE2B 3a774f5af35c59775ae913bcfb7161478e62d8ce701dc7f6820aa8287b4abee846ed5c606d6f75a67a64df2e1ca23ccb1129d39f2e76f3cd2509836ac2c8c6e6 SHA512 c9ad3a97e29ab029b5afd4c86e3aaf66a95ffe2d2237621168e89a4b548b86db8bdbbce317a532565fa009de740ffa0b106df6ce30a9f6491aa31babbc5d428a
+EBUILD qtwidgets-5.14.0-r1.ebuild 1029 BLAKE2B 8f85af38196a44593a0455dc9e965792dd13b663148cbfafa25cfab025f49332b49cd7f7ed57fd8fbb9d1c007a2fdd32c5e1e5b3e5970bda180d8512b8b2299e SHA512 3c0a9ba1db1e2976d1aed6e940ac28867472c3e376a2a2c6cba45f826a5cdedea4dd7b7d64ccbe7e52aebcb4d5b8a91c113ac63a7a7ec870d2d10a029e7af948
MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtwidgets/qtwidgets-5.14.0-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.14.0-r1.ebuild
new file mode 100644
index 000000000000..3d14a9cd5446
--- /dev/null
+++ b/dev-qt/qtwidgets/qtwidgets-5.14.0-r1.ebuild
@@ -0,0 +1,57 @@
+# 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="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 ~sparc ~x86"
+fi
+
+# keep IUSE defaults in sync with qtgui
+IUSE="gles2 gtk +png +X"
+
+DEPEND="
+ ~dev-qt/qtcore-${PV}
+ ~dev-qt/qtgui-${PV}[gles2=,png=,X?]
+ gtk? (
+ ~dev-qt/qtgui-${PV}[dbus]
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ x11-libs/pango
+ )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+ src/tools/uic
+ src/widgets
+ src/plugins/platformthemes
+)
+
+QT5_GENTOO_CONFIG=(
+ gtk:gtk3:
+ ::widgets
+ !:no-widgets:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+ :widgets
+)
+
+src_configure() {
+ local myconf=(
+ -opengl $(usex gles2 es2 desktop)
+ $(qt_use gtk)
+ -gui
+ $(qt_use png libpng system)
+ -widgets
+ $(qt_use X xcb system)
+ $(usex X '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '')
+ )
+ qt5-build_src_configure
+}
diff --git a/dev-qt/qtwidgets/qtwidgets-5.14.0.ebuild b/dev-qt/qtwidgets/qtwidgets-5.14.0.ebuild
deleted file mode 100644
index 700b6405241e..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.14.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 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"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-# keep IUSE defaults in sync with qtgui
-IUSE="gles2 gtk +png +xcb"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtgui-${PV}[gles2=,png=,xcb?]
- gtk? (
- ~dev-qt/qtgui-${PV}[dbus]
- x11-libs/gtk+:3
- x11-libs/libX11
- x11-libs/pango
- )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
- src/tools/uic
- src/widgets
- src/plugins/platformthemes
-)
-
-QT5_GENTOO_CONFIG=(
- gtk:gtk3:
- ::widgets
- !:no-widgets:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
- :widgets
-)
-
-src_configure() {
- local myconf=(
- -opengl $(usex gles2 es2 desktop)
- $(qt_use gtk)
- -gui
- $(qt_use png libpng system)
- -widgets
- $(qt_use xcb xcb system)
- $(usex xcb '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '')
- )
- qt5-build_src_configure
-}
diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest
index d4ba16483f0b..f5bbe49be87c 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -5,5 +5,5 @@ DIST qtx11extras-everywhere-src-5.14.0.tar.xz 127472 BLAKE2B 0d1fb36355f85ae8bde
EBUILD qtx11extras-5.12.3.ebuild 431 BLAKE2B 1260b757e3a8466e2418359ee08cdf00254baba2dc1470e7899e6e458bf81976f7b3dda93ccf5469b192fcf51d635b9ad285e7438a3896abb9f562e3f3f4937a SHA512 e5c96443434042fd97c7e032e9cca1e1786896aabec75fe687b18b3458be101161687516bafb78804ecf9eec131fbf91b37807f2f6df0db96e6fdbf88b9f0879
EBUILD qtx11extras-5.12.5.ebuild 434 BLAKE2B 80da63164d566cb7a9ccf6698eb904d0de3f45d185886f2bd3328c703c124e44c958b696fb1b1de040aaadf033bf5e03265356ea4448e087758501cb3974b833 SHA512 adab2dc1550a0bd33179dfcc600c35810c85685ba8d33df3d55144422478ec0192e8f589c92df8cadfef8b1555c52e61cda68de957d95a983d1cffc3ee6f77d6
EBUILD qtx11extras-5.13.2.ebuild 433 BLAKE2B 4a39125e679ff66cd5a4b0cfc3cb55f7be4dba7bd16ec1b0856848da27e069508b5901b54fe8b6c07d79071710cd44470da760174bb9e174fd9b5ebff23642a3 SHA512 4beb2e5a5dc4ecca841bd56eb685cb59d83e2ea3b4ee94b8cf3cd90b0887b917bb26f6271fc2d10d28aa216909e6142ad6aa1c45a96fc83146a10464ff65c96b
-EBUILD qtx11extras-5.14.0.ebuild 437 BLAKE2B 9197a4c5fb697239786d957e6ed46f10d6d76d34616c8e0839310371e6efee35429fc3c540fe598eb6c766c7341ce88f6051dec7f911dd215c6d9c15dbab1fba SHA512 8edbae821f392918661b0c66daa03c8288c0655128140a0e652f6a9b8e5bb98c4fd15305780ef4c697dbe36441e6d68fec5343949d752a77e5aa2fe72ac7848c
+EBUILD qtx11extras-5.14.0-r1.ebuild 436 BLAKE2B 4be61843a21d0e6986416682d3613c76c8953ee3946fc435c1af771af2bb9a62c9191dabff85bd88edafc81d5029b18f1f8a5b38bc7cefe85f0b42191f5180bc SHA512 6bd6c59c8b68d98a3ee9d4c5fe2816def7c01bc72348a6cf5e7c99d70a46ef0b6b84acc5f478d04dd8863cc5b4222651b204b42aadaa1169d2ba81f5cf7300df
MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtx11extras/qtx11extras-5.14.0-r1.ebuild b/dev-qt/qtx11extras/qtx11extras-5.14.0-r1.ebuild
new file mode 100644
index 000000000000..32aefe9b955d
--- /dev/null
+++ b/dev-qt/qtx11extras/qtx11extras-5.14.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qt5-build
+
+DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+ ~dev-qt/qtcore-${PV}
+ ~dev-qt/qtgui-${PV}[X]
+"
+DEPEND="${RDEPEND}
+ test? ( ~dev-qt/qtwidgets-${PV} )
+"
diff --git a/dev-qt/qtx11extras/qtx11extras-5.14.0.ebuild b/dev-qt/qtx11extras/qtx11extras-5.14.0.ebuild
deleted file mode 100644
index a27428572cf7..000000000000
--- a/dev-qt/qtx11extras/qtx11extras-5.14.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-IUSE=""
-
-RDEPEND="
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtgui-${PV}[xcb]
-"
-DEPEND="${RDEPEND}
- test? ( ~dev-qt/qtwidgets-${PV} )
-"
--
cgit v1.2.3