Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtshadertools/, dev-qt/qtsvg/, dev-qt/qtdeclarative/, ...
Date: Fri, 24 Dec 2021 23:08:48
Message-Id: 1640366149.eec507e98cab1f54468f9a73d59a62141514fb24.asturm@gentoo
1 commit: eec507e98cab1f54468f9a73d59a62141514fb24
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 24 16:02:36 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 24 17:15:49 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=eec507e9
7
8 dev-qt: Drop 6.2.1
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 dev-qt/qtbase/Manifest | 1 -
14 dev-qt/qtbase/qtbase-6.2.1.ebuild | 184 -----------------------
15 dev-qt/qtdeclarative/Manifest | 1 -
16 dev-qt/qtdeclarative/qtdeclarative-6.2.1.ebuild | 20 ---
17 dev-qt/qtlocation/Manifest | 1 -
18 dev-qt/qtlocation/qtlocation-6.2.1.ebuild | 18 ---
19 dev-qt/qtmultimedia/Manifest | 1 -
20 dev-qt/qtmultimedia/qtmultimedia-6.2.1.ebuild | 40 -----
21 dev-qt/qtnetwork/metadata.xml | 1 -
22 dev-qt/qtshadertools/Manifest | 1 -
23 dev-qt/qtshadertools/qtshadertools-6.2.1.ebuild | 17 ---
24 dev-qt/qtsvg/Manifest | 1 -
25 dev-qt/qtsvg/qtsvg-6.2.1.ebuild | 19 ---
26 dev-qt/qttools/Manifest | 1 -
27 dev-qt/qttools/qttools-6.2.1.ebuild | 18 ---
28 dev-qt/qtwebchannel/Manifest | 1 -
29 dev-qt/qtwebchannel/qtwebchannel-6.2.1.ebuild | 18 ---
30 dev-qt/qtwebengine/Manifest | 1 -
31 dev-qt/qtwebengine/qtwebengine-6.2.1.ebuild | 192 ------------------------
32 19 files changed, 536 deletions(-)
33
34 diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
35 index 9af966f1..71caf4cc 100644
36 --- a/dev-qt/qtbase/Manifest
37 +++ b/dev-qt/qtbase/Manifest
38 @@ -1,2 +1 @@
39 -DIST qtbase-everywhere-src-6.2.1.tar.xz 46641424 BLAKE2B 2c60afc31d5cde123c140eafabb4372c39c5b152cc3332d514a0d3bd92b2696b331adee1ad847dcb05eb642d242704fa5fd26f9a8298269f60ab64c3bd95e08c SHA512 9c1c3db8589ce085e1e895dfe6346f2f7a1928defb19e5ea87829f05138f4ceb78e8390c70bda86f430f5c059c4ab73a28e230f792be3cccf38951bdc1ee5dc2
40 DIST qtbase-everywhere-src-6.2.2.tar.xz 46649016 BLAKE2B ae14ed74e06e2de2798b6b1d95dc4c4c2c61c839aabf7f5271ce1f6f6320d21c02f933974badbe94d882465ebe9cb43396305fa74d11445b50f3329590c57a15 SHA512 769dbf2b271083cfb9c72e6bd99cd52cdfd7d9d303d88d05175e4f0da5e8da5df9724bd48ad664e1d8e829a3529fa166654138c48cb36636f4787d0b26ff4b3b
41
42 diff --git a/dev-qt/qtbase/qtbase-6.2.1.ebuild b/dev-qt/qtbase/qtbase-6.2.1.ebuild
43 deleted file mode 100644
44 index c0867b42..00000000
45 --- a/dev-qt/qtbase/qtbase-6.2.1.ebuild
46 +++ /dev/null
47 @@ -1,184 +0,0 @@
48 -# Copyright 2021 Gentoo Authors
49 -# Distributed under the terms of the GNU General Public License v2
50 -
51 -EAPI=8
52 -
53 -inherit qt6-build
54 -
55 -DESCRIPTION="Cross-platform application development framework"
56 -
57 -if [[ ${QT6_BUILD_TYPE} == release ]]; then
58 - KEYWORDS="~amd64"
59 -fi
60 -
61 -# Qt Modules
62 -IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml"
63 -REQUIRED_USE="
64 - opengl? ( gui ) widgets? ( gui )
65 - X? ( || ( evdev libinput ) )
66 -"
67 -
68 -QTGUI_IUSE="accessibility egl eglfs evdev +gif gles2-only +ico +jpeg +libinput tslib tuio vulkan +X"
69 -QTNETWORK_IUSE="gssapi libproxy sctp +ssl vnc"
70 -QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
71 -IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev"
72 -# QtPrintSupport = QtGui + QtWidgets enabled.
73 -# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X
74 -# moved vnc logically to QtNetwork as that is upstream condition for it
75 -REQUIRED_USE+="
76 - $(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/})
77 - $(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/})
78 - $(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/})
79 - accessibility? ( dbus X )
80 - cups? ( gui widgets )
81 - eglfs? ( egl )
82 - gtk? ( widgets )
83 - gui? ( || ( eglfs X ) || ( libinput X ) )
84 - libinput? ( udev )
85 - sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) )
86 - X? ( gles2-only? ( egl ) )
87 -"
88 -
89 -# TODO:
90 -# qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c
91 -# qtnetwork: connman, networkmanager
92 -DEPEND="
93 - app-arch/brotli:=
94 - app-arch/libarchive[zstd]
95 - app-arch/zstd:=
96 - app-crypt/libb2
97 - dev-libs/double-conversion:=
98 - dev-libs/glib:2
99 - dev-libs/libpcre2:=[pcre16,unicode]
100 - dev-util/gtk-update-icon-cache
101 - media-libs/fontconfig
102 - >=media-libs/freetype-2.6.1:2
103 - >=media-libs/harfbuzz-1.6.0:=
104 - media-libs/tiff:0
105 - >=sys-apps/dbus-1.4.20
106 - sys-libs/zlib:=
107 - virtual/opengl
108 - egl? ( media-libs/mesa[egl] )
109 - evdev? ( sys-libs/mtdev )
110 - freetds? ( dev-db/freetds )
111 - gles2-only? ( media-libs/mesa[gles2] )
112 - gssapi? ( virtual/krb5 )
113 - gtk? (
114 - x11-libs/gtk+:3
115 - x11-libs/libX11
116 - x11-libs/pango
117 - )
118 - gui? ( media-libs/libpng:0= )
119 - icu? ( dev-libs/icu:= )
120 - !icu? ( virtual/libiconv )
121 - jpeg? ( virtual/jpeg:0 )
122 - libinput? (
123 - dev-libs/libinput:=
124 - >=x11-libs/libxkbcommon-0.5.0
125 - )
126 - libproxy? ( net-libs/libproxy )
127 - mysql? ( dev-db/mysql-connector-c:= )
128 - oci8? ( dev-db/oracle-instantclient:=[sdk] )
129 - odbc? ( dev-db/unixODBC )
130 - postgres? ( dev-db/postgresql:* )
131 - sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
132 - sqlite? ( dev-db/sqlite:3 )
133 - ssl? ( dev-libs/openssl:0= )
134 - systemd? ( sys-apps/systemd:= )
135 - tslib? ( >=x11-libs/tslib-1.21 )
136 - udev? ( virtual/libudev:= )
137 - vulkan? ( dev-util/vulkan-headers )
138 - X? (
139 - x11-libs/libdrm
140 - x11-libs/libICE
141 - x11-libs/libSM
142 - x11-libs/libX11
143 - >=x11-libs/libxcb-1.12:=[xkb]
144 - >=x11-libs/libxkbcommon-0.5.0[X]
145 - x11-libs/xcb-util-image
146 - x11-libs/xcb-util-keysyms
147 - x11-libs/xcb-util-renderutil
148 - x11-libs/xcb-util-wm
149 - )
150 -"
151 -RDEPEND="${DEPEND}"
152 -
153 -src_prepare() {
154 - qt6-build_src_prepare
155 -
156 - # TODO: fails without QtGui
157 - sed -e "/androiddeployqt/s/^/#DONT/" -e "/androidtestrunner/s/^/#DONT/" \
158 - -i src/tools/CMakeLists.txt || die
159 -}
160 -
161 -src_configure() {
162 - local mycmakeargs=(
163 - -DINSTALL_BINDIR=${QT6_BINDIR}
164 - -DINSTALL_INCLUDEDIR=${QT6_HEADERDIR}
165 - -DINSTALL_LIBDIR=${QT6_LIBDIR}
166 - -DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
167 - -DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
168 - -DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR}
169 - -DINSTALL_QMLDIR=${QT6_QMLDIR}
170 - -DINSTALL_DATADIR=${QT6_DATADIR}
171 - -DINSTALL_DOCDIR=${QT6_DOCDIR}
172 - -DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
173 - -DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR}
174 - -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
175 - -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
176 - -DQT_FEATURE_zstd=ON
177 - $(qt_feature concurrent)
178 - $(qt_feature dbus)
179 - $(qt_feature gui)
180 - $(qt_feature icu)
181 - $(qt_feature network)
182 - $(qt_feature sql)
183 - $(qt_feature systemd journald)
184 - -DQT_FEATURE_testlib=ON # TODO: install QtTest by default?
185 - $(qt_feature udev libudev)
186 - $(qt_feature xml)
187 - )
188 - use gui && mycmakeargs+=(
189 - $(qt_feature accessibility accessibility_atspi_bridge)
190 - $(qt_feature egl)
191 - $(qt_feature eglfs eglfs_egldevice)
192 - $(qt_feature eglfs eglfs_gbm)
193 - $(qt_feature evdev)
194 - $(qt_feature evdev mtdev)
195 - $(qt_feature gif)
196 - $(qt_feature jpeg)
197 - $(qt_feature opengl)
198 - $(qt_feature gles2-only opengles2)
199 - $(qt_feature libinput)
200 - $(qt_feature tslib)
201 - $(qt_feature tuio tuiotouch)
202 - $(qt_feature vulkan)
203 - $(qt_feature widgets)
204 - $(qt_feature X xcb)
205 - $(qt_feature X xcb_xlib)
206 - )
207 - use widgets && mycmakeargs+=(
208 - $(qt_feature cups)
209 - $(qt_feature gtk gtk3)
210 - )
211 - if use libinput || use X; then
212 - mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON )
213 - fi
214 - use network && mycmakeargs+=(
215 - $(qt_feature gssapi)
216 - $(qt_feature libproxy)
217 - $(qt_feature sctp)
218 - $(qt_feature ssl openssl)
219 - $(qt_feature vnc)
220 - )
221 - use sql && mycmakeargs+=(
222 - $(qt_feature freetds sql_tds)
223 - $(qt_feature mysql sql_mysql)
224 - $(qt_feature oci8 sql_oci)
225 - $(qt_feature odbc sql_odbc)
226 - $(qt_feature postgres sql_psql)
227 - $(qt_feature sqlite sql_sqlite)
228 - $(qt_feature sqlite system_sqlite)
229 - )
230 - qt6-build_src_configure
231 -}
232
233 diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
234 index b08805c1..1e413cd1 100644
235 --- a/dev-qt/qtdeclarative/Manifest
236 +++ b/dev-qt/qtdeclarative/Manifest
237 @@ -1,2 +1 @@
238 -DIST qtdeclarative-everywhere-src-6.2.1.tar.xz 29764804 BLAKE2B 1d738a04ad18661b3483321771a5ba0559ed73c84640bc5b07d236f527a1068c8d143c76fbb66768d52bb96e0417fa38e0a4875a0ba6729ab647181d5ec5a962 SHA512 b581718823de27915e4a59284a522fc1d2b869167d92af2ea20caba9f4e43f2fadb83f5bf6aaeda42f5f316c976cd9a3a313437c99f2a0eba1cff55ba7735cbe
239 DIST qtdeclarative-everywhere-src-6.2.2.tar.xz 29455560 BLAKE2B 30b439d4dcc563ea6dc1f101d5bff87aae13cf5f2a16d330af9d5e51be6926abeaf2243b8881645686354c62697ef8c8010ce9dff0dd58f039eba6e00197fcad SHA512 2cfa9814a104e7e046d73a0c3ca191c8c94410e5d28bcb62c3a816c188514fd3d857d35d5f71d06aa902523e2210a3818756b15ac98fecf9a35f624a89ee2e86
240
241 diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.2.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.2.1.ebuild
242 deleted file mode 100644
243 index 66011c10..00000000
244 --- a/dev-qt/qtdeclarative/qtdeclarative-6.2.1.ebuild
245 +++ /dev/null
246 @@ -1,20 +0,0 @@
247 -# Copyright 2021 Gentoo Authors
248 -# Distributed under the terms of the GNU General Public License v2
249 -
250 -EAPI=8
251 -
252 -inherit qt6-build
253 -
254 -DESCRIPTION="Qt Declarative (Quick 2)"
255 -
256 -if [[ ${QT6_BUILD_TYPE} == release ]]; then
257 - KEYWORDS="~amd64"
258 -fi
259 -
260 -DEPEND="
261 - =dev-qt/qtbase-${PV}*
262 - =dev-qt/qtshadertools-${PV}*
263 -"
264 -RDEPEND="${DEPEND}"
265 -
266 -# TODO: qml/quick automagic
267
268 diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
269 deleted file mode 100644
270 index 51235611..00000000
271 --- a/dev-qt/qtlocation/Manifest
272 +++ /dev/null
273 @@ -1 +0,0 @@
274 -DIST qtlocation-everywhere-src-6.2.1.tar.xz 6675600 BLAKE2B 6b7d510bbe1eb1580da508fd4b1b3bc4c9193f7ef033bdd6951fdad90926ef90a54aa54eac298223fec066efa045f3dad7de03f7a7b29a13cb76128df18f7b30 SHA512 b1b0a770a27348823099e6d150db32087fec4febf47534a5cff9eb76c12ea8715f095b608dfa270624ae7e5b8e859a26ff40c8a14f04d166e808bbcf0afef4f4
275
276 diff --git a/dev-qt/qtlocation/qtlocation-6.2.1.ebuild b/dev-qt/qtlocation/qtlocation-6.2.1.ebuild
277 deleted file mode 100644
278 index 5bfb8228..00000000
279 --- a/dev-qt/qtlocation/qtlocation-6.2.1.ebuild
280 +++ /dev/null
281 @@ -1,18 +0,0 @@
282 -# Copyright 2021 Gentoo Authors
283 -# Distributed under the terms of the GNU General Public License v2
284 -
285 -EAPI=8
286 -
287 -inherit qt6-build
288 -
289 -DESCRIPTION="Location (places, maps, navigation) library for the Qt6 framework"
290 -
291 -if [[ ${QT6_BUILD_TYPE} == release ]]; then
292 - KEYWORDS="~amd64"
293 -fi
294 -
295 -DEPEND="
296 - =dev-qt/qtbase-${PV}*
297 - =dev-qt/qtdeclarative-${PV}*
298 -"
299 -RDEPEND="${DEPEND}"
300
301 diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
302 index 7ed9ed05..e177bbec 100644
303 --- a/dev-qt/qtmultimedia/Manifest
304 +++ b/dev-qt/qtmultimedia/Manifest
305 @@ -1,2 +1 @@
306 -DIST qtmultimedia-everywhere-src-6.2.1.tar.xz 3710324 BLAKE2B 8d0275d525a449fc734af56a781bdad759feb612d7eb794a94a3c9e22eae20c71d2a07b76abf8492f9e20b589492abc6a121c407a5e6d158217e8d3ba1d1ae07 SHA512 6e6fba8c059106b99ccd94ce87f6df17d56de24ccafdd8e3e4d42e312895166c52492dfe425bbb1851e37a49636a560383982580fe184b7a345048e93e8ee05c
307 DIST qtmultimedia-everywhere-src-6.2.2.tar.xz 3771836 BLAKE2B eb19531f9068462f45994eab15a478a91eb4123a08954d48b53338ba5a29d64bc1bf780b2c92ead08f7793499afc671fab2ea0dea0b72188eb17ad94b1421607 SHA512 70eaa88742f0fe5b4106e6ec0ed864fca439b8c4e8c2478894c4f550410b57eee829b2fecf2d199d4892073f0d4754b0acbbea8b8c6ab897ed480730cd9cac15
308
309 diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.2.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.2.1.ebuild
310 deleted file mode 100644
311 index 4c0400d1..00000000
312 --- a/dev-qt/qtmultimedia/qtmultimedia-6.2.1.ebuild
313 +++ /dev/null
314 @@ -1,40 +0,0 @@
315 -# Copyright 2021 Gentoo Authors
316 -# Distributed under the terms of the GNU General Public License v2
317 -
318 -EAPI=8
319 -
320 -inherit qt6-build
321 -
322 -DESCRIPTION="Qt Multimedia"
323 -
324 -if [[ ${QT6_BUILD_TYPE} == release ]]; then
325 - KEYWORDS="~amd64"
326 -fi
327 -
328 -IUSE="gstreamer"
329 -
330 -RDEPEND="
331 - =dev-qt/qtbase-${PV}*
332 - =dev-qt/qtdeclarative-${PV}*
333 - =dev-qt/qtshadertools-${PV}*
334 - gstreamer? (
335 - dev-libs/glib:2
336 - media-libs/gstreamer:1.0
337 - media-libs/gst-plugins-bad:1.0
338 - media-libs/gst-plugins-base:1.0
339 - media-libs/libglvnd
340 - )
341 -"
342 -DEPEND="${RDEPEND}
343 - gstreamer? ( x11-base/xorg-proto )
344 -"
345 -
346 -src_configure() {
347 - # TODO: linux_v4l automagic
348 - local mycmakeargs=(
349 - -DQT_FEATURE_alsa=off
350 - -DQT_FEATURE_pulseaudio=off
351 - $(qt_feature gstreamer)
352 - )
353 - qt6-build_src_configure
354 -}
355
356 diff --git a/dev-qt/qtnetwork/metadata.xml b/dev-qt/qtnetwork/metadata.xml
357 index 5e81d7dc..8a8481b4 100644
358 --- a/dev-qt/qtnetwork/metadata.xml
359 +++ b/dev-qt/qtnetwork/metadata.xml
360 @@ -6,7 +6,6 @@
361 <name>Gentoo Qt Project</name>
362 </maintainer>
363 <use>
364 - <flag name="bindist">Disable EC support via <pkg>dev-libs/openssl</pkg></flag>
365 <flag name="connman">Enable <pkg>net-misc/connman</pkg>-based bearer plugin</flag>
366 <flag name="gssapi">Enable support for GSSAPI (<pkg>virtual/krb5</pkg>)</flag>
367 <flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for automatic
368
369 diff --git a/dev-qt/qtshadertools/Manifest b/dev-qt/qtshadertools/Manifest
370 index 7f27b9d9..d0fe230a 100644
371 --- a/dev-qt/qtshadertools/Manifest
372 +++ b/dev-qt/qtshadertools/Manifest
373 @@ -1,2 +1 @@
374 -DIST qtshadertools-everywhere-src-6.2.1.tar.xz 986656 BLAKE2B c7bb167986167373766a242b4e69413b3cc61aedd865779c1c3ba4268a74e70b0df8b796329a1df204834e0e7fc6f75bef8afdec2962212c5c905799d1a0e1e0 SHA512 94e6bab0211e38e72cbd970b3c69da04a0c78fd51bb3539ad6c7cd39e9573d22cf59cb7155a7e77ea64ea434d877da17fa593d230ecf0cc72785aa4b4b7d0e3f
375 DIST qtshadertools-everywhere-src-6.2.2.tar.xz 986604 BLAKE2B 771c1f8fb407855c0ab75d070934864f695bad6df066a388372c5d5dce0d7eab1b29a5f57bafadf898d7bc45070366771f3c46ed3438f24860c785356a6eca73 SHA512 ff05db03bd0bee5226d03b64299d0afd63ea84dd0b6545ccb41e965f2354f01b867b3ff7ff1f2e80f18f16cc6ae597c22fe028d278d85e23167bee03a3b245c7
376
377 diff --git a/dev-qt/qtshadertools/qtshadertools-6.2.1.ebuild b/dev-qt/qtshadertools/qtshadertools-6.2.1.ebuild
378 deleted file mode 100644
379 index 44a0d914..00000000
380 --- a/dev-qt/qtshadertools/qtshadertools-6.2.1.ebuild
381 +++ /dev/null
382 @@ -1,17 +0,0 @@
383 -# Copyright 2021 Gentoo Authors
384 -# Distributed under the terms of the GNU General Public License v2
385 -
386 -EAPI=8
387 -
388 -inherit qt6-build
389 -
390 -DESCRIPTION="Qt APIs and Tools for Graphics Pipelines"
391 -
392 -if [[ ${QT6_BUILD_TYPE} == release ]]; then
393 - KEYWORDS="~amd64"
394 -fi
395 -
396 -DEPEND="
397 - =dev-qt/qtbase-${PV}*
398 -"
399 -RDEPEND="${DEPEND}"
400
401 diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
402 index 7dad246e..ec264eee 100644
403 --- a/dev-qt/qtsvg/Manifest
404 +++ b/dev-qt/qtsvg/Manifest
405 @@ -1,2 +1 @@
406 -DIST qtsvg-everywhere-src-6.2.1.tar.xz 1717684 BLAKE2B 0e5dee2741d80f5d4d72f3b8e385100db123598bf823673c8523fb590cc9b4034e23b9c6778f39629b3fe8fc010b161ecc9ceacdda5c5b96ccd5237e48007fd8 SHA512 807357ea22042788cb573b5132ac3f0caeb011d3a20f338aaf87f229625da26d7aab2bce87174ded33f2a668c2046855c06ff5169af0e30e400219efc8e00964
407 DIST qtsvg-everywhere-src-6.2.2.tar.xz 1718020 BLAKE2B 2629bc1d1971dd11d793e2462f72de767e4d679edec0261fba8a570f4787673468b106a8fd5d31b30930751de09da6f3fef6fef2e55598390e9928df9e3cdfa0 SHA512 2a1361d2b1fa5eb2cf1bfb6f3beeb765d144043e12eda5f002ddae3c89d110d1b4e55a7c4be55985c5613c2f22e5d57dd2d7bbf0cbdc2f7bbe58403efedcba1a
408
409 diff --git a/dev-qt/qtsvg/qtsvg-6.2.1.ebuild b/dev-qt/qtsvg/qtsvg-6.2.1.ebuild
410 deleted file mode 100644
411 index 4857ed61..00000000
412 --- a/dev-qt/qtsvg/qtsvg-6.2.1.ebuild
413 +++ /dev/null
414 @@ -1,19 +0,0 @@
415 -# Copyright 2021 Gentoo Authors
416 -# Distributed under the terms of the GNU General Public License v2
417 -
418 -EAPI=8
419 -
420 -inherit qt6-build
421 -
422 -DESCRIPTION="SVG rendering library for the Qt6 framework"
423 -
424 -if [[ ${QT6_BUILD_TYPE} == release ]]; then
425 - KEYWORDS="~amd64"
426 -fi
427 -
428 -DEPEND="
429 - =dev-qt/qtbase-${PV}*
430 - sys-libs/zlib:=
431 -
432 -"
433 -RDEPEND="${DEPEND}"
434
435 diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
436 index 07d6c052..d3421bd3 100644
437 --- a/dev-qt/qttools/Manifest
438 +++ b/dev-qt/qttools/Manifest
439 @@ -1,2 +1 @@
440 -DIST qttools-everywhere-src-6.2.1.tar.xz 8668512 BLAKE2B 45605dde132713c5f80f5d2aac1c4beb267d241880299a5c21b5cc1ddc2ec1d278379d7924d0bd65cc29416848230b40ea91fc3839a4016b800dee14e0cdfbb8 SHA512 2d64cd8e3feaa29314e3d80aa46ab5f4b58fe94c29fd0521a5fa4a238764a578aff2cd0901c91d36172f5da53d610159c6cfe90007e5a68f63b2ae6cde78780e
441 DIST qttools-everywhere-src-6.2.2.tar.xz 8622800 BLAKE2B 47ba23c6e45080bb33e551104a856bd0205a58f1e4c61d8947b42dd162e183d14912723321b87da0d7b2f8e638a26aa5caf86d3898bc3b2377b628b3a772f982 SHA512 bce7ce96e64f423eed3f3655dd53d58588093287a6879da86067c4313962afd43d6f514d776c77f5b9462df31ce5801ab42a3232ebc8ef49209da6812fa9a304
442
443 diff --git a/dev-qt/qttools/qttools-6.2.1.ebuild b/dev-qt/qttools/qttools-6.2.1.ebuild
444 deleted file mode 100644
445 index 53ce00a4..00000000
446 --- a/dev-qt/qttools/qttools-6.2.1.ebuild
447 +++ /dev/null
448 @@ -1,18 +0,0 @@
449 -# Copyright 2021 Gentoo Authors
450 -# Distributed under the terms of the GNU General Public License v2
451 -
452 -EAPI=8
453 -
454 -inherit qt6-build
455 -
456 -DESCRIPTION="Qt Tools"
457 -
458 -if [[ ${QT6_BUILD_TYPE} == release ]]; then
459 - KEYWORDS="~amd64"
460 -fi
461 -
462 -DEPEND="
463 - =dev-qt/qtbase-${PV}*
464 - =dev-qt/qtdeclarative-${PV}*
465 -"
466 -RDEPEND="${DEPEND}"
467
468 diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
469 index e1c3fdee..ec7a69d4 100644
470 --- a/dev-qt/qtwebchannel/Manifest
471 +++ b/dev-qt/qtwebchannel/Manifest
472 @@ -1,2 +1 @@
473 -DIST qtwebchannel-everywhere-src-6.2.1.tar.xz 211188 BLAKE2B 5be9e1917996fd192b1a49c4868b0eaa1be065b61bf8b2b4d8571a00c2da9b271d046422f3b36e6040aa7204da05d0db39a173b31d2f5ed68875a75feba67384 SHA512 3bf57b86e0c88776d9bb3c223f7f9d5a4785047da757a2fc8d5dcc241dbfd09395fce53beb03b5fb4106c29234825987116735375cf8ab8ad0173e5c09d747f1
474 DIST qtwebchannel-everywhere-src-6.2.2.tar.xz 211088 BLAKE2B ea9abec4b6a2343ff6d5a206c15c25301b75462d9bf21241d3735994ad0286e8a02a163b0c907b3300f8efb5292ea9c267a5906ed7a88548d081308529a3062a SHA512 0b2b3faf52126589cbf9a1072d68be60fcb0936e4fe52804a070aa15a248d9c4acf261ead42e119dfffdb33902a125a27cfe8611e5c047646d9a32e15f2b6bde
475
476 diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.2.1.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.2.1.ebuild
477 deleted file mode 100644
478 index 719f560d..00000000
479 --- a/dev-qt/qtwebchannel/qtwebchannel-6.2.1.ebuild
480 +++ /dev/null
481 @@ -1,18 +0,0 @@
482 -# Copyright 2021 Gentoo Authors
483 -# Distributed under the terms of the GNU General Public License v2
484 -
485 -EAPI=8
486 -
487 -inherit qt6-build
488 -
489 -DESCRIPTION="Qt WebChannel"
490 -
491 -if [[ ${QT6_BUILD_TYPE} == release ]]; then
492 - KEYWORDS="~amd64"
493 -fi
494 -
495 -DEPEND="
496 - =dev-qt/qtbase-${PV}*
497 - =dev-qt/qtdeclarative-${PV}*
498 -"
499 -RDEPEND="${DEPEND}"
500
501 diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
502 index b1f83ed2..2bee5c71 100644
503 --- a/dev-qt/qtwebengine/Manifest
504 +++ b/dev-qt/qtwebengine/Manifest
505 @@ -1,3 +1,2 @@
506 DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5 SHA512 c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654
507 -DIST qtwebengine-everywhere-src-6.2.1.tar.xz 369758400 BLAKE2B ddbc533be3b51dc4c8503a5107f74c540cde7825bfe3401e7a74deebcd6db46453b05be4538dca4c2618960e29b691ad656c1b13e52aeac6991e8ae93ea97158 SHA512 ff7d766889f982b8a87ac5f804d38827e457079fefbee5e992368d4cff9c9fee58add02779c8c123c1bc8da30513169cb5c028e76f209ec699093f0493c44bc1
508 DIST qtwebengine-everywhere-src-6.2.2.tar.xz 369695600 BLAKE2B 93affc7039e45429060ba35db10131a8873f19fa1188fecf3f28e83afc0e6f25f6ac5b6ad8e3dd6a65216a9e5f7b831ea21b431d652db16d7aff62bb26c365e0 SHA512 7bc7a6ada9125d02995a71a962ae464ae3f452e30b409a004aed245c4636af4b6e6736fbeb9349ecc4ecfeec7328ac96bc9193ed53221de322ebc913ea2a833f
509
510 diff --git a/dev-qt/qtwebengine/qtwebengine-6.2.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.2.1.ebuild
511 deleted file mode 100644
512 index d6f70346..00000000
513 --- a/dev-qt/qtwebengine/qtwebengine-6.2.1.ebuild
514 +++ /dev/null
515 @@ -1,192 +0,0 @@
516 -# Copyright 2021 Gentoo Authors
517 -# Distributed under the terms of the GNU General Public License v2
518 -
519 -EAPI=8
520 -
521 -PYTHON_COMPAT=( python2_7 )
522 -PYTHON_REQ_USE="xml(+)"
523 -CHROMIUM_VER="90.0.4430.228"
524 -CHROMIUM_PATCHES_VER="94.0.4606.61"
525 -
526 -inherit estack flag-o-matic multiprocessing python-any-r1 qt6-build
527 -
528 -DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
529 -
530 -if [[ ${QT6_BUILD_TYPE} == release ]]; then
531 - KEYWORDS="~amd64"
532 -fi
533 -
534 -IUSE="
535 - alsa bindist designer geolocation +jumbo-build kerberos pipewire pulseaudio
536 - +system-ffmpeg +system-icu widgets
537 -"
538 -REQUIRED_USE="designer? ( widgets )"
539 -
540 -BDEPEND="${PYTHON_DEPS}
541 - >=dev-util/gn-0.1807
542 - dev-util/gperf
543 - dev-util/ninja
544 - dev-util/re2c
545 - net-libs/nodejs[ssl]
546 - sys-devel/bison
547 - sys-devel/flex
548 -"
549 -RDEPEND="
550 - app-arch/snappy:=
551 - dev-libs/glib:2
552 - dev-libs/nspr
553 - dev-libs/nss
554 - dev-libs/expat
555 - dev-libs/libevent:=
556 - dev-libs/libxml2[icu]
557 - dev-libs/libxslt
558 - dev-libs/re2:=
559 - =dev-qt/qtdeclarative-${PV}*
560 - =dev-qt/qtwebchannel-${PV}*
561 - media-libs/fontconfig
562 - media-libs/freetype
563 - media-libs/harfbuzz:=
564 - media-libs/lcms:2
565 - media-libs/libjpeg-turbo:=
566 - media-libs/libpng:0=
567 - >=media-libs/libvpx-1.5:=[svc(+)]
568 - media-libs/libwebp:=
569 - media-libs/opus
570 - sys-apps/dbus
571 - sys-apps/pciutils
572 - sys-libs/zlib[minizip]
573 - virtual/libudev
574 - x11-libs/libdrm
575 - x11-libs/libX11
576 - x11-libs/libXcomposite
577 - x11-libs/libXcursor
578 - x11-libs/libxcb:=
579 - x11-libs/libXdamage
580 - x11-libs/libXext
581 - x11-libs/libXfixes
582 - x11-libs/libXi
583 - x11-libs/libxkbcommon
584 - x11-libs/libxkbfile
585 - x11-libs/libXrandr
586 - x11-libs/libXrender
587 - x11-libs/libXScrnSaver
588 - x11-libs/libXtst
589 - alsa? ( media-libs/alsa-lib )
590 - geolocation? ( =dev-qt/qtlocation-${PV}* )
591 - kerberos? ( virtual/krb5 )
592 - pipewire? ( media-video/pipewire )
593 - pulseaudio? ( media-sound/pulseaudio:= )
594 - system-ffmpeg? ( media-video/ffmpeg:0= )
595 - system-icu? ( >=dev-libs/icu-69.1:= )
596 - widgets? (
597 - =dev-qt/qtbase-${PV}*[widgets]
598 - )
599 -"
600 -DEPEND="${RDEPEND}
601 - media-libs/libglvnd
602 -"
603 -
604 -pkg_preinst() {
605 - elog "This version of Qt WebEngine is based on Chromium version ${CHROMIUM_VER}, with"
606 - elog "additional security fixes up to ${CHROMIUM_PATCHES_VER}. Extensive as it is, the"
607 - elog "list of backports is impossible to evaluate, but always bound to be behind"
608 - elog "Chromium's release schedule."
609 - elog "In addition, various online services may deny service based on an outdated"
610 - elog "user agent version (and/or other checks). Google is already known to do so."
611 - elog
612 - elog "tldr: Your web browsing experience will be compromised."
613 -}
614 -
615 -src_unpack() {
616 - # bug 307861
617 - eshopts_push -s extglob
618 - if is-flagq '-g?(gdb)?([1-9])'; then
619 - ewarn
620 - ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
621 - ewarn "You may experience really long compilation times and/or increased memory usage."
622 - ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
623 - ewarn
624 - fi
625 - eshopts_pop
626 -
627 - default
628 -}
629 -
630 -src_prepare() {
631 - # bug 620444 - ensure local headers are used
632 - find "${S}" -type f -name "*.pr[fio]" | \
633 - xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
634 -
635 - if use system-icu; then
636 - # Sanity check to ensure that bundled copy of ICU is not used.
637 - # Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
638 - # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
639 - # If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
640 - # shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
641 - # src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
642 - local file
643 - while read file; do
644 - echo "#error This file should not be used!" > "${file}" || die
645 - done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
646 - fi
647 -
648 - qt6-build_src_prepare
649 -}
650 -
651 -src_configure() {
652 - export NINJA_PATH=/usr/bin/ninja
653 - export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
654 -
655 - local mycmakeargs=(
656 -# -DQT_FEATURE_accessibility=off
657 -# -DQT_FEATURE_force_asserts=off
658 -# -DQT_FEATURE_opengl=off
659 -# -DQT_FEATURE_printer=off
660 - -DQT_FEATURE_qtpdf_build=off
661 - -DQT_FEATURE_qtpdf_quick_build=off
662 - -DQT_FEATURE_qtpdf_widgets_build=off
663 - -DQT_FEATURE_qtwebengine_build=on
664 - -DQT_FEATURE_qtwebengine_quick_build=on
665 - -DQT_FEATURE_qtwebengine_widgets_build=on
666 -# -DQT_FEATURE_ssl=off
667 -# -DQT_FEATURE_static=off
668 -# -DQT_FEATURE_system_zlib=off
669 -# -DQT_FEATURE_system_png=off
670 -# -DQT_FEATURE_system_jpeg=off
671 -# -DQT_FEATURE_system_freetype=off
672 -# -DQT_FEATURE_system_harfbuzz=off
673 -# -DQT_FEATURE_use_gold_linker=off
674 -# -DQT_FEATURE_use_lld_linker=off
675 - -DQT_FEATURE_webengine_embedded_build=off
676 - -DQT_FEATURE_webengine_extensions=on
677 -# -DQT_FEATURE_webengine_full_debug_info=$(usex debug)
678 - -DQT_FEATURE_webengine_geolocation=$(usex geolocation on off)
679 - -DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build)
680 -# -DQT_FEATURE_webengine_jumbo_file_merge_limit
681 - -DQT_FEATURE_webengine_kerberos=$(usex kerberos on off)
682 - -DQT_FEATURE_webengine_native_spellchecker=off
683 - -DQT_FEATURE_webengine_ozone_x11=on
684 - -DQT_FEATURE_webengine_pepper_plugins=on
685 - -DQT_FEATURE_webengine_proprietary_codecs=$(usex bindist off on)
686 - -DQT_FEATURE_webengine_printing_and_pdf=on
687 - -DQT_FEATURE_webengine_sanitizer=on
688 - -DQT_FEATURE_webengine_spellchecker=on
689 - -DQT_FEATURE_webengine_system_opus=on
690 - -DQT_FEATURE_webengine_system_libwebp=on
691 - -DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
692 - -DQT_FEATURE_webengine_system_ffmpeg=$(usex system-ffmpeg)
693 - -DQT_FEATURE_webengine_system_gn=on
694 - -DQT_FEATURE_webengine_system_icu=$(usex system-icu)
695 - -DQT_FEATURE_webengine_system_libevent=on
696 - -DQT_FEATURE_webengine_system_libpci=on
697 - -DQT_FEATURE_webengine_system_libpng=on
698 - -DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off)
699 - -DQT_FEATURE_webengine_system_zlib=on
700 - -DQT_FEATURE_webengine_webchannel=on
701 - -DQT_FEATURE_webengine_webrtc=on
702 - -DQT_FEATURE_webengine_webrtc_pipewire=$(usex pipewire on off)
703 -# -DQT_FEATURE_xcb=off
704 - )
705 -
706 - qt6-build_src_configure
707 -}