commit: 040f587dc703adc1e0eba504e83430a032ba3c62 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Jan 14 23:06:06 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Jan 14 23:06:06 2020 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=040f587d
dev-qt/qtgui: Rename USE xcb to X Closes: https://bugs.gentoo.org/705440 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-qt/qtgui/metadata.xml | 2 +- dev-qt/qtgui/qtgui-5.12.9999.ebuild | 37 +++++++++++++++++++------------------ dev-qt/qtgui/qtgui-5.14.9999.ebuild | 37 +++++++++++++++++++------------------ dev-qt/qtgui/qtgui-5.15.9999.ebuild | 37 +++++++++++++++++++------------------ dev-qt/qtgui/qtgui-5.9999.ebuild | 37 +++++++++++++++++++------------------ 5 files changed, 77 insertions(+), 73 deletions(-) diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml index 74256c16..5fd07056 100644 --- a/dev-qt/qtgui/metadata.xml +++ b/dev-qt/qtgui/metadata.xml @@ -15,7 +15,7 @@ <flag name="tslib">Enable support for touchscreen devices via <pkg>x11-libs/tslib</pkg></flag> <flag name="tuio">Build plugin to receive touch events over the TUIO protocol</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> + <flag name="X">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.12.9999.ebuild b/dev-qt/qtgui/qtgui-5.12.9999.ebuild index bd23ada7..7e8a5ceb 100644 --- a/dev-qt/qtgui/qtgui-5.12.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.12.9999.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + QT5_MODULE="qtbase" inherit qt5-build @@ -14,14 +15,14 @@ fi # TODO: linuxfb IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus - jpeg +libinput +png tslib tuio +udev vnc wayland +xcb" + jpeg +libinput +png tslib tuio +udev vnc 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? ( egl ) ) " RDEPEND=" @@ -51,7 +52,7 @@ RDEPEND=" tuio? ( ~dev-qt/qtnetwork-${PV} ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-${PV} ) - xcb? ( + X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 @@ -111,13 +112,13 @@ 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: + X:xcb: + X:xcb-glx: + X:xcb-plugin: + X:xcb-render: + X:xcb-sm: + X:xcb-xlib: + X:xcb-xinput: ) QT5_GENTOO_PRIVATE_CONFIG=( @@ -130,8 +131,8 @@ 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 @@ -166,10 +167,10 @@ src_configure() { $(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 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 diff --git a/dev-qt/qtgui/qtgui-5.14.9999.ebuild b/dev-qt/qtgui/qtgui-5.14.9999.ebuild index 97db51f0..ab7524bb 100644 --- a/dev-qt/qtgui/qtgui-5.14.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.14.9999.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + QT5_MODULE="qtbase" inherit qt5-build @@ -14,14 +15,14 @@ fi # TODO: linuxfb IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus - jpeg +libinput +png tslib tuio +udev vnc wayland +xcb" + jpeg +libinput +png tslib tuio +udev vnc 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? ( egl ) ) " COMMON_DEPEND=" @@ -51,7 +52,7 @@ COMMON_DEPEND=" tuio? ( ~dev-qt/qtnetwork-${PV} ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-${PV} ) - xcb? ( + X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 @@ -118,13 +119,13 @@ 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: + X:xcb: + X:xcb-glx: + X:xcb-plugin: + X:xcb-render: + X:xcb-sm: + X:xcb-xlib: + X:xcb-xinput: ) QT5_GENTOO_PRIVATE_CONFIG=( @@ -137,8 +138,8 @@ 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 @@ -173,10 +174,10 @@ src_configure() { $(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 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 diff --git a/dev-qt/qtgui/qtgui-5.15.9999.ebuild b/dev-qt/qtgui/qtgui-5.15.9999.ebuild index 8a4c7007..3074f4ce 100644 --- a/dev-qt/qtgui/qtgui-5.15.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.15.9999.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + QT5_MODULE="qtbase" inherit qt5-build @@ -14,14 +15,14 @@ fi # TODO: linuxfb IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus - jpeg +libinput +png tslib tuio +udev vnc wayland +xcb" + jpeg +libinput +png tslib tuio +udev vnc 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? ( egl ) ) " COMMON_DEPEND=" @@ -51,7 +52,7 @@ COMMON_DEPEND=" tuio? ( ~dev-qt/qtnetwork-${PV} ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-${PV} ) - xcb? ( + X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 @@ -118,13 +119,13 @@ 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: + X:xcb: + X:xcb-glx: + X:xcb-plugin: + X:xcb-render: + X:xcb-sm: + X:xcb-xlib: + X:xcb-xinput: ) QT5_GENTOO_PRIVATE_CONFIG=( @@ -137,8 +138,8 @@ 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 @@ -173,10 +174,10 @@ src_configure() { $(qt_use png libpng system) $(qt_use tslib) $(qt_use udev libudev) - $(qt_use xcb) - $(usex xcb '-xcb-xlib' '') + $(qt_use X) + $(usex X '-xcb-xlib' '') ) - if use libinput || use xcb; then + if use libinput || use X; then myconf+=( -xkbcommon ) fi qt5-build_src_configure diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild index e8e79ac3..04d52960 100644 --- a/dev-qt/qtgui/qtgui-5.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.9999.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + QT5_MODULE="qtbase" inherit qt5-build @@ -14,14 +15,14 @@ fi # TODO: linuxfb IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus - jpeg +libinput +png tslib tuio +udev vnc wayland +xcb" + jpeg +libinput +png tslib tuio +udev vnc 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? ( egl ) ) " RDEPEND=" @@ -51,7 +52,7 @@ RDEPEND=" tuio? ( ~dev-qt/qtnetwork-${PV} ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-${PV} ) - xcb? ( + X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 @@ -111,13 +112,13 @@ 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: + X:xcb: + X:xcb-glx: + X:xcb-plugin: + X:xcb-render: + X:xcb-sm: + X:xcb-xlib: + X:xcb-xinput: ) QT5_GENTOO_PRIVATE_CONFIG=( @@ -128,8 +129,8 @@ 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 @@ -164,10 +165,10 @@ src_configure() { $(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 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
