commit: aa03e562bc2a040b9e9f31eb6116ee3d7cb00c92
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 20:48:22 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 10:04:45 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=aa03e562
dev-qt/qtchooser: Drop tools colliding with Qt 5.15.3 links
Upstream repo has diverged from 66 release so rebase patch.
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/qtchooser-9999-qt-5.15.3-compat.patch | 35 ++++++++++++++++++++++
dev-qt/qtchooser/qtchooser-9999.ebuild | 10 +++----
2 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtchooser/files/qtchooser-9999-qt-5.15.3-compat.patch
b/dev-qt/qtchooser/files/qtchooser-9999-qt-5.15.3-compat.patch
new file mode 100644
index 00000000..316c3b86
--- /dev/null
+++ b/dev-qt/qtchooser/files/qtchooser-9999-qt-5.15.3-compat.patch
@@ -0,0 +1,35 @@
+--- a/Makefile
++++ b/Makefile
+@@ -4,22 +4,17 @@
+ TOOLS = \
+ androiddeployqt \
+ androidtestrunner \
+- assistant \
+ balsam \
+ balsamui \
+ designer \
+ instancer \
+ lconvert \
+- linguist \
+ lrelease \
+ lupdate \
+ meshdebug \
+ moc \
+- pixeltool \
+ qcollectiongenerator \
+- qdbus \
+ qdbuscpp2xml \
+- qdbusviewer \
+ qdbusxml2cpp \
+ qdistancefieldgenerator \
+ qdoc \
+ repc \
+ shadergen \
+ uic \
+- uic3 \
+- xmlpatterns \
+- xmlpatternsvalidator \
++ uic3
+
+ # keep the above line empty
+
diff --git a/dev-qt/qtchooser/qtchooser-9999.ebuild
b/dev-qt/qtchooser/qtchooser-9999.ebuild
index 46e20878..cd50a5c9 100644
--- a/dev-qt/qtchooser/qtchooser-9999.ebuild
+++ b/dev-qt/qtchooser/qtchooser-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="https://code.qt.io/qtsdk/qtchooser.git";
inherit git-r3
else
- SRC_URI="http://download.qt.io/official_releases/${PN}/${P}.tar.xz";
+ SRC_URI="https://download.qt.io/official_releases/${PN}/${P}.tar.xz";
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
@@ -25,9 +25,9 @@ DEPEND="test? (
dev-qt/qtcore:5
dev-qt/qttest:5
)"
-RDEPEND="
- !<dev-qt/qtcore-5.15.2-r10:5
-"
+RDEPEND="!<dev-qt/qtcore-5.15.3:5"
+
+PATCHES=( "${FILESDIR}/${PN}-9999-qt-5.15.3-compat.patch" )
qtchooser_make() {
emake \
