Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/
Date: Sun, 19 Jan 2020 23:54:29
Message-Id: 1579043394.71bfd3c05c75cb8ee0fa0179b1f34a732a4e5f17.asturm@gentoo
1 commit: 71bfd3c05c75cb8ee0fa0179b1f34a732a4e5f17
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 14 23:09:15 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 14 23:09:54 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=71bfd3c0
7
8 dev-qt/qtwidgets: Rename USE xcb to X
9
10 Closes: https://bugs.gentoo.org/705440
11 Package-Manager: Portage-2.3.84, Repoman-2.3.20
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 dev-qt/qtwidgets/qtwidgets-5.12.9999.ebuild | 11 ++++++-----
15 dev-qt/qtwidgets/qtwidgets-5.14.9999.ebuild | 11 ++++++-----
16 dev-qt/qtwidgets/qtwidgets-5.15.9999.ebuild | 11 ++++++-----
17 dev-qt/qtwidgets/qtwidgets-5.9999.ebuild | 11 ++++++-----
18 4 files changed, 24 insertions(+), 20 deletions(-)
19
20 diff --git a/dev-qt/qtwidgets/qtwidgets-5.12.9999.ebuild b/dev-qt/qtwidgets/qtwidgets-5.12.9999.ebuild
21 index 700b6405..3d14a9cd 100644
22 --- a/dev-qt/qtwidgets/qtwidgets-5.12.9999.ebuild
23 +++ b/dev-qt/qtwidgets/qtwidgets-5.12.9999.ebuild
24 @@ -1,7 +1,8 @@
25 -# Copyright 1999-2019 Gentoo Authors
26 +# Copyright 1999-2020 Gentoo Authors
27 # Distributed under the terms of the GNU General Public License v2
28
29 EAPI=7
30 +
31 QT5_MODULE="qtbase"
32 inherit qt5-build
33
34 @@ -12,11 +13,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
35 fi
36
37 # keep IUSE defaults in sync with qtgui
38 -IUSE="gles2 gtk +png +xcb"
39 +IUSE="gles2 gtk +png +X"
40
41 DEPEND="
42 ~dev-qt/qtcore-${PV}
43 - ~dev-qt/qtgui-${PV}[gles2=,png=,xcb?]
44 + ~dev-qt/qtgui-${PV}[gles2=,png=,X?]
45 gtk? (
46 ~dev-qt/qtgui-${PV}[dbus]
47 x11-libs/gtk+:3
48 @@ -49,8 +50,8 @@ src_configure() {
49 -gui
50 $(qt_use png libpng system)
51 -widgets
52 - $(qt_use xcb xcb system)
53 - $(usex xcb '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '')
54 + $(qt_use X xcb system)
55 + $(usex X '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '')
56 )
57 qt5-build_src_configure
58 }
59
60 diff --git a/dev-qt/qtwidgets/qtwidgets-5.14.9999.ebuild b/dev-qt/qtwidgets/qtwidgets-5.14.9999.ebuild
61 index 700b6405..3d14a9cd 100644
62 --- a/dev-qt/qtwidgets/qtwidgets-5.14.9999.ebuild
63 +++ b/dev-qt/qtwidgets/qtwidgets-5.14.9999.ebuild
64 @@ -1,7 +1,8 @@
65 -# Copyright 1999-2019 Gentoo Authors
66 +# Copyright 1999-2020 Gentoo Authors
67 # Distributed under the terms of the GNU General Public License v2
68
69 EAPI=7
70 +
71 QT5_MODULE="qtbase"
72 inherit qt5-build
73
74 @@ -12,11 +13,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
75 fi
76
77 # keep IUSE defaults in sync with qtgui
78 -IUSE="gles2 gtk +png +xcb"
79 +IUSE="gles2 gtk +png +X"
80
81 DEPEND="
82 ~dev-qt/qtcore-${PV}
83 - ~dev-qt/qtgui-${PV}[gles2=,png=,xcb?]
84 + ~dev-qt/qtgui-${PV}[gles2=,png=,X?]
85 gtk? (
86 ~dev-qt/qtgui-${PV}[dbus]
87 x11-libs/gtk+:3
88 @@ -49,8 +50,8 @@ src_configure() {
89 -gui
90 $(qt_use png libpng system)
91 -widgets
92 - $(qt_use xcb xcb system)
93 - $(usex xcb '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '')
94 + $(qt_use X xcb system)
95 + $(usex X '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '')
96 )
97 qt5-build_src_configure
98 }
99
100 diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.9999.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.9999.ebuild
101 index fb915b77..4032c89b 100644
102 --- a/dev-qt/qtwidgets/qtwidgets-5.15.9999.ebuild
103 +++ b/dev-qt/qtwidgets/qtwidgets-5.15.9999.ebuild
104 @@ -1,7 +1,8 @@
105 -# Copyright 1999-2019 Gentoo Authors
106 +# Copyright 1999-2020 Gentoo Authors
107 # Distributed under the terms of the GNU General Public License v2
108
109 EAPI=7
110 +
111 QT5_MODULE="qtbase"
112 inherit qt5-build
113
114 @@ -12,11 +13,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
115 fi
116
117 # keep IUSE defaults in sync with qtgui
118 -IUSE="gles2 gtk +png +xcb"
119 +IUSE="gles2 gtk +png +X"
120
121 DEPEND="
122 ~dev-qt/qtcore-${PV}
123 - ~dev-qt/qtgui-${PV}[gles2=,png=,xcb?]
124 + ~dev-qt/qtgui-${PV}[gles2=,png=,X?]
125 gtk? (
126 ~dev-qt/qtgui-${PV}[dbus]
127 x11-libs/gtk+:3
128 @@ -49,8 +50,8 @@ src_configure() {
129 -gui
130 $(qt_use png libpng system)
131 -widgets
132 - $(qt_use xcb)
133 - $(usex xcb '-xcb-xlib -xkbcommon' '')
134 + $(qt_use X)
135 + $(usex X '-xcb-xlib -xkbcommon' '')
136 )
137 qt5-build_src_configure
138 }
139
140 diff --git a/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild b/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild
141 index 700b6405..3d14a9cd 100644
142 --- a/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild
143 +++ b/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild
144 @@ -1,7 +1,8 @@
145 -# Copyright 1999-2019 Gentoo Authors
146 +# Copyright 1999-2020 Gentoo Authors
147 # Distributed under the terms of the GNU General Public License v2
148
149 EAPI=7
150 +
151 QT5_MODULE="qtbase"
152 inherit qt5-build
153
154 @@ -12,11 +13,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
155 fi
156
157 # keep IUSE defaults in sync with qtgui
158 -IUSE="gles2 gtk +png +xcb"
159 +IUSE="gles2 gtk +png +X"
160
161 DEPEND="
162 ~dev-qt/qtcore-${PV}
163 - ~dev-qt/qtgui-${PV}[gles2=,png=,xcb?]
164 + ~dev-qt/qtgui-${PV}[gles2=,png=,X?]
165 gtk? (
166 ~dev-qt/qtgui-${PV}[dbus]
167 x11-libs/gtk+:3
168 @@ -49,8 +50,8 @@ src_configure() {
169 -gui
170 $(qt_use png libpng system)
171 -widgets
172 - $(qt_use xcb xcb system)
173 - $(usex xcb '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '')
174 + $(qt_use X xcb system)
175 + $(usex X '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '')
176 )
177 qt5-build_src_configure
178 }
Report Message
Find on MARC Find on Google Groups