commit: 71bfd3c05c75cb8ee0fa0179b1f34a732a4e5f17 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Jan 14 23:09:15 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Jan 14 23:09:54 2020 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=71bfd3c0
dev-qt/qtwidgets: 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/qtwidgets/qtwidgets-5.12.9999.ebuild | 11 ++++++----- dev-qt/qtwidgets/qtwidgets-5.14.9999.ebuild | 11 ++++++----- dev-qt/qtwidgets/qtwidgets-5.15.9999.ebuild | 11 ++++++----- dev-qt/qtwidgets/qtwidgets-5.9999.ebuild | 11 ++++++----- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/dev-qt/qtwidgets/qtwidgets-5.12.9999.ebuild b/dev-qt/qtwidgets/qtwidgets-5.12.9999.ebuild index 700b6405..3d14a9cd 100644 --- a/dev-qt/qtwidgets/qtwidgets-5.12.9999.ebuild +++ b/dev-qt/qtwidgets/qtwidgets-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 @@ -12,11 +13,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # keep IUSE defaults in sync with qtgui -IUSE="gles2 gtk +png +xcb" +IUSE="gles2 gtk +png +X" DEPEND=" ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}[gles2=,png=,xcb?] + ~dev-qt/qtgui-${PV}[gles2=,png=,X?] gtk? ( ~dev-qt/qtgui-${PV}[dbus] x11-libs/gtk+:3 @@ -49,8 +50,8 @@ src_configure() { -gui $(qt_use png libpng system) -widgets - $(qt_use xcb xcb system) - $(usex xcb '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '') + $(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.9999.ebuild b/dev-qt/qtwidgets/qtwidgets-5.14.9999.ebuild index 700b6405..3d14a9cd 100644 --- a/dev-qt/qtwidgets/qtwidgets-5.14.9999.ebuild +++ b/dev-qt/qtwidgets/qtwidgets-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 @@ -12,11 +13,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # keep IUSE defaults in sync with qtgui -IUSE="gles2 gtk +png +xcb" +IUSE="gles2 gtk +png +X" DEPEND=" ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}[gles2=,png=,xcb?] + ~dev-qt/qtgui-${PV}[gles2=,png=,X?] gtk? ( ~dev-qt/qtgui-${PV}[dbus] x11-libs/gtk+:3 @@ -49,8 +50,8 @@ src_configure() { -gui $(qt_use png libpng system) -widgets - $(qt_use xcb xcb system) - $(usex xcb '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '') + $(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.15.9999.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.9999.ebuild index fb915b77..4032c89b 100644 --- a/dev-qt/qtwidgets/qtwidgets-5.15.9999.ebuild +++ b/dev-qt/qtwidgets/qtwidgets-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 @@ -12,11 +13,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # keep IUSE defaults in sync with qtgui -IUSE="gles2 gtk +png +xcb" +IUSE="gles2 gtk +png +X" DEPEND=" ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}[gles2=,png=,xcb?] + ~dev-qt/qtgui-${PV}[gles2=,png=,X?] gtk? ( ~dev-qt/qtgui-${PV}[dbus] x11-libs/gtk+:3 @@ -49,8 +50,8 @@ src_configure() { -gui $(qt_use png libpng system) -widgets - $(qt_use xcb) - $(usex xcb '-xcb-xlib -xkbcommon' '') + $(qt_use X) + $(usex X '-xcb-xlib -xkbcommon' '') ) qt5-build_src_configure } diff --git a/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild b/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild index 700b6405..3d14a9cd 100644 --- a/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild +++ b/dev-qt/qtwidgets/qtwidgets-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 @@ -12,11 +13,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # keep IUSE defaults in sync with qtgui -IUSE="gles2 gtk +png +xcb" +IUSE="gles2 gtk +png +X" DEPEND=" ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}[gles2=,png=,xcb?] + ~dev-qt/qtgui-${PV}[gles2=,png=,X?] gtk? ( ~dev-qt/qtgui-${PV}[dbus] x11-libs/gtk+:3 @@ -49,8 +50,8 @@ src_configure() { -gui $(qt_use png libpng system) -widgets - $(qt_use xcb xcb system) - $(usex xcb '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '') + $(qt_use X xcb system) + $(usex X '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '') ) qt5-build_src_configure }
