Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtserialbus/, dev-qt/qtmultimedia/files/, dev-qt/qtnetwork/files/, ...
Date: Sun, 18 Oct 2020 16:16:17
Message-Id: 1603037728.1c0947091db651f4e7d136e22d4887b47d9245cd.asturm@gentoo
1 5.14.2.ebuild dev-qt/qtmultimedia/Manifest dev-qt/qtmultimedia/files/qtmultimedia-5.14.2-gstreamer-buffering.patch dev-qt/qtmultimedia/qtmultimedia-5.14.2-r1.ebuild dev-qt/qtnetwork/Manifest dev-qt/qtnetwork/files/qtnetwork-5.14.2-CVE-2020-13962.patch dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild dev-qt/qtnetworkauth/Manifest dev-qt/qtnetworkauth/qtnetworkauth-5.14.2.ebuild dev-qt/qtopengl/Manifest dev-qt/qtopengl/qtopengl-5.14.2-r1.ebuild dev-qt/qtpaths/Manifest dev-qt/qtpaths/qtpaths-5.14.2.ebuild dev-qt/qtplugininfo/Manifest dev-qt/qtplugininfo/qtplugininfo-5.14.2.ebuild dev-qt/qtpositioning/Manifest dev-qt/qtpositioning/qtpositioning-5.14.2.ebuild dev-qt/qtprintsupport/Manifest dev-qt/qtprintsupport/qtprintsupport-5.14.2.ebuild dev-qt/qtquickcontrols/Manifest dev-qt/qtquickcontrols/qtquickcontrols-5.14.2.ebuild dev-qt/qtquickcontrols2/Manifest dev-qt/qtquickcontrols2/files/qtquickcontrols2-5.14.2-account-for-scale-before-positioning.patch dev-qt/qtquickcontrols2/qtquickcontrols2-5.
2 14.2-r1.ebuild dev-qt/qtscript/Manifest dev-qt/qtscript/qtscript-5.14.2.ebuild dev-qt/qtscxml/Manifest dev-qt/qtscxml/qtscxml-5.14.2.ebuild dev-qt/qtsensors/Manifest dev-qt/qtsensors/qtsensors-5.14.2.ebuild dev-qt/qtserialbus/Manifest dev-qt/qtserialbus/qtserialbus-5.14.2.ebuild dev-qt/qtserialport/Manifest dev-qt/qtserialport/qtserialport-5.14.2.ebuild dev-qt/qtspeech/Manifest dev-qt/qtspeech/qtspeech-5.14.2.ebuild dev-qt/qtsql/Manifest dev-qt/qtsql/qtsql-5.14.2.ebuild dev-qt/qtsvg/Manifest dev-qt/qtsvg/qtsvg-5.14.2.ebuild dev-qt/qttest/Manifest dev-qt/qttest/qttest-5.14.2.ebuild dev-qt/qttranslations/Manifest dev-qt/qttranslations/qttranslations-5.14.2.ebuild dev-qt/qtvirtualkeyboard/Manifest dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.14.2.ebuild dev-qt/qtwayland/Manifest dev-qt/qtwayland/qtwayland-5.14.2.ebuild dev-qt/qtwebchannel/Manifest dev-qt/qtwebchannel/qtwebchannel-5.14.2.ebuild dev-qt/qtwebengine/Manifest dev-qt/qtwebengine/files/qtwebengine-5.14.1-disable-fatal-warning
3 s.patch dev-qt/qtwebengine/files/qtwebengine-5.14.2-g
4 cc-10.patch dev-qt/qtwebengine/files/qtwebengine-5.14.2-icu67.patch dev-qt/qtwebengine/files/qtwebengine-5.15.0-bison-3.7-build.patch dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild dev-qt/qtwebsockets/Manifest dev-qt/qtwebsockets/qtwebsockets-5.14.2.ebuild dev-qt/qtwebview/Manifest dev-qt/qtwebview/qtwebview-5.14.2.ebuild dev-qt/qtwidgets/Manifest dev-qt/qtwidgets/qtwidgets-5.14.2.ebuild dev-qt/qtx11extras/Manifest dev-qt/qtx11extras/qtx11extras-5.14.2.ebuild dev-qt/qtxml/Manifest dev-qt/qtxml/qtxml-5.14.2.ebuild dev-qt/qtxmlpatterns/Manifest dev-qt/qtxmlpatterns/qtxmlpatterns-5.14.2.ebuild
5 X-VCS-Directories: dev-qt/qtsvg/ dev-qt/qtxml/ dev-qt/linguist-tools/ dev-qt/qtwebengine/ dev-qt/qtdiag/ dev-qt/qt3d/ dev-qt/qtbluetooth/ dev-qt/qtnetwork/files/ dev-qt/qtserialbus/ dev-qt/qtmultimedia/files/ dev-qt/qttranslations/ dev-qt/qtimageformats/ dev-qt/qtdbus/ dev-qt/qtdeclarative/ dev-qt/qdbusviewer/ dev-qt/qtsql/ dev-qt/linguist/ dev-qt/qtlocation/files/ dev-qt/designer/ dev-qt/qtxmlpatterns/ dev-qt/qtplugininfo/ dev-qt/qtvirtualkeyboard/ dev-qt/qtcore/files/ dev-qt/qtwebchannel/ dev-qt/qtpaths/ dev-qt/qtwebengine/files/ dev-qt/qtquickcontrols2/files/ dev-qt/qtwebview/ dev-qt/qtmultimedia/ dev-qt/qtgamepad/ dev-qt/qtwayland/ dev-qt/qtdatavis3d/ dev-qt/qttest/ dev-qt/qtcharts/ dev-qt/qtgui/ dev-qt/qtquickcontrols/ dev-qt/qtsensors/ dev-qt/qtgui/files/ dev-qt/qtnetwork/ dev-qt/qtwidgets/ dev-qt/qtscxml/ dev-qt/qdbus/ dev-qt/qtserialport/ dev-qt/qtquickcontrols2/ dev-qt/qt-docs/ dev-qt/qtx11extras/ dev-qt/qdoc/ dev-qt/qtprintsupport/ dev-qt/assistant/ dev-qt/qthelp/ dev-qt/pi
6 xeltool/ dev-qt/qtconcurrent/ dev-qt/qtgraphicaleffects/ dev-qt/qtnetworkauth/ dev-qt/qtscript/ dev-qt/qtopengl/ dev-qt/qtpositioning/ dev-qt/qtwebsockets/ dev-qt/qtdeclarative/files/ dev-qt/qtcore/ dev-qt/qtspeech/ dev-qt/qtlocation/
7 X-VCS-Committer: asturm
8 X-VCS-Committer-Name: Andreas Sturmlechner
9 X-VCS-Revision: 1c0947091db651f4e7d136e22d4887b47d9245cd
10 X-VCS-Branch: master
11 Date: Sun, 18 Oct 2020 16:16:13 +0000 (UTC)
12
13 commit: 1c0947091db651f4e7d136e22d4887b47d9245cd
14 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
15 AuthorDate: Tue Oct 13 14:26:11 2020 +0000
16 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
17 CommitDate: Sun Oct 18 16:15:28 2020 +0000
18 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c094709
19
20 dev-qt: Drop Qt 5.14.2
21
22 Bug: https://bugs.gentoo.org/734600
23 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
24
25 dev-qt/assistant/Manifest | 1 -
26 dev-qt/assistant/assistant-5.14.2.ebuild | 55 ------
27 dev-qt/designer/Manifest | 1 -
28 dev-qt/designer/designer-5.14.2.ebuild | 57 -------
29 dev-qt/linguist-tools/Manifest | 1 -
30 dev-qt/linguist-tools/linguist-tools-5.14.2.ebuild | 35 ----
31 dev-qt/linguist/Manifest | 1 -
32 dev-qt/linguist/linguist-5.14.2.ebuild | 48 ------
33 dev-qt/pixeltool/Manifest | 1 -
34 dev-qt/pixeltool/pixeltool-5.14.2.ebuild | 25 ---
35 dev-qt/qdbus/Manifest | 1 -
36 dev-qt/qdbus/qdbus-5.14.2.ebuild | 25 ---
37 dev-qt/qdbusviewer/Manifest | 1 -
38 dev-qt/qdbusviewer/qdbusviewer-5.14.2.ebuild | 45 -----
39 dev-qt/qdoc/Manifest | 1 -
40 dev-qt/qdoc/qdoc-5.14.2.ebuild | 41 -----
41 dev-qt/qt-docs/Manifest | 55 ------
42 dev-qt/qt-docs/metadata.xml | 1 -
43 .../qt-docs/qt-docs-5.14.2_p202003291239-r1.ebuild | 103 ------------
44 dev-qt/qt-docs/qt-docs-5.14.2_p202003291239.ebuild | 102 ------------
45 dev-qt/qt3d/Manifest | 1 -
46 dev-qt/qt3d/qt3d-5.14.2.ebuild | 34 ----
47 dev-qt/qtbluetooth/Manifest | 1 -
48 dev-qt/qtbluetooth/qtbluetooth-5.14.2-r1.ebuild | 33 ----
49 dev-qt/qtcharts/Manifest | 1 -
50 dev-qt/qtcharts/qtcharts-5.14.2.ebuild | 29 ----
51 dev-qt/qtconcurrent/Manifest | 1 -
52 dev-qt/qtconcurrent/qtconcurrent-5.14.2.ebuild | 23 ---
53 dev-qt/qtcore/Manifest | 1 -
54 .../files/qtcore-5.14.2-QLibrary-deadlock.patch | 106 ------------
55 dev-qt/qtcore/qtcore-5.14.2.ebuild | 103 ------------
56 dev-qt/qtdatavis3d/Manifest | 1 -
57 dev-qt/qtdatavis3d/qtdatavis3d-5.14.2.ebuild | 31 ----
58 dev-qt/qtdbus/Manifest | 1 -
59 dev-qt/qtdbus/qtdbus-5.14.2.ebuild | 43 -----
60 dev-qt/qtdeclarative/Manifest | 1 -
61 ....2-QQuickMouseArea-stuck-in-pressed-state.patch | 55 ------
62 ...ative-5.14.2-fix-subpixel-positioned-text.patch | 64 -------
63 .../qtdeclarative/qtdeclarative-5.14.2-r4.ebuild | 59 -------
64 dev-qt/qtdiag/Manifest | 1 -
65 dev-qt/qtdiag/qtdiag-5.14.2.ebuild | 36 ----
66 dev-qt/qtgamepad/Manifest | 1 -
67 dev-qt/qtgamepad/qtgamepad-5.14.2.ebuild | 35 ----
68 dev-qt/qtgraphicaleffects/Manifest | 1 -
69 .../qtgraphicaleffects-5.14.2.ebuild | 21 ---
70 dev-qt/qtgui/Manifest | 1 -
71 .../qtgui/files/qtgui-5.14.2-CVE-2020-17507.patch | 39 -----
72 dev-qt/qtgui/qtgui-5.14.2-r1.ebuild | 185 ---------------------
73 dev-qt/qthelp/Manifest | 1 -
74 dev-qt/qthelp/qthelp-5.14.2.ebuild | 29 ----
75 dev-qt/qtimageformats/Manifest | 1 -
76 dev-qt/qtimageformats/qtimageformats-5.14.2.ebuild | 30 ----
77 dev-qt/qtlocation/Manifest | 1 -
78 .../files/qtlocation-5.14.2-gcc-10.patch | 36 ----
79 dev-qt/qtlocation/qtlocation-5.14.2.ebuild | 49 ------
80 dev-qt/qtmultimedia/Manifest | 1 -
81 .../qtmultimedia-5.14.2-gstreamer-buffering.patch | 38 -----
82 dev-qt/qtmultimedia/qtmultimedia-5.14.2-r1.ebuild | 72 --------
83 dev-qt/qtnetwork/Manifest | 1 -
84 .../files/qtnetwork-5.14.2-CVE-2020-13962.patch | 172 -------------------
85 dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild | 66 --------
86 dev-qt/qtnetworkauth/Manifest | 1 -
87 dev-qt/qtnetworkauth/qtnetworkauth-5.14.2.ebuild | 20 ---
88 dev-qt/qtopengl/Manifest | 1 -
89 dev-qt/qtopengl/qtopengl-5.14.2-r1.ebuild | 34 ----
90 dev-qt/qtpaths/Manifest | 1 -
91 dev-qt/qtpaths/qtpaths-5.14.2.ebuild | 23 ---
92 dev-qt/qtplugininfo/Manifest | 1 -
93 dev-qt/qtplugininfo/qtplugininfo-5.14.2.ebuild | 23 ---
94 dev-qt/qtpositioning/Manifest | 1 -
95 dev-qt/qtpositioning/qtpositioning-5.14.2.ebuild | 40 -----
96 dev-qt/qtprintsupport/Manifest | 1 -
97 dev-qt/qtprintsupport/qtprintsupport-5.14.2.ebuild | 42 -----
98 dev-qt/qtquickcontrols/Manifest | 1 -
99 .../qtquickcontrols/qtquickcontrols-5.14.2.ebuild | 32 ----
100 dev-qt/qtquickcontrols2/Manifest | 1 -
101 ...14.2-account-for-scale-before-positioning.patch | 61 -------
102 .../qtquickcontrols2-5.14.2-r1.ebuild | 34 ----
103 dev-qt/qtscript/Manifest | 1 -
104 dev-qt/qtscript/qtscript-5.14.2.ebuild | 36 ----
105 dev-qt/qtscxml/Manifest | 1 -
106 dev-qt/qtscxml/qtscxml-5.14.2.ebuild | 19 ---
107 dev-qt/qtsensors/Manifest | 1 -
108 dev-qt/qtsensors/qtsensors-5.14.2.ebuild | 28 ----
109 dev-qt/qtserialbus/Manifest | 1 -
110 dev-qt/qtserialbus/qtserialbus-5.14.2.ebuild | 20 ---
111 dev-qt/qtserialport/Manifest | 1 -
112 dev-qt/qtserialport/qtserialport-5.14.2.ebuild | 27 ---
113 dev-qt/qtspeech/Manifest | 1 -
114 dev-qt/qtspeech/qtspeech-5.14.2.ebuild | 20 ---
115 dev-qt/qtsql/Manifest | 1 -
116 dev-qt/qtsql/qtsql-5.14.2.ebuild | 55 ------
117 dev-qt/qtsvg/Manifest | 1 -
118 dev-qt/qtsvg/qtsvg-5.14.2.ebuild | 23 ---
119 dev-qt/qttest/Manifest | 1 -
120 dev-qt/qttest/qttest-5.14.2.ebuild | 33 ----
121 dev-qt/qttranslations/Manifest | 1 -
122 dev-qt/qttranslations/qttranslations-5.14.2.ebuild | 19 ---
123 dev-qt/qtvirtualkeyboard/Manifest | 1 -
124 .../qtvirtualkeyboard-5.14.2.ebuild | 43 -----
125 dev-qt/qtwayland/Manifest | 1 -
126 dev-qt/qtwayland/qtwayland-5.14.2.ebuild | 45 -----
127 dev-qt/qtwebchannel/Manifest | 1 -
128 dev-qt/qtwebchannel/qtwebchannel-5.14.2.ebuild | 26 ---
129 dev-qt/qtwebengine/Manifest | 1 -
130 ...qtwebengine-5.14.1-disable-fatal-warnings.patch | 12 --
131 .../files/qtwebengine-5.14.2-gcc-10.patch | 89 ----------
132 .../files/qtwebengine-5.14.2-icu67.patch | 169 -------------------
133 .../files/qtwebengine-5.15.0-bison-3.7-build.patch | 54 ------
134 dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild | 152 -----------------
135 dev-qt/qtwebsockets/Manifest | 1 -
136 dev-qt/qtwebsockets/qtwebsockets-5.14.2.ebuild | 27 ---
137 dev-qt/qtwebview/Manifest | 1 -
138 dev-qt/qtwebview/qtwebview-5.14.2.ebuild | 21 ---
139 dev-qt/qtwidgets/Manifest | 1 -
140 dev-qt/qtwidgets/qtwidgets-5.14.2.ebuild | 57 -------
141 dev-qt/qtx11extras/Manifest | 1 -
142 dev-qt/qtx11extras/qtx11extras-5.14.2.ebuild | 22 ---
143 dev-qt/qtxml/Manifest | 1 -
144 dev-qt/qtxml/qtxml-5.14.2.ebuild | 29 ----
145 dev-qt/qtxmlpatterns/Manifest | 1 -
146 dev-qt/qtxmlpatterns/qtxmlpatterns-5.14.2.ebuild | 30 ----
147 122 files changed, 3398 deletions(-)
148
149 diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
150 index 203fdae199c..3792b4301e9 100644
151 --- a/dev-qt/assistant/Manifest
152 +++ b/dev-qt/assistant/Manifest
153 @@ -1,2 +1 @@
154 -DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
155 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
156
157 diff --git a/dev-qt/assistant/assistant-5.14.2.ebuild b/dev-qt/assistant/assistant-5.14.2.ebuild
158 deleted file mode 100644
159 index fca5047fefa..00000000000
160 --- a/dev-qt/assistant/assistant-5.14.2.ebuild
161 +++ /dev/null
162 @@ -1,55 +0,0 @@
163 -# Copyright 1999-2020 Gentoo Authors
164 -# Distributed under the terms of the GNU General Public License v2
165 -
166 -EAPI=7
167 -QT5_MODULE="qttools"
168 -inherit desktop qt5-build xdg-utils
169 -
170 -DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
171 -
172 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
173 - KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
174 -fi
175 -
176 -IUSE="webkit"
177 -
178 -DEPEND="
179 - ~dev-qt/qtcore-${PV}:5=
180 - ~dev-qt/qtgui-${PV}
181 - ~dev-qt/qthelp-${PV}
182 - ~dev-qt/qtnetwork-${PV}
183 - ~dev-qt/qtprintsupport-${PV}
184 - ~dev-qt/qtsql-${PV}[sqlite]
185 - ~dev-qt/qtwidgets-${PV}
186 - webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
187 -"
188 -RDEPEND="${DEPEND}"
189 -
190 -QT5_TARGET_SUBDIRS=(
191 - src/assistant/assistant
192 -)
193 -
194 -src_prepare() {
195 - qt_use_disable_mod webkit webkitwidgets \
196 - src/assistant/assistant/assistant.pro
197 -
198 - qt5-build_src_prepare
199 -}
200 -
201 -src_install() {
202 - qt5-build_src_install
203 -
204 - doicon -s 32 src/assistant/assistant/images/assistant.png
205 - newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
206 - make_desktop_entry "${QT5_BINDIR}"/assistant 'Qt 5 Assistant' assistant 'Qt;Development;Documentation'
207 -}
208 -
209 -pkg_postinst() {
210 - qt5-build_pkg_postinst
211 - xdg_icon_cache_update
212 -}
213 -
214 -pkg_postrm() {
215 - qt5-build_pkg_postrm
216 - xdg_icon_cache_update
217 -}
218
219 diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
220 index 203fdae199c..3792b4301e9 100644
221 --- a/dev-qt/designer/Manifest
222 +++ b/dev-qt/designer/Manifest
223 @@ -1,2 +1 @@
224 -DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
225 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
226
227 diff --git a/dev-qt/designer/designer-5.14.2.ebuild b/dev-qt/designer/designer-5.14.2.ebuild
228 deleted file mode 100644
229 index 29ac650d089..00000000000
230 --- a/dev-qt/designer/designer-5.14.2.ebuild
231 +++ /dev/null
232 @@ -1,57 +0,0 @@
233 -# Copyright 1999-2020 Gentoo Authors
234 -# Distributed under the terms of the GNU General Public License v2
235 -
236 -EAPI=7
237 -QT5_MODULE="qttools"
238 -inherit desktop qt5-build xdg-utils
239 -
240 -DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces with QtWidgets"
241 -
242 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
243 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86"
244 -fi
245 -
246 -IUSE="declarative webkit"
247 -
248 -DEPEND="
249 - ~dev-qt/qtcore-${PV}:5=
250 - ~dev-qt/qtgui-${PV}:5=
251 - ~dev-qt/qtnetwork-${PV}
252 - ~dev-qt/qtprintsupport-${PV}
253 - ~dev-qt/qtwidgets-${PV}
254 - ~dev-qt/qtxml-${PV}
255 - declarative? ( ~dev-qt/qtdeclarative-${PV}[widgets] )
256 - webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
257 -"
258 -RDEPEND="${DEPEND}"
259 -
260 -QT5_TARGET_SUBDIRS=(
261 - src/designer
262 -)
263 -
264 -src_prepare() {
265 - qt_use_disable_mod declarative quickwidgets \
266 - src/designer/src/plugins/plugins.pro
267 -
268 - qt_use_disable_mod webkit webkitwidgets \
269 - src/designer/src/plugins/plugins.pro
270 -
271 - qt5-build_src_prepare
272 -}
273 -
274 -src_install() {
275 - qt5-build_src_install
276 -
277 - doicon -s 128 src/designer/src/designer/images/designer.png
278 - make_desktop_entry "${QT5_BINDIR}"/designer 'Qt 5 Designer' designer 'Qt;Development;GUIDesigner'
279 -}
280 -
281 -pkg_postinst() {
282 - qt5-build_pkg_postinst
283 - xdg_icon_cache_update
284 -}
285 -
286 -pkg_postrm() {
287 - qt5-build_pkg_postrm
288 - xdg_icon_cache_update
289 -}
290
291 diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
292 index 203fdae199c..3792b4301e9 100644
293 --- a/dev-qt/linguist-tools/Manifest
294 +++ b/dev-qt/linguist-tools/Manifest
295 @@ -1,2 +1 @@
296 -DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
297 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
298
299 diff --git a/dev-qt/linguist-tools/linguist-tools-5.14.2.ebuild b/dev-qt/linguist-tools/linguist-tools-5.14.2.ebuild
300 deleted file mode 100644
301 index ea280072e0e..00000000000
302 --- a/dev-qt/linguist-tools/linguist-tools-5.14.2.ebuild
303 +++ /dev/null
304 @@ -1,35 +0,0 @@
305 -# Copyright 1999-2020 Gentoo Authors
306 -# Distributed under the terms of the GNU General Public License v2
307 -
308 -EAPI=7
309 -QT5_MODULE="qttools"
310 -inherit qt5-build
311 -
312 -DESCRIPTION="Tools for working with Qt translation data files"
313 -
314 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
315 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
316 -fi
317 -
318 -IUSE="qml"
319 -
320 -DEPEND="
321 - ~dev-qt/qtcore-${PV}:5=
322 - ~dev-qt/qtxml-${PV}
323 - qml? ( ~dev-qt/qtdeclarative-${PV} )
324 -"
325 -RDEPEND="${DEPEND}"
326 -
327 -QT5_TARGET_SUBDIRS=(
328 - src/linguist
329 -)
330 -
331 -src_prepare() {
332 - sed -i -e '/SUBDIRS += linguist/d' \
333 - src/linguist/linguist.pro || die
334 -
335 - qt_use_disable_mod qml qmldevtools-private \
336 - src/linguist/lupdate/lupdate.pro
337 -
338 - qt5-build_src_prepare
339 -}
340
341 diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
342 index 203fdae199c..3792b4301e9 100644
343 --- a/dev-qt/linguist/Manifest
344 +++ b/dev-qt/linguist/Manifest
345 @@ -1,2 +1 @@
346 -DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
347 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
348
349 diff --git a/dev-qt/linguist/linguist-5.14.2.ebuild b/dev-qt/linguist/linguist-5.14.2.ebuild
350 deleted file mode 100644
351 index b1887a6ebd6..00000000000
352 --- a/dev-qt/linguist/linguist-5.14.2.ebuild
353 +++ /dev/null
354 @@ -1,48 +0,0 @@
355 -# Copyright 1999-2020 Gentoo Authors
356 -# Distributed under the terms of the GNU General Public License v2
357 -
358 -EAPI=7
359 -QT5_MODULE="qttools"
360 -inherit desktop qt5-build xdg-utils
361 -
362 -DESCRIPTION="Graphical tool for translating Qt applications"
363 -
364 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
365 - KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 x86"
366 -fi
367 -
368 -IUSE=""
369 -
370 -DEPEND="
371 - ~dev-qt/designer-${PV}
372 - ~dev-qt/qtcore-${PV}:5=
373 - ~dev-qt/qtgui-${PV}:5=
374 - ~dev-qt/qtprintsupport-${PV}
375 - ~dev-qt/qtwidgets-${PV}
376 - ~dev-qt/qtxml-${PV}
377 -"
378 -RDEPEND="${DEPEND}"
379 -
380 -QT5_TARGET_SUBDIRS=(
381 - src/linguist/linguist
382 -)
383 -
384 -src_install() {
385 - qt5-build_src_install
386 -
387 - local size
388 - for size in 16 32 48 64 128; do
389 - newicon -s ${size} src/linguist/linguist/images/icons/linguist-${size}-32.png linguist.png
390 - done
391 - make_desktop_entry "${QT5_BINDIR}"/linguist 'Qt 5 Linguist' linguist 'Qt;Development;Translation'
392 -}
393 -
394 -pkg_postinst() {
395 - qt5-build_pkg_postinst
396 - xdg_icon_cache_update
397 -}
398 -
399 -pkg_postrm() {
400 - qt5-build_pkg_postrm
401 - xdg_icon_cache_update
402 -}
403
404 diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
405 index 203fdae199c..3792b4301e9 100644
406 --- a/dev-qt/pixeltool/Manifest
407 +++ b/dev-qt/pixeltool/Manifest
408 @@ -1,2 +1 @@
409 -DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
410 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
411
412 diff --git a/dev-qt/pixeltool/pixeltool-5.14.2.ebuild b/dev-qt/pixeltool/pixeltool-5.14.2.ebuild
413 deleted file mode 100644
414 index 5298dc39f7b..00000000000
415 --- a/dev-qt/pixeltool/pixeltool-5.14.2.ebuild
416 +++ /dev/null
417 @@ -1,25 +0,0 @@
418 -# Copyright 1999-2020 Gentoo Authors
419 -# Distributed under the terms of the GNU General Public License v2
420 -
421 -EAPI=7
422 -QT5_MODULE="qttools"
423 -inherit qt5-build
424 -
425 -DESCRIPTION="Qt screen magnifier"
426 -
427 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
428 - KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
429 -fi
430 -
431 -IUSE=""
432 -
433 -DEPEND="
434 - ~dev-qt/qtcore-${PV}:5=
435 - ~dev-qt/qtgui-${PV}:5=
436 - ~dev-qt/qtwidgets-${PV}
437 -"
438 -RDEPEND="${DEPEND}"
439 -
440 -QT5_TARGET_SUBDIRS=(
441 - src/pixeltool
442 -)
443
444 diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
445 index 203fdae199c..3792b4301e9 100644
446 --- a/dev-qt/qdbus/Manifest
447 +++ b/dev-qt/qdbus/Manifest
448 @@ -1,2 +1 @@
449 -DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
450 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
451
452 diff --git a/dev-qt/qdbus/qdbus-5.14.2.ebuild b/dev-qt/qdbus/qdbus-5.14.2.ebuild
453 deleted file mode 100644
454 index 0446d75dde0..00000000000
455 --- a/dev-qt/qdbus/qdbus-5.14.2.ebuild
456 +++ /dev/null
457 @@ -1,25 +0,0 @@
458 -# Copyright 1999-2020 Gentoo Authors
459 -# Distributed under the terms of the GNU General Public License v2
460 -
461 -EAPI=7
462 -QT5_MODULE="qttools"
463 -inherit qt5-build
464 -
465 -DESCRIPTION="Interface to Qt applications communicating over D-Bus"
466 -
467 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
468 - KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
469 -fi
470 -
471 -IUSE=""
472 -
473 -DEPEND="
474 - ~dev-qt/qtcore-${PV}
475 - ~dev-qt/qtdbus-${PV}
476 - ~dev-qt/qtxml-${PV}
477 -"
478 -RDEPEND="${DEPEND}"
479 -
480 -QT5_TARGET_SUBDIRS=(
481 - src/qdbus/qdbus
482 -)
483
484 diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
485 index 203fdae199c..3792b4301e9 100644
486 --- a/dev-qt/qdbusviewer/Manifest
487 +++ b/dev-qt/qdbusviewer/Manifest
488 @@ -1,2 +1 @@
489 -DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
490 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
491
492 diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.14.2.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.14.2.ebuild
493 deleted file mode 100644
494 index 8fc278009e4..00000000000
495 --- a/dev-qt/qdbusviewer/qdbusviewer-5.14.2.ebuild
496 +++ /dev/null
497 @@ -1,45 +0,0 @@
498 -# Copyright 1999-2020 Gentoo Authors
499 -# Distributed under the terms of the GNU General Public License v2
500 -
501 -EAPI=7
502 -QT5_MODULE="qttools"
503 -inherit desktop qt5-build xdg-utils
504 -
505 -DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
506 -
507 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
508 - KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
509 -fi
510 -
511 -IUSE=""
512 -
513 -DEPEND="
514 - ~dev-qt/qtcore-${PV}
515 - ~dev-qt/qtdbus-${PV}
516 - ~dev-qt/qtgui-${PV}
517 - ~dev-qt/qtwidgets-${PV}
518 - ~dev-qt/qtxml-${PV}
519 -"
520 -RDEPEND="${DEPEND}"
521 -
522 -QT5_TARGET_SUBDIRS=(
523 - src/qdbus/qdbusviewer
524 -)
525 -
526 -src_install() {
527 - qt5-build_src_install
528 -
529 - doicon -s 32 src/qdbus/qdbusviewer/images/qdbusviewer.png
530 - newicon -s 128 src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
531 - make_desktop_entry "${QT5_BINDIR}"/qdbusviewer 'Qt 5 QDBusViewer' qdbusviewer 'Qt;Development'
532 -}
533 -
534 -pkg_postinst() {
535 - qt5-build_pkg_postinst
536 - xdg_icon_cache_update
537 -}
538 -
539 -pkg_postrm() {
540 - qt5-build_pkg_postrm
541 - xdg_icon_cache_update
542 -}
543
544 diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
545 index 203fdae199c..3792b4301e9 100644
546 --- a/dev-qt/qdoc/Manifest
547 +++ b/dev-qt/qdoc/Manifest
548 @@ -1,2 +1 @@
549 -DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
550 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
551
552 diff --git a/dev-qt/qdoc/qdoc-5.14.2.ebuild b/dev-qt/qdoc/qdoc-5.14.2.ebuild
553 deleted file mode 100644
554 index 989eea074d8..00000000000
555 --- a/dev-qt/qdoc/qdoc-5.14.2.ebuild
556 +++ /dev/null
557 @@ -1,41 +0,0 @@
558 -# Copyright 1999-2020 Gentoo Authors
559 -# Distributed under the terms of the GNU General Public License v2
560 -
561 -EAPI=7
562 -QT5_MODULE="qttools"
563 -inherit qt5-build
564 -
565 -DESCRIPTION="Qt documentation generator"
566 -
567 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
568 - KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
569 -fi
570 -
571 -IUSE="qml"
572 -
573 -DEPEND="
574 - ~dev-qt/qtcore-${PV}:5=
575 - sys-devel/clang:=
576 - qml? ( ~dev-qt/qtdeclarative-${PV} )
577 -"
578 -RDEPEND="${DEPEND}"
579 -
580 -QT5_TARGET_SUBDIRS=(
581 - src/qdoc
582 -)
583 -
584 -src_prepare() {
585 - qt_use_disable_mod qml qmldevtools-private \
586 - src/qdoc/qdoc.pro
587 -
588 - qt5-build_src_prepare
589 -}
590 -
591 -src_configure() {
592 - # src/qdoc requires files that are only generated when qmake is
593 - # run in the root directory. bug 676948; same fix as bug 633776
594 - mkdir -p "${QT5_BUILD_DIR}"/src/qdoc || die
595 - qt5_qmake "${QT5_BUILD_DIR}"
596 - cp src/qdoc/qtqdoc-config.pri "${QT5_BUILD_DIR}"/src/qdoc || die
597 - qt5-build_src_configure
598 -}
599
600 diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
601 index 40638f49f08..bcce12949db 100644
602 --- a/dev-qt/qt-docs/Manifest
603 +++ b/dev-qt/qt-docs/Manifest
604 @@ -1,58 +1,3 @@
605 -DIST 5.14.2-0-202003291239qdoc-documentation.7z 548115 BLAKE2B a3f889d3a5a3a28dd59d0cfa34d15c3ef3609e971feaf9c66dfbcc4a2e2d085a2f1288a576d67b8b3f56572b17c99e1483b2f3411797efbc43c75c38100be1bc SHA512 61f9e88dadc1b06a548e2ea2cb5d9a07710f88d8997983391b105e0d5d0bb61ab248d49ea5ba90dd88c902ed9fd28355a9f730667e5fe10300203ca2a54b0674
606 -DIST 5.14.2-0-202003291239qmake-documentation.7z 338952 BLAKE2B 9cef2a5cc058eb3dd8f937b60c798d786d3ae4a3cc1c750a8a9aa6535f44322212f54c6d9d6b89f77636eb4298445645764af2b89edbd47eac111778ed8ccb09 SHA512 4e4108898847fe75c286a6c445db8b75aa92c2cc260a425bf04575de18ac0e775a4f289fe5b814e5cbd00724e484c8c5fb6103b89bfa46eaf6c1c5248e632cf0
607 -DIST 5.14.2-0-202003291239qt3d-documentation.7z 5839936 BLAKE2B 0dba528d2b88b9f294bc92c6c05602d229e537de3215839116b9435e0cb6d49e57c3d69bd9ffe8e3f84dfb17c41ffa96f1cbf9b1ed303db08139cb818f445799 SHA512 c9f6eb528db99913e9d00a0973d8c12930dc319fa7e56f625e5874666379e5012483515b3382306c9515a2c5e1ade196bb8dc90587e13ea290a8bcecd64418f1
608 -DIST 5.14.2-0-202003291239qtassistant-documentation.7z 452240 BLAKE2B b16632f75a16b86e086e575bc5a1fe37dea7bd2da70baa057c2fad837c2327be760c92034c108a0df271c5f3a9c7ab74199c15a4cf6c33554d82a0196c376f7f SHA512 7364bce0517161ace8593e2fcc42e6b8cf402db96608dab2b647390905c3f1dd1ab47fceed54c6c3b766f97e16387e64f9fb444a7eda8f76f9cb79967b4ba27b
609 -DIST 5.14.2-0-202003291239qtbluetooth-documentation.7z 2137974 BLAKE2B 1345822a0bec50fb2613fd47f023ef331b82631a39af171ed22f9efba106beeead5db96a6a39f298581f64c834a42bb7a700a72c0f1da169b4e79f62268de839 SHA512 5d4c6e550a238d6eaf1c599d2a4dd2d22fa096b1d6024a3a9309a14fa3394af81cdd641b5256754cc808656dffaf1a985c4eee4b35ac4fed3b627781527dad94
610 -DIST 5.14.2-0-202003291239qtcharts-documentation.7z 8724264 BLAKE2B ff7035a2c8d76cfd993a61aa5090596537b9cf758c147c9ef14bf901224d143e9cff772762f8b073ba48f71af068cd27771e84ca4d580068e058709df28d8098 SHA512 388e783c46d81ac8dba57dc7a7e40d09c97384f74454008948a4a66ba7bcf513a3566e450e58ce356475e8afbe42e9a70ec35c36bb8c8d7abd12eafc3be318e1
611 -DIST 5.14.2-0-202003291239qtconcurrent-documentation.7z 122431 BLAKE2B 79f0e929d462080ff89798d9085cd9e13afddcd96d468c91aa30f81529be60d4f54be7275eef82cbe17e45f6dec0e4f74a4da120cb23df50b643ddbcaa180667 SHA512 443c91b2159ce82e3ef2791abe74ef2e6fde0560bc22f343dd6209974440fcb40b491a3d67691fa4150968af139331a1797fa428df76227ca24086db746cc841
612 -DIST 5.14.2-0-202003291239qtcore-documentation.7z 6523725 BLAKE2B 7fb8e451eb8a20b9e8f276efa3395205a895a611e3fc5233553bab4c822b01ef4d9313fe73dc91b6465612f78332746c13983517e19df37fd3614c4c27d364e0 SHA512 c932390025ac31a2b9b9251727700624f4b3578221f133868a133c467d0130d8d8d5bc2910c35dd4ad0a1bce306c722c437a8a3e4924968ebf0dc1d467b0f875
613 -DIST 5.14.2-0-202003291239qtdatavisualization-documentation.7z 6106581 BLAKE2B 2814d1eeed7f92814d39ecc6d434be187728a09615f5346f2c8552befba105c893467ca2c56f9f48d3263ff309c7b947e9cd8a6211923a4a0023cc66a82bb701 SHA512 f9e0bde2d88da6e3bdf4606b0711b062b1f4a0039b4722dd6dad969b0cb0942f471adcc089da5fe1532f472ffa1ad562824b85fc4e4f3fd25e1b14e8783f240a
614 -DIST 5.14.2-0-202003291239qtdbus-documentation.7z 396511 BLAKE2B 5e8812ea9c964a1c2cbc1b66aabde7c58650966a6918ec8b74e3456b63e03994dda812d70d53df46dc1e63983fd9bb094c231140529ac02cf8a7abde55757ced SHA512 7e9453ebba72fe950abc6898a07efe1e5428059811e0a6c7f9018bfb9badcbc772d4bf9c63b4870f8da4b208ec555d91263bec5e562add1e432cd8c9dc13ff70
615 -DIST 5.14.2-0-202003291239qtdesigner-documentation.7z 3531000 BLAKE2B 56ddb89623ae6ed02f3f60b91b784da636eafb4f6e74b63013475a4c3cead74b945f92dfc82eea973dcdd8c0ea0fa3acccb5c7f34fb1def4d7d6452bb8929602 SHA512 e582ad0adf4b5f33ab0b32a0e7db71483908efe2fd56e42102a28ebd050b21517c5d5420100816f8d43ab89040f62189db4d80d469d24cdc738696d224c6552b
616 -DIST 5.14.2-0-202003291239qtdoc-documentation.7z 10116385 BLAKE2B b631d107620fe8f9018848fee343a775e14cf02cea9d1fc4c0170429def5dec52e44a52babf2d047934a50b6a287f61411a42aa2bdc08c13b59550dd7208af2d SHA512 0994508646d8e52dcb013ea1326070276f0d6fbd7fd835cef3d78371a24b15792bc6ebfc905bc926191d2eb47b1a60d9e75edf66ef9d3e07bdf20393811d18a7
617 -DIST 5.14.2-0-202003291239qtgamepad-documentation.7z 238732 BLAKE2B 2e24aed01ecb77d28c476a077663e3e289d7bb8badad74e8a5f20c9a64e056995263bdb9d73c44b34f0cc3358e165604aafb6db60c1130da27c2eb6493a92a87 SHA512 f9b33da7b7824bf12cc50f6ab4dbeac180ff6a938de9bbce1b04bad400451fcfea74e55e15f4f39218a6f63ee9f85c0c4db89122bdc1bfdc5f90220644edda06
618 -DIST 5.14.2-0-202003291239qtgraphicaleffects-documentation.7z 15994331 BLAKE2B 35b6a3ec3b6325ceac1009779ac5e1d28497082569e67e644a8800e4a89c09f55a6a994baacdce3e3874cf0f969525fd15691c2fe1dbd63a3f90228a6cafbcf2 SHA512 8d50be92bd25d9e70c90c1cd3a62beb08161d1a16590fbf281c9098761adaa40bef56de66c27e101cd6fe409fff560a185b141ba5f8eee8fb8abda86bf88fee7
619 -DIST 5.14.2-0-202003291239qtgui-documentation.7z 7431093 BLAKE2B 8e32dd369f9f21fc3b6d4f71d04d2df059a60e41d4350b53df7f9d0c4beb5498742e8d499cbc0eea970c1f107b445ffaafff68f087665221369c851ff66842f2 SHA512 1b7633f7b0b3647cac60e7fdcdf5040743321867e8c7583b388d451b40a72322c293e8fba8014a5978ae47934d3a7081fe954cb2471411cdbeaa636d6d04558e
620 -DIST 5.14.2-0-202003291239qthelp-documentation.7z 199198 BLAKE2B 5e04b96af4eb27446bf6eafb00c9338c37f09ed5ef4a43b9e33fdc63a992471ffbdf49e860205c93ac795863c8f516500c717468c27e9798618511c3ae9436b0 SHA512 4e34cc37c01096feda4fc6e5422749697e4f1990bf2a3d9c756ef5b08f73ec93837236bc30ba2aa6e2a6a98ddfafb2e92d650ddcb8fc8dc3d08f83247f2a2fbb
621 -DIST 5.14.2-0-202003291239qtimageformats-documentation.7z 29042 BLAKE2B 64b4c90bd02d8ac93009f11ab923a65b5182ce11c44268e00c32c50c80fa422f555c3217ceb2ebccab79dd85ea5e2b27c1a3c48714752dc35dcfebe33cab54da SHA512 84c4eec9c11f41d236fa391ac9dab32647221972720f70446fdd6007521ed41039ce4fd6a28464087861e1c80e9077bc880b2fe1a2f5ae7c56e3a8c1508cbb1e
622 -DIST 5.14.2-0-202003291239qtlinguist-documentation.7z 968571 BLAKE2B 04aeb56ca406cea61a3cb0dd898fba7b1a5b32369d947ac3a293d2f1d3a3a9f5b128e02a734f6da4d59ecc7f14cc03079e99caf3df13899fbabf2ddf1a987865 SHA512 ec807c1f824eaa0181d705fc5dcf6c0e855e83c06fd2ef0ac3e351c83e099613a1fc437714a2bc81ebe988f72e8f481a6ee0d33770a78ab7df8982e93046eb9c
623 -DIST 5.14.2-0-202003291239qtlocation-documentation.7z 2766777 BLAKE2B 89f2e8b74f75fade05045598ef340c9d5b0f9c459a941670b058309e780eb0295676116c09ffffad795591633277306d29ec8071b98c349c43908b1c25b7c13e SHA512 74fd76499dfe8ee8b0fde9b97af290784707021aa446498509c92b89db559d2e5050347050efc7f111f2eada2cf6cca941d7025f58dd05bdd44373f600799b3c
624 -DIST 5.14.2-0-202003291239qtmultimedia-documentation.7z 2802759 BLAKE2B 1f616a2b8391f659a83ca165ae31410af7c67d860c10b38ae06d4ebd774eb3b9bfa7ef7e405b8ad4bd0370cd915f4dfd5156390845a1ebf748ae30704bcd464c SHA512 fb4234ab57d70a5f92f73d91b23d8e5731c75a914ef213aba5dc5e7f868e142b4d647bef50d048b2d92a4f98c695ac57bf8fbcbd603dda985aaf1752d6010219
625 -DIST 5.14.2-0-202003291239qtnetwork-documentation.7z 1499902 BLAKE2B 68fb52b35bc38b602ab1a7c434cd8b07c75e4747e43f7b165eab5b32669279d0396eca99c79d825f59646df75f82c90b8e066add39209adc2f25b5ad0db59ecb SHA512 c9679aab71c645cbc8ca73ac57b7b2da994c69998699c533f4bb84821147a920b974474c9df36362adca054bb1a8825be5e1ab760a069acd04262581922db368
626 -DIST 5.14.2-0-202003291239qtnetworkauth-documentation.7z 244223 BLAKE2B 7e883362bc9c692999c073554b3b306cf8de55ce37e9ea73f558ce9f4f6f1359db1c4365bc080a5cf0a64abddeb8a3f63ffdf71c6176fa1b1dc4e9fb112633b6 SHA512 cc86171689e60fb6cd885f838a13603652d216b46956106b03117ed4f9c4bb17e57c9c77267b146076010e08a16b966274ee39420757372db110a187e6da7b9e
627 -DIST 5.14.2-0-202003291239qtopengl-documentation.7z 836338 BLAKE2B 4202512854b7f1eb0221054a125e6ef987a3acc80683cfc60abf83708a5a52685f3283dd79807b74c8845c26ca84b7d365e8c729648d9084ce2d742b932f3bdb SHA512 a0b7309f9b183867be6bd4132992e4f258770afa5b7488377835db4d3ffb64b8a8abecab438b9de8e557b492da5183a66f4bd6822168da71f65e611b96204a99
628 -DIST 5.14.2-0-202003291239qtplatformheaders-documentation.7z 78675 BLAKE2B d4ead7ca1511dabd6aedca080ad62860f520a87103f09d82de247889d4ec5e5e6c26d5d136a9c1cc5280c13e9b0972da42a1ebae6715b2b5aaadb4b83b96b693 SHA512 ac836a953fc5bb51f8bef5340a425924430422a9b1aa949a9e2c28a2a9ef1b10eb2b60fe2c58945b8da2b60824c40b516d6c30877325de2483ad0ceb36da05eb
629 -DIST 5.14.2-0-202003291239qtpositioning-documentation.7z 587458 BLAKE2B cfbbdca9664da130975707b97a0a04c21fc8677be3e1368c402c30a00d2c68f06f5927e711c432eb14589440a14d4df20bb8cd3c7131db2e18e413f4bae8ed92 SHA512 87066ff7f35a664ef1c5f3ec8c28827b445cbd56e40501c5a152fa7fc4ded10447aceb03afef57a21ae2f0502f1376e3133db11948b2d809261a228117d40b4e
630 -DIST 5.14.2-0-202003291239qtprintsupport-documentation.7z 376410 BLAKE2B 65da643907e6216d3b8f67dc504fb7e9838a17493ddef8543259512aa39c6a81c9ecb69cb9bae9f85e4439c037292fcfe66ff5ad9896a38749fcec507a303011 SHA512 d6afb912757c722c8371e1a4ecc61ce01a5a5f3ae9ac581a97b25faed3517fdf189a41c84df78e89ea81ff63c2d4bf8ab3bb25d42f28a863699dc14a9c950271
631 -DIST 5.14.2-0-202003291239qtqml-documentation.7z 1526503 BLAKE2B cf17ff5e2a953a7df579bd3b2a39a4e604dc8e9a240ebbc60f7947d0c4d91b62bbeb8ed03ebb80deed63a8f5560e68c4a31f0347038304cac96a68df3ec273cb SHA512 21fb46fe61bf74000a364b62c55d7896664d5620429f62961c97d1c018bf4922662978bec32d8e7c95e9088f91d4ed0cf567f3e6d5e550e620797f394e5a496d
632 -DIST 5.14.2-0-202003291239qtqmltest-documentation.7z 81719 BLAKE2B a99e255af7d6aadf1db94b17cdf81ef39babbb937dbcd462f073b7acff8b51bb6fb9b1d51e9b731196ffa90083139d46c3707db8f646db1566ca6d71fcf6dd17 SHA512 6982352ca75111e1b7a0fa78675ca4f40c29b153a5908670442c78f4acfd349ae89d80ee1597a1dd08fcd0874a82f2846b26df5c7e9d4592e23b59489b59a4f8
633 -DIST 5.14.2-0-202003291239qtquick-documentation.7z 16639611 BLAKE2B 3b33273a5b110497f59e5ddc6eb0236a8fda86ed6c172ab36abd36a6ac05cbcdba2170c67b12fbee014f8a17c0546b454b8ed2168533ccd517f10614aa21a8c5 SHA512 78c3a1abf5d0ea503cf19d165125cbee91ec04807a52333410b97b35847c2123eab74988c119a7a24daceaa13cd95bc6d7a10b70131ab7d289e128e7b6a3d8bc
634 -DIST 5.14.2-0-202003291239qtquickcontrols-documentation.7z 9331828 BLAKE2B 08d52b7c0213b20226d46cd1a5a715771c3a4938b05ac40021006d7e5ff7c45fccd69bb728698e71e50d95045e9c26d5d05da38214eeb390c86ebb93a7c49057 SHA512 d1aff40d5fe89dc2d14d5755fe3d39881c00e922eab3828c93e2b448270263a6a79fb43a9df0ed72b66325477f015d2145b35e75be179575d1a4450dc82766df
635 -DIST 5.14.2-0-202003291239qtquickcontrols1-documentation.7z 1961340 BLAKE2B 46b1795874e9e29019427259c502ddd644c5de6e985700416fff1494b199b6f518fca17e07168cb3de1a201a2754518c4055559442301254f2bd86e87b1c354f SHA512 bf715dffa72e0369faa159d67ba9bacf31154da382a87a031577729acf7caa51af55cbf2fb94ab529afbfaa5dd65f1a011ef8e52b8ce764dbfff037358d0f22c
636 -DIST 5.14.2-0-202003291239qtquickdialogs-documentation.7z 183373 BLAKE2B e1b1d4ddb85ce48e9c744ce7566f1ec2789b2fcf03f65c2616fa63b2a7ccdabc0a2ab60811bc723f3e9aa4bfa304b04bcd5097b0e617dd4f8c72b19d499e2ee0 SHA512 18a0914c7d398fdeb065829e9f93f51efddb58c35e43962fc891a46538807ce7dad27644acd976886fbb441e8b9e35790f4ed1271546a155da38b9dcd803a027
637 -DIST 5.14.2-0-202003291239qtquickextras-documentation.7z 673822 BLAKE2B d06bead9f468325f1457fd41d047797f3618322131e5fbc095c1a78e0926b020a5f3012f86f251c96d52e8d52b0d79c05f4639c19338d67f0e6de65901bb5af7 SHA512 d6fa5acb6558fc840d731da25d9061fe3dfa4e3bbb47354bc8760afe0431bcdbd1cb21491416d7773bb171108492b35e14d2f5df0fdf67e307e3ccd6fa0cc598
638 -DIST 5.14.2-0-202003291239qtquicktimeline-documentation.7z 149836 BLAKE2B 28cc7173aea37167a7aaada170bb0fa7fa378ddf270c6237836c47bf2b741aefd7f0454e33be4c089742644bb72b91f9aec1e00d54d837790b21349d1d66092b SHA512 b92c321d486a49a586569dd248cf9a6f49a5acb7806bd3ba60e1f29b85919d2ef79749cef644d9f53be5cb242ef9475bf1358e38bfb4bdaedb4b02f2f90de86c
639 -DIST 5.14.2-0-202003291239qtscript-documentation.7z 601309 BLAKE2B 24b63ae7f20f60d5e2b2c1cbbc5dc47f3f19cc1bb0bc1dade609bcb0a253f483d49359a7b2f9f508936a8c3d22802907fdb64fcf388e4c6b42cb60c6b154f2d7 SHA512 8cbff7316c0b0f2dfd302b374bb78fb6b7f4f466e886299d9c2aa22097ff2b871e4a41bad2f4262c49b065e13892f1e155f1dd6aa179b9a9e898227bb0641d76
640 -DIST 5.14.2-0-202003291239qtscripttools-documentation.7z 85919 BLAKE2B 9da6dfdc7bb18e4fbb6bad8326040e35e55ac8be556d8cc7e280b8fb481d56c9e26fa1f8bce4fa47acb0024bf622c2d46f99f5199cf0dd8412626c23f3b06767 SHA512 545e3b7cfe5fc2a76928e5c75866e350f2a80c7d47104171252e734e9d0c2966c4dae3100118730854f3de9bba7e1bc84167f60f44956730db0e0543a10819a8
641 -DIST 5.14.2-0-202003291239qtscxml-documentation.7z 622979 BLAKE2B 6243b5dc2c17eb6c0727174f61327a7a687a0af6cdc99a27d6f3c796f29358873e2fdadc2384341bf4ebe57078ada9ba2e9633c64699a280c1dd148bff273f29 SHA512 19e836eda1e1f7d9dc278a2195309665a0962ba4ba339511a2060217751de5288e137139833dc6e5825a7a5914ec66f234ceb58497058ae183f57b663b7b9cd3
642 -DIST 5.14.2-0-202003291239qtsensors-documentation.7z 3404679 BLAKE2B 33732ef14e76dbb2bb8e9a296eba8963f4ffbacabe2d6ab7521ae4c44fe44e246c32101f90a6b84bbf232b5172714eb5f9003e25de4197d53c18b60efc3767d9 SHA512 09146cc94ea1b97ecf5eff0127424dfb7e07bdf7751c60be58559c274ca29bbabf710b18d874a596548ebad2557804c1f2ea07792c3efa1e1692c0b806b2b10b
643 -DIST 5.14.2-0-202003291239qtserialbus-documentation.7z 367915 BLAKE2B 734832b230a62f9cc7789cd20821c0ef7bd627cfd5f28dbd71f522348b4da0c863dc276e35fd66a52a14e033090c68f0f7301f31978f61bb66e1d37c2d8719ff SHA512 9f00f877376cd0ddc847f907ae223acd0ca87f4d693673b2468a6a603f3ba2c5d8548588507f071511252311268e6006ccc2beeeaea45059ee0d7f4fdb0b61a2
644 -DIST 5.14.2-0-202003291239qtserialport-documentation.7z 278435 BLAKE2B 3ccc904b861ecce946945586122063c6bb383179e67d0a2324ec57661e91396ddd6e01c1d01843ea7b5da4ff23841f4162769417fef1eda1f8fcfb1e1bb5f496 SHA512 5e8e8c7d8d8315fa74330294dd0933713aa390fb52f39b4f9b90eeef74346d02fd4255f4e2ec860ddf8cbc4a06df13a371c78c7f1ae033d97a016c782fce5d61
645 -DIST 5.14.2-0-202003291239qtspeech-documentation.7z 134032 BLAKE2B 8d7671a8a71e8f112a98b9868ee5a0cfea4dc3eb63ff42fc60aaf9c5142be0b821583fafdf1cbdee2d66786f84949760d0be8a589747e2e811fd380ee09919e2 SHA512 e6eae003f852f04ddb438c73f02346e5a8040f206af8e444c5d6e28d8af5988f8f24a3c1853496a7da545a8fca1ab2f9ce6b7b4d3e9a8b7d2cf35d70e32a8cfd
646 -DIST 5.14.2-0-202003291239qtsql-documentation.7z 882769 BLAKE2B 5044c05764d02836f1dbc05f60fe969a4463d0f48c8858fabdebcdc5b374482e92af1deef80775adac202a31d9cf81b1c02e979d28c4d8024850f9a3c66b9942 SHA512 be3381013c78ae871ebf8e1ba4978b0845a1ddd6790e67ab5799a6d59e3d70ce0467f81aa207f9c3f58fb5bd86264b8a8a2a7336c7ecf6cbf6e75e4f7b7273f4
647 -DIST 5.14.2-0-202003291239qtsvg-documentation.7z 252552 BLAKE2B 516068324ce1d2f476c10e3934c96cce5fefa3f31511772614486ba71f5bd2facd9f3ac925769bcedaf2130651e6fa0aa67eac05dc351f1b65353150597ee14d SHA512 387b822eca333ef8226c79cdc55146fa5011165edae48fe06ad8fe9d951191a1528273a9fd14d7f60e9c1be49ef3224474a7e1ebda31672f727aa2c37c277541
648 -DIST 5.14.2-0-202003291239qttestlib-documentation.7z 219524 BLAKE2B 33f6d3dd6d217c7eec5d6ec4e3f346e9b263123be1d802cadf3bb1a15247ab02ccf768e0b5b1b98db32e5da919a1a4fdbaaba85c5ca8ee6d4d76d97fe1ae1be2 SHA512 4b7220b7473138729c48c135d70f3b2631d7a60461617b0bcdea30ce18917aa597d56cd5abbd1827e9701e17695c1bebacd49091dedea48ec908e3d0616a9fc7
649 -DIST 5.14.2-0-202003291239qtuitools-documentation.7z 158530 BLAKE2B 970493230cd91086e29545932ea9e7699aedc2bf68e0ea9b46682ae012074b5bfcb9845704714d9c3e653c77160bc4b9914405f827e3b3783840aacc18b88bca SHA512 531d9d2ea2796a7142468fc63b7894385299ec490b480450d160e6e1861d300582d19ea1cda706554a58b0f26438a4dd509362ffe05323a37445767d96525677
650 -DIST 5.14.2-0-202003291239qtvirtualkeyboard-documentation.7z 2037666 BLAKE2B f741913404fb8ba1747b785579e4c4c3728878c7238287f1426b32498def5019db2d2baea2818cf66f377ad01dbf0a5e3a2f5b3121efe4edb2a58e299ef2c1b5 SHA512 686ffc453726eba33d1cb6765cf3a66999f0f6ca3020ff20e9e6c1dc010f458ca88136c8f04c50b89fec7bfdf0dd54f62ae66e4cc43f9dacb77146517efc3d80
651 -DIST 5.14.2-0-202003291239qtwaylandcompositor-documentation.7z 586165 BLAKE2B 7f3f3046950301052fe6bc3fd611537290e9949b40939094b4595eb36f787e39ad5d678e42b3dfcb4efa149c7add225569a68b5d0f6c1f85f4d7680b38849be7 SHA512 c518c03515e21d5d3bbcf03cb1b704b9fb24be178aa9fae2d478d152d97c3766476b031b5e170b7b504344121be31da823ddfc5110217caaf99eaf0ee11e32c4
652 -DIST 5.14.2-0-202003291239qtwebchannel-documentation.7z 163023 BLAKE2B 594bf502959024a63365ed4098e624c5bb9627b40a98d98ed9a3e8d0bb6447a29e85385d94ee2039b11099cfba3da93d0fac2b772447c425d096a07947471faf SHA512 05aca7034070847201a4011d2b5952cf526124d8f3afc0cba5b03511b50f54e892e280465ccfed1efa849391babd1ecd0f528b14c0a36294a999be43fd4f2bc5
653 -DIST 5.14.2-0-202003291239qtwebengine-documentation.7z 2983056 BLAKE2B 97b3c0558e7d2a0c91bc9ae62d5bb78b3116f5b3586bb8d0a9bffd58a9e0e9bbc1a1a0275cc1869f84291d26e1ddb6d4c39605a60cf0f4d2942373ba80859312 SHA512 cfee5d5a76c05d668fca7dc6bc342d1f2f9e95a34c5782805069d1b260e5e3793d7dc0db1c6a1b3e96e8dec38e48e226c393c08fc354c7bb95dd889f27cbf93c
654 -DIST 5.14.2-0-202003291239qtwebsockets-documentation.7z 306861 BLAKE2B e7715265e92039d953d4bb711252f6ced098bdd227ec44f0c8597cd0bb021b2f4a9ebd76a65ad416dc91afaa04c0af538786160c6045b5bf60ba087e8b53d13b SHA512 0879de8d72f6e8201677caf3f7d26b4f1761f13fd8dcbb1d6c211663a16b96fca487f5fc96acaa77108ba148fb0fd1733af3a4ab35dddb5e5b5fae377de07cfe
655 -DIST 5.14.2-0-202003291239qtwebview-documentation.7z 120314 BLAKE2B 22bd0a4a09a9bf35679095ee06416a6285abb8b40d976168d63d9d0828dc5992887d1b381a530aac35259943141b2afe55c4769ee65fd5083d34e7b76132fcca SHA512 82c7e399d0468c6548e526f30315af6ff3498ca846c2c762139fbbc75ee0006edba4a5e921d60a2f5200e308f678fe45914144d5aadb28e79690af29c9a7fc09
656 -DIST 5.14.2-0-202003291239qtwidgets-documentation.7z 26796173 BLAKE2B 6383a2be3148bd0d40d09f8ebf044b3ca1f5648de0813ba21892246edfad9da2d6ff66e45495443531f840e762517caa399401f0a0de80ca3ccf181d378c7c78 SHA512 f81066289080709bad87c529be13fa16b9652d35d8a0f1671d9aad914101c6b9a934ce5504cd6133671cbe0cefaf6174caba3b0bc5e46741d8329ad2ed42b908
657 -DIST 5.14.2-0-202003291239qtx11extras-documentation.7z 36888 BLAKE2B 0f7757cb82a7fea064e9b484e08cbd3b1cefd5f29117ab283f0b26ffddae142e494f674744f2fca4f210da5c86b86500ef26781ca7e5bb0f13b0c12af9195d4d SHA512 728814ee896cdc429e843bbdc136931795d54b4b70bf0d54bc8ac9b8edac42986981d39c134f3ea5329984a9b15e0f0089df716c44889cf13368fef92cbbff5e
658 -DIST 5.14.2-0-202003291239qtxml-documentation.7z 499466 BLAKE2B 82ce65d6c4dfb39aa3202e20acafd0cb970e57ef24f35a2c4d64b3a550cc3e041b8bd2e74489b4738651ff1125247ae18e7e2885e919346f0b89776c36697846 SHA512 62b7d24f724721bb007c4de36bc2bb9578cb719de8acac72c5c144e1acb4a12a0a15930a3f0b8aff3ed557f236d2ab124045f86dc33b2d195da05e61133fd100
659 -DIST 5.14.2-0-202003291239qtxmlpatterns-documentation.7z 1193876 BLAKE2B ac7c92c265fb0bc4b5ed7ccf267c50389ca840bdf91a35abce127e14608e585b20191cfe84924864e2fc607b4d360207e50b85424c8517fce136d971de2c47a9 SHA512 2d012722d64b27c6ec11726e5b457ae1b87448e681271809489ea521ab0ac65553dc2d8c105bedc65501abc5af7d6921afc2d3cf5ac69fd17548405076f66146
660 DIST 5.15.1-0-202009071124qdoc-documentation.7z 538292 BLAKE2B 2bfddf75b83783a515f7278e4c9e384e96d58a64f5326d640278dce7d730e011a0fd028ce41efb43d47c36c45cb378101a78c62779600cabff6c108db7146af9 SHA512 48ce574f1a4a888a40ed6ea8b81bb3baaec538c15c534dde15038eaf017bf97bf6714dd711b22a9d00332f4f79041ee20b27a4e0987ef98d48e7fb651df86f32
661 DIST 5.15.1-0-202009071124qmake-documentation.7z 343276 BLAKE2B e4b4220bf97cb668b70021c3264713005fbb2b890cad7f19573f079726b84b181764789e0e46557eb8999ca84668e40b1c59836cd8ba4837f38754182d272313 SHA512 56bb705c4dde6e348bc995a0077b36c765e0295622490496d7c634effe5d9ad6e5f8a8239dd799ad0d61cbeb0d244904938d6e97ff91f761cc5f0c057e81ff86
662 DIST 5.15.1-0-202009071124qt3d-documentation.7z 5832015 BLAKE2B d68bd281fcbf4c665f2b72602a4f2de779203cebdd870935f21c9514921062e1ca28d802f7d77779ec978752514b692f76f54487d0694c84397efadefcfa52bf SHA512 54d49afed958dc0231880d364c3385f017c72ab9226e1044b9d2b146685d5b5adf8fee44ed2ca58fa0d8f06fa01898724d570185f5b5995b93c5e028206fe959
663
664 diff --git a/dev-qt/qt-docs/metadata.xml b/dev-qt/qt-docs/metadata.xml
665 index af49c1ea8e0..d54e1fe9c86 100644
666 --- a/dev-qt/qt-docs/metadata.xml
667 +++ b/dev-qt/qt-docs/metadata.xml
668 @@ -11,7 +11,6 @@
669 <flag name="bluetooth">Install documentation for <pkg>dev-qt/qtbluetooth</pkg></flag>
670 <flag name="charts">Install documentation for <pkg>dev-qt/qtcharts</pkg></flag>
671 <flag name="concurrent">Install documentation for <pkg>dev-qt/qtconcurrent</pkg></flag>
672 - <flag name="core">Install documentation for <pkg>dev-qt/qtcore</pkg></flag>
673 <flag name="datavis">Install documentation for <pkg>dev-qt/qtdatavis3d</pkg></flag>
674 <flag name="declarative">Install documentation for <pkg>dev-qt/qtdeclarative</pkg></flag>
675 <flag name="designer">Install documentation for <pkg>dev-qt/designer</pkg></flag>
676
677 diff --git a/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239-r1.ebuild b/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239-r1.ebuild
678 deleted file mode 100644
679 index 9014281d55f..00000000000
680 --- a/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239-r1.ebuild
681 +++ /dev/null
682 @@ -1,103 +0,0 @@
683 -# Copyright 1999-2020 Gentoo Authors
684 -# Distributed under the terms of the GNU General Public License v2
685 -
686 -EAPI=7
687 -
688 -PV_FULL=${PV/_p/-0-}
689 -PV_NODOTS=$(ver_rs 1-3 '' ${PV%_p*})
690 -BASE_URI="https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_${PV_NODOTS}_src_doc_examples/qt.qt5.${PV_NODOTS}.doc"
691 -
692 -declare -A QT5_DOCS=(
693 - [3d]="qt3d"
694 - [assistant]="qtassistant"
695 - [bluetooth]="qtbluetooth"
696 - [concurrent]="qtconcurrent"
697 - [core]="qtcore qmake qtdoc"
698 - [dbus]="qtdbus"
699 - [declarative]="qtqml qtqmltest qtquick qtquickdialogs qtquickextras"
700 - [designer]="qtdesigner qtuitools"
701 - [gamepad]="qtgamepad"
702 - [graphicaleffects]="qtgraphicaleffects"
703 - [gui]="qtgui qtplatformheaders"
704 - [help]="qthelp"
705 - [imageformats]="qtimageformats"
706 - [linguist]="qtlinguist"
707 - [location]="qtlocation"
708 - [multimedia]="qtmultimedia"
709 - [network]="qtnetwork"
710 - [opengl]="qtopengl"
711 - [positioning]="qtpositioning"
712 - [printsupport]="qtprintsupport"
713 - [qdoc]="qdoc"
714 - [quickcontrols2]="qtquickcontrols"
715 - [quickcontrols]="qtquickcontrols1"
716 - [scxml]="qtscxml"
717 - [sensors]="qtsensors"
718 - [serialbus]="qtserialbus"
719 - [serialport]="qtserialport"
720 - [speech]="qtspeech"
721 - [sql]="qtsql"
722 - [svg]="qtsvg"
723 - [test]="qttestlib"
724 - [wayland]="qtwaylandcompositor"
725 - [webchannel]="qtwebchannel"
726 - [websockets]="qtwebsockets"
727 - [webview]="qtwebview"
728 - [widgets]="qtwidgets"
729 - [x11extras]="qtx11extras"
730 - [xml]="qtxml"
731 - [xmlpatterns]="qtxmlpatterns"
732 -)
733 -
734 -DESCRIPTION="Qt5 documentation, for use with Qt Creator and other tools"
735 -HOMEPAGE="https://doc.qt.io/"
736 -
737 -LICENSE="FDL-1.3"
738 -SLOT="5"
739 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
740 -
741 -IUSE="charts datavis +html networkauth +qch script timeline virtualkeyboard webengine"
742 -REQUIRED_USE="|| ( html qch )"
743 -
744 -SRC_URI="
745 - charts? ( ${BASE_URI}.qtcharts/${PV_FULL}qtcharts-documentation.7z )
746 - datavis? ( ${BASE_URI}.qtdatavis3d/${PV_FULL}qtdatavisualization-documentation.7z )
747 - networkauth? ( ${BASE_URI}.qtnetworkauth/${PV_FULL}qtnetworkauth-documentation.7z )
748 - script? ( ${BASE_URI}.qtscript/${PV_FULL}qtscript-documentation.7z
749 - ${BASE_URI}.qtscript/${PV_FULL}qtscripttools-documentation.7z )
750 - timeline? ( ${BASE_URI}.qtquicktimeline/${PV_FULL}qtquicktimeline-documentation.7z )
751 - virtualkeyboard? ( ${BASE_URI}.qtvirtualkeyboard/${PV_FULL}qtvirtualkeyboard-documentation.7z )
752 - webengine? ( ${BASE_URI}.qtwebengine/${PV_FULL}qtwebengine-documentation.7z )
753 -"
754 -
755 -for DOCUSE in ${!QT5_DOCS[@]}; do
756 - IUSE+=" +${DOCUSE}"
757 - for DOCTAR in ${QT5_DOCS[${DOCUSE}]}; do
758 - SRC_URI+=" ${DOCUSE}? ( ${BASE_URI}/${PV_FULL}${DOCTAR}-documentation.7z )"
759 - done
760 -done
761 -unset DOCTAR DOCUSE
762 -
763 -BDEPEND="
764 - app-arch/p7zip
765 - media-libs/libpng:0
766 -"
767 -
768 -S=${WORKDIR}/Docs/Qt-${PV%_p*}
769 -
770 -src_prepare() {
771 - default
772 -
773 - # Fix broken png file, bug 679146
774 - local png=qtdoc/images/used-in-examples/demos/tweetsearch/content/resources/anonymous.png
775 - pngfix -q --out=${png/.png/fixed.png} ${png} # see pngfix help for exit codes
776 - [[ $? -gt 15 ]] && die "Failed to fix ${png}"
777 - mv -f ${png/.png/fixed.png} ${png} || die
778 -}
779 -
780 -src_install() {
781 - # must be the same as QT5_DOCDIR
782 - insinto /usr/share/qt5-doc
783 - use html && doins -r */
784 - use qch && doins *.qch
785 -}
786
787 diff --git a/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239.ebuild b/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239.ebuild
788 deleted file mode 100644
789 index 0aa5c59ac2d..00000000000
790 --- a/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239.ebuild
791 +++ /dev/null
792 @@ -1,102 +0,0 @@
793 -# Copyright 1999-2020 Gentoo Authors
794 -# Distributed under the terms of the GNU General Public License v2
795 -
796 -EAPI=7
797 -
798 -PV_FULL=${PV/_p/-0-}
799 -PV_NODOTS=$(ver_rs 1-3 '' ${PV%_p*})
800 -BASE_URI="https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_${PV_NODOTS}_src_doc_examples/qt.qt5.${PV_NODOTS}.doc"
801 -
802 -declare -A QT5_DOCS=(
803 - [3d]="qt3d"
804 - [assistant]="qtassistant"
805 - [bluetooth]="qtbluetooth"
806 - [concurrent]="qtconcurrent"
807 - [core]="qtcore qmake qtdoc"
808 - [dbus]="qtdbus"
809 - [declarative]="qtqml qtqmltest qtquick qtquickdialogs qtquickextras"
810 - [designer]="qtdesigner qtuitools"
811 - [gamepad]="qtgamepad"
812 - [graphicaleffects]="qtgraphicaleffects"
813 - [gui]="qtgui qtplatformheaders"
814 - [help]="qthelp"
815 - [imageformats]="qtimageformats"
816 - [linguist]="qtlinguist"
817 - [location]="qtlocation"
818 - [multimedia]="qtmultimedia"
819 - [network]="qtnetwork"
820 - [opengl]="qtopengl"
821 - [positioning]="qtpositioning"
822 - [printsupport]="qtprintsupport"
823 - [qdoc]="qdoc"
824 - [quickcontrols2]="qtquickcontrols"
825 - [quickcontrols]="qtquickcontrols1"
826 - [scxml]="qtscxml"
827 - [sensors]="qtsensors"
828 - [serialbus]="qtserialbus"
829 - [serialport]="qtserialport"
830 - [speech]="qtspeech"
831 - [sql]="qtsql"
832 - [svg]="qtsvg"
833 - [test]="qttestlib"
834 - [wayland]="qtwaylandcompositor"
835 - [webchannel]="qtwebchannel"
836 - [websockets]="qtwebsockets"
837 - [webview]="qtwebview"
838 - [widgets]="qtwidgets"
839 - [x11extras]="qtx11extras"
840 - [xml]="qtxml"
841 - [xmlpatterns]="qtxmlpatterns"
842 -)
843 -
844 -DESCRIPTION="Qt5 documentation, for use with Qt Creator and other tools"
845 -HOMEPAGE="https://doc.qt.io/"
846 -
847 -LICENSE="FDL-1.3"
848 -SLOT="5"
849 -KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
850 -
851 -IUSE="charts datavis +html networkauth +qch script virtualkeyboard webengine"
852 -REQUIRED_USE="|| ( html qch )"
853 -
854 -SRC_URI="
855 - charts? ( ${BASE_URI}.qtcharts/${PV_FULL}qtcharts-documentation.7z )
856 - datavis? ( ${BASE_URI}.qtdatavis3d/${PV_FULL}qtdatavisualization-documentation.7z )
857 - networkauth? ( ${BASE_URI}.qtnetworkauth/${PV_FULL}qtnetworkauth-documentation.7z )
858 - script? ( ${BASE_URI}.qtscript/${PV_FULL}qtscript-documentation.7z
859 - ${BASE_URI}.qtscript/${PV_FULL}qtscripttools-documentation.7z )
860 - virtualkeyboard? ( ${BASE_URI}.qtvirtualkeyboard/${PV_FULL}qtvirtualkeyboard-documentation.7z )
861 - webengine? ( ${BASE_URI}.qtwebengine/${PV_FULL}qtwebengine-documentation.7z )
862 -"
863 -
864 -for DOCUSE in ${!QT5_DOCS[@]}; do
865 - IUSE+=" +${DOCUSE}"
866 - for DOCTAR in ${QT5_DOCS[${DOCUSE}]}; do
867 - SRC_URI+=" ${DOCUSE}? ( ${BASE_URI}/${PV_FULL}${DOCTAR}-documentation.7z )"
868 - done
869 -done
870 -unset DOCTAR DOCUSE
871 -
872 -BDEPEND="
873 - app-arch/p7zip
874 - media-libs/libpng:0
875 -"
876 -
877 -S=${WORKDIR}/Docs/Qt-${PV%_p*}
878 -
879 -src_prepare() {
880 - default
881 -
882 - # Fix broken png file, bug 679146
883 - local png=qtdoc/images/used-in-examples/demos/tweetsearch/content/resources/anonymous.png
884 - pngfix -q --out=${png/.png/fixed.png} ${png} # see pngfix help for exit codes
885 - [[ $? -gt 15 ]] && die "Failed to fix ${png}"
886 - mv -f ${png/.png/fixed.png} ${png} || die
887 -}
888 -
889 -src_install() {
890 - # must be the same as QT5_DOCDIR
891 - insinto /usr/share/qt5-doc
892 - use html && doins -r */
893 - use qch && doins *.qch
894 -}
895
896 diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
897 index e96656130e2..178c3750596 100644
898 --- a/dev-qt/qt3d/Manifest
899 +++ b/dev-qt/qt3d/Manifest
900 @@ -1,2 +1 @@
901 -DIST qt3d-everywhere-src-5.14.2.tar.xz 81576496 BLAKE2B 39077430fa58a14d0636ef56607b687636651d8fb798093d00b150ae023c462780245f06d61eac214560b336a1f445c2fbeca397c1dc7e7ee0331cc008692a3c SHA512 43053d001d59094bfac19c5bf3ad17df277c64d0c214b72d4cf02231396d9109a231da8d9d72ebe79822bc09ee24fa2387b4b120dbad43d69a49e3d66ee21da8
902 DIST qt3d-everywhere-src-5.15.1.tar.xz 81919836 BLAKE2B e0c617e777dc2562caaee02483bb4c9ec2fd17214ea02505942b074b82e698a82e4c81ef552705872c6c10be3cbab65a1fc3c5aff2c87637639f223583a04ae6 SHA512 5d35f39bd3cb65a4b7490fd3d57a4f62b3ccaad25c7963613d67641927bdc9d895fb436d049de5485a9e8e067c716951e376349cbfc3996af6765adda73d51d5
903
904 diff --git a/dev-qt/qt3d/qt3d-5.14.2.ebuild b/dev-qt/qt3d/qt3d-5.14.2.ebuild
905 deleted file mode 100644
906 index 26d5cfdc5fd..00000000000
907 --- a/dev-qt/qt3d/qt3d-5.14.2.ebuild
908 +++ /dev/null
909 @@ -1,34 +0,0 @@
910 -# Copyright 1999-2020 Gentoo Authors
911 -# Distributed under the terms of the GNU General Public License v2
912 -
913 -EAPI=7
914 -inherit qt5-build
915 -
916 -DESCRIPTION="3D rendering module for the Qt5 framework"
917 -
918 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
919 - KEYWORDS="amd64 arm64 x86"
920 -fi
921 -
922 -# TODO: tools
923 -IUSE="gamepad gles2-only qml"
924 -
925 -DEPEND="
926 - ~dev-qt/qtconcurrent-${PV}
927 - ~dev-qt/qtcore-${PV}
928 - ~dev-qt/qtgui-${PV}
929 - ~dev-qt/qtnetwork-${PV}
930 - >=media-libs/assimp-4.0.0
931 - gamepad? ( ~dev-qt/qtgamepad-${PV} )
932 - qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] )
933 -"
934 -RDEPEND="${DEPEND}"
935 -
936 -src_prepare() {
937 - rm -r src/3rdparty/assimp/{code,contrib,include} || die
938 -
939 - qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri
940 - qt_use_disable_mod qml quick src/src.pro
941 -
942 - qt5-build_src_prepare
943 -}
944
945 diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
946 index d52059437dd..9bd72b0c690 100644
947 --- a/dev-qt/qtbluetooth/Manifest
948 +++ b/dev-qt/qtbluetooth/Manifest
949 @@ -1,2 +1 @@
950 -DIST qtconnectivity-everywhere-src-5.14.2.tar.xz 2804940 BLAKE2B d72e1159877049865d45c5aea8281fce87d797bb41cd82aac534463f48752f8144d018a9a1a23d153adc41b64559c0aa160c00ad1c30ce7790abb11f4ee1d87f SHA512 948050b915f6f2e1fffcb2c8b55d9061f25a82314d02e7a39faa9b88e065bb924ce5f8a7c26ed1f07b29b986d47acd5678f57bb96668d1c1ecd93ad3a7e40c7a
951 DIST qtconnectivity-everywhere-src-5.15.1.tar.xz 2814984 BLAKE2B b1c4e0525fd50af4971d97a4f735e5a9c2fd1bdb72bf2ee01e7136ce57da576d10e4083da7ecd3257471b7a9f7fed3b925b473dcc99ef81a3576fc81abbb7971 SHA512 ad7bad604c466461bcc7bfd889ecbb36e010c89ea1ecf7736f8b0ad49e682a1800cd2507b8d8c0b582c424b176f8179aeec85a6b0fc4ed933f8b6032e935d39a
952
953 diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.14.2-r1.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.14.2-r1.ebuild
954 deleted file mode 100644
955 index e9b3e7f2f77..00000000000
956 --- a/dev-qt/qtbluetooth/qtbluetooth-5.14.2-r1.ebuild
957 +++ /dev/null
958 @@ -1,33 +0,0 @@
959 -# Copyright 1999-2020 Gentoo Authors
960 -# Distributed under the terms of the GNU General Public License v2
961 -
962 -EAPI=7
963 -QT5_MODULE="qtconnectivity"
964 -inherit qt5-build
965 -
966 -DESCRIPTION="Bluetooth support library for the Qt5 framework"
967 -
968 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
969 - KEYWORDS="amd64 arm arm64 x86"
970 -fi
971 -
972 -IUSE="qml"
973 -
974 -RDEPEND="
975 - ~dev-qt/qtconcurrent-${PV}
976 - ~dev-qt/qtcore-${PV}:5=
977 - ~dev-qt/qtdbus-${PV}
978 - >=net-wireless/bluez-5:=
979 - qml? ( ~dev-qt/qtdeclarative-${PV} )
980 -"
981 -DEPEND="${RDEPEND}
982 - ~dev-qt/qtnetwork-${PV}
983 -"
984 -
985 -src_prepare() {
986 - sed -i -e 's/nfc//' src/src.pro || die
987 -
988 - qt_use_disable_mod qml quick src/src.pro
989 -
990 - qt5-build_src_prepare
991 -}
992
993 diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest
994 index 16104b4ec74..27e2f880d1b 100644
995 --- a/dev-qt/qtcharts/Manifest
996 +++ b/dev-qt/qtcharts/Manifest
997 @@ -1,2 +1 @@
998 -DIST qtcharts-everywhere-src-5.14.2.tar.xz 4250508 BLAKE2B 0f6839bceee19215e82355d66972af69a714e28a75609a0920cee0792e593070fea237e6760b86bda81299ecb9d6bd3561c0a90dafbd571d3a14b72212ddacb0 SHA512 2776db3dfe6f6f1047bd19d8d936d3f72de46c0807bbf02ba874053113d76df4cf80497d5ed2cee192ad94abb8e12b4fbce8359a63d8beb1190d491fc2da35bc
999 DIST qtcharts-everywhere-src-5.15.1.tar.xz 4251664 BLAKE2B 392464bfd9fecadf59f759284ff530a5dbeefa0ea31a2ec134538f0abe21ef517be319ab51ff0f0d0a29f68a4c7b3a2c8905484cd193a33626e6381c11880822 SHA512 7e644d4a674f175745646f8b541c8cfd972853fdf3a3ee5d0f7c23f035ae81cef0671292535fe65b1c276e4c54c7a48db1a1d2f9be97834513d154eea1666f3c
1000
1001 diff --git a/dev-qt/qtcharts/qtcharts-5.14.2.ebuild b/dev-qt/qtcharts/qtcharts-5.14.2.ebuild
1002 deleted file mode 100644
1003 index 8a4f4e2ff53..00000000000
1004 --- a/dev-qt/qtcharts/qtcharts-5.14.2.ebuild
1005 +++ /dev/null
1006 @@ -1,29 +0,0 @@
1007 -# Copyright 1999-2020 Gentoo Authors
1008 -# Distributed under the terms of the GNU General Public License v2
1009 -
1010 -EAPI=7
1011 -inherit qt5-build
1012 -
1013 -DESCRIPTION="Chart component library for the Qt5 framework"
1014 -LICENSE="GPL-3"
1015 -
1016 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
1017 - KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
1018 -fi
1019 -
1020 -IUSE="qml"
1021 -
1022 -DEPEND="
1023 - ~dev-qt/qtcore-${PV}
1024 - ~dev-qt/qtgui-${PV}
1025 - ~dev-qt/qtwidgets-${PV}
1026 - qml? ( ~dev-qt/qtdeclarative-${PV} )
1027 -"
1028 -RDEPEND="${DEPEND}"
1029 -
1030 -src_prepare() {
1031 - qt_use_disable_mod qml quick \
1032 - src/src.pro
1033 -
1034 - qt5-build_src_prepare
1035 -}
1036
1037 diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
1038 index d72f3b48819..98e054ddcf5 100644
1039 --- a/dev-qt/qtconcurrent/Manifest
1040 +++ b/dev-qt/qtconcurrent/Manifest
1041 @@ -1,2 +1 @@
1042 -DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
1043 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
1044
1045 diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.14.2.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.14.2.ebuild
1046 deleted file mode 100644
1047 index 5dc681ed53a..00000000000
1048 --- a/dev-qt/qtconcurrent/qtconcurrent-5.14.2.ebuild
1049 +++ /dev/null
1050 @@ -1,23 +0,0 @@
1051 -# Copyright 1999-2020 Gentoo Authors
1052 -# Distributed under the terms of the GNU General Public License v2
1053 -
1054 -EAPI=7
1055 -QT5_MODULE="qtbase"
1056 -inherit qt5-build
1057 -
1058 -DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
1059 -
1060 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
1061 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
1062 -fi
1063 -
1064 -IUSE=""
1065 -
1066 -DEPEND="
1067 - ~dev-qt/qtcore-${PV}:5=
1068 -"
1069 -RDEPEND="${DEPEND}"
1070 -
1071 -QT5_TARGET_SUBDIRS=(
1072 - src/concurrent
1073 -)
1074
1075 diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
1076 index d72f3b48819..98e054ddcf5 100644
1077 --- a/dev-qt/qtcore/Manifest
1078 +++ b/dev-qt/qtcore/Manifest
1079 @@ -1,2 +1 @@
1080 -DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
1081 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
1082
1083 diff --git a/dev-qt/qtcore/files/qtcore-5.14.2-QLibrary-deadlock.patch b/dev-qt/qtcore/files/qtcore-5.14.2-QLibrary-deadlock.patch
1084 deleted file mode 100644
1085 index 6a9c9921b7d..00000000000
1086 --- a/dev-qt/qtcore/files/qtcore-5.14.2-QLibrary-deadlock.patch
1087 +++ /dev/null
1088 @@ -1,106 +0,0 @@
1089 -From 276fa8383a7535765be7182883ef4aade17ce013 Mon Sep 17 00:00:00 2001
1090 -From: Thiago Macieira <thiago.macieira@×××××.com>
1091 -Date: Thu, 2 Apr 2020 12:08:41 -0300
1092 -Subject: [PATCH] QLibrary: fix deadlock caused by fix to QTBUG-39642
1093 -
1094 -Commit ae6f73e8566fa76470937aca737141183929a5ec inserted a mutex around
1095 -the entire load_sys(). We had reasoed that deadlocks would only occur if
1096 -the object creation in instance() recursed into its own instance(),
1097 -which was already a bug. But we had forgotten that dlopen()/
1098 -LoadLibrary() executes initialization code from the module being loaded,
1099 -which could cause a recursion back into the same QPluginLoader or
1100 -QLibrary object. This recursion is benign because the module *is* loaded
1101 -and dlopen()/LoadLibrary() returns the same handle.
1102 -
1103 -[ChangeLog][QtCore][QLibrary and QPluginLoader] Fixed a deadlock that
1104 -would happen if the plugin or library being loaded has load-time
1105 -initialization code (C++ global variables) that recursed back into the
1106 -same QLibrary or QPluginLoader object.
1107 -
1108 -PS: QLibraryPrivate::loadPlugin() updates pluginState outside a mutex
1109 -lock, so pluginState should be made an atomic variable. Once that is
1110 -done, we'll only need locking the mutex to update errorString (no
1111 -locking before loading).
1112 -
1113 -Fixes: QTBUG-83207
1114 -Task-number: QTBUG-39642
1115 -Change-Id: Ibdc95e9af7bd456a94ecfffd160209304e5ab2eb
1116 -Reviewed-by: Volker Hilsheimer <volker.hilsheimer@××.io>
1117 -Reviewed-by: David Faure <david.faure@××××.com>
1118 ----
1119 - src/corelib/plugin/qlibrary.cpp | 2 --
1120 - src/corelib/plugin/qlibrary_unix.cpp | 4 ++++
1121 - src/corelib/plugin/qlibrary_win.cpp | 3 +++
1122 - 3 files changed, 7 insertions(+), 2 deletions(-)
1123 -
1124 -diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp
1125 -index ddb053c26fa..be9d92b2048 100644
1126 ---- a/src/corelib/plugin/qlibrary.cpp
1127 -+++ b/src/corelib/plugin/qlibrary.cpp
1128 -@@ -576,9 +576,7 @@ bool QLibraryPrivate::load()
1129 -
1130 - Q_TRACE(QLibraryPrivate_load_entry, fileName);
1131 -
1132 -- mutex.lock();
1133 - bool ret = load_sys();
1134 -- mutex.unlock();
1135 - if (qt_debug_component()) {
1136 - if (ret) {
1137 - qDebug() << "loaded library" << fileName;
1138 -diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp
1139 -index 017aa97b66a..a5c72f81d96 100644
1140 ---- a/src/corelib/plugin/qlibrary_unix.cpp
1141 -+++ b/src/corelib/plugin/qlibrary_unix.cpp
1142 -@@ -123,6 +123,7 @@ QStringList QLibraryPrivate::prefixes_sys()
1143 -
1144 - bool QLibraryPrivate::load_sys()
1145 - {
1146 -+ QMutexLocker locker(&mutex);
1147 - QString attempt;
1148 - QFileSystemEntry fsEntry(fileName);
1149 -
1150 -@@ -213,6 +214,7 @@ bool QLibraryPrivate::load_sys()
1151 - }
1152 - #endif
1153 -
1154 -+ locker.unlock();
1155 - bool retry = true;
1156 - Handle hnd = nullptr;
1157 - for (int prefix = 0; retry && !hnd && prefix < prefixes.size(); prefix++) {
1158 -@@ -273,6 +275,8 @@ bool QLibraryPrivate::load_sys()
1159 - }
1160 - }
1161 - #endif
1162 -+
1163 -+ locker.relock();
1164 - if (!hnd) {
1165 - errorString = QLibrary::tr("Cannot load library %1: %2").arg(fileName, qdlerror());
1166 - }
1167 -diff --git a/src/corelib/plugin/qlibrary_win.cpp b/src/corelib/plugin/qlibrary_win.cpp
1168 -index 000bf762763..ef58724be8e 100644
1169 ---- a/src/corelib/plugin/qlibrary_win.cpp
1170 -+++ b/src/corelib/plugin/qlibrary_win.cpp
1171 -@@ -78,6 +78,7 @@ bool QLibraryPrivate::load_sys()
1172 - // fileName
1173 - //
1174 - // NB If it's a plugin we do not ever try the ".dll" extension
1175 -+ QMutexLocker locker(&mutex);
1176 - QStringList attempts;
1177 -
1178 - if (pluginState != IsAPlugin)
1179 -@@ -95,6 +96,7 @@ bool QLibraryPrivate::load_sys()
1180 - attempts.prepend(QDir::rootPath() + fileName);
1181 - #endif
1182 -
1183 -+ locker.unlock();
1184 - Handle hnd = nullptr;
1185 - for (const QString &attempt : qAsConst(attempts)) {
1186 - #ifndef Q_OS_WINRT
1187 -@@ -115,6 +117,7 @@ bool QLibraryPrivate::load_sys()
1188 - #ifndef Q_OS_WINRT
1189 - SetErrorMode(oldmode);
1190 - #endif
1191 -+ locker.relock();
1192 - if (!hnd) {
1193 - errorString = QLibrary::tr("Cannot load library %1: %2").arg(
1194 - QDir::toNativeSeparators(fileName), qt_error_string());
1195
1196 diff --git a/dev-qt/qtcore/qtcore-5.14.2.ebuild b/dev-qt/qtcore/qtcore-5.14.2.ebuild
1197 deleted file mode 100644
1198 index 48df292f53b..00000000000
1199 --- a/dev-qt/qtcore/qtcore-5.14.2.ebuild
1200 +++ /dev/null
1201 @@ -1,103 +0,0 @@
1202 -# Copyright 1999-2020 Gentoo Authors
1203 -# Distributed under the terms of the GNU General Public License v2
1204 -
1205 -EAPI=7
1206 -
1207 -QT5_MODULE="qtbase"
1208 -inherit linux-info qt5-build
1209 -
1210 -DESCRIPTION="Cross-platform application development framework"
1211 -SLOT=5/$(ver_cut 1-3)
1212 -
1213 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
1214 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
1215 -fi
1216 -
1217 -IUSE="icu old-kernel systemd"
1218 -
1219 -DEPEND="
1220 - dev-libs/double-conversion:=
1221 - dev-libs/glib:2
1222 - dev-libs/libpcre2[pcre16,unicode]
1223 - sys-libs/zlib:=
1224 - icu? ( dev-libs/icu:= )
1225 - !icu? ( virtual/libiconv )
1226 - systemd? ( sys-apps/systemd:= )
1227 -"
1228 -RDEPEND="${DEPEND}
1229 - !<dev-qt/qtcore-4.8.7-r4:4
1230 -"
1231 -
1232 -QT5_TARGET_SUBDIRS=(
1233 - src/tools/bootstrap
1234 - src/tools/moc
1235 - src/tools/rcc
1236 - src/corelib
1237 - src/tools/qlalr
1238 - doc
1239 -)
1240 -
1241 -QT5_GENTOO_PRIVATE_CONFIG=(
1242 - !:network
1243 - !:sql
1244 - !:testlib
1245 - !:xml
1246 -)
1247 -
1248 -PATCHES=(
1249 - "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
1250 - "${FILESDIR}/${P}-QLibrary-deadlock.patch" # QTBUG-83207
1251 -)
1252 -
1253 -pkg_pretend() {
1254 - use kernel_linux || return
1255 - get_running_version
1256 - if kernel_is -lt 3 17 && ! use old-kernel; then
1257 - ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for"
1258 - ewarn "dev-qt/qtcore to function on this kernel properly. See Bug #669994."
1259 - fi
1260 -}
1261 -
1262 -src_prepare() {
1263 - # don't add -O3 to CXXFLAGS, bug 549140
1264 - sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
1265 -
1266 - # fix missing qt_version_tag symbol w/ LTO, bug 674382
1267 - sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
1268 -
1269 - qt5-build_src_prepare
1270 -}
1271 -
1272 -src_configure() {
1273 - local myconf=(
1274 - -no-feature-statx # bug 672856
1275 - $(qt_use icu)
1276 - $(qt_use !icu iconv)
1277 - $(qt_use systemd journald)
1278 - )
1279 - use old-kernel && myconf+=(
1280 - -no-feature-renameat2 # needs Linux 3.16, bug 669994
1281 - -no-feature-getentropy # needs Linux 3.17, bug 669994
1282 - )
1283 - qt5-build_src_configure
1284 -}
1285 -
1286 -src_install() {
1287 - qt5-build_src_install
1288 -
1289 - local flags=(
1290 - DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
1291 - OPENGL OPENSSL SSL WIDGETS
1292 - )
1293 -
1294 - for flag in ${flags[@]}; do
1295 - cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
1296 -
1297 - #if defined(QT_NO_${flag}) && defined(QT_${flag})
1298 - # undef QT_NO_${flag}
1299 - #elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
1300 - # define QT_NO_${flag}
1301 - #endif
1302 - _EOF_
1303 - done
1304 -}
1305
1306 diff --git a/dev-qt/qtdatavis3d/Manifest b/dev-qt/qtdatavis3d/Manifest
1307 index c40e59ba351..be5bbdcc3e6 100644
1308 --- a/dev-qt/qtdatavis3d/Manifest
1309 +++ b/dev-qt/qtdatavis3d/Manifest
1310 @@ -1,2 +1 @@
1311 -DIST qtdatavis3d-everywhere-src-5.14.2.tar.xz 5190800 BLAKE2B 2e60bb97526bfac4c9bd70aae8885fc5f9b7704f8dbe8cff726ef6a60d83507f4d9c59a92b45a3fce78c21ed6d7e41466acec00910e96921a73b5d9bc9fa130d SHA512 25d207e045e58f9edc3a661b641225f6a11eb45f723847281007fa53b753430dc5792e31bdd142c95e886bfda5f6d29826cd151cb23a1e1a81cc0b91d5f7a2f6
1312 DIST qtdatavis3d-everywhere-src-5.15.1.tar.xz 5191624 BLAKE2B ac6f6591f12e00bd9e473da0441d6863b1ffc44d125998a530a3993e9489ee56ed5c9d30e9842fc2b4a4b22110a0296709834582025d50c34653f90be5f08393 SHA512 3f11cddebd29aa90ce62fa19f9ab33026393bf95525bea7c4514e04acef23db9dbfdf000aa885aa2f823b1cd6ca99ac2a1f8afaabe67ee13785d5e4650aa4c97
1313
1314 diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.14.2.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.14.2.ebuild
1315 deleted file mode 100644
1316 index b14bfaf7cb4..00000000000
1317 --- a/dev-qt/qtdatavis3d/qtdatavis3d-5.14.2.ebuild
1318 +++ /dev/null
1319 @@ -1,31 +0,0 @@
1320 -# Copyright 1999-2020 Gentoo Authors
1321 -# Distributed under the terms of the GNU General Public License v2
1322 -
1323 -EAPI=7
1324 -inherit qt5-build
1325 -
1326 -DESCRIPTION="3D data visualization library for the Qt5 framework"
1327 -LICENSE="GPL-3"
1328 -
1329 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
1330 - KEYWORDS="amd64 arm64 x86"
1331 -fi
1332 -
1333 -IUSE="gles2-only qml"
1334 -
1335 -DEPEND="
1336 - ~dev-qt/qtcore-${PV}
1337 - ~dev-qt/qtgui-${PV}[gles2-only=]
1338 - qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] )
1339 -"
1340 -RDEPEND="${DEPEND}"
1341 -
1342 -src_prepare() {
1343 - # eliminate bogus dependency on qtwidgets
1344 - sed -i -e '/requires.*widgets/d' qtdatavis3d.pro || die
1345 -
1346 - qt_use_disable_mod qml quick \
1347 - src/src.pro
1348 -
1349 - qt5-build_src_prepare
1350 -}
1351
1352 diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
1353 index d72f3b48819..98e054ddcf5 100644
1354 --- a/dev-qt/qtdbus/Manifest
1355 +++ b/dev-qt/qtdbus/Manifest
1356 @@ -1,2 +1 @@
1357 -DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
1358 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
1359
1360 diff --git a/dev-qt/qtdbus/qtdbus-5.14.2.ebuild b/dev-qt/qtdbus/qtdbus-5.14.2.ebuild
1361 deleted file mode 100644
1362 index f0425f0dc00..00000000000
1363 --- a/dev-qt/qtdbus/qtdbus-5.14.2.ebuild
1364 +++ /dev/null
1365 @@ -1,43 +0,0 @@
1366 -# Copyright 1999-2020 Gentoo Authors
1367 -# Distributed under the terms of the GNU General Public License v2
1368 -
1369 -EAPI=7
1370 -QT5_MODULE="qtbase"
1371 -inherit qt5-build
1372 -
1373 -DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
1374 -
1375 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
1376 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
1377 -fi
1378 -
1379 -IUSE=""
1380 -
1381 -DEPEND="
1382 - ~dev-qt/qtcore-${PV}:5=
1383 - >=sys-apps/dbus-1.4.20
1384 -"
1385 -RDEPEND="${DEPEND}"
1386 -
1387 -QT5_TARGET_SUBDIRS=(
1388 - src/dbus
1389 - src/tools/qdbusxml2cpp
1390 - src/tools/qdbuscpp2xml
1391 -)
1392 -
1393 -QT5_GENTOO_CONFIG=(
1394 - :dbus
1395 - :dbus-linked:
1396 -)
1397 -
1398 -QT5_GENTOO_PRIVATE_CONFIG=(
1399 - :dbus
1400 - :dbus-linked
1401 -)
1402 -
1403 -src_configure() {
1404 - local myconf=(
1405 - -dbus-linked
1406 - )
1407 - qt5-build_src_configure
1408 -}
1409
1410 diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
1411 index fc9e295e584..a84d768da2c 100644
1412 --- a/dev-qt/qtdeclarative/Manifest
1413 +++ b/dev-qt/qtdeclarative/Manifest
1414 @@ -1,2 +1 @@
1415 -DIST qtdeclarative-everywhere-src-5.14.2.tar.xz 21305980 BLAKE2B 0ccbae8ddc46f4891af6732a4b3cf874c523c7ded5a06f78c7c5cd290fef8e32ad6efe5dcffe947024144128ab2f1108594e4a30da9ca79e1ce3008c73ca2a25 SHA512 48d3a547237514a8bdc2a4c0b3f97732abceacece0e0899d2f33787293eb99f54c28efce35a34b8c46dcd4d78ebbc88bfc820bc68496076eacace40aaceee004
1416 DIST qtdeclarative-everywhere-src-5.15.1.tar.xz 21558724 BLAKE2B 15da5471799e461e5f5983fb0d947cad9d635a1bb0760da0b709f273ba9a9846df442f424d2009e857d831695d14a92c9be941270a07dc0f33cc46382ba44e6f SHA512 193ec706b764330a2ae00614b13482b7586642f9cfd32458e8c975daa07ba25f0f9887de0918c4034f52f613b860677c09c46a3b7d07d4229446cfc0805bcccd
1417
1418 diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-QQuickMouseArea-stuck-in-pressed-state.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-QQuickMouseArea-stuck-in-pressed-state.patch
1419 deleted file mode 100644
1420 index 1dd0ff1155d..00000000000
1421 --- a/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-QQuickMouseArea-stuck-in-pressed-state.patch
1422 +++ /dev/null
1423 @@ -1,55 +0,0 @@
1424 -From 8ace780b5aa298e3c01903bfd57f766a42209191 Mon Sep 17 00:00:00 2001
1425 -From: Frederik Gladhorn <frederik.gladhorn@××××××××××.com>
1426 -Date: Sat, 28 Mar 2020 15:14:41 +0100
1427 -Subject: [PATCH] Fix QQuickMouseArea getting stuck in pressed state when
1428 - hiding in press
1429 -MIME-Version: 1.0
1430 -Content-Type: text/plain; charset=utf8
1431 -Content-Transfer-Encoding: 8bit
1432 -
1433 -In 78c1fcbc49f56463064eef738a475d9018357b24 we stopped giving the
1434 -exclusive grab to hidden or disabled items with is good. But the change
1435 -did not take into consideration how mouse area handles its internal
1436 -state.
1437 -
1438 -As a simple example: A mouse area that would set itself hiddin in the
1439 -press handler, would continue to have d->pressed == true, which means it
1440 -would not react to any future press events.
1441 -
1442 -The fix is to let mouse area check in its change handler whether it has
1443 -become invisible.
1444 -The test also checks that enabled behaves the same way. There is no
1445 -action needed, since mouse area does completely custom handling of
1446 -enabled (maybe something to fix in Qt 6), disabling a mouse area doesn't
1447 -disable its children for example, it doesn't invoke
1448 -QQuickItem::setEnabled at all. Due to this circumventing the common
1449 -behavior, by chance disabling a mouse area in the on pressed handler
1450 -works.
1451 -
1452 -Fixes: QTBUG-74987
1453 -Change-Id: Idb8499b3e5bcb744fbba203fdea5c46695bd5077
1454 -Reviewed-by: Jan Arve Sæther <jan-arve.saether@××.io>
1455 ----
1456 - src/quick/items/qquickmousearea.cpp | 6 ++++
1457 - 3 files changed, 80 insertions(+)
1458 - create mode 100644 tests/auto/quick/qquickmousearea/data/settingHiddenInPressUngrabs.qml
1459 -
1460 -diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp
1461 -index 368379f5c40..dc60712a9cd 100644
1462 ---- a/src/quick/items/qquickmousearea.cpp
1463 -+++ b/src/quick/items/qquickmousearea.cpp
1464 -@@ -1083,6 +1083,12 @@ void QQuickMouseArea::itemChange(ItemChange change, const ItemChangeData &value)
1465 - }
1466 - setHovered(!d->hovered);
1467 - }
1468 -+ if (d->pressed && (!isVisible())) {
1469 -+ // This happens when the mouse area sets itself disabled or hidden
1470 -+ // inside the press handler. In that case we should not keep the internal
1471 -+ // state as pressed, since we never became the mouse grabber.
1472 -+ ungrabMouse();
1473 -+ }
1474 - break;
1475 - default:
1476 - break;
1477 ---
1478 -2.16.3
1479
1480 diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch
1481 deleted file mode 100644
1482 index 23eaa7d5100..00000000000
1483 --- a/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch
1484 +++ /dev/null
1485 @@ -1,64 +0,0 @@
1486 -From e807f9d1d80559b8ff91f1c3cfdd755b3da56a6d Mon Sep 17 00:00:00 2001
1487 -From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@××.io>
1488 -Date: Tue, 5 May 2020 11:36:24 +0200
1489 -Subject: [PATCH] Fix subpixel positioned text with Text.NativeRendering
1490 -
1491 -We would be generating subpixel positioned glyphs based on the
1492 -relative positions of the glyphs, ignoring the fractional part
1493 -contributed by the origin of the text. So if the text origin was
1494 -inside a pixel, the subpixel antialiasing would be wrong and we
1495 -would see kerning errors.
1496 -
1497 -This was especially visible when using AlignHCenter on text
1498 -with hinting disabled and resizing the item it was aligning to.
1499 -
1500 -Pick-to: 5.15
1501 -Task-number: QTBUG-49646
1502 -Change-Id: I0e709ba2b5d2440e34c94c6f819befe0a65a113a
1503 -Reviewed-by: Lars Knoll <lars.knoll@××.io>
1504 -Reviewed-by: Konstantin Ritt <ritt.ks@×××××.com>
1505 ----
1506 - src/quick/scenegraph/qsgdefaultglyphnode_p.cpp | 9 ++++-----
1507 - 1 file changed, 4 insertions(+), 5 deletions(-)
1508 -
1509 -diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
1510 -index cfa645bfd03..f73b64f537f 100644
1511 ---- a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
1512 -+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
1513 -@@ -789,11 +789,12 @@ void QSGTextMaskMaterial::populate(const QPointF &p,
1514 - const QMargins &margins)
1515 - {
1516 - Q_ASSERT(m_font.isValid());
1517 -+ QPointF position(p.x(), p.y() - m_font.ascent());
1518 - QVector<QFixedPoint> fixedPointPositions;
1519 - const int glyphPositionsSize = glyphPositions.size();
1520 - fixedPointPositions.reserve(glyphPositionsSize);
1521 - for (int i=0; i < glyphPositionsSize; ++i)
1522 -- fixedPointPositions.append(QFixedPoint::fromPointF(glyphPositions.at(i)));
1523 -+ fixedPointPositions.append(QFixedPoint::fromPointF(position + glyphPositions.at(i)));
1524 -
1525 - QTextureGlyphCache *cache = glyphCache();
1526 -
1527 -@@ -815,18 +816,16 @@ void QSGTextMaskMaterial::populate(const QPointF &p,
1528 - Q_ASSERT(geometry->sizeOfVertex() == sizeof(QVector4D));
1529 - ushort *ip = geometry->indexDataAsUShort();
1530 -
1531 -- QPointF position(p.x(), p.y() - m_font.ascent());
1532 - bool supportsSubPixelPositions = fontD->fontEngine->supportsSubPixelPositions();
1533 - for (int i=0; i<glyphIndexes.size(); ++i) {
1534 -+ QPointF glyphPosition = glyphPositions.at(i) + position;
1535 - QFixed subPixelPosition;
1536 - if (supportsSubPixelPositions)
1537 -- subPixelPosition = fontD->fontEngine->subPixelPositionForX(QFixed::fromReal(glyphPositions.at(i).x()));
1538 -+ subPixelPosition = fontD->fontEngine->subPixelPositionForX(QFixed::fromReal(glyphPosition.x()));
1539 -
1540 - QTextureGlyphCache::GlyphAndSubPixelPosition glyph(glyphIndexes.at(i), subPixelPosition);
1541 - const QTextureGlyphCache::Coord &c = cache->coords.value(glyph);
1542 -
1543 -- QPointF glyphPosition = glyphPositions.at(i) + position;
1544 --
1545 - // On a retina screen the glyph positions are not pre-scaled (as opposed to
1546 - // eg. the raster paint engine). To ensure that we get the same behavior as
1547 - // the raster engine (and CoreText itself) when it comes to rounding of the
1548 ---
1549 -2.16.3
1550
1551 diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r4.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r4.ebuild
1552 deleted file mode 100644
1553 index ee5e2c5a785..00000000000
1554 --- a/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r4.ebuild
1555 +++ /dev/null
1556 @@ -1,59 +0,0 @@
1557 -# Copyright 2009-2020 Gentoo Authors
1558 -# Distributed under the terms of the GNU General Public License v2
1559 -
1560 -EAPI=7
1561 -PYTHON_COMPAT=( python3_{6,7,8} )
1562 -inherit python-any-r1 qt5-build
1563 -
1564 -DESCRIPTION="The QML and Quick modules for the Qt5 framework"
1565 -
1566 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
1567 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
1568 -fi
1569 -
1570 -IUSE="gles2-only +jit localstorage vulkan +widgets"
1571 -
1572 -BDEPEND="${PYTHON_DEPS}"
1573 -# qtgui[gles2-only=] is needed because of bug 504322
1574 -DEPEND="
1575 - ~dev-qt/qtcore-${PV}
1576 - ~dev-qt/qtgui-${PV}:5=[gles2-only=,vulkan=]
1577 - ~dev-qt/qtnetwork-${PV}
1578 - ~dev-qt/qttest-${PV}
1579 - localstorage? ( ~dev-qt/qtsql-${PV} )
1580 - widgets? ( ~dev-qt/qtwidgets-${PV}[gles2-only=] )
1581 -"
1582 -RDEPEND="${DEPEND}
1583 - !<dev-qt/qtquickcontrols-5.7:5
1584 -"
1585 -
1586 -PATCHES=(
1587 - "${FILESDIR}/${P}-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
1588 - "${FILESDIR}/${P}-fix-subpixel-positioned-text.patch" # QTBUG-49646
1589 - "${FILESDIR}/${P}-QQuickMouseArea-stuck-in-pressed-state.patch" # QTBUG-74987
1590 -)
1591 -
1592 -src_prepare() {
1593 - use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
1594 -
1595 - qt_use_disable_mod localstorage sql \
1596 - src/imports/imports.pro
1597 -
1598 - qt_use_disable_mod widgets widgets \
1599 - src/src.pro \
1600 - src/qmltest/qmltest.pro \
1601 - tests/auto/auto.pro \
1602 - tools/tools.pro \
1603 - tools/qmlscene/qmlscene.pro \
1604 - tools/qml/qml.pro
1605 -
1606 - qt5-build_src_prepare
1607 -}
1608 -
1609 -src_configure() {
1610 - local myqmakeargs=(
1611 - --
1612 - -qml-debug
1613 - )
1614 - qt5-build_src_configure
1615 -}
1616
1617 diff --git a/dev-qt/qtdiag/Manifest b/dev-qt/qtdiag/Manifest
1618 index 203fdae199c..3792b4301e9 100644
1619 --- a/dev-qt/qtdiag/Manifest
1620 +++ b/dev-qt/qtdiag/Manifest
1621 @@ -1,2 +1 @@
1622 -DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
1623 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
1624
1625 diff --git a/dev-qt/qtdiag/qtdiag-5.14.2.ebuild b/dev-qt/qtdiag/qtdiag-5.14.2.ebuild
1626 deleted file mode 100644
1627 index cdbb37ad3e6..00000000000
1628 --- a/dev-qt/qtdiag/qtdiag-5.14.2.ebuild
1629 +++ /dev/null
1630 @@ -1,36 +0,0 @@
1631 -# Copyright 1999-2020 Gentoo Authors
1632 -# Distributed under the terms of the GNU General Public License v2
1633 -
1634 -EAPI=7
1635 -QT5_MODULE="qttools"
1636 -inherit qt5-build
1637 -
1638 -DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
1639 -
1640 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
1641 - KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~sparc x86"
1642 -fi
1643 -
1644 -IUSE="+network +widgets"
1645 -
1646 -DEPEND="
1647 - ~dev-qt/qtcore-${PV}:5=
1648 - ~dev-qt/qtgui-${PV}:5=
1649 - network? ( ~dev-qt/qtnetwork-${PV}[ssl] )
1650 - widgets? ( ~dev-qt/qtwidgets-${PV} )
1651 -"
1652 -RDEPEND="${DEPEND}"
1653 -
1654 -QT5_TARGET_SUBDIRS=(
1655 - src/qtdiag
1656 -)
1657 -
1658 -src_prepare() {
1659 - qt_use_disable_mod network network \
1660 - src/qtdiag/qtdiag.pro
1661 -
1662 - qt_use_disable_mod widgets widgets \
1663 - src/qtdiag/qtdiag.pro
1664 -
1665 - qt5-build_src_prepare
1666 -}
1667
1668 diff --git a/dev-qt/qtgamepad/Manifest b/dev-qt/qtgamepad/Manifest
1669 index 5585a9d58dc..c45e2180a9a 100644
1670 --- a/dev-qt/qtgamepad/Manifest
1671 +++ b/dev-qt/qtgamepad/Manifest
1672 @@ -1,2 +1 @@
1673 -DIST qtgamepad-everywhere-src-5.14.2.tar.xz 386940 BLAKE2B e1f9312f5007eea0f8126bd1145be603958a6e0833e74f2fe116595d7afa07ba7868d4dce91281440755ce7ff98445bdb38fc09e54ef35ec57dd156fadcaf23e SHA512 23971fae9b1626afc005dccae3bb715f719695bf5e24a1711b3e7049ce49ef5c72097e1eb702464ab7663d41750bf4103e4ed78ee7954269921e3064b79f4c05
1674 DIST qtgamepad-everywhere-src-5.15.1.tar.xz 387004 BLAKE2B 26e7e766121b18851f28c514e4cb7c144f1cce506ef80dc9db4034639df0c77671b5be618d318bb20c8aba290f1a3ed1d99d3a23fac83bc0942063d2cb4f77c2 SHA512 f74933f9e28d0db03d30743e7d75c7a1ba28fa03d97aa894b5cbc306a2d501c27ec40eb84c6b999a6e5ed01b3126bfa992a3a3ca28246310edfe1f2fc12c1d88
1675
1676 diff --git a/dev-qt/qtgamepad/qtgamepad-5.14.2.ebuild b/dev-qt/qtgamepad/qtgamepad-5.14.2.ebuild
1677 deleted file mode 100644
1678 index 5354d14f6fb..00000000000
1679 --- a/dev-qt/qtgamepad/qtgamepad-5.14.2.ebuild
1680 +++ /dev/null
1681 @@ -1,35 +0,0 @@
1682 -# Copyright 1999-2020 Gentoo Authors
1683 -# Distributed under the terms of the GNU General Public License v2
1684 -
1685 -EAPI=7
1686 -inherit qt5-build
1687 -
1688 -DESCRIPTION="Qt module to support gamepad hardware"
1689 -
1690 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
1691 - KEYWORDS="amd64 arm64 x86"
1692 -fi
1693 -
1694 -IUSE="evdev qml sdl"
1695 -
1696 -DEPEND="
1697 - ~dev-qt/qtcore-${PV}
1698 - ~dev-qt/qtgui-${PV}[evdev?]
1699 - evdev? ( virtual/libudev:= )
1700 - qml? ( ~dev-qt/qtdeclarative-${PV} )
1701 - sdl? ( media-libs/libsdl )
1702 -"
1703 -RDEPEND="${DEPEND}"
1704 -
1705 -src_prepare() {
1706 - qt_use_disable_mod qml quick \
1707 - src/src.pro
1708 -
1709 - qt_use_disable_config evdev evdev \
1710 - src/plugins/gamepads/gamepads.pro
1711 -
1712 - qt_use_disable_config sdl sdl2 \
1713 - src/plugins/gamepads/gamepads.pro
1714 -
1715 - qt5-build_src_prepare
1716 -}
1717
1718 diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
1719 index d4149856750..ce038e4cbf1 100644
1720 --- a/dev-qt/qtgraphicaleffects/Manifest
1721 +++ b/dev-qt/qtgraphicaleffects/Manifest
1722 @@ -1,2 +1 @@
1723 -DIST qtgraphicaleffects-everywhere-src-5.14.2.tar.xz 14040880 BLAKE2B 7fe0d534b9365e02c6a9499a7d0ef5d2e87a9c46819f05ad5052a23400bf90070b6ec9e7aad8a76de63760bea7853c29a1e01eb055956588f46347525a86f2e1 SHA512 fa6ed3eff243675f9d0bfa71b2886804e4902cf9d7d91d5dec0f8e4f060ee7c347ba7775a89e3f8effd0ffed8314f916b55f09056902abc892ee27e79ce2925c
1724 DIST qtgraphicaleffects-everywhere-src-5.15.1.tar.xz 14040940 BLAKE2B 1e49e58efeedadccb76c680ef80b017fbf5ff62df25140e0ef7012caacab0db67307f1a6ffd0cfe28e76b67ace61c858b1e34994c700b2a533233b9659efb970 SHA512 651f8d96199b6324726fcf97eebf16a3ee40e5a9523a3c03255ca4201228b8d02314d5dd9722f59d44f09b4ff8dd722fb276b9af7f65728693a2c4ee62f781c1
1725
1726 diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.14.2.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.14.2.ebuild
1727 deleted file mode 100644
1728 index f778c7d5a49..00000000000
1729 --- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.14.2.ebuild
1730 +++ /dev/null
1731 @@ -1,21 +0,0 @@
1732 -# Copyright 1999-2020 Gentoo Authors
1733 -# Distributed under the terms of the GNU General Public License v2
1734 -
1735 -EAPI=7
1736 -VIRTUALX_REQUIRED="test"
1737 -inherit qt5-build
1738 -
1739 -DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
1740 -
1741 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
1742 - KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86"
1743 -fi
1744 -
1745 -IUSE=""
1746 -
1747 -RDEPEND="
1748 - ~dev-qt/qtcore-${PV}
1749 - ~dev-qt/qtdeclarative-${PV}
1750 - ~dev-qt/qtgui-${PV}
1751 -"
1752 -DEPEND="${RDEPEND}"
1753
1754 diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
1755 index d72f3b48819..98e054ddcf5 100644
1756 --- a/dev-qt/qtgui/Manifest
1757 +++ b/dev-qt/qtgui/Manifest
1758 @@ -1,2 +1 @@
1759 -DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
1760 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
1761
1762 diff --git a/dev-qt/qtgui/files/qtgui-5.14.2-CVE-2020-17507.patch b/dev-qt/qtgui/files/qtgui-5.14.2-CVE-2020-17507.patch
1763 deleted file mode 100644
1764 index cad9aa4b682..00000000000
1765 --- a/dev-qt/qtgui/files/qtgui-5.14.2-CVE-2020-17507.patch
1766 +++ /dev/null
1767 @@ -1,39 +0,0 @@
1768 -From 1616c71921b73b227f56ccb3f2c49a994ec23440 Mon Sep 17 00:00:00 2001
1769 -From: Allan Sandfeld Jensen <allan.jensen@××.io>
1770 -Date: Thu, 23 Jul 2020 11:48:48 +0200
1771 -Subject: Fix buffer overflow in XBM parser
1772 -
1773 -Avoid parsing over the buffer limit, or interpreting non-hex
1774 -as hex.
1775 -
1776 -This still leaves parsing of lines longer than 300 chars
1777 -unreliable
1778 -
1779 -Change-Id: I1c57a7e530c4380f6f9040b2ec729ccd7dc7a5fb
1780 -Reviewed-by: Robert Loehning <robert.loehning@××.io>
1781 -Reviewed-by: Eirik Aavitsland <eirik.aavitsland@××.io>
1782 -(cherry picked from commit c562c1fc19629fb505acd0f6380604840b634211)
1783 -Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@××××××××××.org>
1784 ----
1785 - src/gui/image/qxbmhandler.cpp | 4 ++-
1786 - .../gui/image/qimagereader/tst_qimagereader.cpp | 38 ++++++++++++++++++++++
1787 - 2 files changed, 41 insertions(+), 1 deletion(-)
1788 -
1789 -diff --git a/src/gui/image/qxbmhandler.cpp b/src/gui/image/qxbmhandler.cpp
1790 -index f06561690c..72ce7f7ecd 100644
1791 ---- a/src/gui/image/qxbmhandler.cpp
1792 -+++ b/src/gui/image/qxbmhandler.cpp
1793 -@@ -159,7 +159,9 @@ static bool read_xbm_body(QIODevice *device, int w, int h, QImage *outImage)
1794 - w = (w+7)/8; // byte width
1795 -
1796 - while (y < h) { // for all encoded bytes...
1797 -- if (p) { // p = "0x.."
1798 -+ if (p && p < (buf + readBytes - 3)) { // p = "0x.."
1799 -+ if (!isxdigit(p[2]) || !isxdigit(p[3]))
1800 -+ return false;
1801 - *b++ = hex2byte(p+2);
1802 - p += 2;
1803 - if (++x == w && ++y < h) {
1804 ---
1805 -cgit v1.2.1
1806 -
1807
1808 diff --git a/dev-qt/qtgui/qtgui-5.14.2-r1.ebuild b/dev-qt/qtgui/qtgui-5.14.2-r1.ebuild
1809 deleted file mode 100644
1810 index 1f42c15329e..00000000000
1811 --- a/dev-qt/qtgui/qtgui-5.14.2-r1.ebuild
1812 +++ /dev/null
1813 @@ -1,185 +0,0 @@
1814 -# Copyright 1999-2020 Gentoo Authors
1815 -# Distributed under the terms of the GNU General Public License v2
1816 -
1817 -EAPI=7
1818 -
1819 -QT5_MODULE="qtbase"
1820 -inherit qt5-build
1821 -
1822 -DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
1823 -SLOT=5/$(ver_cut 1-3) # bug 707658
1824 -
1825 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
1826 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
1827 -fi
1828 -
1829 -# TODO: linuxfb
1830 -
1831 -IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
1832 - +libinput +png tslib tuio +udev vnc vulkan wayland +X"
1833 -REQUIRED_USE="
1834 - || ( eglfs X )
1835 - accessibility? ( dbus X )
1836 - eglfs? ( egl )
1837 - ibus? ( dbus )
1838 - libinput? ( udev )
1839 - X? ( gles2-only? ( egl ) )
1840 -"
1841 -
1842 -RDEPEND="
1843 - dev-libs/glib:2
1844 - ~dev-qt/qtcore-${PV}:5=
1845 - dev-util/gtk-update-icon-cache
1846 - media-libs/fontconfig
1847 - >=media-libs/freetype-2.6.1:2
1848 - >=media-libs/harfbuzz-1.6.0:=
1849 - sys-libs/zlib:=
1850 - virtual/opengl
1851 - dbus? ( ~dev-qt/qtdbus-${PV} )
1852 - egl? ( media-libs/mesa[egl] )
1853 - eglfs? (
1854 - media-libs/mesa[gbm]
1855 - x11-libs/libdrm
1856 - )
1857 - evdev? ( sys-libs/mtdev )
1858 - gles2-only? ( media-libs/mesa[gles2] )
1859 - jpeg? ( virtual/jpeg:0 )
1860 - libinput? (
1861 - dev-libs/libinput:=
1862 - >=x11-libs/libxkbcommon-0.5.0
1863 - )
1864 - png? ( media-libs/libpng:0= )
1865 - tslib? ( >=x11-libs/tslib-1.21 )
1866 - tuio? ( ~dev-qt/qtnetwork-${PV} )
1867 - udev? ( virtual/libudev:= )
1868 - vnc? ( ~dev-qt/qtnetwork-${PV} )
1869 - vulkan? ( dev-util/vulkan-headers )
1870 - X? (
1871 - x11-libs/libICE
1872 - x11-libs/libSM
1873 - x11-libs/libX11
1874 - >=x11-libs/libxcb-1.12:=[xkb]
1875 - >=x11-libs/libxkbcommon-0.5.0[X]
1876 - x11-libs/xcb-util-image
1877 - x11-libs/xcb-util-keysyms
1878 - x11-libs/xcb-util-renderutil
1879 - x11-libs/xcb-util-wm
1880 - )
1881 -"
1882 -DEPEND="${RDEPEND}
1883 - evdev? ( sys-kernel/linux-headers )
1884 - udev? ( sys-kernel/linux-headers )
1885 -"
1886 -PDEPEND="
1887 - ibus? ( app-i18n/ibus )
1888 - wayland? ( ~dev-qt/qtwayland-${PV} )
1889 -"
1890 -
1891 -QT5_TARGET_SUBDIRS=(
1892 - src/tools/qvkgen
1893 - src/gui
1894 - src/openglextensions
1895 - src/platformheaders
1896 - src/platformsupport
1897 - src/plugins/generic
1898 - src/plugins/imageformats
1899 - src/plugins/platforms
1900 - src/plugins/platforminputcontexts
1901 -)
1902 -
1903 -QT5_GENTOO_CONFIG=(
1904 - accessibility:accessibility-atspi-bridge
1905 - egl:egl:
1906 - eglfs:eglfs:
1907 - eglfs:eglfs_egldevice:
1908 - eglfs:eglfs_gbm:
1909 - evdev:evdev:
1910 - evdev:mtdev:
1911 - :fontconfig:
1912 - :system-freetype:FREETYPE
1913 - !:no-freetype:
1914 - !gif:no-gif:
1915 - gles2-only::OPENGL_ES
1916 - gles2-only:opengles2:OPENGL_ES_2
1917 - !:no-gui:
1918 - :system-harfbuzz:
1919 - !:no-harfbuzz:
1920 - jpeg:system-jpeg:IMAGEFORMAT_JPEG
1921 - !jpeg:no-jpeg:
1922 - libinput
1923 - libinput:xkbcommon:
1924 - :opengl
1925 - png:png:
1926 - png:system-png:IMAGEFORMAT_PNG
1927 - !png:no-png:
1928 - tslib:tslib:
1929 - udev:libudev:
1930 - vulkan:vulkan:
1931 - X:xcb:
1932 - X:xcb-glx:
1933 - X:xcb-plugin:
1934 - X:xcb-render:
1935 - X:xcb-sm:
1936 - X:xcb-xlib:
1937 - X:xcb-xinput:
1938 -)
1939 -
1940 -QT5_GENTOO_PRIVATE_CONFIG=(
1941 - :gui
1942 -)
1943 -
1944 -PATCHES=(
1945 - "${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
1946 - "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
1947 - "${FILESDIR}/${PN}-5.14.2-CVE-2020-17507.patch" # bug 736924
1948 -)
1949 -
1950 -src_prepare() {
1951 - # don't add -O3 to CXXFLAGS, bug 549140
1952 - sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
1953 -
1954 - # egl_x11 is activated when both egl and X are enabled
1955 - use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
1956 -
1957 - qt_use_disable_config dbus dbus \
1958 - src/platformsupport/themes/genericunix/genericunix.pri
1959 -
1960 - qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
1961 -
1962 - qt_use_disable_mod ibus dbus \
1963 - src/plugins/platforminputcontexts/platforminputcontexts.pro
1964 -
1965 - use vnc || sed -i -e '/SUBDIRS += vnc/d' \
1966 - src/plugins/platforms/platforms.pro || die
1967 -
1968 - qt5-build_src_prepare
1969 -}
1970 -
1971 -src_configure() {
1972 - local myconf=(
1973 - $(usex dbus -dbus-linked '')
1974 - $(qt_use egl)
1975 - $(qt_use eglfs)
1976 - $(usex eglfs '-gbm -kms' '')
1977 - $(qt_use evdev)
1978 - $(qt_use evdev mtdev)
1979 - -fontconfig
1980 - -system-freetype
1981 - $(usex gif '' -no-gif)
1982 - -gui
1983 - -system-harfbuzz
1984 - $(qt_use jpeg libjpeg system)
1985 - $(qt_use libinput)
1986 - -opengl $(usex gles2-only es2 desktop)
1987 - $(qt_use png libpng system)
1988 - $(qt_use tslib)
1989 - $(qt_use udev libudev)
1990 - $(qt_use vulkan)
1991 - $(qt_use X xcb system)
1992 - $(usex X '-xcb-xlib -xcb-xinput -xkb' '')
1993 - )
1994 - if use libinput || use X; then
1995 - myconf+=( -xkbcommon )
1996 - fi
1997 - qt5-build_src_configure
1998 -}
1999
2000 diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
2001 index 203fdae199c..3792b4301e9 100644
2002 --- a/dev-qt/qthelp/Manifest
2003 +++ b/dev-qt/qthelp/Manifest
2004 @@ -1,2 +1 @@
2005 -DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
2006 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
2007
2008 diff --git a/dev-qt/qthelp/qthelp-5.14.2.ebuild b/dev-qt/qthelp/qthelp-5.14.2.ebuild
2009 deleted file mode 100644
2010 index 5dddcc287a3..00000000000
2011 --- a/dev-qt/qthelp/qthelp-5.14.2.ebuild
2012 +++ /dev/null
2013 @@ -1,29 +0,0 @@
2014 -# Copyright 1999-2020 Gentoo Authors
2015 -# Distributed under the terms of the GNU General Public License v2
2016 -
2017 -EAPI=7
2018 -QT5_MODULE="qttools"
2019 -inherit qt5-build
2020 -
2021 -DESCRIPTION="Qt5 module for integrating online documentation into applications"
2022 -
2023 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
2024 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
2025 -fi
2026 -
2027 -IUSE=""
2028 -
2029 -DEPEND="
2030 - ~dev-qt/qtcore-${PV}:5=
2031 - ~dev-qt/qtgui-${PV}
2032 - ~dev-qt/qtnetwork-${PV}
2033 - ~dev-qt/qtsql-${PV}[sqlite]
2034 - ~dev-qt/qtwidgets-${PV}
2035 -"
2036 -RDEPEND="${DEPEND}"
2037 -
2038 -QT5_TARGET_SUBDIRS=(
2039 - src/assistant/help
2040 - src/assistant/qcollectiongenerator
2041 - src/assistant/qhelpgenerator
2042 -)
2043
2044 diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
2045 index 29aa8d1d492..429ca869184 100644
2046 --- a/dev-qt/qtimageformats/Manifest
2047 +++ b/dev-qt/qtimageformats/Manifest
2048 @@ -1,2 +1 @@
2049 -DIST qtimageformats-everywhere-src-5.14.2.tar.xz 1805208 BLAKE2B 115939d859478ccb2190c68ea3e93484537d372f62fc03f42931e69c5b7e0f1f84b376659986c3a36082e05930cafd076579c9786f9f4669ebecbb4254ee8d35 SHA512 e835489bdd1cf19aaa1c04e6ae1c480d4077cf24eee1d46b2f4deb03c093f64df6beaf83adb69b7edcba67c952a60deb89a26923addf2b4254aff18bc2ebf6a6
2050 DIST qtimageformats-everywhere-src-5.15.1.tar.xz 1807112 BLAKE2B d90e99c7a374c7aea73a04ba58c537225bb1c3e24d6af7c68e247f8473583dadd6eb369f7c2d9a71f56e27ddc84560ade933c63c549a4739f8e22c8a4cb5d0da SHA512 90da1c76b16dc5ea4ba99372208e3b10619efc4d131686ac6ab4a963ab0177ff9eee9155af564d72052f4ae1c21f06431ab66aa4e55b3c864f015b63ad75c107
2051
2052 diff --git a/dev-qt/qtimageformats/qtimageformats-5.14.2.ebuild b/dev-qt/qtimageformats/qtimageformats-5.14.2.ebuild
2053 deleted file mode 100644
2054 index e839a0613b3..00000000000
2055 --- a/dev-qt/qtimageformats/qtimageformats-5.14.2.ebuild
2056 +++ /dev/null
2057 @@ -1,30 +0,0 @@
2058 -# Copyright 1999-2020 Gentoo Authors
2059 -# Distributed under the terms of the GNU General Public License v2
2060 -
2061 -EAPI=7
2062 -inherit qt5-build
2063 -
2064 -DESCRIPTION="Additional format plugins for the Qt image I/O system"
2065 -
2066 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
2067 - KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
2068 -fi
2069 -
2070 -IUSE="mng"
2071 -
2072 -DEPEND="
2073 - ~dev-qt/qtcore-${PV}
2074 - ~dev-qt/qtgui-${PV}
2075 - media-libs/libwebp:=
2076 - media-libs/tiff:0
2077 - mng? ( media-libs/libmng:= )
2078 -"
2079 -RDEPEND="${DEPEND}"
2080 -
2081 -src_configure() {
2082 - sed -e 's/qtConfig(jasper)/false:/' \
2083 - -i src/plugins/imageformats/imageformats.pro || die
2084 - qt_use_disable_config mng mng src/plugins/imageformats/imageformats.pro
2085 -
2086 - qt5-build_src_configure
2087 -}
2088
2089 diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
2090 index ce54b624614..bccd0d823c9 100644
2091 --- a/dev-qt/qtlocation/Manifest
2092 +++ b/dev-qt/qtlocation/Manifest
2093 @@ -1,2 +1 @@
2094 -DIST qtlocation-everywhere-src-5.14.2.tar.xz 6120852 BLAKE2B 0224cd6eecc182ddb960c6f3814d2d913a2776e879bb2e87a6c11f18840e275a770977df89c6bfa1aeb174502713969b5d8c02f9c46670671034f6879a41150f SHA512 ca11e118a9061f69ac0181db14b1bf92309c03615802092f7cf404c882108efa3acae9bb73ee3870ea68cd7d7d11863445fc72dcf52099d6be77e0986b7f012c
2095 DIST qtlocation-everywhere-src-5.15.1.tar.xz 6553252 BLAKE2B 493ea55065f03f05db7c65c22f53b96a62b3912a62f3385d393650a96b156e5a5d76dfe5ed3df8eee5ce379c9bbf36a62b6f088dab0519bd14355a7ba956a279 SHA512 b79383b60107bc4d8fcc9b4a087db57597d0b928248806fef9dfeaa8ce3347ce96b388cbce1a7bcaf3287d380f7c269c44e8ec25966112c041aa298313854106
2096
2097 diff --git a/dev-qt/qtlocation/files/qtlocation-5.14.2-gcc-10.patch b/dev-qt/qtlocation/files/qtlocation-5.14.2-gcc-10.patch
2098 deleted file mode 100644
2099 index e7cc6f70d05..00000000000
2100 --- a/dev-qt/qtlocation/files/qtlocation-5.14.2-gcc-10.patch
2101 +++ /dev/null
2102 @@ -1,36 +0,0 @@
2103 -From 0853378b2f2de82c59501e31d18906694ec6e27e Mon Sep 17 00:00:00 2001
2104 -From: Bruno de Oliveira Abinader <bruno@××××××.com>
2105 -Date: Wed, 22 Apr 2020 19:54:53 +0300
2106 -Subject: Fix compilation issues on GCC 9
2107 -
2108 ----
2109 - platform/default/bidi.cpp | 1 +
2110 - src/mbgl/util/convert.cpp | 2 ++
2111 - 2 files changed, 3 insertions(+)
2112 -
2113 -diff --git a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
2114 -index d475c387b..c1710a6f1 100644
2115 ---- a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
2116 -+++ b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
2117 -@@ -5,6 +5,7 @@
2118 - #include <unicode/ushape.h>
2119 -
2120 - #include <memory>
2121 -+#include <stdexcept>
2122 -
2123 - namespace mbgl {
2124 -
2125 -diff --git a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
2126 -index 97bfe9108..510ff2386 100644
2127 ---- a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
2128 -+++ b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
2129 -@@ -1,5 +1,7 @@
2130 - #include <mbgl/util/convert.hpp>
2131 -
2132 -+#include <cstdint>
2133 -+
2134 - namespace mbgl {
2135 - namespace util {
2136 -
2137 ---
2138 -cgit v1.2.1
2139
2140 diff --git a/dev-qt/qtlocation/qtlocation-5.14.2.ebuild b/dev-qt/qtlocation/qtlocation-5.14.2.ebuild
2141 deleted file mode 100644
2142 index 6aa228fb575..00000000000
2143 --- a/dev-qt/qtlocation/qtlocation-5.14.2.ebuild
2144 +++ /dev/null
2145 @@ -1,49 +0,0 @@
2146 -# Copyright 1999-2020 Gentoo Authors
2147 -# Distributed under the terms of the GNU General Public License v2
2148 -
2149 -EAPI=7
2150 -inherit qt5-build
2151 -
2152 -DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
2153 -
2154 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
2155 - KEYWORDS="amd64 arm arm64 x86"
2156 -fi
2157 -
2158 -IUSE=""
2159 -
2160 -RDEPEND="
2161 - dev-libs/icu:=
2162 - ~dev-qt/qtcore-${PV}
2163 - ~dev-qt/qtdeclarative-${PV}
2164 - ~dev-qt/qtgui-${PV}
2165 - ~dev-qt/qtnetwork-${PV}
2166 - ~dev-qt/qtpositioning-${PV}[qml]
2167 - ~dev-qt/qtsql-${PV}
2168 - sys-libs/zlib
2169 -"
2170 -DEPEND="${RDEPEND}
2171 - ~dev-qt/qtconcurrent-${PV}
2172 -"
2173 -
2174 -QT5_TARGET_SUBDIRS=(
2175 - src/3rdparty/clipper
2176 - src/3rdparty/poly2tri
2177 - src/3rdparty/clip2tri
2178 - src/3rdparty/mapbox-gl-native
2179 - src/location
2180 - src/imports/location
2181 - src/imports/locationlabs
2182 - src/plugins/geoservices
2183 -)
2184 -
2185 -PATCHES=( "${FILESDIR}/${P}-gcc-10.patch" ) # bug 722102
2186 -
2187 -src_configure() {
2188 - # src/plugins/geoservices requires files that are only generated when
2189 - # qmake is run in the root directory. Bug 633776.
2190 - mkdir -p "${QT5_BUILD_DIR}"/src/location || die
2191 - qt5_qmake "${QT5_BUILD_DIR}"
2192 - cp src/location/qtlocation-config.pri "${QT5_BUILD_DIR}"/src/location || die
2193 - qt5-build_src_configure
2194 -}
2195
2196 diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
2197 index 1e04e0e9fcc..388380dc4ea 100644
2198 --- a/dev-qt/qtmultimedia/Manifest
2199 +++ b/dev-qt/qtmultimedia/Manifest
2200 @@ -1,2 +1 @@
2201 -DIST qtmultimedia-everywhere-src-5.14.2.tar.xz 3793964 BLAKE2B 98f408e9a3ea48c053797ec20139d134a50d623a4092665695a435c754ee85a369830b23cc5ccce3d9a099cf707c1b28c2529050ff60d3f93f26809b3b2593c4 SHA512 5ebee0f96334d58b74ae344875aa93d32bfdd7c906856f84152e9ae0a3ebb12f627a0d3ab4552031b70c20ad59db1674b1a261ed0828e1efcc6ab48ba3718559
2202 DIST qtmultimedia-everywhere-src-5.15.1.tar.xz 3825940 BLAKE2B 8a86e77b37c7af0226420025f23bcea6aaffcf885f7c56945faa8606bdaf003b29013b452ee2cd44cb1abe7adf260af06f099b7af23664110a97a0dab0574a36 SHA512 9c063dc481c91a94ba151fa96166d04a83e1cdcdb66c5fa80c038bd973c87b928c3d90d1c8add7c3ec29c4dc7dceff9e8cf288ce980f95d199f37e90593104d9
2203
2204 diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-5.14.2-gstreamer-buffering.patch b/dev-qt/qtmultimedia/files/qtmultimedia-5.14.2-gstreamer-buffering.patch
2205 deleted file mode 100644
2206 index 5d17b079613..00000000000
2207 --- a/dev-qt/qtmultimedia/files/qtmultimedia-5.14.2-gstreamer-buffering.patch
2208 +++ /dev/null
2209 @@ -1,38 +0,0 @@
2210 -From d8d072417b08dd75734b3f0aa86c3a49db934770 Mon Sep 17 00:00:00 2001
2211 -From: Roman Valov <roman.valov@×××××.com>
2212 -Date: Mon, 13 Apr 2020 12:54:09 +0000
2213 -Subject: [PATCH] Gstreamer: fix stream buffering
2214 -
2215 -Gstreamer client should handle GST_MESSAGE_BUFFERING to play and pause
2216 -streams based on buffer-percent value and Qt does it properly.
2217 -However `updateSessionState` of QGstreamerPlayerControl was implemented
2218 -to go back into playing state each time session state becomes paused.
2219 -That behavior resulted into choppy stream playback.
2220 -Fix with condition to un-pause playback only if it's already buffered.
2221 -
2222 -Fixes: QTBUG-83417
2223 -Change-Id: Ida4a9e2e196de00050bdc64725fa818c7e939785
2224 -Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@××.io>
2225 ----
2226 - src/gsttools/qgstreamerplayercontrol.cpp | 6 ++++--
2227 - 1 file changed, 4 insertions(+), 2 deletions(-)
2228 -
2229 -diff --git a/src/gsttools/qgstreamerplayercontrol.cpp b/src/gsttools/qgstreamerplayercontrol.cpp
2230 -index 165978288..d65102e2f 100644
2231 ---- a/src/gsttools/qgstreamerplayercontrol.cpp
2232 -+++ b/src/gsttools/qgstreamerplayercontrol.cpp
2233 -@@ -439,8 +439,10 @@ void QGstreamerPlayerControl::updateSessionState(QMediaPlayer::State state)
2234 - }
2235 - m_pendingSeekPosition = -1;
2236 -
2237 -- if (m_currentState == QMediaPlayer::PlayingState)
2238 -- m_session->play();
2239 -+ if (m_currentState == QMediaPlayer::PlayingState) {
2240 -+ if (m_mediaStatus == QMediaPlayer::BufferedMedia)
2241 -+ m_session->play();
2242 -+ }
2243 - }
2244 -
2245 - updateMediaStatus();
2246 ---
2247 -2.16.3
2248
2249 diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.14.2-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.14.2-r1.ebuild
2250 deleted file mode 100644
2251 index fdcd87079b9..00000000000
2252 --- a/dev-qt/qtmultimedia/qtmultimedia-5.14.2-r1.ebuild
2253 +++ /dev/null
2254 @@ -1,72 +0,0 @@
2255 -# Copyright 1999-2020 Gentoo Authors
2256 -# Distributed under the terms of the GNU General Public License v2
2257 -
2258 -EAPI=7
2259 -inherit qt5-build
2260 -
2261 -DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
2262 -
2263 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
2264 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
2265 -fi
2266 -
2267 -IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
2268 -
2269 -RDEPEND="
2270 - ~dev-qt/qtcore-${PV}
2271 - ~dev-qt/qtgui-${PV}[gles2-only=]
2272 - ~dev-qt/qtnetwork-${PV}
2273 - alsa? ( media-libs/alsa-lib )
2274 - gstreamer? (
2275 - dev-libs/glib:2
2276 - media-libs/gstreamer:1.0
2277 - media-libs/gst-plugins-bad:1.0
2278 - media-libs/gst-plugins-base:1.0
2279 - )
2280 - pulseaudio? ( media-sound/pulseaudio[glib] )
2281 - qml? (
2282 - ~dev-qt/qtdeclarative-${PV}
2283 - gles2-only? ( ~dev-qt/qtgui-${PV}[egl] )
2284 - openal? ( media-libs/openal )
2285 - )
2286 - widgets? (
2287 - ~dev-qt/qtopengl-${PV}
2288 - ~dev-qt/qtwidgets-${PV}[gles2-only=]
2289 - )
2290 -"
2291 -DEPEND="${RDEPEND}
2292 - gstreamer? ( x11-base/xorg-proto )
2293 -"
2294 -
2295 -PATCHES=(
2296 - "${FILESDIR}/${P}-gstreamer-buffering.patch" # QTBUG-83417
2297 -)
2298 -
2299 -src_prepare() {
2300 - sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
2301 - src/multimedia/multimedia.pro || die
2302 -
2303 - qt_use_disable_config openal openal \
2304 - src/imports/imports.pro
2305 -
2306 - qt_use_disable_mod qml quick \
2307 - src/src.pro \
2308 - src/plugins/plugins.pro
2309 -
2310 - qt_use_disable_mod widgets widgets \
2311 - src/src.pro \
2312 - src/gsttools/gsttools.pro \
2313 - src/plugins/gstreamer/common.pri
2314 -
2315 - qt5-build_src_prepare
2316 -}
2317 -
2318 -src_configure() {
2319 - local myqmakeargs=(
2320 - --
2321 - $(qt_use alsa)
2322 - $(qt_use gstreamer)
2323 - $(qt_use pulseaudio)
2324 - )
2325 - qt5-build_src_configure
2326 -}
2327
2328 diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
2329 index d72f3b48819..98e054ddcf5 100644
2330 --- a/dev-qt/qtnetwork/Manifest
2331 +++ b/dev-qt/qtnetwork/Manifest
2332 @@ -1,2 +1 @@
2333 -DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
2334 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
2335
2336 diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.14.2-CVE-2020-13962.patch b/dev-qt/qtnetwork/files/qtnetwork-5.14.2-CVE-2020-13962.patch
2337 deleted file mode 100644
2338 index 9bbdda61a25..00000000000
2339 --- a/dev-qt/qtnetwork/files/qtnetwork-5.14.2-CVE-2020-13962.patch
2340 +++ /dev/null
2341 @@ -1,172 +0,0 @@
2342 -From 8ddffc6ba4f38bb8dbeb0cf61b6b10ee73505bbb Mon Sep 17 00:00:00 2001
2343 -From: Timur Pocheptsov <timur.pocheptsov@××.io>
2344 -Date: Mon, 13 Apr 2020 20:31:34 +0200
2345 -Subject: [PATCH] OpenSSL: handle SSL_shutdown's errors properly
2346 -MIME-Version: 1.0
2347 -Content-Type: text/plain; charset=utf8
2348 -Content-Transfer-Encoding: 8bit
2349 -
2350 -Do not call SSL_shutdown on a session that is in handshake state (SSL_in_init(s)
2351 -returns 1). Also, do not call SSL_shutdown if a session encountered a fatal
2352 -error (SSL_ERROR_SYSCALL or SSL_ERROR_SSL was found before). If SSL_shutdown
2353 -was unsuccessful (returned code != 1), we have to clear the error(s) it queued.
2354 -Unfortunately, SSL_in_init was a macro in OpenSSL 1.0.x. We have to
2355 -resolve SSL_state to implement SSL_in_init.
2356 -
2357 -Fixes: QTBUG-83450
2358 -Change-Id: I6326119f4e79605429263045ac20605c30dccca3
2359 -Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@××.io>
2360 -(cherry picked from commit 8907635da59c2ae0e8db01f27b24a841b830e655)
2361 ----
2362 - src/network/ssl/qsslsocket.cpp | 2 +-
2363 - src/network/ssl/qsslsocket_openssl.cpp | 23 ++++++++++++++++------
2364 - src/network/ssl/qsslsocket_openssl11_symbols_p.h | 7 +++++++
2365 - src/network/ssl/qsslsocket_openssl_symbols.cpp | 8 ++++++++
2366 - .../ssl/qsslsocket_opensslpre11_symbols_p.h | 2 ++
2367 - src/network/ssl/qsslsocket_p.h | 1 +
2368 - 6 files changed, 36 insertions(+), 7 deletions(-)
2369 -
2370 -diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
2371 -index 4e9e9472631..5c9e589ec39 100644
2372 ---- a/src/network/ssl/qsslsocket.cpp
2373 -+++ b/src/network/ssl/qsslsocket.cpp
2374 -@@ -2166,7 +2166,7 @@ void QSslSocketPrivate::init()
2375 - pendingClose = false;
2376 - flushTriggered = false;
2377 - ocspResponses.clear();
2378 --
2379 -+ systemOrSslErrorDetected = false;
2380 - // we don't want to clear the ignoreErrorsList, so
2381 - // that it is possible setting it before connecting
2382 - // ignoreErrorsList.clear();
2383 -diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
2384 -index 51510f1c60b..855865209bc 100644
2385 ---- a/src/network/ssl/qsslsocket_openssl.cpp
2386 -+++ b/src/network/ssl/qsslsocket_openssl.cpp
2387 -@@ -648,10 +648,16 @@ bool QSslSocketBackendPrivate::initSslContext()
2388 - void QSslSocketBackendPrivate::destroySslContext()
2389 - {
2390 - if (ssl) {
2391 -- // We do not send a shutdown alert here. Just mark the session as
2392 -- // resumable for qhttpnetworkconnection's "optimization", otherwise
2393 -- // OpenSSL won't start a session resumption.
2394 -- q_SSL_shutdown(ssl);
2395 -+ if (!q_SSL_in_init(ssl) && !systemOrSslErrorDetected) {
2396 -+ // We do not send a shutdown alert here. Just mark the session as
2397 -+ // resumable for qhttpnetworkconnection's "optimization", otherwise
2398 -+ // OpenSSL won't start a session resumption.
2399 -+ if (q_SSL_shutdown(ssl) != 1) {
2400 -+ // Some error may be queued, clear it.
2401 -+ const auto errors = getErrorsFromOpenSsl();
2402 -+ Q_UNUSED(errors);
2403 -+ }
2404 -+ }
2405 - q_SSL_free(ssl);
2406 - ssl = nullptr;
2407 - }
2408 -@@ -1084,6 +1090,7 @@ void QSslSocketBackendPrivate::transmit()
2409 - case SSL_ERROR_SSL: // error in the SSL library
2410 - // we do not know exactly what the error is, nor whether we can recover from it,
2411 - // so just return to prevent an endless loop in the outer "while" statement
2412 -+ systemOrSslErrorDetected = true;
2413 - {
2414 - const ScopedBool bg(inSetAndEmitError, true);
2415 - setErrorAndEmit(QAbstractSocket::SslInternalError,
2416 -@@ -1681,8 +1688,12 @@ bool QSslSocketBackendPrivate::checkOcspStatus()
2417 - void QSslSocketBackendPrivate::disconnectFromHost()
2418 - {
2419 - if (ssl) {
2420 -- if (!shutdown) {
2421 -- q_SSL_shutdown(ssl);
2422 -+ if (!shutdown && !q_SSL_in_init(ssl) && !systemOrSslErrorDetected) {
2423 -+ if (q_SSL_shutdown(ssl) != 1) {
2424 -+ // Some error may be queued, clear it.
2425 -+ const auto errors = getErrorsFromOpenSsl();
2426 -+ Q_UNUSED(errors);
2427 -+ }
2428 - shutdown = true;
2429 - transmit();
2430 - }
2431 -diff --git a/src/network/ssl/qsslsocket_openssl11_symbols_p.h b/src/network/ssl/qsslsocket_openssl11_symbols_p.h
2432 -index 0fe0899d4fd..b7193ad1807 100644
2433 ---- a/src/network/ssl/qsslsocket_openssl11_symbols_p.h
2434 -+++ b/src/network/ssl/qsslsocket_openssl11_symbols_p.h
2435 -@@ -192,4 +192,11 @@ typedef int (*q_SSL_psk_use_session_cb_func_t)(SSL *, const EVP_MD *, const unsi
2436 - }
2437 - void q_SSL_set_psk_use_session_callback(SSL *s, q_SSL_psk_use_session_cb_func_t);
2438 -
2439 -+#if OPENSSL_VERSION_NUMBER < 0x10101000L
2440 -+// What a mess!
2441 -+int q_SSL_in_init(SSL *s);
2442 -+#else
2443 -+int q_SSL_in_init(const SSL *s);
2444 -+#endif // 1.1.1 or 1.1.0
2445 -+
2446 - #endif
2447 -diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp
2448 -index 85029a6ff3f..d1bd84cf25f 100644
2449 ---- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
2450 -+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
2451 -@@ -160,6 +160,11 @@ DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
2452 - DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
2453 - DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
2454 - DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
2455 -+#if OPENSSL_VERSION_NUMBER < 0x10101000L
2456 -+DEFINEFUNC(int, SSL_in_init, SSL *a, a, return 0, return)
2457 -+#else
2458 -+DEFINEFUNC(int, SSL_in_init, const SSL *a, a, return 0, return)
2459 -+#endif
2460 - #ifdef TLS1_3_VERSION
2461 - DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
2462 - DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
2463 -@@ -242,6 +247,7 @@ DEFINEFUNC2(void, BIO_set_shutdown, BIO *a, a, int shut, shut, return, DUMMYARG)
2464 - // Functions below are either deprecated or removed in OpenSSL >= 1.1:
2465 -
2466 - DEFINEFUNC(unsigned char *, ASN1_STRING_data, ASN1_STRING *a, a, return nullptr, return)
2467 -+DEFINEFUNC(int, SSL_state, const SSL *a, a, return 0, return)
2468 -
2469 - #ifdef SSLEAY_MACROS
2470 - DEFINEFUNC3(void *, ASN1_dup, i2d_of_void *a, a, d2i_of_void *b, b, char *c, c, return nullptr, return)
2471 -@@ -971,6 +977,7 @@ bool q_resolveOpenSslSymbols()
2472 - #if QT_CONFIG(opensslv11)
2473 -
2474 - RESOLVEFUNC(OPENSSL_init_ssl)
2475 -+ RESOLVEFUNC(SSL_in_init)
2476 - RESOLVEFUNC(OPENSSL_init_crypto)
2477 - RESOLVEFUNC(ASN1_STRING_get0_data)
2478 - RESOLVEFUNC(EVP_CIPHER_CTX_reset)
2479 -@@ -1066,6 +1073,7 @@ bool q_resolveOpenSslSymbols()
2480 - #else // !opensslv11
2481 -
2482 - RESOLVEFUNC(ASN1_STRING_data)
2483 -+ RESOLVEFUNC(SSL_state)
2484 -
2485 - #ifdef SSLEAY_MACROS
2486 - RESOLVEFUNC(ASN1_dup)
2487 -diff --git a/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h b/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h
2488 -index f5626d5d164..92841017793 100644
2489 ---- a/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h
2490 -+++ b/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h
2491 -@@ -121,6 +121,8 @@ SSL_CTX *q_SSL_CTX_new(const SSL_METHOD *a);
2492 -
2493 - int q_SSL_library_init();
2494 - void q_SSL_load_error_strings();
2495 -+int q_SSL_state(const SSL *a);
2496 -+#define q_SSL_in_init(a) (q_SSL_state(a) & SSL_ST_INIT)
2497 -
2498 - #if OPENSSL_VERSION_NUMBER >= 0x10001000L
2499 - int q_SSL_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
2500 -diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h
2501 -index daa9be23f4a..350b1f1fc18 100644
2502 ---- a/src/network/ssl/qsslsocket_p.h
2503 -+++ b/src/network/ssl/qsslsocket_p.h
2504 -@@ -208,6 +208,7 @@ protected:
2505 - bool verifyErrorsHaveBeenIgnored();
2506 - bool paused;
2507 - bool flushTriggered;
2508 -+ bool systemOrSslErrorDetected = false;
2509 - QVector<QOcspResponse> ocspResponses;
2510 - };
2511 -
2512 ---
2513 -2.16.3
2514
2515 diff --git a/dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild
2516 deleted file mode 100644
2517 index e26d2f3855c..00000000000
2518 --- a/dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild
2519 +++ /dev/null
2520 @@ -1,66 +0,0 @@
2521 -# Copyright 1999-2020 Gentoo Authors
2522 -# Distributed under the terms of the GNU General Public License v2
2523 -
2524 -EAPI=7
2525 -QT5_MODULE="qtbase"
2526 -inherit qt5-build
2527 -
2528 -DESCRIPTION="Network abstraction library for the Qt5 framework"
2529 -
2530 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
2531 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
2532 -fi
2533 -
2534 -IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl"
2535 -
2536 -DEPEND="
2537 - ~dev-qt/qtcore-${PV}:5=
2538 - sys-libs/zlib:=
2539 - connman? ( ~dev-qt/qtdbus-${PV} )
2540 - gssapi? ( virtual/krb5 )
2541 - libproxy? ( net-libs/libproxy )
2542 - networkmanager? ( ~dev-qt/qtdbus-${PV} )
2543 - sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
2544 - ssl? ( dev-libs/openssl:0=[bindist=] )
2545 -"
2546 -RDEPEND="${DEPEND}
2547 - connman? ( net-misc/connman )
2548 - networkmanager? ( net-misc/networkmanager )
2549 -"
2550 -
2551 -QT5_TARGET_SUBDIRS=(
2552 - src/network
2553 - src/plugins/bearer/generic
2554 -)
2555 -
2556 -QT5_GENTOO_CONFIG=(
2557 - libproxy:libproxy:
2558 - ssl::SSL
2559 - ssl::OPENSSL
2560 - ssl:openssl-linked:LINKED_OPENSSL
2561 -)
2562 -
2563 -QT5_GENTOO_PRIVATE_CONFIG=(
2564 - :network
2565 -)
2566 -
2567 -PATCHES=(
2568 - "${FILESDIR}/${P}-CVE-2020-13962.patch" # bug 727604, QTBUG-83450
2569 -)
2570 -
2571 -pkg_setup() {
2572 - use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
2573 - use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
2574 -}
2575 -
2576 -src_configure() {
2577 - local myconf=(
2578 - $(usex connman -dbus-linked '')
2579 - $(usex gssapi -feature-gssapi -no-feature-gssapi)
2580 - $(qt_use libproxy)
2581 - $(usex networkmanager -dbus-linked '')
2582 - $(qt_use sctp)
2583 - $(usex ssl -openssl-linked '')
2584 - )
2585 - qt5-build_src_configure
2586 -}
2587
2588 diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest
2589 index 07481f884cd..796c5a0f19f 100644
2590 --- a/dev-qt/qtnetworkauth/Manifest
2591 +++ b/dev-qt/qtnetworkauth/Manifest
2592 @@ -1,2 +1 @@
2593 -DIST qtnetworkauth-everywhere-src-5.14.2.tar.xz 141424 BLAKE2B 11adc6be96f4bc4247aa04a0b21bb142cc8d63dbe547a271759e7c564dde031193f1eceae4366791afd1bc9734be0eef23b538817feb5431322002bab5d39595 SHA512 9001755ae289213f7d2c994bedbbcc1ca641b3c80fc5279f6829ed48c31eed8cdbd87a0ed0ce451bc9611318ef09ef7c40b795d2c45fface2bd357ee579b15ad
2594 DIST qtnetworkauth-everywhere-src-5.15.1.tar.xz 141416 BLAKE2B 428f55b4d08c88b837b4c3397e13d7296855fd930df0fc319e564709993b4cc4dc7e1f2179c26f7f08e1b33172f62a4e1f7f373439f9ca341cbc821083dce6dc SHA512 2c22acf4842f2e26c514ea48bd4e21f466571c1993b811495c1eb9fe22ea66a687ca882c9ed09b38c00a9a6616b13d44021e0d9a65020f4ab9495d6e8c64d282
2595
2596 diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.14.2.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.14.2.ebuild
2597 deleted file mode 100644
2598 index 05f6b5ff089..00000000000
2599 --- a/dev-qt/qtnetworkauth/qtnetworkauth-5.14.2.ebuild
2600 +++ /dev/null
2601 @@ -1,20 +0,0 @@
2602 -# Copyright 1999-2020 Gentoo Authors
2603 -# Distributed under the terms of the GNU General Public License v2
2604 -
2605 -EAPI=7
2606 -inherit qt5-build
2607 -
2608 -DESCRIPTION="Network authorization library for the Qt5 framework"
2609 -LICENSE="GPL-3"
2610 -
2611 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
2612 - KEYWORDS="amd64 arm64 x86"
2613 -fi
2614 -
2615 -IUSE=""
2616 -
2617 -DEPEND="
2618 - ~dev-qt/qtcore-${PV}
2619 - ~dev-qt/qtnetwork-${PV}
2620 -"
2621 -RDEPEND="${DEPEND}"
2622
2623 diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
2624 index d72f3b48819..98e054ddcf5 100644
2625 --- a/dev-qt/qtopengl/Manifest
2626 +++ b/dev-qt/qtopengl/Manifest
2627 @@ -1,2 +1 @@
2628 -DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
2629 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
2630
2631 diff --git a/dev-qt/qtopengl/qtopengl-5.14.2-r1.ebuild b/dev-qt/qtopengl/qtopengl-5.14.2-r1.ebuild
2632 deleted file mode 100644
2633 index a2f5822ec72..00000000000
2634 --- a/dev-qt/qtopengl/qtopengl-5.14.2-r1.ebuild
2635 +++ /dev/null
2636 @@ -1,34 +0,0 @@
2637 -# Copyright 1999-2020 Gentoo Authors
2638 -# Distributed under the terms of the GNU General Public License v2
2639 -
2640 -EAPI=7
2641 -QT5_MODULE="qtbase"
2642 -VIRTUALX_REQUIRED="test"
2643 -inherit qt5-build
2644 -
2645 -DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
2646 -
2647 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
2648 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
2649 -fi
2650 -
2651 -IUSE="gles2-only"
2652 -
2653 -DEPEND="
2654 - ~dev-qt/qtcore-${PV}:5=
2655 - ~dev-qt/qtgui-${PV}[gles2-only=]
2656 - ~dev-qt/qtwidgets-${PV}[gles2-only=]
2657 - virtual/opengl
2658 -"
2659 -RDEPEND="${DEPEND}"
2660 -
2661 -QT5_TARGET_SUBDIRS=(
2662 - src/opengl
2663 -)
2664 -
2665 -src_configure() {
2666 - local myconf=(
2667 - -opengl $(usex gles2-only es2 desktop)
2668 - )
2669 - qt5-build_src_configure
2670 -}
2671
2672 diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
2673 index 203fdae199c..3792b4301e9 100644
2674 --- a/dev-qt/qtpaths/Manifest
2675 +++ b/dev-qt/qtpaths/Manifest
2676 @@ -1,2 +1 @@
2677 -DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
2678 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
2679
2680 diff --git a/dev-qt/qtpaths/qtpaths-5.14.2.ebuild b/dev-qt/qtpaths/qtpaths-5.14.2.ebuild
2681 deleted file mode 100644
2682 index d3f77cca75f..00000000000
2683 --- a/dev-qt/qtpaths/qtpaths-5.14.2.ebuild
2684 +++ /dev/null
2685 @@ -1,23 +0,0 @@
2686 -# Copyright 1999-2020 Gentoo Authors
2687 -# Distributed under the terms of the GNU General Public License v2
2688 -
2689 -EAPI=7
2690 -QT5_MODULE="qttools"
2691 -inherit qt5-build
2692 -
2693 -DESCRIPTION="Command line client to QStandardPaths"
2694 -
2695 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
2696 - KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
2697 -fi
2698 -
2699 -IUSE=""
2700 -
2701 -DEPEND="
2702 - ~dev-qt/qtcore-${PV}
2703 -"
2704 -RDEPEND="${DEPEND}"
2705 -
2706 -QT5_TARGET_SUBDIRS=(
2707 - src/qtpaths
2708 -)
2709
2710 diff --git a/dev-qt/qtplugininfo/Manifest b/dev-qt/qtplugininfo/Manifest
2711 index 203fdae199c..3792b4301e9 100644
2712 --- a/dev-qt/qtplugininfo/Manifest
2713 +++ b/dev-qt/qtplugininfo/Manifest
2714 @@ -1,2 +1 @@
2715 -DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
2716 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
2717
2718 diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.14.2.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.14.2.ebuild
2719 deleted file mode 100644
2720 index 20db4ecf2a3..00000000000
2721 --- a/dev-qt/qtplugininfo/qtplugininfo-5.14.2.ebuild
2722 +++ /dev/null
2723 @@ -1,23 +0,0 @@
2724 -# Copyright 1999-2020 Gentoo Authors
2725 -# Distributed under the terms of the GNU General Public License v2
2726 -
2727 -EAPI=7
2728 -QT5_MODULE="qttools"
2729 -inherit qt5-build
2730 -
2731 -DESCRIPTION="Qt5 plugin metadata dumper"
2732 -
2733 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
2734 - KEYWORDS="~amd64 ~x86"
2735 -fi
2736 -
2737 -IUSE=""
2738 -
2739 -DEPEND="
2740 - ~dev-qt/qtcore-${PV}
2741 -"
2742 -RDEPEND="${DEPEND}"
2743 -
2744 -QT5_TARGET_SUBDIRS=(
2745 - src/qtplugininfo
2746 -)
2747
2748 diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
2749 index ce54b624614..bccd0d823c9 100644
2750 --- a/dev-qt/qtpositioning/Manifest
2751 +++ b/dev-qt/qtpositioning/Manifest
2752 @@ -1,2 +1 @@
2753 -DIST qtlocation-everywhere-src-5.14.2.tar.xz 6120852 BLAKE2B 0224cd6eecc182ddb960c6f3814d2d913a2776e879bb2e87a6c11f18840e275a770977df89c6bfa1aeb174502713969b5d8c02f9c46670671034f6879a41150f SHA512 ca11e118a9061f69ac0181db14b1bf92309c03615802092f7cf404c882108efa3acae9bb73ee3870ea68cd7d7d11863445fc72dcf52099d6be77e0986b7f012c
2754 DIST qtlocation-everywhere-src-5.15.1.tar.xz 6553252 BLAKE2B 493ea55065f03f05db7c65c22f53b96a62b3912a62f3385d393650a96b156e5a5d76dfe5ed3df8eee5ce379c9bbf36a62b6f088dab0519bd14355a7ba956a279 SHA512 b79383b60107bc4d8fcc9b4a087db57597d0b928248806fef9dfeaa8ce3347ce96b388cbce1a7bcaf3287d380f7c269c44e8ec25966112c041aa298313854106
2755
2756 diff --git a/dev-qt/qtpositioning/qtpositioning-5.14.2.ebuild b/dev-qt/qtpositioning/qtpositioning-5.14.2.ebuild
2757 deleted file mode 100644
2758 index 00e76ee9b7d..00000000000
2759 --- a/dev-qt/qtpositioning/qtpositioning-5.14.2.ebuild
2760 +++ /dev/null
2761 @@ -1,40 +0,0 @@
2762 -# Copyright 1999-2020 Gentoo Authors
2763 -# Distributed under the terms of the GNU General Public License v2
2764 -
2765 -EAPI=7
2766 -QT5_MODULE="qtlocation"
2767 -inherit qt5-build
2768 -
2769 -DESCRIPTION="Physical position determination library for the Qt5 framework"
2770 -
2771 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
2772 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
2773 -fi
2774 -
2775 -IUSE="geoclue +qml"
2776 -
2777 -RDEPEND="
2778 - ~dev-qt/qtcore-${PV}
2779 - geoclue? ( ~dev-qt/qtdbus-${PV} )
2780 - qml? ( ~dev-qt/qtdeclarative-${PV} )
2781 -"
2782 -DEPEND="${RDEPEND}"
2783 -PDEPEND="
2784 - geoclue? ( app-misc/geoclue:2.0 )
2785 -"
2786 -
2787 -QT5_TARGET_SUBDIRS=(
2788 - src/3rdparty/clipper
2789 - src/3rdparty/poly2tri
2790 - src/3rdparty/clip2tri
2791 - src/positioning
2792 - src/plugins/position/positionpoll
2793 -)
2794 -
2795 -pkg_setup() {
2796 - use geoclue && QT5_TARGET_SUBDIRS+=( src/plugins/position/geoclue2 )
2797 - use qml && QT5_TARGET_SUBDIRS+=(
2798 - src/positioningquick
2799 - src/imports/positioning
2800 - )
2801 -}
2802
2803 diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
2804 index d72f3b48819..98e054ddcf5 100644
2805 --- a/dev-qt/qtprintsupport/Manifest
2806 +++ b/dev-qt/qtprintsupport/Manifest
2807 @@ -1,2 +1 @@
2808 -DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
2809 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
2810
2811 diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.14.2.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.14.2.ebuild
2812 deleted file mode 100644
2813 index babe7326c5b..00000000000
2814 --- a/dev-qt/qtprintsupport/qtprintsupport-5.14.2.ebuild
2815 +++ /dev/null
2816 @@ -1,42 +0,0 @@
2817 -# Copyright 1999-2020 Gentoo Authors
2818 -# Distributed under the terms of the GNU General Public License v2
2819 -
2820 -EAPI=7
2821 -QT5_MODULE="qtbase"
2822 -VIRTUALX_REQUIRED="test"
2823 -inherit qt5-build
2824 -
2825 -DESCRIPTION="Printing support library for the Qt5 framework"
2826 -
2827 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
2828 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
2829 -fi
2830 -
2831 -IUSE="cups gles2-only"
2832 -
2833 -RDEPEND="
2834 - ~dev-qt/qtcore-${PV}:5=
2835 - ~dev-qt/qtgui-${PV}[gles2-only=]
2836 - ~dev-qt/qtwidgets-${PV}[gles2-only=]
2837 - cups? ( >=net-print/cups-1.4 )
2838 -"
2839 -DEPEND="${RDEPEND}
2840 - test? ( ~dev-qt/qtnetwork-${PV} )
2841 -"
2842 -
2843 -QT5_TARGET_SUBDIRS=(
2844 - src/printsupport
2845 - src/plugins/printsupport
2846 -)
2847 -
2848 -QT5_GENTOO_CONFIG=(
2849 - cups
2850 -)
2851 -
2852 -src_configure() {
2853 - local myconf=(
2854 - $(qt_use cups)
2855 - -opengl $(usex gles2-only es2 desktop)
2856 - )
2857 - qt5-build_src_configure
2858 -}
2859
2860 diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
2861 index 0fc9116f79d..46a59cd395b 100644
2862 --- a/dev-qt/qtquickcontrols/Manifest
2863 +++ b/dev-qt/qtquickcontrols/Manifest
2864 @@ -1,2 +1 @@
2865 -DIST qtquickcontrols-everywhere-src-5.14.2.tar.xz 5981560 BLAKE2B 91ac3b77d0f1e83a489148aae8b143d2f1131020084c22dc0a2ad9aecbff16bd19ea5a3f09eaba3146e5034b6914a696d6eacd0307ec8ca7c260318c49772564 SHA512 e5076d838e54e8fcc62ffd76d66ab322f1927f6489c51dd0fa6e39de1e003c1994d24730da79c8d9d2747839faaa7b1b78f14b58f05447db440a477094be40e4
2866 DIST qtquickcontrols-everywhere-src-5.15.1.tar.xz 5983304 BLAKE2B 14ec58e4a1ae70617c74bdd5c3cd992e0c3a2c96540963edc2cba796e7730607df331167a928fd2e2dedc27457b4b27824b680b2670ca8e538423290d8cd6776 SHA512 71e6ee040bc76dc1576d31ff2c1d687e115f4c6dc63307e64c8173c2441835923375ee6b7f5473b3ec8c586f34e04b061b9a9e16b7f34b4075cfa0278599d2ce
2867
2868 diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.14.2.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.14.2.ebuild
2869 deleted file mode 100644
2870 index 3ca97181e2a..00000000000
2871 --- a/dev-qt/qtquickcontrols/qtquickcontrols-5.14.2.ebuild
2872 +++ /dev/null
2873 @@ -1,32 +0,0 @@
2874 -# Copyright 1999-2020 Gentoo Authors
2875 -# Distributed under the terms of the GNU General Public License v2
2876 -
2877 -EAPI=7
2878 -inherit qt5-build
2879 -
2880 -DESCRIPTION="Set of Qt Quick controls to create complete user interfaces (deprecated)"
2881 -
2882 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
2883 - KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86"
2884 -fi
2885 -
2886 -IUSE="+widgets"
2887 -
2888 -DEPEND="
2889 - ~dev-qt/qtcore-${PV}
2890 - ~dev-qt/qtdeclarative-${PV}
2891 - ~dev-qt/qtgui-${PV}
2892 - widgets? ( ~dev-qt/qtwidgets-${PV} )
2893 -"
2894 -RDEPEND="${DEPEND}"
2895 -
2896 -src_prepare() {
2897 - qt_use_disable_mod widgets widgets \
2898 - src/src.pro \
2899 - src/controls/Private/private.pri \
2900 - tests/auto/activeFocusOnTab/activeFocusOnTab.pro \
2901 - tests/auto/controls/controls.pro \
2902 - tests/auto/testplugin/testplugin.pro
2903 -
2904 - qt5-build_src_prepare
2905 -}
2906
2907 diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
2908 index 0a33aab87fd..6e7231e2681 100644
2909 --- a/dev-qt/qtquickcontrols2/Manifest
2910 +++ b/dev-qt/qtquickcontrols2/Manifest
2911 @@ -1,2 +1 @@
2912 -DIST qtquickcontrols2-everywhere-src-5.14.2.tar.xz 8153752 BLAKE2B d1803007fb016276b75db9102ebfd82a6afa279b845d3507a04b76c2ab6fc8345840f3ea76c12607ed2b7be11e2b2c26bb76ff84b65a4c8df7cf9c66dbd95003 SHA512 de8b669417c2d039c0f49e805be72e757877991bc3c7feb13417202a4964cb6391924837751c520ed6234930e90dfe00417ca1c369418b2cdf4f09da679ba722
2913 DIST qtquickcontrols2-everywhere-src-5.15.1.tar.xz 8282444 BLAKE2B 94be5403a3642ceb1ce8eb7ceae2a116743f5ee75c0614448bbfb846918d108f3c5bb6ad881bb63eb30082f0bbeed28a49e32456d335e67f19dc65418c76216a SHA512 ecb75619e80b737e3ae214f65a5175d933f8dc7832eb4eccd469fc1cb1eb85ef5c47f81563165da2d75abf15d7c47b868e68ab758d95183371b4ef64e7c52a39
2914
2915 diff --git a/dev-qt/qtquickcontrols2/files/qtquickcontrols2-5.14.2-account-for-scale-before-positioning.patch b/dev-qt/qtquickcontrols2/files/qtquickcontrols2-5.14.2-account-for-scale-before-positioning.patch
2916 deleted file mode 100644
2917 index ae54f12f365..00000000000
2918 --- a/dev-qt/qtquickcontrols2/files/qtquickcontrols2-5.14.2-account-for-scale-before-positioning.patch
2919 +++ /dev/null
2920 @@ -1,61 +0,0 @@
2921 -From 4df52eee2b40244ba1a3d115a43ed51cfd742105 Mon Sep 17 00:00:00 2001
2922 -From: Andy Shaw <andy.shaw@××.io>
2923 -Date: Thu, 7 Feb 2019 17:35:51 +0100
2924 -Subject: [PATCH] Menu: account for the scale when getting the size before
2925 - positioning
2926 -
2927 -Fixes: QTBUG-73687
2928 -Change-Id: Id2d6a6b5c6651337ab7ae26d07011160b79654bf
2929 -Reviewed-by: Mitch Curtis <mitch.curtis@××.io>
2930 ----
2931 - src/quicktemplates2/qquickpopup.cpp | 1 +
2932 - src/quicktemplates2/qquickpopuppositioner.cpp | 14 +++++++-------
2933 - 3 files changed, 17 insertions(+), 15 deletions(-)
2934 -
2935 -diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
2936 -index ecb2568ed..d108420ea 100644
2937 ---- a/src/quicktemplates2/qquickpopup.cpp
2938 -+++ b/src/quicktemplates2/qquickpopup.cpp
2939 -@@ -471,6 +471,7 @@ void QQuickPopupPrivate::finalizeEnterTransition()
2940 - if (focus)
2941 - popupItem->setFocus(true);
2942 - transitionState = NoTransition;
2943 -+ getPositioner()->reposition();
2944 - emit q->openedChanged();
2945 - emit q->opened();
2946 - }
2947 -diff --git a/src/quicktemplates2/qquickpopuppositioner.cpp b/src/quicktemplates2/qquickpopuppositioner.cpp
2948 -index ebd8ff294..dbe8ac1d5 100644
2949 ---- a/src/quicktemplates2/qquickpopuppositioner.cpp
2950 -+++ b/src/quicktemplates2/qquickpopuppositioner.cpp
2951 -@@ -108,10 +108,11 @@ void QQuickPopupPositioner::reposition()
2952 - return;
2953 - }
2954 -
2955 -- const qreal w = popupItem->width();
2956 -- const qreal h = popupItem->height();
2957 -- const qreal iw = popupItem->implicitWidth();
2958 -- const qreal ih = popupItem->implicitHeight();
2959 -+ const qreal scale = popupItem->scale();
2960 -+ const qreal w = popupItem->width() * scale;
2961 -+ const qreal h = popupItem->height() * scale;
2962 -+ const qreal iw = popupItem->implicitWidth() * scale;
2963 -+ const qreal ih = popupItem->implicitHeight() * scale;
2964 -
2965 - bool widthAdjusted = false;
2966 - bool heightAdjusted = false;
2967 -@@ -257,10 +258,9 @@ void QQuickPopupPositioner::reposition()
2968 - }
2969 -
2970 - if (!p->hasWidth && widthAdjusted && rect.width() > 0)
2971 -- popupItem->setWidth(rect.width());
2972 -+ popupItem->setWidth(rect.width() / scale);
2973 - if (!p->hasHeight && heightAdjusted && rect.height() > 0)
2974 -- popupItem->setHeight(rect.height());
2975 --
2976 -+ popupItem->setHeight(rect.height() / scale);
2977 - m_positioning = false;
2978 - }
2979 -
2980 ---
2981 -2.16.3
2982
2983 diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.14.2-r1.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.14.2-r1.ebuild
2984 deleted file mode 100644
2985 index 05d48cade92..00000000000
2986 --- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.14.2-r1.ebuild
2987 +++ /dev/null
2988 @@ -1,34 +0,0 @@
2989 -# Copyright 1999-2020 Gentoo Authors
2990 -# Distributed under the terms of the GNU General Public License v2
2991 -
2992 -EAPI=7
2993 -inherit qt5-build
2994 -
2995 -DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
2996 -
2997 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
2998 - KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
2999 -fi
3000 -
3001 -IUSE="widgets"
3002 -
3003 -DEPEND="
3004 - ~dev-qt/qtcore-${PV}
3005 - ~dev-qt/qtdeclarative-${PV}
3006 - ~dev-qt/qtgui-${PV}
3007 - widgets? ( ~dev-qt/qtwidgets-${PV} )
3008 -"
3009 -RDEPEND="${DEPEND}
3010 - ~dev-qt/qtgraphicaleffects-${PV}
3011 -"
3012 -
3013 -PATCHES=(
3014 - "${FILESDIR}/${P}-account-for-scale-before-positioning.patch" # QTBUG-73687
3015 -)
3016 -
3017 -src_prepare() {
3018 - qt_use_disable_mod widgets widgets \
3019 - src/imports/platform/platform.pro
3020 -
3021 - qt5-build_src_prepare
3022 -}
3023
3024 diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
3025 index 22a6b9289ad..4788d092236 100644
3026 --- a/dev-qt/qtscript/Manifest
3027 +++ b/dev-qt/qtscript/Manifest
3028 @@ -1,2 +1 @@
3029 -DIST qtscript-everywhere-src-5.14.2.tar.xz 2654528 BLAKE2B cb749d1db5774ef1e236ec82f57ca17fdb85bfec02f7dc346ceb0bb316783c8e1bdfe5b4d0a6339b3b91050a8a003b1fa221de10eadfd1f5b8828dced669c1d8 SHA512 2eef6c4d23fccd67abc3647852ca92edd951b4ece8047f28571689a143421c5a1403ef0fcc96615e4ed708df64f7eede643d872fac850554031a17e2d907f398
3030 DIST qtscript-everywhere-src-5.15.1.tar.xz 2663232 BLAKE2B 3bc0c6bce1f7792fa67cc05f1948b3ca82a4ba5c3166f55860ba83f5b9a352d2eddeb9586a967e02251e1be143b6f1aeefcfd7dca627c207190ab1b39b2f755a SHA512 f97bdf0a3a402f2658d23c92d2f0d916bda68b63f1f140f90cb99176e969736758d50cbdc36c5a4b135b08cb74c117dd92c29bcbb41b1a28189af9180604b8ba
3031
3032 diff --git a/dev-qt/qtscript/qtscript-5.14.2.ebuild b/dev-qt/qtscript/qtscript-5.14.2.ebuild
3033 deleted file mode 100644
3034 index d2aa2181a86..00000000000
3035 --- a/dev-qt/qtscript/qtscript-5.14.2.ebuild
3036 +++ /dev/null
3037 @@ -1,36 +0,0 @@
3038 -# Copyright 1999-2020 Gentoo Authors
3039 -# Distributed under the terms of the GNU General Public License v2
3040 -
3041 -EAPI=7
3042 -inherit qt5-build
3043 -
3044 -DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
3045 -
3046 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
3047 - KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
3048 -fi
3049 -
3050 -IUSE="+jit scripttools"
3051 -
3052 -DEPEND="
3053 - ~dev-qt/qtcore-${PV}
3054 - scripttools? (
3055 - ~dev-qt/qtgui-${PV}
3056 - ~dev-qt/qtwidgets-${PV}
3057 - )
3058 -"
3059 -RDEPEND="${DEPEND}"
3060 -
3061 -src_prepare() {
3062 - qt_use_disable_mod scripttools widgets \
3063 - src/src.pro
3064 -
3065 - qt5-build_src_prepare
3066 -}
3067 -
3068 -src_configure() {
3069 - local myqmakeargs=(
3070 - JAVASCRIPTCORE_JIT=$(usex jit 'yes' 'no')
3071 - )
3072 - qt5-build_src_configure
3073 -}
3074
3075 diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest
3076 index d7fe984e5d2..29ff91b0cb0 100644
3077 --- a/dev-qt/qtscxml/Manifest
3078 +++ b/dev-qt/qtscxml/Manifest
3079 @@ -1,2 +1 @@
3080 -DIST qtscxml-everywhere-src-5.14.2.tar.xz 433268 BLAKE2B 171e4f6f6a97ee673dd985b63d3ecffabda911276f4e916f4a9c63bf1fb4367972f102a1638ded3e26c5fee706ef0391d4cb6eb7aa0823b33670641a9fc2e2ac SHA512 2e1cbea7c32d93675b4a67287dd17c9ed120a6655f8f9a30edfe12a16f67b3c5ad6d0fd04c0102297693bf87e225d81e963534958c8e73622c605388c9fc8425
3081 DIST qtscxml-everywhere-src-5.15.1.tar.xz 434168 BLAKE2B 7957a43ff527763137dfab45bec9242e8ca9a5d308ab0b7d1d9057f8e362f24ef73de19e61e1301922be87082ca07eda1524704916769875e5ef879710c661d2 SHA512 893c3b247578c330db9b828e28e4df83b0e966bb469f1f453569e0226a8181b642c37f2198ff4194bec7997daee9578bebaaa7166bf1be8b67693edd0fbac082
3082
3083 diff --git a/dev-qt/qtscxml/qtscxml-5.14.2.ebuild b/dev-qt/qtscxml/qtscxml-5.14.2.ebuild
3084 deleted file mode 100644
3085 index f85c0919e34..00000000000
3086 --- a/dev-qt/qtscxml/qtscxml-5.14.2.ebuild
3087 +++ /dev/null
3088 @@ -1,19 +0,0 @@
3089 -# Copyright 1999-2020 Gentoo Authors
3090 -# Distributed under the terms of the GNU General Public License v2
3091 -
3092 -EAPI=7
3093 -inherit qt5-build
3094 -
3095 -DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
3096 -
3097 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
3098 - KEYWORDS="amd64 arm64 x86"
3099 -fi
3100 -
3101 -IUSE=""
3102 -
3103 -DEPEND="
3104 - ~dev-qt/qtcore-${PV}
3105 - ~dev-qt/qtdeclarative-${PV}
3106 -"
3107 -RDEPEND="${DEPEND}"
3108
3109 diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
3110 index 8698178f258..16acd538e78 100644
3111 --- a/dev-qt/qtsensors/Manifest
3112 +++ b/dev-qt/qtsensors/Manifest
3113 @@ -1,2 +1 @@
3114 -DIST qtsensors-everywhere-src-5.14.2.tar.xz 2050616 BLAKE2B 7a31fc1d57fd925baf8c3fb38477f5888334f64bf08f55ed557db85bca12d6e9d24bbf38e2cad0b74774712a1311a2554c35155507887d7c032d25ae28d47f1c SHA512 43872a51163317c2fb642f59a9e41ede77cb86d7148436d9e673ac94543fb8acffe4e040824dd88a9029943418a3371c77815b82a0a566426857d18fbc23e341
3115 DIST qtsensors-everywhere-src-5.15.1.tar.xz 2057232 BLAKE2B d4b609db7a73fbaf8cb3da02e34639491a778dab10061de7887bc76f39bcf712d9529fffd1712f94551da350bb9f0f823eac48a6d9be0a4d73e0fe9753bc475e SHA512 ef0757125a6c5b89e206661d1d0e0674b673a81e1a0be1de9de2fdcd701fd507b0b47e1b67be013cbebbf846f593e37e4ef2941dcec4b78028019820d1fe7c3b
3116
3117 diff --git a/dev-qt/qtsensors/qtsensors-5.14.2.ebuild b/dev-qt/qtsensors/qtsensors-5.14.2.ebuild
3118 deleted file mode 100644
3119 index bc68f84ee2a..00000000000
3120 --- a/dev-qt/qtsensors/qtsensors-5.14.2.ebuild
3121 +++ /dev/null
3122 @@ -1,28 +0,0 @@
3123 -# Copyright 1999-2020 Gentoo Authors
3124 -# Distributed under the terms of the GNU General Public License v2
3125 -
3126 -EAPI=7
3127 -inherit qt5-build
3128 -
3129 -DESCRIPTION="Hardware sensor access library for the Qt5 framework"
3130 -
3131 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
3132 - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86"
3133 -fi
3134 -
3135 -# TODO: simulator
3136 -IUSE="qml"
3137 -
3138 -RDEPEND="
3139 - ~dev-qt/qtcore-${PV}
3140 - ~dev-qt/qtdbus-${PV}
3141 - qml? ( ~dev-qt/qtdeclarative-${PV} )
3142 -"
3143 -DEPEND="${RDEPEND}"
3144 -
3145 -src_prepare() {
3146 - qt_use_disable_mod qml quick \
3147 - src/src.pro
3148 -
3149 - qt5-build_src_prepare
3150 -}
3151
3152 diff --git a/dev-qt/qtserialbus/Manifest b/dev-qt/qtserialbus/Manifest
3153 index 68aba60f88a..f50f47eeb7d 100644
3154 --- a/dev-qt/qtserialbus/Manifest
3155 +++ b/dev-qt/qtserialbus/Manifest
3156 @@ -1,2 +1 @@
3157 -DIST qtserialbus-everywhere-src-5.14.2.tar.xz 349808 BLAKE2B f2c11796e412fef11031ce881c7e6684572bd67f7bccdca1b98a7099d19df57d184ef8b33f5b2df4f516b5922b482dfe32122411c98a6f73fca66104ec70be64 SHA512 c98c7d30dc7f44837a601088b2797bc85d8b659dcdba5f22c229edad0fcee57e38c5b5d55ed223f22c9ce4e14b72ea6e59b920d4f4b366d0381b208e3e9cff40
3158 DIST qtserialbus-everywhere-src-5.15.1.tar.xz 356308 BLAKE2B 980c78aefbbfae6526d65ddce65276ec03b3c781529938d5a43a8e285dbb6f51412f54d7f9c17d6c4c8db3e9734847c0134805fd45367c39508636fb9c801d91 SHA512 cd7e0d721aa46a59239f44c6b0122509aba2237e0e62ea5399b4d4924601a9def989dd8b5d17fdcc46b41491d582d82b46c7efdfb9277ac1f06da7f1e2a1a859
3159
3160 diff --git a/dev-qt/qtserialbus/qtserialbus-5.14.2.ebuild b/dev-qt/qtserialbus/qtserialbus-5.14.2.ebuild
3161 deleted file mode 100644
3162 index 2b783f49966..00000000000
3163 --- a/dev-qt/qtserialbus/qtserialbus-5.14.2.ebuild
3164 +++ /dev/null
3165 @@ -1,20 +0,0 @@
3166 -# Copyright 1999-2020 Gentoo Authors
3167 -# Distributed under the terms of the GNU General Public License v2
3168 -
3169 -EAPI=7
3170 -inherit qt5-build
3171 -
3172 -DESCRIPTION="Qt module to access CAN, ModBus, and other industrial serial buses and protocols"
3173 -
3174 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
3175 - KEYWORDS="~amd64 ~x86"
3176 -fi
3177 -
3178 -IUSE=""
3179 -
3180 -DEPEND="
3181 - ~dev-qt/qtcore-${PV}
3182 - ~dev-qt/qtnetwork-${PV}
3183 - ~dev-qt/qtserialport-${PV}
3184 -"
3185 -RDEPEND="${DEPEND}"
3186
3187 diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
3188 index 084f8612981..5126265a248 100644
3189 --- a/dev-qt/qtserialport/Manifest
3190 +++ b/dev-qt/qtserialport/Manifest
3191 @@ -1,2 +1 @@
3192 -DIST qtserialport-everywhere-src-5.14.2.tar.xz 316492 BLAKE2B 38aaf7053fde382b0b161356fdf9ab97bdf08b6307bb97b704b846dc26a309b1256c6cb53e8caa0207ffb2e174387059debba0f0256f8893f60b1c1fce58fc5a SHA512 4a4fb81bcccaddc5902223940031a9002395cbc5e99c78c1ac5df04031b6a0551bb340757f84bad82ca7ef551358c1eba3a035b0b8f4221f7db0ab738ac65b06
3193 DIST qtserialport-everywhere-src-5.15.1.tar.xz 321472 BLAKE2B 6aa086b8ec8d79abbf1f428913800a67e1a48fb8629c10058fc464b913f3840a9dc06084bf181749b543f4795400b93f133ffe74cbc546986bf48e01317bb883 SHA512 5d2e9742d1c5f784375b3d0bf05e227abf1f358f4ba60e66044378b60ac256dda2ab5ecced07c68ca8d93fe894617050821654200e1faa12f4cca112a4fbd2a4
3194
3195 diff --git a/dev-qt/qtserialport/qtserialport-5.14.2.ebuild b/dev-qt/qtserialport/qtserialport-5.14.2.ebuild
3196 deleted file mode 100644
3197 index 23658e243ff..00000000000
3198 --- a/dev-qt/qtserialport/qtserialport-5.14.2.ebuild
3199 +++ /dev/null
3200 @@ -1,27 +0,0 @@
3201 -# Copyright 1999-2020 Gentoo Authors
3202 -# Distributed under the terms of the GNU General Public License v2
3203 -
3204 -EAPI=7
3205 -inherit qt5-build
3206 -
3207 -DESCRIPTION="Serial port abstraction library for the Qt5 framework"
3208 -
3209 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
3210 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
3211 -fi
3212 -
3213 -IUSE=""
3214 -
3215 -DEPEND="
3216 - ~dev-qt/qtcore-${PV}
3217 - virtual/libudev:=
3218 -"
3219 -RDEPEND="${DEPEND}"
3220 -
3221 -src_prepare() {
3222 - # make sure we link against libudev
3223 - sed -i -e 's/:qtConfig(libudev)//' \
3224 - src/serialport/serialport-lib.pri || die
3225 -
3226 - qt5-build_src_prepare
3227 -}
3228
3229 diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
3230 index d50e61a243e..5244c976ef5 100644
3231 --- a/dev-qt/qtspeech/Manifest
3232 +++ b/dev-qt/qtspeech/Manifest
3233 @@ -1,2 +1 @@
3234 -DIST qtspeech-everywhere-src-5.14.2.tar.xz 101100 BLAKE2B d37d08a2f7e6d40c7f6e68f9c4e301cdf9762ad9088a3fa0f9568af7211a2842b035e8f5eb001538aaa84385104d112cd6e550e32119099acee922f2dd13db36 SHA512 d3870cc66cba4f5dd2c0a2a4845defe4299de2d7affe12ccdadc4948116317590b580592d575cc5e8eb190043a92f38416e030f47cfb87f5cf3419a31152e00f
3235 DIST qtspeech-everywhere-src-5.15.1.tar.xz 101772 BLAKE2B 8a61ff9d5b0ba33ef3c82e26f3e4ae91ff0a6af848ae2bd26c0f0850cab0cbc701698c712e528cb6bb9a66ac699519f8235cb2c62edabc4506bf397ca747401c SHA512 0e2c82ea72b5bff5b36f3d833d80dec68b39f3b9c3ca4d9c9fa29f0419a45dfb19ac59fb105136c551f6bbe60ad32af0f4aaa6abafb5bc61bc5d85ecb94b326f
3236
3237 diff --git a/dev-qt/qtspeech/qtspeech-5.14.2.ebuild b/dev-qt/qtspeech/qtspeech-5.14.2.ebuild
3238 deleted file mode 100644
3239 index ce5caf53038..00000000000
3240 --- a/dev-qt/qtspeech/qtspeech-5.14.2.ebuild
3241 +++ /dev/null
3242 @@ -1,20 +0,0 @@
3243 -# Copyright 1999-2020 Gentoo Authors
3244 -# Distributed under the terms of the GNU General Public License v2
3245 -
3246 -EAPI=7
3247 -inherit qt5-build
3248 -
3249 -DESCRIPTION="Text-to-speech library for the Qt5 framework"
3250 -
3251 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
3252 - KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
3253 -fi
3254 -
3255 -# TODO: flite plugin - needs 2.0.0 (not yet in tree)
3256 -IUSE=""
3257 -
3258 -RDEPEND="
3259 - >=app-accessibility/speech-dispatcher-0.8.7
3260 - ~dev-qt/qtcore-${PV}
3261 -"
3262 -DEPEND="${RDEPEND}"
3263
3264 diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
3265 index d72f3b48819..98e054ddcf5 100644
3266 --- a/dev-qt/qtsql/Manifest
3267 +++ b/dev-qt/qtsql/Manifest
3268 @@ -1,2 +1 @@
3269 -DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
3270 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
3271
3272 diff --git a/dev-qt/qtsql/qtsql-5.14.2.ebuild b/dev-qt/qtsql/qtsql-5.14.2.ebuild
3273 deleted file mode 100644
3274 index 3b493c72fbb..00000000000
3275 --- a/dev-qt/qtsql/qtsql-5.14.2.ebuild
3276 +++ /dev/null
3277 @@ -1,55 +0,0 @@
3278 -# Copyright 1999-2020 Gentoo Authors
3279 -# Distributed under the terms of the GNU General Public License v2
3280 -
3281 -EAPI=7
3282 -QT5_MODULE="qtbase"
3283 -inherit qt5-build
3284 -
3285 -DESCRIPTION="SQL abstraction library for the Qt5 framework"
3286 -SLOT=5/$(ver_cut 1-3) # bug 639140
3287 -
3288 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
3289 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
3290 -fi
3291 -
3292 -IUSE="freetds mysql oci8 odbc postgres +sqlite"
3293 -
3294 -REQUIRED_USE="
3295 - || ( freetds mysql oci8 odbc postgres sqlite )
3296 -"
3297 -
3298 -DEPEND="
3299 - ~dev-qt/qtcore-${PV}:5=
3300 - freetds? ( dev-db/freetds )
3301 - mysql? ( dev-db/mysql-connector-c:= )
3302 - oci8? ( dev-db/oracle-instantclient:=[sdk] )
3303 - odbc? ( dev-db/unixODBC )
3304 - postgres? ( dev-db/postgresql:* )
3305 - sqlite? ( dev-db/sqlite:3 )
3306 -"
3307 -RDEPEND="${DEPEND}"
3308 -
3309 -QT5_TARGET_SUBDIRS=(
3310 - src/sql
3311 - src/plugins/sqldrivers
3312 -)
3313 -
3314 -QT5_GENTOO_PRIVATE_CONFIG=(
3315 - :sql
3316 -)
3317 -
3318 -src_configure() {
3319 - local myconf=(
3320 - $(qt_use freetds sql-tds plugin)
3321 - $(qt_use mysql sql-mysql plugin)
3322 - $(qt_use oci8 sql-oci plugin)
3323 - $(qt_use odbc sql-odbc plugin)
3324 - $(qt_use postgres sql-psql plugin)
3325 - $(qt_use sqlite sql-sqlite plugin)
3326 - $(usex sqlite -system-sqlite '')
3327 - )
3328 -
3329 - use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
3330 -
3331 - qt5-build_src_configure
3332 -}
3333
3334 diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
3335 index de3d88b5486..ff4a7cb588e 100644
3336 --- a/dev-qt/qtsvg/Manifest
3337 +++ b/dev-qt/qtsvg/Manifest
3338 @@ -1,2 +1 @@
3339 -DIST qtsvg-everywhere-src-5.14.2.tar.xz 1880100 BLAKE2B 285732e614c5aaf3a4ddb644cdfb3cd35708985d79d6ab3aa5917fde35d43fd656b5c6fbc5f08764b6413e5f0aa8919f70966791ece15fbb2d96c38b9575e27b SHA512 b4cf8a7081e01caea3c71826d32ebb9da6a71bd4eab3cf353e87080009065aff2c533300c0c08a005ff8f441d2da641a097319114a5c11b618398fac41f574a7
3340 DIST qtsvg-everywhere-src-5.15.1.tar.xz 1885556 BLAKE2B b17906bce25066581fa4f53c4b35dad918da737fec8a966c891a150a242a787f231619fa6b1a303d02edfd7cde4a977fc3c0f94eb993bef56e4dfdee81892f20 SHA512 c0289bbce4682eef9cd87811ad11a4ce2141cb89bd026f9cc595123e6b4ebbe9e81a91b54bcf25fbf4225bc66e8a5e4f49e4fabde43e9da066583f22aab4f35f
3341
3342 diff --git a/dev-qt/qtsvg/qtsvg-5.14.2.ebuild b/dev-qt/qtsvg/qtsvg-5.14.2.ebuild
3343 deleted file mode 100644
3344 index 558cc0f0b7f..00000000000
3345 --- a/dev-qt/qtsvg/qtsvg-5.14.2.ebuild
3346 +++ /dev/null
3347 @@ -1,23 +0,0 @@
3348 -# Copyright 1999-2020 Gentoo Authors
3349 -# Distributed under the terms of the GNU General Public License v2
3350 -
3351 -EAPI=7
3352 -inherit qt5-build
3353 -
3354 -DESCRIPTION="SVG rendering library for the Qt5 framework"
3355 -
3356 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
3357 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
3358 -fi
3359 -
3360 -IUSE=""
3361 -
3362 -RDEPEND="
3363 - ~dev-qt/qtcore-${PV}
3364 - ~dev-qt/qtgui-${PV}
3365 - ~dev-qt/qtwidgets-${PV}
3366 - sys-libs/zlib:=
3367 -"
3368 -DEPEND="${RDEPEND}
3369 - test? ( ~dev-qt/qtxml-${PV} )
3370 -"
3371
3372 diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
3373 index d72f3b48819..98e054ddcf5 100644
3374 --- a/dev-qt/qttest/Manifest
3375 +++ b/dev-qt/qttest/Manifest
3376 @@ -1,2 +1 @@
3377 -DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
3378 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
3379
3380 diff --git a/dev-qt/qttest/qttest-5.14.2.ebuild b/dev-qt/qttest/qttest-5.14.2.ebuild
3381 deleted file mode 100644
3382 index 25b708984fb..00000000000
3383 --- a/dev-qt/qttest/qttest-5.14.2.ebuild
3384 +++ /dev/null
3385 @@ -1,33 +0,0 @@
3386 -# Copyright 1999-2020 Gentoo Authors
3387 -# Distributed under the terms of the GNU General Public License v2
3388 -
3389 -EAPI=7
3390 -QT5_MODULE="qtbase"
3391 -VIRTUALX_REQUIRED="test"
3392 -inherit qt5-build
3393 -
3394 -DESCRIPTION="Unit testing library for the Qt5 framework"
3395 -
3396 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
3397 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
3398 -fi
3399 -
3400 -IUSE=""
3401 -
3402 -RDEPEND="
3403 - ~dev-qt/qtcore-${PV}:5=
3404 -"
3405 -DEPEND="${RDEPEND}
3406 - test? (
3407 - ~dev-qt/qtgui-${PV}
3408 - ~dev-qt/qtxml-${PV}
3409 - )
3410 -"
3411 -
3412 -QT5_TARGET_SUBDIRS=(
3413 - src/testlib
3414 -)
3415 -
3416 -QT5_GENTOO_PRIVATE_CONFIG=(
3417 - :testlib
3418 -)
3419
3420 diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
3421 index 0825854cc5b..e3082b7a48c 100644
3422 --- a/dev-qt/qttranslations/Manifest
3423 +++ b/dev-qt/qttranslations/Manifest
3424 @@ -1,2 +1 @@
3425 -DIST qttranslations-everywhere-src-5.14.2.tar.xz 1348684 BLAKE2B f72cb65813c9b21d57eb6673d193fd6f67d65ced740622567b39333714a8491e3ffa2edd729aba917fae8883d693fbd68c567ca03cd243ea734804e1862b4794 SHA512 38cedf19a1d7b920b7dcfcc014d3986c4067dafd7192efe43c3b8f282e0637391f9ec0b8cc7f5506cc76629d005298becba1421506b48c6baf3366ec2f378544
3426 DIST qttranslations-everywhere-src-5.15.1.tar.xz 1419252 BLAKE2B 80656f949a8a408953169e9fb611887a73f302025a8411cddce40956b72fd4ac7bfb580fa37c2e932a5f7fe1388503bb30117b675cf65a8c7eee301a766bbfce SHA512 8e9fe7614c9aa9c557db1bfd6a0ceae90b45e5d28e0cd715fd4ad962b9fbfa722549d6c2a13d82deebd7d3fab7e68cc7affd207beb75629de0d01a5522035581
3427
3428 diff --git a/dev-qt/qttranslations/qttranslations-5.14.2.ebuild b/dev-qt/qttranslations/qttranslations-5.14.2.ebuild
3429 deleted file mode 100644
3430 index 762a128712e..00000000000
3431 --- a/dev-qt/qttranslations/qttranslations-5.14.2.ebuild
3432 +++ /dev/null
3433 @@ -1,19 +0,0 @@
3434 -# Copyright 1999-2020 Gentoo Authors
3435 -# Distributed under the terms of the GNU General Public License v2
3436 -
3437 -EAPI=7
3438 -inherit qt5-build
3439 -
3440 -DESCRIPTION="Translation files for the Qt5 framework"
3441 -
3442 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
3443 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
3444 -fi
3445 -
3446 -IUSE=""
3447 -
3448 -DEPEND="
3449 - ~dev-qt/linguist-tools-${PV}
3450 - ~dev-qt/qtcore-${PV}
3451 -"
3452 -RDEPEND=""
3453
3454 diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
3455 index 542259ce235..e81f0343e56 100644
3456 --- a/dev-qt/qtvirtualkeyboard/Manifest
3457 +++ b/dev-qt/qtvirtualkeyboard/Manifest
3458 @@ -1,2 +1 @@
3459 -DIST qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz 10957372 BLAKE2B 9fc84f0ee58a235e7a6291030ce8c8f9271789b7f62bd39b9fd9d0f23a47703c147c388ea89187527ba60902e03c0a145291c3ead1a185d3e771a982ce4c0430 SHA512 752634de8796a1809818176db47021aa24de842cf6334d689a91d3b011105a5e2b8113615a8f50f6974bf8fa989026b434121b42278de1ef905075ba3ee72c47
3460 DIST qtvirtualkeyboard-everywhere-src-5.15.1.tar.xz 10969980 BLAKE2B 8f645c22e7fa48f967b72cd66af5658f9ddf119cdf66b7acac9cc4ac6b26b45e461960c1987936a872dff093949f305c65ba0a3009cfbf22fcd73e0443e97e92 SHA512 f369eb0c313aa5a932cacca44f93732f8a7b8de4bf46df294c40b7c7dd436d5da5012680420306b57347aa38a10d78231199093a10e2b8a272429536a327962e
3461
3462 diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.14.2.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.14.2.ebuild
3463 deleted file mode 100644
3464 index 2bab20a9745..00000000000
3465 --- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.14.2.ebuild
3466 +++ /dev/null
3467 @@ -1,43 +0,0 @@
3468 -# Copyright 1999-2020 Gentoo Authors
3469 -# Distributed under the terms of the GNU General Public License v2
3470 -
3471 -EAPI=7
3472 -
3473 -inherit qt5-build
3474 -
3475 -DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
3476 -
3477 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
3478 - KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
3479 -fi
3480 -
3481 -# TODO: unbudle libraries for more layouts
3482 -IUSE="handwriting +spell +X"
3483 -
3484 -DEPEND="
3485 - ~dev-qt/qtcore-${PV}
3486 - ~dev-qt/qtdeclarative-${PV}
3487 - ~dev-qt/qtgui-${PV}
3488 - ~dev-qt/qtsvg-${PV}
3489 - spell? ( app-text/hunspell:= )
3490 - X? ( x11-libs/libxcb:= )
3491 -"
3492 -RDEPEND="${DEPEND}"
3493 -
3494 -src_configure() {
3495 - local myqmakeargs=(
3496 - $(usex handwriting CONFIG+=lipi-toolkit '')
3497 - $(usex spell '' CONFIG+=disable-hunspell)
3498 - $(usex X '' CONFIG+=disable-desktop)
3499 - CONFIG+="lang-ar_AR lang-bg_BG lang-cs_CZ lang-da_DK lang-de_DE \
3500 - lang-el_GR lang-en_GB lang-en_US lang-es_ES lang-es_MX \
3501 - lang-et_EE lang-fa_FA lang-fi_FI lang-fr_CA lang-fr_FR \
3502 - lang-he_IL lang-hi_IN lang-hr_HR lang-hu_HU lang-id_ID \
3503 - lang-it_IT lang-ms_MY lang-nb_NO lang-nl_NL lang-pl_PL \
3504 - lang-pt_BR lang-pt_PT lang-ro_RO lang-ru_RU lang-sk_SK \
3505 - lang-sl_SI lang-sq_AL lang-sr_SP lang-sv_SE lang-tr_TR \
3506 - lang-uk_UA lang-vi_VN"
3507 - )
3508 -
3509 - qt5-build_src_configure
3510 -}
3511
3512 diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
3513 index c6c735e132a..6660cc90db8 100644
3514 --- a/dev-qt/qtwayland/Manifest
3515 +++ b/dev-qt/qtwayland/Manifest
3516 @@ -1,2 +1 @@
3517 -DIST qtwayland-everywhere-src-5.14.2.tar.xz 544532 BLAKE2B 13cf07116737ec2fd301f51f517cbc062fdd42b800d6d2739193f3570f1a9552e66e9909de15c22cc530d5284c3be9ff24915ce4b36f529ec6c22faeb0edff58 SHA512 0f396cabace17f099c2f2c0be54317006dc00c5f4be08cd79a4fa4fdc94362f63cc6ce9decc7feb63f566dd2ea52d562257e4bb23332557054418fc16dc7e899
3518 DIST qtwayland-everywhere-src-5.15.1.tar.xz 563508 BLAKE2B 507e8612a35c6439fab0637edfcae95d712daf19c0a8b97110b57b8a8ffd70374addc3ef19f210eedc9493d84ec441f18bd0fd5a25af5394fde40ee55573eb09 SHA512 d6619f35b3ab163372a0d49a2221c487d5936b6d9ebeb92a7fd41521c424d550eea7c5c584e07f15bde1ec5ece1bd5774845eb9956ce793e546197ffdb28d594
3519
3520 diff --git a/dev-qt/qtwayland/qtwayland-5.14.2.ebuild b/dev-qt/qtwayland/qtwayland-5.14.2.ebuild
3521 deleted file mode 100644
3522 index 144ebd6f0d8..00000000000
3523 --- a/dev-qt/qtwayland/qtwayland-5.14.2.ebuild
3524 +++ /dev/null
3525 @@ -1,45 +0,0 @@
3526 -# Copyright 1999-2020 Gentoo Authors
3527 -# Distributed under the terms of the GNU General Public License v2
3528 -
3529 -EAPI=7
3530 -inherit qt5-build
3531 -
3532 -DESCRIPTION="Wayland platform plugin for Qt"
3533 -
3534 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
3535 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
3536 -fi
3537 -
3538 -IUSE="vulkan X"
3539 -
3540 -DEPEND="
3541 - >=dev-libs/wayland-1.6.0
3542 - ~dev-qt/qtcore-${PV}
3543 - ~dev-qt/qtdeclarative-${PV}
3544 - ~dev-qt/qtgui-${PV}[egl,libinput,vulkan=]
3545 - media-libs/mesa[egl]
3546 - >=x11-libs/libxkbcommon-0.2.0
3547 - vulkan? ( dev-util/vulkan-headers )
3548 - X? (
3549 - ~dev-qt/qtgui-${PV}[-gles2-only]
3550 - x11-libs/libX11
3551 - x11-libs/libXcomposite
3552 - )
3553 -"
3554 -RDEPEND="${DEPEND}"
3555 -
3556 -src_prepare() {
3557 - use X || rm -r config.tests/xcomposite || die
3558 -
3559 - qt5-build_src_prepare
3560 -}
3561 -
3562 -src_configure() {
3563 - local myqmakeargs=(
3564 - --
3565 - $(qt_use vulkan feature-wayland-vulkan-server-buffer)
3566 - $(qt_use X feature-xcomposite-egl)
3567 - $(qt_use X feature-xcomposite-glx)
3568 - )
3569 - qt5-build_src_configure
3570 -}
3571
3572 diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
3573 index df98f4dcb8b..cc14b3ca6dd 100644
3574 --- a/dev-qt/qtwebchannel/Manifest
3575 +++ b/dev-qt/qtwebchannel/Manifest
3576 @@ -1,2 +1 @@
3577 -DIST qtwebchannel-everywhere-src-5.14.2.tar.xz 202592 BLAKE2B d65dadcc93c02d1a4d8bee81371a79037054442c153cd4e24d04df1052d654204fd8bf3cb17aada35b2627ac5221b840af58e3fd7f58cda45c0a3eee97308d63 SHA512 57080c8cf7fb5c91fa6b325566d3fb2dc3c1d3bcd8128d2a40ea92f8bae7ca0f0fb4bac1d68452998a5dc06781155058d149df069fed5ff16b6d8ad43a72e002
3578 DIST qtwebchannel-everywhere-src-5.15.1.tar.xz 208872 BLAKE2B 14899ca0f65eafd69c0b7610035c7b1de6d2c033a4929a49b3898a16aea2eada812d4ebd343f7581eebd5df5e649c9cb7f62c2b9287d24fcbfc7c82600dfaf27 SHA512 01f37630ce7aa32726831b4a4d5e52e861269e33efd89246770e8a2a5536be976601d055c95f99d45699ea918ac4ce465b9ffab725f39841ddc5d320817c7523
3579
3580 diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.14.2.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.14.2.ebuild
3581 deleted file mode 100644
3582 index 8e07b74973b..00000000000
3583 --- a/dev-qt/qtwebchannel/qtwebchannel-5.14.2.ebuild
3584 +++ /dev/null
3585 @@ -1,26 +0,0 @@
3586 -# Copyright 1999-2020 Gentoo Authors
3587 -# Distributed under the terms of the GNU General Public License v2
3588 -
3589 -EAPI=7
3590 -inherit qt5-build
3591 -
3592 -DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
3593 -
3594 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
3595 - KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
3596 -fi
3597 -
3598 -IUSE="qml"
3599 -
3600 -DEPEND="
3601 - ~dev-qt/qtcore-${PV}
3602 - qml? ( ~dev-qt/qtdeclarative-${PV} )
3603 -"
3604 -RDEPEND="${DEPEND}"
3605 -
3606 -src_prepare() {
3607 - qt_use_disable_mod qml quick src/src.pro
3608 - qt_use_disable_mod qml qml src/webchannel/webchannel.pro
3609 -
3610 - qt5-build_src_prepare
3611 -}
3612
3613 diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
3614 index ff67491b489..4858850b01d 100644
3615 --- a/dev-qt/qtwebengine/Manifest
3616 +++ b/dev-qt/qtwebengine/Manifest
3617 @@ -1,3 +1,2 @@
3618 DIST qtwebengine-5.15.0-ppc64.tar.xz 48156 BLAKE2B 6901b04ca869e6980e7f624000dd292fad2b514d8b1853d2796a11fa0e1b1c3a80f284cc1e3c242133b6886bb56329430229645af1ad8cac927371e3941b9fab SHA512 c2613a8d889bb9d7184a65ab6127c8329a945386f23cb860219b8e161d0a43683fa66f69d8d1441f5920fa370fda7c4629865fa452be9ab8a8b1515e5f93504b
3619 -DIST qtwebengine-everywhere-src-5.14.2.tar.xz 242467568 BLAKE2B 2b69af846d9f6b1b1bd6380f56868e7fe86c88baf00e4b596e6a825d636472f837c1fc3b9ed41182dcc20dc0ba03360182aba39aee4adca66f407a8346f90fbf SHA512 bcfd9ece04bdbfded5272ce1b3ab482e88349b1f5c5a071f58f6e66fcb9604d1fc38fe909ae3d9631bdf0bf7c081d7590620c3388f1a577b5236f68b084699bf
3620 DIST qtwebengine-everywhere-src-5.15.1.tar.xz 278488056 BLAKE2B f369e435510644b36a7305a1a2b907f09f533f995c0c1a367a801cb9f277f66914f4511f20926ed4c865e9e5ec921c12d4406191706d263320a861250cebb3a0 SHA512 651520fcf89681b06c57f1992223f06ecbe3750a88ffae7a94a339503957e09d327ee1ae7e4bce88bfb09131b3b9c9abfc44f7bccb9c50d286181eaf306991a4
3621
3622 diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.14.1-disable-fatal-warnings.patch b/dev-qt/qtwebengine/files/qtwebengine-5.14.1-disable-fatal-warnings.patch
3623 deleted file mode 100644
3624 index 40f1f5d6c2a..00000000000
3625 --- a/dev-qt/qtwebengine/files/qtwebengine-5.14.1-disable-fatal-warnings.patch
3626 +++ /dev/null
3627 @@ -1,12 +0,0 @@
3628 -diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri
3629 -index 97d3953..dd3d222 100644
3630 ---- a/src/buildtools/config/common.pri
3631 -+++ b/src/buildtools/config/common.pri
3632 -@@ -25,6 +25,7 @@ gn_args += \
3633 - v8_use_external_startup_data=false \
3634 - toolkit_views=false \
3635 - treat_warnings_as_errors=false \
3636 -+ fatal_linker_warnings=false \
3637 - safe_browsing_mode=0 \
3638 - optimize_webui=false \
3639 - forbid_non_component_debug_builds=false
3640
3641 diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10.patch b/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10.patch
3642 deleted file mode 100644
3643 index 5df71a60252..00000000000
3644 --- a/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10.patch
3645 +++ /dev/null
3646 @@ -1,89 +0,0 @@
3647 -From cf83347e6fa9c086b5df022d23ca666245bf1989 Mon Sep 17 00:00:00 2001
3648 -From: Jimi Huotari <chiitoo@g.o>
3649 -Date: Sun, 10 May 2020 06:02:59 +0300
3650 -Subject: [PATCH] Fix build with GCC 10
3651 -
3652 -Change-Id: I733b8e8a00c49766effbee08c8b1f6f5d31a2dbf
3653 ----
3654 - chromium/base/trace_event/trace_event_memory_overhead.h | 1 +
3655 - chromium/media/cdm/supported_cdm_versions.h | 1 +
3656 - .../third_party/perfetto/include/perfetto/base/task_runner.h | 1 +
3657 - chromium/third_party/webrtc/call/rtx_receive_stream.h | 1 +
3658 - .../webrtc/modules/audio_processing/aec3/clockdrift_detector.h | 1 +
3659 - .../third_party/webrtc/modules/video_coding/decoding_state.h | 1 +
3660 - 6 files changed, 6 insertions(+)
3661 -
3662 -diff --git a/chromium/base/trace_event/trace_event_memory_overhead.h b/chromium/base/trace_event/trace_event_memory_overhead.h
3663 -index 69468d46409..e10a3eca667 100644
3664 ---- a/src/3rdparty/chromium/base/trace_event/trace_event_memory_overhead.h
3665 -+++ b/src/3rdparty/chromium/base/trace_event/trace_event_memory_overhead.h
3666 -@@ -8,6 +8,7 @@
3667 - #include <stddef.h>
3668 - #include <stdint.h>
3669 -
3670 -+#include <string>
3671 - #include <unordered_map>
3672 -
3673 - #include "base/base_export.h"
3674 -diff --git a/chromium/media/cdm/supported_cdm_versions.h b/chromium/media/cdm/supported_cdm_versions.h
3675 -index 3f220da8c71..c54e3bb7d30 100644
3676 ---- a/src/3rdparty/chromium/media/cdm/supported_cdm_versions.h
3677 -+++ b/src/3rdparty/chromium/media/cdm/supported_cdm_versions.h
3678 -@@ -6,6 +6,7 @@
3679 - #define MEDIA_CDM_SUPPORTED_CDM_VERSIONS_H_
3680 -
3681 - #include <array>
3682 -+#include <cstddef>
3683 -
3684 - #include "media/base/media_export.h"
3685 - #include "media/cdm/api/content_decryption_module.h"
3686 -diff --git a/chromium/third_party/perfetto/include/perfetto/base/task_runner.h b/chromium/third_party/perfetto/include/perfetto/base/task_runner.h
3687 -index cf60401238f..ee4ad255dea 100644
3688 ---- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/task_runner.h
3689 -+++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/task_runner.h
3690 -@@ -18,6 +18,7 @@
3691 - #define INCLUDE_PERFETTO_BASE_TASK_RUNNER_H_
3692 -
3693 - #include <functional>
3694 -+#include <stdint.h>
3695 -
3696 - #include "perfetto/base/export.h"
3697 -
3698 -diff --git a/chromium/third_party/webrtc/call/rtx_receive_stream.h b/chromium/third_party/webrtc/call/rtx_receive_stream.h
3699 -index 8ffa4400a9c..66cc46dc091 100644
3700 ---- a/src/3rdparty/chromium/third_party/webrtc/call/rtx_receive_stream.h
3701 -+++ b/src/3rdparty/chromium/third_party/webrtc/call/rtx_receive_stream.h
3702 -@@ -12,6 +12,7 @@
3703 - #define CALL_RTX_RECEIVE_STREAM_H_
3704 -
3705 - #include <map>
3706 -+#include <stdint.h>
3707 -
3708 - #include "call/rtp_packet_sink_interface.h"
3709 -
3710 -diff --git a/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h b/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
3711 -index 22528c94892..69e624e8b19 100644
3712 ---- a/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
3713 -+++ b/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
3714 -@@ -12,6 +12,7 @@
3715 - #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_
3716 -
3717 - #include <array>
3718 -+#include <cstddef>
3719 -
3720 - namespace webrtc {
3721 -
3722 -diff --git a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
3723 -index b87fb2d0345..e6c5e2855de 100644
3724 ---- a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
3725 -+++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
3726 -@@ -13,6 +13,7 @@
3727 -
3728 - #include <map>
3729 - #include <set>
3730 -+#include <stdint.h>
3731 - #include <vector>
3732 -
3733 - namespace webrtc {
3734 ---
3735 -2.26.2
3736
3737 diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.14.2-icu67.patch b/dev-qt/qtwebengine/files/qtwebengine-5.14.2-icu67.patch
3738 deleted file mode 100644
3739 index 42ee5e87da2..00000000000
3740 --- a/dev-qt/qtwebengine/files/qtwebengine-5.14.2-icu67.patch
3741 +++ /dev/null
3742 @@ -1,169 +0,0 @@
3743 -From 2b107e7670ffb43719a66ee4a55ab408a5dcf2a5 Mon Sep 17 00:00:00 2001
3744 -From: Ujjwal Sharma <ryzokuken@×××××××.org>
3745 -Date: Wed, 22 Apr 2020 12:20:17 +0530
3746 -Subject: [PATCH] deps: V8: backport 3f8dc4b2e5ba
3747 -
3748 -Original commit message:
3749 -
3750 - [intl] Remove soon-to-be removed getAllFieldPositions
3751 -
3752 - Needed to land ICU67.1 soon.
3753 -
3754 - Bug: v8:10393
3755 - Change-Id: I3c7737ca600d6ccfdc46ffaddfb318ce60bc7618
3756 - Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2136489
3757 - Reviewed-by: Jakob Kummerow <jkummerow@××××××××.org>
3758 - Commit-Queue: Frank Tang <ftang@××××××××.org>
3759 - Cr-Commit-Position: refs/heads/master@{#67027}
3760 -
3761 -Refs: https://github.com/v8/v8/commit/3f8dc4b2e5baf77b463334c769af85b79d8c1463
3762 ----
3763 - common.gypi | 2 +-
3764 - src/3rdparty/chromium/v8/src/objects/js-number-format.cc | 72 +++++++++++++------------
3765 - 2 files changed, 38 insertions(+), 36 deletions(-)
3766 -
3767 -diff --git a/deps/v8/src/objects/js-number-format.cc b/deps/v8/src/objects/js-number-format.cc
3768 -index 92d3e2fb82e..ced408aa173 100644
3769 ---- a/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
3770 -+++ b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
3771 -@@ -1197,42 +1197,31 @@ MaybeHandle<JSNumberFormat> JSNumberFormat::New(Isolate* isolate,
3772 - }
3773 -
3774 - namespace {
3775 --Maybe<icu::UnicodeString> IcuFormatNumber(
3776 -+Maybe<bool> IcuFormatNumber(
3777 - Isolate* isolate,
3778 - const icu::number::LocalizedNumberFormatter& number_format,
3779 -- Handle<Object> numeric_obj, icu::FieldPositionIterator* fp_iter) {
3780 -+ Handle<Object> numeric_obj, icu::number::FormattedNumber* formatted) {
3781 - // If it is BigInt, handle it differently.
3782 - UErrorCode status = U_ZERO_ERROR;
3783 -- icu::number::FormattedNumber formatted;
3784 - if (numeric_obj->IsBigInt()) {
3785 - Handle<BigInt> big_int = Handle<BigInt>::cast(numeric_obj);
3786 - Handle<String> big_int_string;
3787 - ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, big_int_string,
3788 - BigInt::ToString(isolate, big_int),
3789 -- Nothing<icu::UnicodeString>());
3790 -- formatted = number_format.formatDecimal(
3791 -+ Nothing<bool>());
3792 -+ *formatted = number_format.formatDecimal(
3793 - {big_int_string->ToCString().get(), big_int_string->length()}, status);
3794 - } else {
3795 - double number = numeric_obj->Number();
3796 -- formatted = number_format.formatDouble(number, status);
3797 -+ *formatted = number_format.formatDouble(number, status);
3798 - }
3799 - if (U_FAILURE(status)) {
3800 - // This happen because of icu data trimming trim out "unit".
3801 - // See https://bugs.chromium.org/p/v8/issues/detail?id=8641
3802 -- THROW_NEW_ERROR_RETURN_VALUE(isolate,
3803 -- NewTypeError(MessageTemplate::kIcuError),
3804 -- Nothing<icu::UnicodeString>());
3805 -- }
3806 -- if (fp_iter) {
3807 -- formatted.getAllFieldPositions(*fp_iter, status);
3808 -+ THROW_NEW_ERROR_RETURN_VALUE(
3809 -+ isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<bool>());
3810 - }
3811 -- icu::UnicodeString result = formatted.toString(status);
3812 -- if (U_FAILURE(status)) {
3813 -- THROW_NEW_ERROR_RETURN_VALUE(isolate,
3814 -- NewTypeError(MessageTemplate::kIcuError),
3815 -- Nothing<icu::UnicodeString>());
3816 -- }
3817 -- return Just(result);
3818 -+ return Just(true);
3819 - }
3820 -
3821 - } // namespace
3822 -@@ -1243,10 +1232,16 @@ MaybeHandle<String> JSNumberFormat::FormatNumeric(
3823 - Handle<Object> numeric_obj) {
3824 - DCHECK(numeric_obj->IsNumeric());
3825 -
3826 -- Maybe<icu::UnicodeString> maybe_format =
3827 -- IcuFormatNumber(isolate, number_format, numeric_obj, nullptr);
3828 -+ icu::number::FormattedNumber formatted;
3829 -+ Maybe<bool> maybe_format =
3830 -+ IcuFormatNumber(isolate, number_format, numeric_obj, &formatted);
3831 - MAYBE_RETURN(maybe_format, Handle<String>());
3832 -- return Intl::ToString(isolate, maybe_format.FromJust());
3833 -+ UErrorCode status = U_ZERO_ERROR;
3834 -+ icu::UnicodeString result = formatted.toString(status);
3835 -+ if (U_FAILURE(status)) {
3836 -+ THROW_NEW_ERROR(isolate, NewTypeError(MessageTemplate::kIcuError), String);
3837 -+ }
3838 -+ return Intl::ToString(isolate, result);
3839 - }
3840 -
3841 - namespace {
3842 -@@ -1359,12 +1354,18 @@ std::vector<NumberFormatSpan> FlattenRegionsToParts(
3843 - }
3844 -
3845 - namespace {
3846 --Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
3847 -- icu::FieldPositionIterator* fp_iter,
3848 -+Maybe<int> ConstructParts(Isolate* isolate,
3849 -+ icu::number::FormattedNumber* formatted,
3850 - Handle<JSArray> result, int start_index,
3851 - Handle<Object> numeric_obj, bool style_is_unit) {
3852 -+ UErrorCode status = U_ZERO_ERROR;
3853 -+ icu::UnicodeString formatted_text = formatted->toString(status);
3854 -+ if (U_FAILURE(status)) {
3855 -+ THROW_NEW_ERROR_RETURN_VALUE(
3856 -+ isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<int>());
3857 -+ }
3858 - DCHECK(numeric_obj->IsNumeric());
3859 -- int32_t length = formatted.length();
3860 -+ int32_t length = formatted_text.length();
3861 - int index = start_index;
3862 - if (length == 0) return Just(index);
3863 -
3864 -@@ -1373,13 +1374,14 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
3865 - // other region covers some part of the formatted string. It's possible
3866 - // there's another field with exactly the same begin and end as this backdrop,
3867 - // in which case the backdrop's field_id of -1 will give it lower priority.
3868 -- regions.push_back(NumberFormatSpan(-1, 0, formatted.length()));
3869 -+ regions.push_back(NumberFormatSpan(-1, 0, formatted_text.length()));
3870 -
3871 - {
3872 -- icu::FieldPosition fp;
3873 -- while (fp_iter->next(fp)) {
3874 -- regions.push_back(NumberFormatSpan(fp.getField(), fp.getBeginIndex(),
3875 -- fp.getEndIndex()));
3876 -+ icu::ConstrainedFieldPosition cfp;
3877 -+ cfp.constrainCategory(UFIELD_CATEGORY_NUMBER);
3878 -+ while (formatted->nextPosition(cfp, status)) {
3879 -+ regions.push_back(
3880 -+ NumberFormatSpan(cfp.getField(), cfp.getStart(), cfp.getLimit()));
3881 - }
3882 - }
3883 -
3884 -@@ -1401,7 +1403,7 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
3885 - Handle<String> substring;
3886 - ASSIGN_RETURN_ON_EXCEPTION_VALUE(
3887 - isolate, substring,
3888 -- Intl::ToString(isolate, formatted, part.begin_pos, part.end_pos),
3889 -+ Intl::ToString(isolate, formatted_text, part.begin_pos, part.end_pos),
3890 - Nothing<int>());
3891 - Intl::AddElement(isolate, result, index, field_type_string, substring);
3892 - ++index;
3893 -@@ -1421,14 +1423,14 @@ MaybeHandle<JSArray> JSNumberFormat::FormatToParts(
3894 - number_format->icu_number_formatter().raw();
3895 - CHECK_NOT_NULL(fmt);
3896 -
3897 -- icu::FieldPositionIterator fp_iter;
3898 -- Maybe<icu::UnicodeString> maybe_format =
3899 -- IcuFormatNumber(isolate, *fmt, numeric_obj, &fp_iter);
3900 -+ icu::number::FormattedNumber formatted;
3901 -+ Maybe<bool> maybe_format =
3902 -+ IcuFormatNumber(isolate, *fmt, numeric_obj, &formatted);
3903 - MAYBE_RETURN(maybe_format, Handle<JSArray>());
3904 -
3905 - Handle<JSArray> result = factory->NewJSArray(0);
3906 - Maybe<int> maybe_format_to_parts = ConstructParts(
3907 -- isolate, maybe_format.FromJust(), &fp_iter, result, 0, numeric_obj,
3908 -+ isolate, &formatted, result, 0, numeric_obj,
3909 - number_format->style() == JSNumberFormat::Style::UNIT);
3910 - MAYBE_RETURN(maybe_format_to_parts, Handle<JSArray>());
3911 -
3912
3913 diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.0-bison-3.7-build.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.0-bison-3.7-build.patch
3914 deleted file mode 100644
3915 index da7a997fe96..00000000000
3916 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.0-bison-3.7-build.patch
3917 +++ /dev/null
3918 @@ -1,54 +0,0 @@
3919 -From 1a53f5995697f5ac6fd501dbdc0ee39c9488ee66 Mon Sep 17 00:00:00 2001
3920 -From: Allan Sandfeld Jensen <allan.jensen@××.io>
3921 -Date: Fri, 14 Aug 2020 16:38:48 +0200
3922 -Subject: Fix bison 3.7
3923 -MIME-Version: 1.0
3924 -Content-Type: text/plain; charset=UTF-8
3925 -Content-Transfer-Encoding: 8bit
3926 -
3927 -Do a replace run inspired by newer versions of the script.
3928 -
3929 -Fixes: QTBUG-86018
3930 -Change-Id: Ib1dc771e22a662aff0fae842d135ad58fad08bc1
3931 -Reviewed-by: Michael Brüning <michael.bruning@××.io>
3932 ----
3933 - .../blink/renderer/build/scripts/rule_bison.py | 19 +++++++++++++++++++
3934 - 1 file changed, 19 insertions(+)
3935 -
3936 -diff --git a/chromium/third_party/blink/renderer/build/scripts/rule_bison.py b/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
3937 -index f75e25fd23f..7e0767e951a 100755
3938 ---- a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
3939 -+++ b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
3940 -@@ -45,6 +45,19 @@ from utilities import abs
3941 -
3942 - from blinkbuild.name_style_converter import NameStyleConverter
3943 -
3944 -+def modify_file(path, prefix_lines, suffix_lines, replace_list=[]):
3945 -+ prefix_lines = map(lambda s: s + '\n', prefix_lines)
3946 -+ suffix_lines = map(lambda s: s + '\n', suffix_lines)
3947 -+ with open(path, 'r') as f:
3948 -+ old_lines = f.readlines()
3949 -+ for i in range(len(old_lines)):
3950 -+ for src, dest in replace_list:
3951 -+ old_lines[i] = old_lines[i].replace(src, dest)
3952 -+ new_lines = prefix_lines + old_lines + suffix_lines
3953 -+ with open(path, 'w') as f:
3954 -+ f.writelines(new_lines)
3955 -+
3956 -+
3957 - assert len(sys.argv) == 4 or len(sys.argv) == 5
3958 -
3959 - inputFile = abs(sys.argv[1])
3960 -@@ -115,3 +128,9 @@ print >>outputHFile, '#define %s' % headerGuard
3961 - print >>outputHFile, outputHContents
3962 - print >>outputHFile, '#endif // %s' % headerGuard
3963 - outputHFile.close()
3964 -+
3965 -+common_replace_list = [(inputRoot + '.hh',
3966 -+ inputRoot + '.h')]
3967 -+modify_file(
3968 -+ outputCpp, [], [],
3969 -+ replace_list=common_replace_list)
3970 ---
3971 -cgit v1.2.1
3972 -
3973
3974 diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
3975 deleted file mode 100644
3976 index 99d5a260ec3..00000000000
3977 --- a/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
3978 +++ /dev/null
3979 @@ -1,152 +0,0 @@
3980 -# Copyright 1999-2020 Gentoo Authors
3981 -# Distributed under the terms of the GNU General Public License v2
3982 -
3983 -EAPI=7
3984 -
3985 -PYTHON_COMPAT=( python2_7 )
3986 -inherit multiprocessing python-any-r1 qt5-build
3987 -
3988 -DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
3989 -
3990 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
3991 - KEYWORDS="amd64 ~arm arm64 x86"
3992 -fi
3993 -
3994 -IUSE="alsa bindist designer geolocation jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
3995 -REQUIRED_USE="designer? ( widgets )"
3996 -
3997 -RDEPEND="
3998 - app-arch/snappy:=
3999 - dev-libs/glib:2
4000 - dev-libs/nspr
4001 - dev-libs/nss
4002 - ~dev-qt/qtcore-${PV}
4003 - ~dev-qt/qtdeclarative-${PV}
4004 - ~dev-qt/qtgui-${PV}
4005 - ~dev-qt/qtnetwork-${PV}
4006 - ~dev-qt/qtprintsupport-${PV}
4007 - ~dev-qt/qtwebchannel-${PV}[qml]
4008 - dev-libs/expat
4009 - dev-libs/libevent:=
4010 - dev-libs/libxml2[icu]
4011 - dev-libs/libxslt
4012 - dev-libs/re2:=
4013 - media-libs/fontconfig
4014 - media-libs/freetype
4015 - media-libs/harfbuzz:=
4016 - media-libs/lcms:2
4017 - media-libs/libjpeg-turbo:=
4018 - media-libs/libpng:0=
4019 - >=media-libs/libvpx-1.5:=[svc]
4020 - media-libs/libwebp:=
4021 - media-libs/mesa[egl,X(+)]
4022 - media-libs/opus
4023 - sys-apps/dbus
4024 - sys-apps/pciutils
4025 - sys-libs/zlib[minizip]
4026 - virtual/libudev
4027 - x11-libs/libdrm
4028 - x11-libs/libX11
4029 - x11-libs/libXcomposite
4030 - x11-libs/libXcursor
4031 - x11-libs/libXdamage
4032 - x11-libs/libXext
4033 - x11-libs/libXfixes
4034 - x11-libs/libXi
4035 - x11-libs/libXrandr
4036 - x11-libs/libXrender
4037 - x11-libs/libXScrnSaver
4038 - x11-libs/libXtst
4039 - alsa? ( media-libs/alsa-lib )
4040 - designer? ( ~dev-qt/designer-${PV} )
4041 - geolocation? ( ~dev-qt/qtpositioning-${PV} )
4042 - kerberos? ( virtual/krb5 )
4043 - pulseaudio? ( media-sound/pulseaudio:= )
4044 - system-ffmpeg? ( media-video/ffmpeg:0= )
4045 - system-icu? ( >=dev-libs/icu-60.2:= )
4046 - widgets? (
4047 - ~dev-qt/qtdeclarative-${PV}[widgets]
4048 - ~dev-qt/qtwidgets-${PV}
4049 - )
4050 -"
4051 -DEPEND="${RDEPEND}
4052 - ${PYTHON_DEPS}
4053 - >=app-arch/gzip-1.7
4054 - dev-util/gperf
4055 - dev-util/ninja
4056 - dev-util/re2c
4057 - sys-devel/bison
4058 -"
4059 -
4060 -PATCHES=(
4061 - "${FILESDIR}/${PN}-5.14.1-disable-fatal-warnings.patch" # bug 695446
4062 - "${FILESDIR}/${P}-icu67.patch" # bug 720054
4063 - "${FILESDIR}/${P}-gcc-10.patch" # bug 721876
4064 - "${FILESDIR}/${PN}-5.15.0-bison-3.7-build.patch" # bug 740580
4065 -)
4066 -
4067 -src_prepare() {
4068 - if ! use jumbo-build; then
4069 - sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
4070 - src/buildtools/config/common.pri || die
4071 - fi
4072 -
4073 - # bug 630834 - pass appropriate options to ninja when building GN
4074 - sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
4075 - -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die
4076 -
4077 - # bug 620444 - ensure local headers are used
4078 - find "${S}" -type f -name "*.pr[fio]" | \
4079 - xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
4080 -
4081 - if use system-icu; then
4082 - # Sanity check to ensure that bundled copy of ICU is not used.
4083 - # Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
4084 - # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
4085 - # If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
4086 - # shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
4087 - # src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
4088 - local file
4089 - while read file; do
4090 - echo "#error This file should not be used!" > "${file}" || die
4091 - done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
4092 - fi
4093 -
4094 - qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
4095 - qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
4096 -
4097 - qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
4098 -
4099 - qt_use_disable_mod widgets widgets src/src.pro
4100 -
4101 - qt5-build_src_prepare
4102 -}
4103 -
4104 -src_configure() {
4105 - export NINJA_PATH=/usr/bin/ninja
4106 - export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
4107 -
4108 - local myqmakeargs=(
4109 - --
4110 - -printing-and-pdf
4111 - -system-opus
4112 - -system-webp
4113 - $(usex alsa '-alsa' '-no-alsa')
4114 - $(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
4115 - $(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
4116 - $(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos')
4117 - $(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
4118 - $(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
4119 - $(usex system-icu '-webengine-icu' '-no-webengine-icu')
4120 - )
4121 - qt5-build_src_configure
4122 -}
4123 -
4124 -src_install() {
4125 - qt5-build_src_install
4126 -
4127 - # bug 601472
4128 - if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
4129 - die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
4130 - fi
4131 -}
4132
4133 diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
4134 index 7135f4b3dc2..5e7d99211e9 100644
4135 --- a/dev-qt/qtwebsockets/Manifest
4136 +++ b/dev-qt/qtwebsockets/Manifest
4137 @@ -1,2 +1 @@
4138 -DIST qtwebsockets-everywhere-src-5.14.2.tar.xz 252820 BLAKE2B a2c14205fbc7f2bb3d7de1d4dff18557e027cb0d114285aa2cd7558fac63da628d7a8b1772b738194983e77bf108e097c29fe2ec02ace85a188674248bb61ade SHA512 091e17459a8a255fccece092399ac32994307aa53e6e72e736e6ff9f1bb745c49bfcb9a747e1e21acaa0ed95754f7f450ba2f73a3bbafad54e21bf600f7da92f
4139 DIST qtwebsockets-everywhere-src-5.15.1.tar.xz 258908 BLAKE2B cd5c5fbdbbc0191379cbcc6821250597982696e589e1caa18d91258fd6c3eacdb27fd11da94b0e68864c8f3e60c712a052516f5838e56249767125a90e077443 SHA512 5929f972b7e8aa40dbbd0a1157065bd11e81621cc880d1dfc55e4228800215d16cd301319a204413e7fee7ec57c4e5a70229ad2d3c1d3ac69f38bd39ce4b3713
4140
4141 diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.14.2.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.14.2.ebuild
4142 deleted file mode 100644
4143 index 765ce319f88..00000000000
4144 --- a/dev-qt/qtwebsockets/qtwebsockets-5.14.2.ebuild
4145 +++ /dev/null
4146 @@ -1,27 +0,0 @@
4147 -# Copyright 1999-2020 Gentoo Authors
4148 -# Distributed under the terms of the GNU General Public License v2
4149 -
4150 -EAPI=7
4151 -inherit qt5-build
4152 -
4153 -DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
4154 -
4155 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
4156 - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86"
4157 -fi
4158 -
4159 -IUSE="qml +ssl"
4160 -
4161 -DEPEND="
4162 - ~dev-qt/qtcore-${PV}
4163 - ~dev-qt/qtnetwork-${PV}[ssl=]
4164 - qml? ( ~dev-qt/qtdeclarative-${PV} )
4165 -
4166 -"
4167 -RDEPEND="${DEPEND}"
4168 -
4169 -src_prepare() {
4170 - qt_use_disable_mod qml quick src/src.pro
4171 -
4172 - qt5-build_src_prepare
4173 -}
4174
4175 diff --git a/dev-qt/qtwebview/Manifest b/dev-qt/qtwebview/Manifest
4176 index 63a37b33225..5f96798a00c 100644
4177 --- a/dev-qt/qtwebview/Manifest
4178 +++ b/dev-qt/qtwebview/Manifest
4179 @@ -1,2 +1 @@
4180 -DIST qtwebview-everywhere-src-5.14.2.tar.xz 132840 BLAKE2B 8d6d2995b53f55b04353c935f5655c47d34a0e61d68adce5837ac0b6074aae59f506dd49acc700b7c26ca04aa16d03749520329540513a646809ba6e353bc69a SHA512 1a70be0c64f72b7e3b10c8e3ca58d4a04bef14496c8e4852c5cafbd13d653e2f682a58f7dcd576fce79ed082c01a5f8ffc6533836f495f6e5d4b6ddf2be8e3ca
4181 DIST qtwebview-everywhere-src-5.15.1.tar.xz 133392 BLAKE2B 6958323ffe5d2d10b07bb7b926a05aa3f74d5aa38465f94e51877c162b4b2bd8e4733eda122bc691262f20dca9875177b1fbb260a922923e3e20611a2294dc71 SHA512 1da9cca184e66b02eef911e372d0f18466b989cc5c53d0a93e268857e1ca64a2f75bf20dfd1451060e6dbf4c7d248ba376112b7775e45ffa7d556712870478b1
4182
4183 diff --git a/dev-qt/qtwebview/qtwebview-5.14.2.ebuild b/dev-qt/qtwebview/qtwebview-5.14.2.ebuild
4184 deleted file mode 100644
4185 index 10d7f8d0000..00000000000
4186 --- a/dev-qt/qtwebview/qtwebview-5.14.2.ebuild
4187 +++ /dev/null
4188 @@ -1,21 +0,0 @@
4189 -# Copyright 1999-2020 Gentoo Authors
4190 -# Distributed under the terms of the GNU General Public License v2
4191 -
4192 -EAPI=7
4193 -inherit qt5-build
4194 -
4195 -DESCRIPTION="Module for displaying web content in a QML application using the Qt5 framework"
4196 -
4197 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
4198 - KEYWORDS="~amd64"
4199 -fi
4200 -
4201 -IUSE=""
4202 -
4203 -DEPEND="
4204 - ~dev-qt/qtcore-${PV}
4205 - ~dev-qt/qtdeclarative-${PV}
4206 - ~dev-qt/qtgui-${PV}
4207 - ~dev-qt/qtwebengine-${PV}
4208 -"
4209 -RDEPEND="${DEPEND}"
4210
4211 diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
4212 index d72f3b48819..98e054ddcf5 100644
4213 --- a/dev-qt/qtwidgets/Manifest
4214 +++ b/dev-qt/qtwidgets/Manifest
4215 @@ -1,2 +1 @@
4216 -DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
4217 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
4218
4219 diff --git a/dev-qt/qtwidgets/qtwidgets-5.14.2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.14.2.ebuild
4220 deleted file mode 100644
4221 index 3704914a948..00000000000
4222 --- a/dev-qt/qtwidgets/qtwidgets-5.14.2.ebuild
4223 +++ /dev/null
4224 @@ -1,57 +0,0 @@
4225 -# Copyright 1999-2020 Gentoo Authors
4226 -# Distributed under the terms of the GNU General Public License v2
4227 -
4228 -EAPI=7
4229 -
4230 -QT5_MODULE="qtbase"
4231 -inherit qt5-build
4232 -
4233 -DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
4234 -
4235 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
4236 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
4237 -fi
4238 -
4239 -# keep IUSE defaults in sync with qtgui
4240 -IUSE="gles2-only gtk +png +X"
4241 -
4242 -DEPEND="
4243 - ~dev-qt/qtcore-${PV}:5=
4244 - ~dev-qt/qtgui-${PV}[gles2-only=,png=,X?]
4245 - gtk? (
4246 - ~dev-qt/qtgui-${PV}[dbus]
4247 - x11-libs/gtk+:3
4248 - x11-libs/libX11
4249 - x11-libs/pango
4250 - )
4251 -"
4252 -RDEPEND="${DEPEND}"
4253 -
4254 -QT5_TARGET_SUBDIRS=(
4255 - src/tools/uic
4256 - src/widgets
4257 - src/plugins/platformthemes
4258 -)
4259 -
4260 -QT5_GENTOO_CONFIG=(
4261 - gtk:gtk3:
4262 - ::widgets
4263 - !:no-widgets:
4264 -)
4265 -
4266 -QT5_GENTOO_PRIVATE_CONFIG=(
4267 - :widgets
4268 -)
4269 -
4270 -src_configure() {
4271 - local myconf=(
4272 - -opengl $(usex gles2-only es2 desktop)
4273 - $(qt_use gtk)
4274 - -gui
4275 - $(qt_use png libpng system)
4276 - -widgets
4277 - $(qt_use X xcb system)
4278 - $(usex X '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '')
4279 - )
4280 - qt5-build_src_configure
4281 -}
4282
4283 diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest
4284 index 6b723a2f26f..52da148f7b0 100644
4285 --- a/dev-qt/qtx11extras/Manifest
4286 +++ b/dev-qt/qtx11extras/Manifest
4287 @@ -1,2 +1 @@
4288 -DIST qtx11extras-everywhere-src-5.14.2.tar.xz 135712 BLAKE2B 83890aab605bdfaacdddbc7a1893bd570a15f4135bfd924ca923570b3d12042b916f493426b1945319afd60e651f51ad49b3575b69b07ed4264a8a6cd7005a49 SHA512 cf30e66fda18b9bfd266b41f15713f7ca7390bc533fb8093096853f1554c2a91eb065dc17acb5b355b8fad08df3c695289d8c8081d568061c99659ec35d79b14
4289 DIST qtx11extras-everywhere-src-5.15.1.tar.xz 143884 BLAKE2B a740621a4fe41b075dd5843f28bfa1d128e24d1df786b5c8aa0ceba5fe7fc59bc212b7ec8855c4a1eef7cd812615837e38089c9e9fd189dda16f5313d6091af6 SHA512 59155fc97da3f7571da37dd63bed79f61580fa4df7d4886df51520ea6fe8e01e7c09f0aa9caaeaa986c0e5eac11d4479c99c892da4d075c6369b535fd505b084
4290
4291 diff --git a/dev-qt/qtx11extras/qtx11extras-5.14.2.ebuild b/dev-qt/qtx11extras/qtx11extras-5.14.2.ebuild
4292 deleted file mode 100644
4293 index 90bcd078689..00000000000
4294 --- a/dev-qt/qtx11extras/qtx11extras-5.14.2.ebuild
4295 +++ /dev/null
4296 @@ -1,22 +0,0 @@
4297 -# Copyright 1999-2020 Gentoo Authors
4298 -# Distributed under the terms of the GNU General Public License v2
4299 -
4300 -EAPI=7
4301 -
4302 -inherit qt5-build
4303 -
4304 -DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
4305 -
4306 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
4307 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
4308 -fi
4309 -
4310 -IUSE=""
4311 -
4312 -RDEPEND="
4313 - ~dev-qt/qtcore-${PV}
4314 - ~dev-qt/qtgui-${PV}[X]
4315 -"
4316 -DEPEND="${RDEPEND}
4317 - test? ( ~dev-qt/qtwidgets-${PV} )
4318 -"
4319
4320 diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
4321 index d72f3b48819..98e054ddcf5 100644
4322 --- a/dev-qt/qtxml/Manifest
4323 +++ b/dev-qt/qtxml/Manifest
4324 @@ -1,2 +1 @@
4325 -DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
4326 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
4327
4328 diff --git a/dev-qt/qtxml/qtxml-5.14.2.ebuild b/dev-qt/qtxml/qtxml-5.14.2.ebuild
4329 deleted file mode 100644
4330 index 1f6a108a9d9..00000000000
4331 --- a/dev-qt/qtxml/qtxml-5.14.2.ebuild
4332 +++ /dev/null
4333 @@ -1,29 +0,0 @@
4334 -# Copyright 1999-2020 Gentoo Authors
4335 -# Distributed under the terms of the GNU General Public License v2
4336 -
4337 -EAPI=7
4338 -QT5_MODULE="qtbase"
4339 -inherit qt5-build
4340 -
4341 -DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
4342 -
4343 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
4344 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
4345 -fi
4346 -
4347 -IUSE=""
4348 -
4349 -RDEPEND="
4350 - ~dev-qt/qtcore-${PV}:5=
4351 -"
4352 -DEPEND="${RDEPEND}
4353 - test? ( ~dev-qt/qtnetwork-${PV} )
4354 -"
4355 -
4356 -QT5_TARGET_SUBDIRS=(
4357 - src/xml
4358 -)
4359 -
4360 -QT5_GENTOO_PRIVATE_CONFIG=(
4361 - :xml
4362 -)
4363
4364 diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
4365 index 4bd76a82b6c..eb4612fe80c 100644
4366 --- a/dev-qt/qtxmlpatterns/Manifest
4367 +++ b/dev-qt/qtxmlpatterns/Manifest
4368 @@ -1,2 +1 @@
4369 -DIST qtxmlpatterns-everywhere-src-5.14.2.tar.xz 1404028 BLAKE2B aff0d2aa2396418c2b987f1485d3753546c09de8d5eb06efab52d635e95f8e056def8a4b6927d8d8f24c3af264cf762e64a2b3fa9d318671df4ea0f0f3f5bf0a SHA512 27f674c4811b010ec461c54ee258b1d6b58dcb5c11795621b7bbad9fa2c19c1b6b62286cbe8895151261129c7d6d91007c3a8be6cf64af1f4cb32e2e9976ac23
4370 DIST qtxmlpatterns-everywhere-src-5.15.1.tar.xz 1415888 BLAKE2B f17a1dee54ee981fb435c2536f28b015d0a4ce48cf504c5f11b03992a9e569190e2ae8fd9960a408ddec54bdc14588cd498cbf9da0002f696c336af72b211e5a SHA512 f76b2063f88a14754b1ba7e417b9a4936b1cf371bf35c6382a31f9ec01513894313faacb41a43fe6b97c0b0dbb7d4f578877b159ef1321cd1a2cd9b1d36bcdb3
4371
4372 diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.14.2.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.14.2.ebuild
4373 deleted file mode 100644
4374 index 2401961cd1d..00000000000
4375 --- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.14.2.ebuild
4376 +++ /dev/null
4377 @@ -1,30 +0,0 @@
4378 -# Copyright 1999-2020 Gentoo Authors
4379 -# Distributed under the terms of the GNU General Public License v2
4380 -
4381 -EAPI=7
4382 -inherit qt5-build
4383 -
4384 -DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
4385 -
4386 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
4387 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
4388 -fi
4389 -
4390 -IUSE="qml"
4391 -
4392 -DEPEND="
4393 - ~dev-qt/qtcore-${PV}
4394 - ~dev-qt/qtnetwork-${PV}
4395 - qml? ( ~dev-qt/qtdeclarative-${PV} )
4396 -"
4397 -RDEPEND="${DEPEND}"
4398 -
4399 -src_prepare() {
4400 - qt_use_disable_mod qml qml \
4401 - src/src.pro \
4402 - src/imports/imports.pro
4403 -
4404 - qt_use_disable_mod qml quick tests/auto/auto.pro
4405 -
4406 - qt5-build_src_prepare
4407 -}