commit: 0d7d27c3c9303f3794dd78532da28d59f8e93962
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 26 17:56:13 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 17 00:40:31 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d7d27c3
dev-qt: Drop old
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/assistant/Manifest | 1 -
dev-qt/assistant/assistant-5.15.2.ebuild | 55 -----------
dev-qt/designer/Manifest | 1 -
dev-qt/designer/designer-5.15.2.ebuild | 55 -----------
dev-qt/linguist-tools/Manifest | 1 -
dev-qt/linguist-tools/linguist-tools-5.15.2.ebuild | 48 ---------
dev-qt/linguist/Manifest | 1 -
dev-qt/linguist/linguist-5.15.2.ebuild | 49 ---------
dev-qt/pixeltool/Manifest | 1 -
dev-qt/pixeltool/pixeltool-5.15.2.ebuild | 24 -----
dev-qt/qdbus/Manifest | 1 -
dev-qt/qdbus/qdbus-5.15.2.ebuild | 26 -----
dev-qt/qdbusviewer/Manifest | 1 -
dev-qt/qdbusviewer/qdbusviewer-5.15.2.ebuild | 46 ---------
dev-qt/qtchooser/qtchooser-66.ebuild | 51 ----------
dev-qt/qtconcurrent/Manifest | 2 -
.../files/qtconcurrent-5.15.2-gcc11.patch | 45 ---------
dev-qt/qtconcurrent/qtconcurrent-5.15.2-r1.ebuild | 30 ------
dev-qt/qtconcurrent/qtconcurrent-5.15.2.ebuild | 27 -----
dev-qt/qtcore/Manifest | 2 -
.../files/qtcore-5.15.2-fix-UB-in-QDateTime.patch | 88 -----------------
...qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch | 54 ----------
dev-qt/qtcore/files/qtcore-5.15.2-gcc11.patch | 38 -------
dev-qt/qtcore/qtcore-5.15.2-r3.ebuild | 110 ---------------------
dev-qt/qtdbus/Manifest | 2 -
dev-qt/qtdbus/qtdbus-5.15.2-r1.ebuild | 49 ---------
dev-qt/qtdeclarative/Manifest | 1 -
.../files/qtdeclarative-5.15.2-gcc11.patch | 31 ------
.../qtdeclarative/qtdeclarative-5.15.2-r1.ebuild | 60 -----------
dev-qt/qthelp/Manifest | 1 -
dev-qt/qthelp/qthelp-5.15.2.ebuild | 32 ------
dev-qt/qtimageformats/Manifest | 1 -
dev-qt/qtimageformats/qtimageformats-5.15.2.ebuild | 30 ------
dev-qt/qtmultimedia/qtmultimedia-5.15.2-r1.ebuild | 69 -------------
dev-qt/qtnetwork/Manifest | 2 -
...work-5.15.2-QNetworkAccessManager-memleak.patch | 41 --------
dev-qt/qtnetwork/qtnetwork-5.15.2-r2.ebuild | 80 ---------------
dev-qt/qtopengl/Manifest | 2 -
dev-qt/qtopengl/qtopengl-5.15.2-r1.ebuild | 38 -------
dev-qt/qtpaths/Manifest | 1 -
dev-qt/qtpaths/qtpaths-5.15.2.ebuild | 21 ----
dev-qt/qtprintsupport/Manifest | 2 -
.../qtprintsupport/qtprintsupport-5.15.2-r1.ebuild | 46 ---------
dev-qt/qtsql/Manifest | 2 -
dev-qt/qtsql/qtsql-5.15.2-r1.ebuild | 60 -----------
dev-qt/qtsvg/Manifest | 1 -
dev-qt/qtsvg/qtsvg-5.15.2.ebuild | 23 -----
dev-qt/qttest/Manifest | 2 -
dev-qt/qttest/qttest-5.15.2-r1.ebuild | 37 -------
dev-qt/qttranslations/Manifest | 1 -
dev-qt/qttranslations/qttranslations-5.15.2.ebuild | 19 ----
dev-qt/qtwayland/Manifest | 1 -
...-qtwaylandscanner-avoid-dangling-pointers.patch | 35 -------
dev-qt/qtwayland/qtwayland-5.15.2-r1.ebuild | 41 --------
dev-qt/qtwebsockets/Manifest | 1 -
dev-qt/qtwebsockets/qtwebsockets-5.15.2.ebuild | 27 -----
dev-qt/qtwidgets/Manifest | 2 -
dev-qt/qtwidgets/qtwidgets-5.15.2-r1.ebuild | 62 ------------
dev-qt/qtxml/Manifest | 2 -
dev-qt/qtxml/qtxml-5.15.2-r1.ebuild | 33 -------
60 files changed, 1615 deletions(-)
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 2ad3df5c2a7..96e0c95cdef 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,2 +1 @@
DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B
c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789
SHA512
9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
-DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B
bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a
SHA512
3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
diff --git a/dev-qt/assistant/assistant-5.15.2.ebuild
b/dev-qt/assistant/assistant-5.15.2.ebuild
deleted file mode 100644
index da691bbbaef..00000000000
--- a/dev-qt/assistant/assistant-5.15.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qttools"
-inherit desktop qt5-build xdg-utils
-
-DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
- ~dev-qt/qtcore-${PV}:5=
- ~dev-qt/qtgui-${PV}
- ~dev-qt/qthelp-${PV}
- ~dev-qt/qtnetwork-${PV}
- ~dev-qt/qtprintsupport-${PV}
- ~dev-qt/qtsql-${PV}[sqlite]
- ~dev-qt/qtwidgets-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
- src/assistant/assistant
-)
-
-src_prepare() {
- sed -e "s/qtHaveModule(webkitwidgets)/false/g" \
- -i src/assistant/assistant/assistant.pro || die
-
- qt5-build_src_prepare
-}
-
-src_install() {
- qt5-build_src_install
-
- doicon -s 32 src/assistant/assistant/images/assistant.png
- newicon -s 128 src/assistant/assistant/images/assistant-128.png
assistant.png
- make_desktop_entry "${QT5_BINDIR}"/assistant 'Qt 5 Assistant' assistant
'Qt;Development;Documentation'
-}
-
-pkg_postinst() {
- qt5-build_pkg_postinst
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- qt5-build_pkg_postrm
- xdg_icon_cache_update
-}
diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index 2ad3df5c2a7..96e0c95cdef 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,2 +1 @@
DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B
c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789
SHA512
9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
-DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B
bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a
SHA512
3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
diff --git a/dev-qt/designer/designer-5.15.2.ebuild
b/dev-qt/designer/designer-5.15.2.ebuild
deleted file mode 100644
index 72ca74544f7..00000000000
--- a/dev-qt/designer/designer-5.15.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qttools"
-inherit desktop qt5-build xdg-utils
-
-DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces
with QtWidgets"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
-fi
-
-IUSE="declarative"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}:5=
- ~dev-qt/qtgui-${PV}:5=
- ~dev-qt/qtnetwork-${PV}
- ~dev-qt/qtprintsupport-${PV}
- ~dev-qt/qtwidgets-${PV}
- ~dev-qt/qtxml-${PV}
- declarative? ( ~dev-qt/qtdeclarative-${PV}[widgets] )
-"
-RDEPEND="${DEPEND}
- dev-qt/qtchooser
-"
-
-src_prepare() {
- qt_use_disable_mod declarative quickwidgets \
- src/designer/src/plugins/plugins.pro
-
- sed -e "s/qtHaveModule(webkitwidgets)/false/g" \
- -i src/designer/src/plugins/plugins.pro || die
-
- qt5-build_src_prepare
-}
-
-src_install() {
- qt5-build_src_install
-
- doicon -s 128 src/designer/src/designer/images/designer.png
- make_desktop_entry "${QT5_BINDIR}"/designer 'Qt 5 Designer' designer
'Qt;Development;GUIDesigner'
-}
-
-pkg_postinst() {
- qt5-build_pkg_postinst
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- qt5-build_pkg_postrm
- xdg_icon_cache_update
-}
diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index 2ad3df5c2a7..96e0c95cdef 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,2 +1 @@
DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B
c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789
SHA512
9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
-DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B
bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a
SHA512
3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.2.ebuild
b/dev-qt/linguist-tools/linguist-tools-5.15.2.ebuild
deleted file mode 100644
index 9d680f58c92..00000000000
--- a/dev-qt/linguist-tools/linguist-tools-5.15.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Tools for working with Qt translation data files"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}:5=
- ~dev-qt/qtxml-${PV}
- qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}
- dev-qt/qtchooser
-"
-
-QT5_TARGET_SUBDIRS=(
- src/linguist
-)
-
-src_prepare() {
- sed -i -e '/SUBDIRS += linguist/d' \
- src/linguist/linguist.pro || die
-
- qt_use_disable_mod qml qmldevtools-private \
- src/linguist/lupdate/lupdate.pro
-
- qt5-build_src_prepare
-}
-
-src_configure() {
- # Most of qttools require files that are only generated when qmake is
- # run in the root directory.
- # Related bugs: 633776, 676948, and 716514.
- mkdir -p "${QT5_BUILD_DIR}" || die
- qt5_qmake "${QT_BUILD_DIR}"
- cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die
- qt5-build_src_configure
-}
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index 2ad3df5c2a7..96e0c95cdef 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1,2 +1 @@
DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B
c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789
SHA512
9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
-DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B
bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a
SHA512
3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
diff --git a/dev-qt/linguist/linguist-5.15.2.ebuild
b/dev-qt/linguist/linguist-5.15.2.ebuild
deleted file mode 100644
index 23446cbce0c..00000000000
--- a/dev-qt/linguist/linguist-5.15.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qttools"
-inherit desktop qt5-build xdg-utils
-
-DESCRIPTION="Graphical tool for translating Qt applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
- ~dev-qt/designer-${PV}
- ~dev-qt/qtcore-${PV}:5=
- ~dev-qt/qtgui-${PV}:5=
- ~dev-qt/qtprintsupport-${PV}
- ~dev-qt/qtwidgets-${PV}
- ~dev-qt/qtxml-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
- src/linguist/linguist
-)
-
-src_install() {
- qt5-build_src_install
-
- local size
- for size in 16 32 48 64 128; do
- newicon -s ${size}
src/linguist/linguist/images/icons/linguist-${size}-32.png linguist.png
- done
- make_desktop_entry "${QT5_BINDIR}"/linguist 'Qt 5 Linguist' linguist
'Qt;Development;Translation'
-}
-
-pkg_postinst() {
- qt5-build_pkg_postinst
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- qt5-build_pkg_postrm
- xdg_icon_cache_update
-}
diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
index 2ad3df5c2a7..96e0c95cdef 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1,2 +1 @@
DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B
c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789
SHA512
9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
-DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B
bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a
SHA512
3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
diff --git a/dev-qt/pixeltool/pixeltool-5.15.2.ebuild
b/dev-qt/pixeltool/pixeltool-5.15.2.ebuild
deleted file mode 100644
index c90103ced4e..00000000000
--- a/dev-qt/pixeltool/pixeltool-5.15.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt screen magnifier"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
- ~dev-qt/qtcore-${PV}:5=
- ~dev-qt/qtgui-${PV}:5=
- ~dev-qt/qtwidgets-${PV}
-"
-RDEPEND="${DEPEND}
- dev-qt/qtchooser
-"
diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
index 2ad3df5c2a7..96e0c95cdef 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -1,2 +1 @@
DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B
c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789
SHA512
9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
-DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B
bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a
SHA512
3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
diff --git a/dev-qt/qdbus/qdbus-5.15.2.ebuild b/dev-qt/qdbus/qdbus-5.15.2.ebuild
deleted file mode 100644
index 42552e0fb27..00000000000
--- a/dev-qt/qdbus/qdbus-5.15.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Interface to Qt applications communicating over D-Bus"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtdbus-${PV}
- ~dev-qt/qtxml-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
- src/qdbus/qdbus
-)
diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index 2ad3df5c2a7..96e0c95cdef 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1,2 +1 @@
DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B
c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789
SHA512
9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
-DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B
bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a
SHA512
3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.15.2.ebuild
b/dev-qt/qdbusviewer/qdbusviewer-5.15.2.ebuild
deleted file mode 100644
index a9976bf6024..00000000000
--- a/dev-qt/qdbusviewer/qdbusviewer-5.15.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qttools"
-inherit desktop qt5-build xdg-utils
-
-DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and
messages"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtdbus-${PV}
- ~dev-qt/qtgui-${PV}
- ~dev-qt/qtwidgets-${PV}
- ~dev-qt/qtxml-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
- src/qdbus/qdbusviewer
-)
-
-src_install() {
- qt5-build_src_install
-
- doicon -s 32 src/qdbus/qdbusviewer/images/qdbusviewer.png
- newicon -s 128 src/qdbus/qdbusviewer/images/qdbusviewer-128.png
qdbusviewer.png
- make_desktop_entry "${QT5_BINDIR}"/qdbusviewer 'Qt 5 QDBusViewer'
qdbusviewer 'Qt;Development'
-}
-
-pkg_postinst() {
- qt5-build_pkg_postinst
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- qt5-build_pkg_postrm
- xdg_icon_cache_update
-}
diff --git a/dev-qt/qtchooser/qtchooser-66.ebuild
b/dev-qt/qtchooser/qtchooser-66.ebuild
deleted file mode 100644
index 50298a23a94..00000000000
--- a/dev-qt/qtchooser/qtchooser-66.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils toolchain-funcs
-
-DESCRIPTION="Tool to quickly switch between multiple Qt installations"
-HOMEPAGE="https://code.qt.io/cgit/qtsdk/qtchooser.git/";
-SRC_URI="http://download.qt.io/official_releases/${PN}/${P}.tar.xz";
-
-LICENSE="|| ( LGPL-2.1 GPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
- dev-qt/qtcore:5
- dev-qt/qttest:5
- )"
-RDEPEND=""
-
-qtchooser_make() {
- emake \
- CXX="$(tc-getCXX)" \
- LFLAGS="${LDFLAGS}" \
- prefix="${EPREFIX}/usr" \
- "$@"
-}
-
-src_compile() {
- qtchooser_make
-}
-
-src_test() {
- pushd tests/auto >/dev/null || die
- eqmake5
- popd >/dev/null || die
-
- qtchooser_make check
-}
-
-src_install() {
- qtchooser_make INSTALL_ROOT="${D}" install
-
- keepdir /etc/xdg/qtchooser
-
- # TODO: bash and zsh completion
- # newbashcomp scripts/${PN}.bash ${PN}
-}
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index c69b3ee123f..4b8920365b9 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1,3 +1 @@
DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B
2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a
SHA512
b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B
a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0
SHA512
da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
-DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B
0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42
SHA512
a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
diff --git a/dev-qt/qtconcurrent/files/qtconcurrent-5.15.2-gcc11.patch
b/dev-qt/qtconcurrent/files/qtconcurrent-5.15.2-gcc11.patch
deleted file mode 100644
index b27ac767b06..00000000000
--- a/dev-qt/qtconcurrent/files/qtconcurrent-5.15.2-gcc11.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://bugs.gentoo.org/764977
-https://invent.kde.org/qt/qt/qtbase/-/commit/c9543da6998b0827fb75ffe22327c99e2da7d364
-
-From c9543da6998b0827fb75ffe22327c99e2da7d364 Mon Sep 17 00:00:00 2001
-From: Sona Kurazyan <[email protected]>
-Date: Wed, 17 Mar 2021 16:04:00 +0100
-Subject: [PATCH] Remove the unnecessary template parameter from the class
- specialization
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This seems to cause errors when compiling with gcc-11. Although this is
-most likely a compiler bug, specifiying the template parameter type in
-this case isn't necessary.
-
-Fixes: QTBUG-91909
-Fixes: QTBUG-90568
-Change-Id: Ib231257ccb2e16cc533f23ca5840d31e26a66d53
-Reviewed-by: MÃ¥rten Nordheim <[email protected]>
-(cherry picked from commit 659f7a06e91c04b239e3f4c0bcfccbe3581af1c3)
-Reviewed-by: Qt Cherry-pick Bot <[email protected]>
-(cherry picked from commit 049e14870c13235cd066758f29c42dc96c1ccdf8)
----
- src/concurrent/qtconcurrentthreadengine.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/concurrent/qtconcurrentthreadengine.h
b/src/concurrent/qtconcurrentthreadengine.h
-index af413707e4..a4c8548cc4 100644
---- a/src/concurrent/qtconcurrentthreadengine.h
-+++ b/src/concurrent/qtconcurrentthreadengine.h
-@@ -247,8 +247,8 @@ template <>
- class ThreadEngineStarter<void> : public ThreadEngineStarterBase<void>
- {
- public:
-- ThreadEngineStarter<void>(ThreadEngine<void> *_threadEngine)
-- :ThreadEngineStarterBase<void>(_threadEngine) {}
-+ ThreadEngineStarter(ThreadEngine<void> *_threadEngine)
-+ : ThreadEngineStarterBase<void>(_threadEngine) {}
-
- void startBlocking()
- {
---
-GitLab
-
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r1.ebuild
b/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r1.ebuild
deleted file mode 100644
index f0ecb6cd1f6..00000000000
--- a/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
-SRC_URI+="
https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz";
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
- ~dev-qt/qtcore-${PV}:5=
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
- src/concurrent
-)
-
-PATCHES=(
- "${WORKDIR}"/qtbase-${PV}-gcc11.patch # bug 752012
- "${FILESDIR}"/${P}-gcc11.patch # bug #764977
-)
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.2.ebuild
b/dev-qt/qtconcurrent/qtconcurrent-5.15.2.ebuild
deleted file mode 100644
index 346697ad318..00000000000
--- a/dev-qt/qtconcurrent/qtconcurrent-5.15.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
-SRC_URI+="
https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz";
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
- ~dev-qt/qtcore-${PV}:5=
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
- src/concurrent
-)
-
-PATCHES=( "${WORKDIR}"/qtbase-${PV}-gcc11.patch ) # bug 752012
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index c69b3ee123f..4b8920365b9 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,3 +1 @@
DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B
2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a
SHA512
b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B
a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0
SHA512
da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
-DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B
0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42
SHA512
a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
diff --git a/dev-qt/qtcore/files/qtcore-5.15.2-fix-UB-in-QDateTime.patch
b/dev-qt/qtcore/files/qtcore-5.15.2-fix-UB-in-QDateTime.patch
deleted file mode 100644
index b131b7af365..00000000000
--- a/dev-qt/qtcore/files/qtcore-5.15.2-fix-UB-in-QDateTime.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From d2c0fc2b5f1c07c1e0acb1c0127578066b6f9b8e Mon Sep 17 00:00:00 2001
-From: Edward Welbourne <[email protected]>
-Date: Tue, 24 Nov 2020 12:45:11 +0100
-Subject: [PATCH] Bounds-check time-zone offsets when parsing
-
-Parsing of time-zone offsets should check the offset string conforms
-to the expected format and has valid values in its fields. The
-QDateTime parser, fromOffsetString(), neglected the bounds check on
-hours; the QTzTimeZonePrivate parser, parsePosixTime(), neglected all
-upper bounds checks, only checking against negative valus.
-
-Drive-by - refined phrasing of a comment.
-
-Fixes: QTBUG-88656
-Change-Id: If04cdbe65064108eaa87c42310527783ad21b4c0
-Reviewed-by: Thiago Macieira <[email protected]>
-(cherry picked from commit 380d97e1bd15e753907c378a070bdf7f1c1cf06e)
-Reviewed-by: Edward Welbourne <[email protected]>
----
- src/corelib/time/qdatetime.cpp | 2 +-
- src/corelib/time/qtimezoneprivate_tz.cpp | 27 ++++++++++++++++-----------
- 2 files changed, 17 insertions(+), 12 deletions(-)
-
-diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp
-index e824787880c..a2816e87f4a 100644
---- a/src/corelib/time/qdatetime.cpp
-+++ b/src/corelib/time/qdatetime.cpp
-@@ -240,7 +240,7 @@ static int fromOffsetString(QStringView offsetString, bool
*valid) noexcept
- const QStringView hhRef = time.left(qMin(hhLen, time.size()));
- bool ok = false;
- const int hour = C.toInt(hhRef, &ok);
-- if (!ok)
-+ if (!ok || hour > 23) // More generous than QTimeZone::MaxUtcOffsetSecs
- return 0;
-
- const QStringView mmRef = time.mid(qMin(mmIndex, time.size()));
-diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp
b/src/corelib/time/qtimezoneprivate_tz.cpp
-index b816b4ecff2..adc590878d7 100644
---- a/src/corelib/time/qtimezoneprivate_tz.cpp
-+++ b/src/corelib/time/qtimezoneprivate_tz.cpp
-@@ -394,29 +394,34 @@ static int parsePosixTime(const char *begin, const char
*end)
- // Format "hh[:mm[:ss]]"
- int hour, min = 0, sec = 0;
-
-- // Note that the calls to qstrtoll do *not* check the end pointer, which
-- // means they proceed until they find a non-digit. We check that we're
-- // still in range at the end, but we may have read from past end. It's the
-- // caller's responsibility to ensure that begin is part of a
-- // null-terminated string.
-+ // Note that the calls to qstrtoll do *not* check against the end pointer,
-+ // which means they proceed until they find a non-digit. We check that
we're
-+ // still in range at the end, but we may have read past end. It's the
-+ // caller's responsibility to ensure that begin is part of a
null-terminated
-+ // string.
-
-+ const int maxHour = QTimeZone::MaxUtcOffsetSecs / 3600;
- bool ok = false;
-- hour = qstrtoll(begin, &begin, 10, &ok);
-- if (!ok || hour < 0)
-+ const char *cut = begin;
-+ hour = qstrtoll(begin, &cut, 10, &ok);
-+ if (!ok || hour < 0 || hour > maxHour || cut > begin + 2)
- return INT_MIN;
-+ begin = cut;
- if (begin < end && *begin == ':') {
- // minutes
- ++begin;
-- min = qstrtoll(begin, &begin, 10, &ok);
-- if (!ok || min < 0)
-+ min = qstrtoll(begin, &cut, 10, &ok);
-+ if (!ok || min < 0 || min > 59 || cut > begin + 2)
- return INT_MIN;
-
-+ begin = cut;
- if (begin < end && *begin == ':') {
- // seconds
- ++begin;
-- sec = qstrtoll(begin, &begin, 10, &ok);
-- if (!ok || sec < 0)
-+ sec = qstrtoll(begin, &cut, 10, &ok);
-+ if (!ok || sec < 0 || sec > 59 || cut > begin + 2)
- return INT_MIN;
-+ begin = cut;
- }
- }
-
---
-2.16.3
diff --git
a/dev-qt/qtcore/files/qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch
b/dev-qt/qtcore/files/qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch
deleted file mode 100644
index 892d89d2948..00000000000
--- a/dev-qt/qtcore/files/qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 6485b6d45ad165cf976138cf8ab683c42515e794 Mon Sep 17 00:00:00 2001
-From: Kai Koehne <[email protected]>
-Date: Tue, 13 Oct 2020 15:47:31 +0200
-Subject: [PATCH] Fix allocated memory of QByteArray returned by
- QIODevice::readLine
-
-If the maxSize argument is 0 (the default), QIODevice::readLine will
-allocate a QByteArray with the size of the next chunk of data, which
-may be quite large. Before returning, it then resizes the byte array
-to the actual size that was read.
-
-But since change 6b884d2aa129, QByteArray::resize() does no
-longer shrink the capacity. This means that the returned QByteArray
-keeps it's maximum size as allocated memory. This can lead to
-excessive memory consumption, especially if the returned QByteArray's
-are stored for further processing in the client code.
-
-Fix this by explicitly calling QByteArray::squeeze() before returning.
-
-[ChangeLog][QtCore][QIODevice] Fixes a regression in Qt 5.15 causing
-QByteArray's that are returned by QIODevice::readLine() to
-consume large amounts of memory.
-
-Fixes: QTBUG-87010
-Change-Id: I1f95fc4098849e900680fc945238bfeda881022c
-Reviewed-by: Thiago Macieira <[email protected]>
-(cherry picked from commit 263b29eedb223dec1ecaee193302070af87a1852,
-limited squeeze() call if bytes are actually read to preserve retVal.isNull()
-behavior in 5.15)
----
- src/corelib/io/qiodevice.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp
-index cc1d1102522..0f11c2e805c 100644
---- a/src/corelib/io/qiodevice.cpp
-+++ b/src/corelib/io/qiodevice.cpp
-@@ -1480,10 +1480,12 @@ QByteArray QIODevice::readLine(qint64 maxSize)
- } else
- readBytes = readLine(result.data(), result.size());
-
-- if (readBytes <= 0)
-+ if (readBytes <= 0) {
- result.clear();
-- else
-+ } else {
- result.resize(readBytes);
-+ result.squeeze();
-+ }
-
- return result;
- }
---
-2.16.3
diff --git a/dev-qt/qtcore/files/qtcore-5.15.2-gcc11.patch
b/dev-qt/qtcore/files/qtcore-5.15.2-gcc11.patch
deleted file mode 100644
index 9d391311c34..00000000000
--- a/dev-qt/qtcore/files/qtcore-5.15.2-gcc11.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: include <limits> to fix some GCC 11 build issues
-Origin: upstream, commits:
- https://code.qt.io/cgit/qt/qtbase.git/commit/?id=813a928c7c3cf986
- https://code.qt.io/cgit/qt/qtbase.git/commit/?id=9c56d4da2ff631a8
-Last-Update: 2021-01-26
-
---- a/src/corelib/global/qendian.h
-+++ b/src/corelib/global/qendian.h
-@@ -44,6 +44,8 @@
- #include <QtCore/qfloat16.h>
- #include <QtCore/qglobal.h>
-
-+#include <limits>
-+
- // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems
- #include <stdlib.h>
- #include <string.h>
---- a/src/corelib/global/qfloat16.h
-+++ b/src/corelib/global/qfloat16.h
-@@ -43,6 +43,7 @@
-
- #include <QtCore/qglobal.h>
- #include <QtCore/qmetatype.h>
-+#include <limits>
- #include <string.h>
-
- #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) &&
!defined(__F16C__)
---- a/src/corelib/text/qbytearraymatcher.h
-+++ b/src/corelib/text/qbytearraymatcher.h
-@@ -42,6 +42,8 @@
-
- #include <QtCore/qbytearray.h>
-
-+#include <limits>
-+
- QT_BEGIN_NAMESPACE
-
-
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r3.ebuild
b/dev-qt/qtcore/qtcore-5.15.2-r3.ebuild
deleted file mode 100644
index dadcd5585a5..00000000000
--- a/dev-qt/qtcore/qtcore-5.15.2-r3.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-inherit linux-info qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SRC_URI+="
https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz";
-
-SLOT=5/$(ver_cut 1-3)
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="icu old-kernel systemd"
-
-DEPEND="
- dev-libs/double-conversion:=
- dev-libs/glib:2
- dev-libs/libpcre2[pcre16,unicode]
- sys-libs/zlib:=
- icu? ( dev-libs/icu:= )
- !icu? ( virtual/libiconv )
- systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}
- !<dev-qt/qtcore-4.8.7-r4:4
- dev-qt/qtchooser
-"
-
-QT5_TARGET_SUBDIRS=(
- src/tools/bootstrap
- src/tools/moc
- src/tools/rcc
- src/corelib
- src/tools/qlalr
- doc
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
- !:network
- !:sql
- !:testlib
- !:xml
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.14.1-cmake-macro-backward-compat.patch # bug
703306
- "${FILESDIR}"/${PN}-5.15.1-timezone-{1,2}.patch # bug 737914
- "${FILESDIR}"/${P}-fix-UB-in-QDateTime.patch # QTBUG-88656
- "${FILESDIR}"/${P}-fix-alloc-mem-of-QByteArray.patch # QTBUG-87010
- "${FILESDIR}"/${P}-gcc11.patch # bug 768342, 768354
- "${WORKDIR}"/qtbase-${PV}-gcc11.patch # bug 752012
-)
-
-pkg_pretend() {
- use kernel_linux || return
- get_running_version
- if kernel_is -lt 4 11 && ! use old-kernel; then
- ewarn "The running kernel is older than 4.11. USE=old-kernel is
needed for"
- ewarn "dev-qt/qtcore to function on this kernel properly. Bugs
#669994, #672856"
- fi
-}
-
-src_prepare() {
- # don't add -O3 to CXXFLAGS, bug 549140
- sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro ||
die
-
- # fix missing qt_version_tag symbol w/ LTO, bug 674382
- sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
-
- qt5-build_src_prepare
-}
-
-src_configure() {
- local myconf=(
- $(qt_use icu)
- $(qt_use !icu iconv)
- $(qt_use systemd journald)
- )
- use old-kernel && myconf+=(
- -no-feature-renameat2 # needs Linux 3.16, bug 669994
- -no-feature-getentropy # needs Linux 3.17, bug 669994
- -no-feature-statx # needs Linux 4.11, bug 672856
- )
- qt5-build_src_configure
-}
-
-src_install() {
- qt5-build_src_install
-
- local flags=(
- DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
- OPENGL OPENSSL SSL WIDGETS
- )
-
- for flag in ${flags[@]}; do
- cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
-
- #if defined(QT_NO_${flag}) && defined(QT_${flag})
- # undef QT_NO_${flag}
- #elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
- # define QT_NO_${flag}
- #endif
- _EOF_
- done
-}
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index c69b3ee123f..4b8920365b9 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,3 +1 @@
DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B
2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a
SHA512
b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B
a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0
SHA512
da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
-DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B
0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42
SHA512
a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
diff --git a/dev-qt/qtdbus/qtdbus-5.15.2-r1.ebuild
b/dev-qt/qtdbus/qtdbus-5.15.2-r1.ebuild
deleted file mode 100644
index 3cc9ecda38d..00000000000
--- a/dev-qt/qtdbus/qtdbus-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for inter-process communication over the D-Bus
protocol"
-SRC_URI+="
https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz";
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
- ~dev-qt/qtcore-${PV}:5=
- >=sys-apps/dbus-1.4.20
-"
-RDEPEND="${DEPEND}
- dev-qt/qtchooser
-"
-
-QT5_TARGET_SUBDIRS=(
- src/dbus
- src/tools/qdbusxml2cpp
- src/tools/qdbuscpp2xml
-)
-
-QT5_GENTOO_CONFIG=(
- :dbus
- :dbus-linked:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
- :dbus
- :dbus-linked
-)
-
-PATCHES=( "${WORKDIR}"/qtbase-${PV}-gcc11.patch ) # bug 752012
-
-src_configure() {
- local myconf=(
- -dbus-linked
- )
- qt5-build_src_configure
-}
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index a4fcaa9be84..8dbb79d0ede 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,2 +1 @@
DIST qtdeclarative-5.15.2-1c33a9d0.tar.gz 24342460 BLAKE2B
f83d01c9bd28842f53b5bf9e95d1b83738792ae6969309ef702fef2e943a4e886313445c7332a2a5cb72cd99aa5db7520a04a054b16d8065bc03b95cbe14026d
SHA512
a1b6ae66c83cc7385c51845f1cbafb55cadd69c121196cd138abc92e964d0bb594ce20267244e4202a9108d92b9bf0f107536774f2a76da71b434692559c1fb4
-DIST qtdeclarative-everywhere-src-5.15.2.tar.xz 21559880 BLAKE2B
07fa82a55f79c081cf3cb713e6b90274f2b2c420eba958042f58989502e2ae572294c4cd02eb73767e87d84c9173fb154e45370c043f6adfc7fb1a93377e2edc
SHA512
a084e4ace0d6868668c95f1b62598a7dd0f455bfb0943ac8956802d7041436686f20c7ccdde7d6fd6c4b8173c936dd8600cf3b87bf8575f55514edfbb51111d3
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-gcc11.patch
b/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-gcc11.patch
deleted file mode 100644
index c5dd916912d..00000000000
--- a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-gcc11.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 543594243ad0006bf4d98998ecfa52b46242f0ed Mon Sep 17 00:00:00 2001
-From: Jeff Law <[email protected]>
-Date: Oct 16 2020 21:12:18 +0000
-Subject: Fix missing #include for gcc-11
-
-
-diff --git a/src/qml/jsruntime/qv4regexp.cpp b/src/qml/jsruntime/qv4regexp.cpp
-index 76daead8..4f707703 100644
---- a/src/qml/jsruntime/qv4regexp.cpp
-+++ b/src/qml/jsruntime/qv4regexp.cpp
-@@ -37,6 +37,7 @@
- **
- ****************************************************************************/
-
-+#include <limits>
- #include "qv4regexp_p.h"
- #include "qv4engine_p.h"
- #include "qv4scopedvalue_p.h"
-diff --git a/src/qmldebug/qqmlprofilerevent_p.h
b/src/qmldebug/qqmlprofilerevent_p.h
-index a7e37d19..21c3b465 100644
---- a/src/qmldebug/qqmlprofilerevent_p.h
-+++ b/src/qmldebug/qqmlprofilerevent_p.h
-@@ -40,6 +40,8 @@
- #ifndef QQMLPROFILEREVENT_P_H
- #define QQMLPROFILEREVENT_P_H
-
-+#include <limits>
-+
- #include "qqmlprofilerclientdefinitions_p.h"
-
- #include <QtCore/qstring.h>
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r1.ebuild
b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r1.ebuild
deleted file mode 100644
index 643829a93cc..00000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2009-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit python-any-r1 qt5-build
-
-DESCRIPTION="The QML and Quick modules for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="gles2-only +jit localstorage vulkan +widgets"
-
-BDEPEND="${PYTHON_DEPS}"
-# qtgui[gles2-only=] is needed because of bug 504322
-DEPEND="
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtgui-${PV}:5=[gles2-only=,vulkan=]
- ~dev-qt/qtnetwork-${PV}
- ~dev-qt/qttest-${PV}
- localstorage? ( ~dev-qt/qtsql-${PV} )
- widgets? ( ~dev-qt/qtwidgets-${PV}[gles2-only=] )
-"
-RDEPEND="${DEPEND}
- dev-qt/qtchooser
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" #
QTBUG-83890
- "${FILESDIR}/${P}-gcc11.patch" # bug 752093
- "${FILESDIR}/${P}-riscv-atomic.patch" #bug 790689
-)
-
-src_prepare() {
- use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
-
- qt_use_disable_mod localstorage sql \
- src/imports/imports.pro
-
- qt_use_disable_mod widgets widgets \
- src/src.pro \
- src/qmltest/qmltest.pro \
- tests/auto/auto.pro \
- tools/tools.pro \
- tools/qmlscene/qmlscene.pro \
- tools/qml/qml.pro
-
- qt5-build_src_prepare
-}
-
-src_configure() {
- local myqmakeargs=(
- --
- -qml-debug
- )
- qt5-build_src_configure
-}
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 2ad3df5c2a7..96e0c95cdef 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,2 +1 @@
DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B
c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789
SHA512
9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
-DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B
bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a
SHA512
3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
diff --git a/dev-qt/qthelp/qthelp-5.15.2.ebuild
b/dev-qt/qthelp/qthelp-5.15.2.ebuild
deleted file mode 100644
index c6f472aab2b..00000000000
--- a/dev-qt/qthelp/qthelp-5.15.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for integrating online documentation into applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
- ~dev-qt/qtcore-${PV}:5=
- ~dev-qt/qtgui-${PV}
- ~dev-qt/qtnetwork-${PV}
- ~dev-qt/qtsql-${PV}[sqlite]
- ~dev-qt/qtwidgets-${PV}
-"
-RDEPEND="${DEPEND}
- dev-qt/qtchooser
-"
-
-QT5_TARGET_SUBDIRS=(
- src/assistant/help
- src/assistant/qcollectiongenerator
- src/assistant/qhelpgenerator
-)
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index cbf4440eac7..2d7fa26c706 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,2 +1 @@
DIST qtimageformats-5.15.2-cb82c743.tar.gz 2366626 BLAKE2B
76edd4d0fc2908d466e4b7f9af1e93c50cae086c1da1144d4b8230d19163e2c43704365e396769d9ba10d48f46b42a1ce793e49686d6757790c32a1c0ff4db2b
SHA512
f202f3abcdea0b49ae4f286fd50c1855c8b84d502b89f8350666828c6e29c4fa0bafd72b891513330e2541dc407d298076ffb519a030b4bb50517b5196ff9a3f
-DIST qtimageformats-everywhere-src-5.15.2.tar.xz 1806740 BLAKE2B
11da7926a50c17d5a36259d15a5c7e6af68f9f2e7e26626b7e04a031ae428a8d220daa8fa4461efd4b8db85bcbaa1ccf24b72271f3599c7298a4d1a49c25f9c3
SHA512
3c821fac83b8d6177af256dc1d68aca14ae6d5cbdedb8d8665158ebcec0f6e6fb790b5d210a1aa8b0679ecff60fafd4e5d1387c6954498b41409ea44177e0d7e
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.2.ebuild
b/dev-qt/qtimageformats/qtimageformats-5.15.2.ebuild
deleted file mode 100644
index dc39e71a9b7..00000000000
--- a/dev-qt/qtimageformats/qtimageformats-5.15.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Additional format plugins for the Qt image I/O system"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="mng"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtgui-${PV}
- media-libs/libwebp:=
- media-libs/tiff:0
- mng? ( media-libs/libmng:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- sed -e 's/qtConfig(jasper)/false:/' \
- -i src/plugins/imageformats/imageformats.pro || die
- qt_use_disable_config mng mng src/plugins/imageformats/imageformats.pro
-
- qt5-build_src_configure
-}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r1.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r1.ebuild
deleted file mode 100644
index 2ed94944ea3..00000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5
framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
-
-RDEPEND="
- =dev-qt/qtcore-${QT5_PV}*
- =dev-qt/qtgui-${QT5_PV}*[gles2-only=]
- =dev-qt/qtnetwork-${QT5_PV}*
- alsa? ( media-libs/alsa-lib )
- gstreamer? (
- dev-libs/glib:2
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-bad:1.0
- media-libs/gst-plugins-base:1.0
- )
- pulseaudio? ( media-sound/pulseaudio[glib] )
- qml? (
- =dev-qt/qtdeclarative-${QT5_PV}*
- gles2-only? ( =dev-qt/qtgui-${QT5_PV}*[egl] )
- openal? ( media-libs/openal )
- )
- widgets? (
- =dev-qt/qtopengl-${QT5_PV}*
- =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
- )
-"
-DEPEND="${RDEPEND}
- gstreamer? ( x11-base/xorg-proto )
-"
-
-src_prepare() {
- sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
- src/multimedia/multimedia.pro || die
-
- qt_use_disable_config openal openal \
- src/imports/imports.pro
-
- qt_use_disable_mod qml quick \
- src/src.pro \
- src/plugins/plugins.pro
-
- qt_use_disable_mod widgets widgets \
- src/src.pro \
- src/gsttools/gsttools.pro \
- src/plugins/gstreamer/common.pri
-
- qt5-build_src_prepare
-}
-
-src_configure() {
- local myqmakeargs=(
- --
- $(qt_use alsa)
- $(qt_use gstreamer)
- $(qt_use pulseaudio)
- )
- qt5-build_src_configure
-}
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index c69b3ee123f..4b8920365b9 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,3 +1 @@
DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B
2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a
SHA512
b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B
a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0
SHA512
da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
-DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B
0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42
SHA512
a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
diff --git
a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch
b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch
deleted file mode 100644
index be2c1f6e1a0..00000000000
---
a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0807f16eb407eaf8a5b34b67602d0a97778d945d Mon Sep 17 00:00:00 2001
-From: =?utf8?q?M=C3=A5rten=20Nordheim?= <[email protected]>
-Date: Fri, 6 Nov 2020 12:51:42 +0100
-Subject: [PATCH] QNAM: Work around QObject finicky orphan cleanup details
-
-Details described in a comment.
-
-Task-number: QTBUG-88063
-Change-Id: I763ecfedf518de97615e04a8eaae0fe1fd784f52
-Reviewed-by: Timur Pocheptsov <[email protected]>
-(cherry picked from commit 1c6d6cbb62c5e93cbcad2d740c3b0ed01095618c)
-Reviewed-by: Qt Cherry-pick Bot <[email protected]>
----
- src/network/access/qnetworkreplyhttpimpl.cpp | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp
b/src/network/access/qnetworkreplyhttpimpl.cpp
-index 21916f53f15..727c1a0316d 100644
---- a/src/network/access/qnetworkreplyhttpimpl.cpp
-+++ b/src/network/access/qnetworkreplyhttpimpl.cpp
-@@ -808,7 +808,17 @@ void QNetworkReplyHttpImplPrivate::postRequest(const
QNetworkRequest &newHttpReq
-
- // For the synchronous HTTP, this is the normal way the delegate gets
deleted
- // For the asynchronous HTTP this is a safety measure, the delegate
deletes itself when HTTP is finished
-- QObject::connect(thread, SIGNAL(finished()), delegate,
SLOT(deleteLater()));
-+ QMetaObject::Connection threadFinishedConnection =
-+ QObject::connect(thread, SIGNAL(finished()), delegate,
SLOT(deleteLater()));
-+
-+ // QTBUG-88063: When 'delegate' is deleted the connection will be added
to 'thread''s orphaned
-+ // connections list. This orphaned list will be cleaned up next time
'thread' emits a signal,
-+ // unfortunately that's the finished signal. It leads to a soft-leak so
we do this to disconnect
-+ // it on deletion so that it cleans up the orphan immediately.
-+ QObject::connect(delegate, &QObject::destroyed, delegate,
[threadFinishedConnection]() {
-+ if (bool(threadFinishedConnection))
-+ QObject::disconnect(threadFinishedConnection);
-+ });
-
- // Set the properties it needs
- delegate->httpRequest = httpRequest;
---
-2.16.3
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r2.ebuild
b/dev-qt/qtnetwork/qtnetwork-5.15.2-r2.ebuild
deleted file mode 100644
index 23709c175e8..00000000000
--- a/dev-qt/qtnetwork/qtnetwork-5.15.2-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Network abstraction library for the Qt5 framework"
-SRC_URI+="
https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz";
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}:5=
- sys-libs/zlib:=
- connman? ( ~dev-qt/qtdbus-${PV} )
- gssapi? ( virtual/krb5 )
- libproxy? ( net-libs/libproxy )
- networkmanager? ( ~dev-qt/qtdbus-${PV} )
- sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
- ssl? (
- >=dev-libs/openssl-1.1.1:0=[bindist(-)=]
- )
-"
-RDEPEND="${DEPEND}
- connman? ( net-misc/connman )
- networkmanager? ( net-misc/networkmanager )
-"
-
-QT5_TARGET_SUBDIRS=(
- src/network
- src/plugins/bearer/generic
-)
-
-QT5_GENTOO_CONFIG=(
- libproxy:libproxy:
- ssl::SSL
- ssl::OPENSSL
- ssl:openssl-linked:LINKED_OPENSSL
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
- :network
-)
-
-PATCHES=(
- "${FILESDIR}"/${P}-QNetworkAccessManager-memleak.patch # QTBUG-88063
- "${WORKDIR}"/qtbase-${PV}-gcc11.patch # bug 752012
-)
-
-pkg_setup() {
- use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
- use networkmanager &&
QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
-}
-
-src_configure() {
- local myconf=(
- $(usex connman -dbus-linked '')
- $(usex gssapi -feature-gssapi -no-feature-gssapi)
- $(qt_use libproxy)
- $(usex networkmanager -dbus-linked '')
- $(qt_use sctp)
- $(usex ssl -openssl-linked '')
- )
- qt5-build_src_configure
-}
-
-src_install() {
- qt5-build_src_install
- # workaround for bug 652650
- if use ssl; then
- sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \
- -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die
- fi
-}
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index c69b3ee123f..4b8920365b9 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,3 +1 @@
DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B
2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a
SHA512
b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B
a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0
SHA512
da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
-DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B
0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42
SHA512
a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
diff --git a/dev-qt/qtopengl/qtopengl-5.15.2-r1.ebuild
b/dev-qt/qtopengl/qtopengl-5.15.2-r1.ebuild
deleted file mode 100644
index 916bc317471..00000000000
--- a/dev-qt/qtopengl/qtopengl-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
-SRC_URI+="
https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz";
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="gles2-only"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}:5=
- ~dev-qt/qtgui-${PV}[gles2-only=]
- ~dev-qt/qtwidgets-${PV}[gles2-only=]
- !gles2-only? ( virtual/opengl )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
- src/opengl
-)
-
-PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012
-
-src_configure() {
- local myconf=(
- -opengl $(usex gles2-only es2 desktop)
- )
- qt5-build_src_configure
-}
diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
index 2ad3df5c2a7..96e0c95cdef 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -1,2 +1 @@
DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B
c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789
SHA512
9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
-DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B
bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a
SHA512
3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
diff --git a/dev-qt/qtpaths/qtpaths-5.15.2.ebuild
b/dev-qt/qtpaths/qtpaths-5.15.2.ebuild
deleted file mode 100644
index ab89b1b991e..00000000000
--- a/dev-qt/qtpaths/qtpaths-5.15.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Command line client to QStandardPaths"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
- ~dev-qt/qtcore-${PV}
-"
-RDEPEND="${DEPEND}
- dev-qt/qtchooser
-"
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index c69b3ee123f..4b8920365b9 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,3 +1 @@
DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B
2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a
SHA512
b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B
a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0
SHA512
da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
-DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B
0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42
SHA512
a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r1.ebuild
b/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r1.ebuild
deleted file mode 100644
index 6442c1d07e4..00000000000
--- a/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Printing support library for the Qt5 framework"
-SRC_URI+="
https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz";
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="cups gles2-only"
-
-RDEPEND="
- ~dev-qt/qtcore-${PV}:5=
- ~dev-qt/qtgui-${PV}[gles2-only=]
- ~dev-qt/qtwidgets-${PV}[gles2-only=]
- cups? ( >=net-print/cups-1.4 )
-"
-DEPEND="${RDEPEND}
- test? ( ~dev-qt/qtnetwork-${PV} )
-"
-
-QT5_TARGET_SUBDIRS=(
- src/printsupport
- src/plugins/printsupport
-)
-
-QT5_GENTOO_CONFIG=(
- cups
-)
-
-PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012
-
-src_configure() {
- local myconf=(
- $(qt_use cups)
- -opengl $(usex gles2-only es2 desktop)
- )
- qt5-build_src_configure
-}
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index c69b3ee123f..4b8920365b9 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,3 +1 @@
DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B
2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a
SHA512
b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B
a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0
SHA512
da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
-DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B
0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42
SHA512
a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
diff --git a/dev-qt/qtsql/qtsql-5.15.2-r1.ebuild
b/dev-qt/qtsql/qtsql-5.15.2-r1.ebuild
deleted file mode 100644
index f94643be7b4..00000000000
--- a/dev-qt/qtsql/qtsql-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="SQL abstraction library for the Qt5 framework"
-SRC_URI+="
https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz";
-
-SLOT=5/$(ver_cut 1-3) # bug 639140
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="freetds mysql oci8 odbc postgres +sqlite"
-
-REQUIRED_USE="
- || ( freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}:5=
- freetds? ( dev-db/freetds )
- mysql? ( dev-db/mysql-connector-c:= )
- oci8? ( dev-db/oracle-instantclient:=[sdk] )
- odbc? ( dev-db/unixODBC )
- postgres? ( dev-db/postgresql:* )
- sqlite? ( dev-db/sqlite:3 )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
- src/sql
- src/plugins/sqldrivers
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
- :sql
-)
-
-PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012
-
-src_configure() {
- local myconf=(
- $(qt_use freetds sql-tds plugin)
- $(qt_use mysql sql-mysql plugin)
- $(qt_use oci8 sql-oci plugin)
- $(qt_use odbc sql-odbc plugin)
- $(qt_use postgres sql-psql plugin)
- $(qt_use sqlite sql-sqlite plugin)
- $(usex sqlite -system-sqlite '')
- )
-
- use oci8 && myconf+=("-I${ORACLE_HOME}/include"
"-L${ORACLE_HOME}/$(get_libdir)")
-
- qt5-build_src_configure
-}
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 9b22bd9e6f4..72cbe7e4c43 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,2 +1 @@
DIST qtsvg-5.15.2-cfc61697.tar.gz 2779382 BLAKE2B
cd75575741b05cb1ec1b206d1d338c011c718923339d1cb169f0f537f21931e32042f10574e70b5c64d4fc352dfa56adc8b852dafa5131198630afe6bb806580
SHA512
1f8b52c713b4c6d4974af46ebe6519ea597f72ac0c4b80e061f714ff30449e6fdae94eb9705f3c1b857c5ad0647e5875260ee40051cec78321caf7b944fd3d70
-DIST qtsvg-everywhere-src-5.15.2.tar.xz 1886268 BLAKE2B
fee60a9d769e4c8962d084e98cd4c1a958ba926c8b4482f5b60b596a34944576cddfb46c4e04bd4a67cba7dfbdc7e29e61d8b5025cc7d2a1ae063f81eb31a114
SHA512
101e9c8fc05b1bb9c4e869564bff8e5723dd35f0ef557185e56e9dc12fdce74c531522c9642cdff639900eccf7ed0e04bfa48142741259697dded990fb481730
diff --git a/dev-qt/qtsvg/qtsvg-5.15.2.ebuild b/dev-qt/qtsvg/qtsvg-5.15.2.ebuild
deleted file mode 100644
index a93ff622407..00000000000
--- a/dev-qt/qtsvg/qtsvg-5.15.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="SVG rendering library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-RDEPEND="
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtgui-${PV}
- ~dev-qt/qtwidgets-${PV}
- sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}
- test? ( ~dev-qt/qtxml-${PV} )
-"
diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index c69b3ee123f..4b8920365b9 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1,3 +1 @@
DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B
2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a
SHA512
b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B
a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0
SHA512
da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
-DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B
0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42
SHA512
a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
diff --git a/dev-qt/qttest/qttest-5.15.2-r1.ebuild
b/dev-qt/qttest/qttest-5.15.2-r1.ebuild
deleted file mode 100644
index dc827fd108a..00000000000
--- a/dev-qt/qttest/qttest-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Unit testing library for the Qt5 framework"
-SRC_URI+="
https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz";
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-RDEPEND="
- ~dev-qt/qtcore-${PV}:5=
-"
-DEPEND="${RDEPEND}
- test? (
- ~dev-qt/qtgui-${PV}
- ~dev-qt/qtxml-${PV}
- )
-"
-
-QT5_TARGET_SUBDIRS=(
- src/testlib
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
- :testlib
-)
-
-PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index 15882b2abed..c8400f62976 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,2 +1 @@
DIST qttranslations-5.15.2-68f420eb.tar.gz 2994506 BLAKE2B
a0cdc69f6fc9b455b98658ee386d15346c1c23eeedeb4b7ca9d7cd7b60e7ee06a537a68530d017797683d60485dc38b02144f35f3e3e94c280a00b65a690bf97
SHA512
012e83971a8064d87d0d7ea50e6a9579916974fdaef195f1eea1639673085512bd421ced7abc2550c5b07dad264c861a75cd8ae6d48ac1c5e78f5359ceaa61b4
-DIST qttranslations-everywhere-src-5.15.2.tar.xz 1419504 BLAKE2B
3dd5a007bb42492e8a0e81004c99aaf10d97d3c7a77e952240d1d15c607cf34a246271776ff3bf01ad77fcbfb3966366131f23cba162414b02bbfd6da85505b1
SHA512
483b5d919f43c96a032e610cf6316989e7b859ab177cb2f7cb9bb10ebcddf8c9be8e04ff12db38a317c618d13f88455a4d434c7a1133f453882da4e026dd8cbe
diff --git a/dev-qt/qttranslations/qttranslations-5.15.2.ebuild
b/dev-qt/qttranslations/qttranslations-5.15.2.ebuild
deleted file mode 100644
index f7dd842fe29..00000000000
--- a/dev-qt/qttranslations/qttranslations-5.15.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Translation files for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
- ~dev-qt/linguist-tools-${PV}
- ~dev-qt/qtcore-${PV}
-"
-RDEPEND=""
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index daf4a7de725..3a2db5f35aa 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,2 +1 @@
DIST qtwayland-5.15.2-efe6edca.tar.gz 829293 BLAKE2B
6ccc5a4e111818cc65855eb4570727f30932bec9a749069550d07332df719eaeec0baf472c025150a32c9c380294f5e9496ad3babd181887a02fc37d1bfd5f2a
SHA512
87190cd1ade57c98da972a2f5d48aa0376ccc4bfa589f5832b8a62a63b3eafa6acf88d812ae98c484d4b02878ae2c1986c3759c0ba3f46894c76af713d7b8346
-DIST qtwayland-everywhere-src-5.15.2.tar.xz 564884 BLAKE2B
472effd3e9f3fd5470e0449703a52d45f2fd823770880b5ad15d8bf99196eee5d8511ca2bc9e23df6e27c933551d1853928ba79b4b1e5fa6e53334c54c04a463
SHA512
e8657ed676873da7b949e6a1605d025918a03336af9c68f32741945ec3c71a604def55bb00737ba4d97b91c00d0e2df1a83cdcedcf5795c6b2a1ef2caa21c91c
diff --git
a/dev-qt/qtwayland/files/qtwayland-5.15.2-qtwaylandscanner-avoid-dangling-pointers.patch
b/dev-qt/qtwayland/files/qtwayland-5.15.2-qtwaylandscanner-avoid-dangling-pointers.patch
deleted file mode 100644
index 0799cb1a202..00000000000
---
a/dev-qt/qtwayland/files/qtwayland-5.15.2-qtwaylandscanner-avoid-dangling-pointers.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 735164b5c2a2637a8d53a8803a2401e4ef477ff0 Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <[email protected]>
-Date: Fri, 30 Oct 2020 16:55:30 +0200
-Subject: [PATCH] Scanner: Avoid accessing dangling pointers in destroy_func()
-
-Usually, the object associated with the resource gets destroyed in the
-destroy_resource() function.
-
-Therefore, we need to double-check that the object is still alive before
-trying to reset its m_resource.
-
-Pick-to: 5.15
-Change-Id: I26408228f58919db17eb29584a1cbd4a9427d25c
-Reviewed-by: Eskil Abrahamsen Blomfeldt <[email protected]>
----
- src/qtwaylandscanner/qtwaylandscanner.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/qtwaylandscanner/qtwaylandscanner.cpp
b/src/qtwaylandscanner/qtwaylandscanner.cpp
-index 1a1f8bf16..450ef519d 100644
---- a/src/qtwaylandscanner/qtwaylandscanner.cpp
-+++ b/src/qtwaylandscanner/qtwaylandscanner.cpp
-@@ -814,7 +814,9 @@ bool Scanner::process()
- printf(" if (Q_LIKELY(that)) {\n");
- printf("
that->m_resource_map.remove(resource->client(), resource);\n");
- printf(" that->%s_destroy_resource(resource);\n",
interfaceNameStripped);
-- printf(" if (that->m_resource == resource)\n");
-+ printf("\n");
-+ printf(" that = resource->%s_object;\n",
interfaceNameStripped);
-+ printf(" if (that && that->m_resource == resource)\n");
- printf(" that->m_resource = nullptr;\n");
- printf(" }\n");
- printf(" delete resource;\n");
---
-2.16.3
diff --git a/dev-qt/qtwayland/qtwayland-5.15.2-r1.ebuild
b/dev-qt/qtwayland/qtwayland-5.15.2-r1.ebuild
deleted file mode 100644
index d042284d717..00000000000
--- a/dev-qt/qtwayland/qtwayland-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Wayland platform plugin for Qt"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="vulkan X"
-
-DEPEND="
- >=dev-libs/wayland-1.6.0
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtdeclarative-${PV}
- ~dev-qt/qtgui-${PV}[egl,libinput,vulkan=]
- media-libs/mesa[egl]
- >=x11-libs/libxkbcommon-0.2.0
- vulkan? ( dev-util/vulkan-headers )
- X? (
- ~dev-qt/qtgui-${PV}[-gles2-only]
- x11-libs/libX11
- x11-libs/libXcomposite
- )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-qtwaylandscanner-avoid-dangling-pointers.patch )
-
-src_configure() {
- local myqmakeargs=(
- --
- $(qt_use vulkan feature-wayland-vulkan-server-buffer)
- $(qt_use X feature-xcomposite-egl)
- $(qt_use X feature-xcomposite-glx)
- )
- qt5-build_src_configure
-}
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index a8db798d510..b174321d9fb 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,2 +1 @@
DIST qtwebsockets-5.15.2-e7883bc6.tar.gz 434705 BLAKE2B
f8c8fbb0e369ad5ceed40ca62c2a7d6d2cdb3cb74037e9ecb487b0ec31757aae10ed6f61790c566e4431b59585fee423047c4687b41cdfc08e96dd46c2f964b6
SHA512
35b1caed6462083014bbb83c6aa81b441f67da7f0e3813fc47997ca4fecfe5423eaef5dd4ed3c37f42dd311eded0e6b36cce6725c7028047ca21b454ded9257f
-DIST qtwebsockets-everywhere-src-5.15.2.tar.xz 259000 BLAKE2B
1bbc4d5451e70a94b6fb8377a60e43e2fa1aeb0d1224dd04486fcafd7821c3918a887297860e7cfcd18f3afd8dd02a903cf16fb69aeb48a52557af539c79458e
SHA512
1b23b79bff4289e785daf51441daaecf6de66ca5a3febfdd8fdb8ce871471bca4faf7663d68b23aaf562b1ebd6e9c8c27b3074f4b93bc9fcd3a0c54f7f79a9c4
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.15.2.ebuild
b/dev-qt/qtwebsockets/qtwebsockets-5.15.2.ebuild
deleted file mode 100644
index c47cd625b4a..00000000000
--- a/dev-qt/qtwebsockets/qtwebsockets-5.15.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="qml +ssl"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtnetwork-${PV}[ssl=]
- qml? ( ~dev-qt/qtdeclarative-${PV} )
-
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- qt_use_disable_mod qml quick src/src.pro
-
- qt5-build_src_prepare
-}
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index c69b3ee123f..4b8920365b9 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,3 +1 @@
DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B
2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a
SHA512
b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B
a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0
SHA512
da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
-DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B
0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42
SHA512
a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.2-r1.ebuild
b/dev-qt/qtwidgets/qtwidgets-5.15.2-r1.ebuild
deleted file mode 100644
index 3332a278e38..00000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Set of components for creating classic desktop-style UIs for the
Qt5 framework"
-SRC_URI+="
https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz";
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-# keep IUSE defaults in sync with qtgui
-IUSE="gles2-only gtk +png +X"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}:5=
- ~dev-qt/qtgui-${PV}[gles2-only=,png=,X?]
- gtk? (
- ~dev-qt/qtgui-${PV}[dbus]
- x11-libs/gtk+:3
- x11-libs/libX11
- x11-libs/pango
- )
-"
-RDEPEND="${DEPEND}
- dev-qt/qtchooser
-"
-
-QT5_TARGET_SUBDIRS=(
- src/tools/uic
- src/widgets
- src/plugins/platformthemes
-)
-
-QT5_GENTOO_CONFIG=(
- gtk:gtk3:
- ::widgets
- !:no-widgets:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
- :widgets
-)
-
-PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012
-
-src_configure() {
- local myconf=(
- -opengl $(usex gles2-only es2 desktop)
- $(qt_use gtk)
- -gui
- $(qt_use png libpng system)
- -widgets
- $(qt_use X xcb)
- $(usex X '-xcb-xlib -xkbcommon' '')
- )
- qt5-build_src_configure
-}
diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
index c69b3ee123f..4b8920365b9 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -1,3 +1 @@
DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B
2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a
SHA512
b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B
a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0
SHA512
da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
-DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B
0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42
SHA512
a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
diff --git a/dev-qt/qtxml/qtxml-5.15.2-r1.ebuild
b/dev-qt/qtxml/qtxml-5.15.2-r1.ebuild
deleted file mode 100644
index 16d360c85c5..00000000000
--- a/dev-qt/qtxml/qtxml-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
-SRC_URI+="
https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz";
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-RDEPEND="
- ~dev-qt/qtcore-${PV}:5=
-"
-DEPEND="${RDEPEND}
- test? ( ~dev-qt/qtnetwork-${PV} )
-"
-
-QT5_TARGET_SUBDIRS=(
- src/xml
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
- :xml
-)
-
-PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012
