commit: 11d57aad26ec0e96a23d073a78c245e161ee14e3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 8 11:15:33 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 14:26:38 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=11d57aad
dev-qt: Add QT5_KDEPATCHSET_REV within release switch for Qt5Tools
Can't use QT5_BUILD_TYPE pre-inheriting qt5-build.eclass.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/assistant/assistant-5.15.6.9999.ebuild | 9 +++++----
dev-qt/designer/designer-5.15.6.9999.ebuild | 9 +++++----
dev-qt/linguist-tools/linguist-tools-5.15.6.9999.ebuild | 9 +++++----
dev-qt/linguist/linguist-5.15.6.9999.ebuild | 9 +++++----
dev-qt/pixeltool/pixeltool-5.15.6.9999.ebuild | 9 +++++----
dev-qt/qdbus/qdbus-5.15.6.9999.ebuild | 9 +++++----
dev-qt/qdbusviewer/qdbusviewer-5.15.6.9999.ebuild | 9 +++++----
dev-qt/qdoc/qdoc-5.15.6.9999.ebuild | 9 +++++----
dev-qt/qtdiag/qtdiag-5.15.6.9999.ebuild | 9 +++++----
dev-qt/qthelp/qthelp-5.15.6.9999.ebuild | 9 +++++----
dev-qt/qtpaths/qtpaths-5.15.6.9999.ebuild | 13 ++++++-------
dev-qt/qtplugininfo/qtplugininfo-5.15.6.9999.ebuild | 13 ++++++-------
12 files changed, 62 insertions(+), 54 deletions(-)
diff --git a/dev-qt/assistant/assistant-5.15.6.9999.ebuild
b/dev-qt/assistant/assistant-5.15.6.9999.ebuild
index 52bf83ac..599b918c 100644
--- a/dev-qt/assistant/assistant-5.15.6.9999.ebuild
+++ b/dev-qt/assistant/assistant-5.15.6.9999.ebuild
@@ -3,15 +3,16 @@
EAPI=8
+if [[ ${PV} != *9999* ]]; then
+ QT5_KDEPATCHSET_REV=1
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+fi
+
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="
diff --git a/dev-qt/designer/designer-5.15.6.9999.ebuild
b/dev-qt/designer/designer-5.15.6.9999.ebuild
index dde64f6e..58b2ea54 100644
--- a/dev-qt/designer/designer-5.15.6.9999.ebuild
+++ b/dev-qt/designer/designer-5.15.6.9999.ebuild
@@ -3,15 +3,16 @@
EAPI=8
+if [[ ${PV} != *9999* ]]; then
+ QT5_KDEPATCHSET_REV=1
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
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 ~loong ~ppc ~ppc64 ~riscv ~x86"
-fi
-
IUSE="declarative"
DEPEND="
diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.6.9999.ebuild
b/dev-qt/linguist-tools/linguist-tools-5.15.6.9999.ebuild
index fa97b583..96831d4e 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.15.6.9999.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.15.6.9999.ebuild
@@ -3,15 +3,16 @@
EAPI=8
+if [[ ${PV} != *9999* ]]; then
+ QT5_KDEPATCHSET_REV=1
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc
~x86"
+fi
+
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 ~loong ~ppc ~ppc64 ~riscv ~sparc
~x86"
-fi
-
IUSE="qml"
DEPEND="
diff --git a/dev-qt/linguist/linguist-5.15.6.9999.ebuild
b/dev-qt/linguist/linguist-5.15.6.9999.ebuild
index d88d8a7a..e26f321c 100644
--- a/dev-qt/linguist/linguist-5.15.6.9999.ebuild
+++ b/dev-qt/linguist/linguist-5.15.6.9999.ebuild
@@ -3,15 +3,16 @@
EAPI=8
+if [[ ${PV} != *9999* ]]; then
+ QT5_KDEPATCHSET_REV=1
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
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="
diff --git a/dev-qt/pixeltool/pixeltool-5.15.6.9999.ebuild
b/dev-qt/pixeltool/pixeltool-5.15.6.9999.ebuild
index cd180247..15b753cd 100644
--- a/dev-qt/pixeltool/pixeltool-5.15.6.9999.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.15.6.9999.ebuild
@@ -3,15 +3,16 @@
EAPI=8
+if [[ ${PV} != *9999* ]]; then
+ QT5_KDEPATCHSET_REV=1
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+fi
+
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="
diff --git a/dev-qt/qdbus/qdbus-5.15.6.9999.ebuild
b/dev-qt/qdbus/qdbus-5.15.6.9999.ebuild
index fd19b238..5a14016b 100644
--- a/dev-qt/qdbus/qdbus-5.15.6.9999.ebuild
+++ b/dev-qt/qdbus/qdbus-5.15.6.9999.ebuild
@@ -3,15 +3,16 @@
EAPI=8
+if [[ ${PV} != *9999* ]]; then
+ QT5_KDEPATCHSET_REV=1
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc
~x86"
+fi
+
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 ~loong ~ppc ~ppc64 ~riscv ~sparc
~x86"
-fi
-
IUSE=""
DEPEND="
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.15.6.9999.ebuild
b/dev-qt/qdbusviewer/qdbusviewer-5.15.6.9999.ebuild
index 3394c5f1..0b1d890a 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.15.6.9999.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.15.6.9999.ebuild
@@ -3,15 +3,16 @@
EAPI=8
+if [[ ${PV} != *9999* ]]; then
+ QT5_KDEPATCHSET_REV=1
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+fi
+
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="
diff --git a/dev-qt/qdoc/qdoc-5.15.6.9999.ebuild
b/dev-qt/qdoc/qdoc-5.15.6.9999.ebuild
index 80459c8d..db33a032 100644
--- a/dev-qt/qdoc/qdoc-5.15.6.9999.ebuild
+++ b/dev-qt/qdoc/qdoc-5.15.6.9999.ebuild
@@ -3,15 +3,16 @@
EAPI=8
+if [[ ${PV} != *9999* ]]; then
+ QT5_KDEPATCHSET_REV=1
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
QT5_MODULE="qttools"
inherit qt5-build
DESCRIPTION="Qt documentation generator"
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
IUSE="qml"
DEPEND="
diff --git a/dev-qt/qtdiag/qtdiag-5.15.6.9999.ebuild
b/dev-qt/qtdiag/qtdiag-5.15.6.9999.ebuild
index 29438215..ff6df282 100644
--- a/dev-qt/qtdiag/qtdiag-5.15.6.9999.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.15.6.9999.ebuild
@@ -3,15 +3,16 @@
EAPI=8
+if [[ ${PV} != *9999* ]]; then
+ QT5_KDEPATCHSET_REV=1
+ KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
+fi
+
QT5_MODULE="qttools"
inherit qt5-build
DESCRIPTION="Tool for reporting diagnostic information about Qt and its
environment"
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
-fi
-
IUSE="+network +widgets"
DEPEND="
diff --git a/dev-qt/qthelp/qthelp-5.15.6.9999.ebuild
b/dev-qt/qthelp/qthelp-5.15.6.9999.ebuild
index c4a55995..8bc37406 100644
--- a/dev-qt/qthelp/qthelp-5.15.6.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-5.15.6.9999.ebuild
@@ -3,15 +3,16 @@
EAPI=8
+if [[ ${PV} != *9999* ]]; then
+ QT5_KDEPATCHSET_REV=1
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
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="
diff --git a/dev-qt/qtpaths/qtpaths-5.15.6.9999.ebuild
b/dev-qt/qtpaths/qtpaths-5.15.6.9999.ebuild
index 8daabef5..c30a6491 100644
--- a/dev-qt/qtpaths/qtpaths-5.15.6.9999.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.15.6.9999.ebuild
@@ -3,20 +3,19 @@
EAPI=8
+if [[ ${PV} != *9999* ]]; then
+ QT5_KDEPATCHSET_REV=1
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc
~x86"
+fi
+
QT5_MODULE="qttools"
inherit qt5-build
DESCRIPTION="Command line client to QStandardPaths"
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc
~x86"
-fi
-
IUSE=""
-DEPEND="
- =dev-qt/qtcore-${QT5_PV}*
-"
+DEPEND="=dev-qt/qtcore-${QT5_PV}*"
RDEPEND="${DEPEND}"
QT5_TARGET_SUBDIRS=(
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.15.6.9999.ebuild
b/dev-qt/qtplugininfo/qtplugininfo-5.15.6.9999.ebuild
index 7d97665f..2ed8e084 100644
--- a/dev-qt/qtplugininfo/qtplugininfo-5.15.6.9999.ebuild
+++ b/dev-qt/qtplugininfo/qtplugininfo-5.15.6.9999.ebuild
@@ -3,20 +3,19 @@
EAPI=8
+if [[ ${PV} != *9999* ]]; then
+ QT5_KDEPATCHSET_REV=1
+ KEYWORDS="~amd64 ~x86"
+fi
+
QT5_MODULE="qttools"
inherit qt5-build
DESCRIPTION="Qt5 plugin metadata dumper"
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~x86"
-fi
-
IUSE=""
-DEPEND="
- =dev-qt/qtcore-${QT5_PV}*
-"
+DEPEND="=dev-qt/qtcore-${QT5_PV}*"
RDEPEND="${DEPEND}"
QT5_TARGET_SUBDIRS=(
