commit:     310392111524efc9a559c3553183ad7218f946d3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  8 10:06:18 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=31039211

dev-qt: Set QT5_KDEPATCHSET_REV within release switch

Can't use QT5_BUILD_TYPE pre-inheriting qt5-build.eclass.
Makes the live ebuilds a bit more useful to spinning releases.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qt3d/qt3d-5.15.6.9999.ebuild                       |  8 ++++----
 dev-qt/qtbluetooth/qtbluetooth-5.15.6.9999.ebuild         |  9 +++++----
 dev-qt/qtconcurrent/qtconcurrent-5.15.6.9999.ebuild       |  9 +++++----
 dev-qt/qtcore/qtcore-5.15.6.9999.ebuild                   |  9 +++++----
 dev-qt/qtdbus/qtdbus-5.15.6.9999.ebuild                   |  9 +++++----
 dev-qt/qtdeclarative/qtdeclarative-5.15.6.9999.ebuild     |  9 +++++----
 dev-qt/qtgui/qtgui-5.15.6.9999.ebuild                     | 11 ++++++-----
 dev-qt/qtimageformats/qtimageformats-5.15.6.9999.ebuild   |  9 +++++----
 dev-qt/qtlocation/qtlocation-5.15.6.9999.ebuild           |  9 +++++----
 dev-qt/qtmultimedia/qtmultimedia-5.15.6.9999.ebuild       |  9 +++++----
 dev-qt/qtnetwork/qtnetwork-5.15.6.9999.ebuild             |  9 +++++----
 dev-qt/qtopengl/qtopengl-5.15.6.9999.ebuild               |  9 +++++----
 dev-qt/qtprintsupport/qtprintsupport-5.15.6.9999.ebuild   |  9 +++++----
 .../qtquickcontrols2/qtquickcontrols2-5.15.6.9999.ebuild  |  9 +++++----
 dev-qt/qtspeech/qtspeech-5.15.6.9999.ebuild               |  9 +++++----
 dev-qt/qtsql/qtsql-5.15.6.9999.ebuild                     | 11 ++++++-----
 dev-qt/qtsvg/qtsvg-5.15.6.9999.ebuild                     |  9 +++++----
 dev-qt/qttest/qttest-5.15.6.9999.ebuild                   | 13 ++++++-------
 dev-qt/qttranslations/qttranslations-5.15.6.9999.ebuild   |  9 +++++----
 .../qtvirtualkeyboard-5.15.6.9999.ebuild                  |  9 +++++----
 dev-qt/qtwayland/qtwayland-5.15.6.9999.ebuild             | 15 +++++++--------
 dev-qt/qtwebchannel/qtwebchannel-5.15.6.9999.ebuild       |  9 +++++----
 dev-qt/qtwebsockets/qtwebsockets-5.15.6.9999.ebuild       |  9 +++++----
 dev-qt/qtwidgets/qtwidgets-5.15.6.9999.ebuild             | 10 +++++-----
 dev-qt/qtxml/qtxml-5.15.6.9999.ebuild                     | 13 ++++++-------
 25 files changed, 130 insertions(+), 113 deletions(-)

diff --git a/dev-qt/qt3d/qt3d-5.15.6.9999.ebuild 
b/dev-qt/qt3d/qt3d-5.15.6.9999.ebuild
index 0da2ac57..6517132d 100644
--- a/dev-qt/qt3d/qt3d-5.15.6.9999.ebuild
+++ b/dev-qt/qt3d/qt3d-5.15.6.9999.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=8
 
+if [[ ${PV} != *9999* ]]; then
+       QT5_KDEPATCHSET_REV=1
+       KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
 inherit qt5-build
 
 DESCRIPTION="3D rendering module for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-       KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-fi
-
 # TODO: tools
 IUSE="gamepad gles2-only qml vulkan"
 

diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.15.6.9999.ebuild 
b/dev-qt/qtbluetooth/qtbluetooth-5.15.6.9999.ebuild
index 9923f030..b3e443f1 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.15.6.9999.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-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="qtconnectivity"
 inherit qt5-build
 
 DESCRIPTION="Bluetooth support library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-       KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
 IUSE="qml"
 
 DEPEND="

diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.6.9999.ebuild 
b/dev-qt/qtconcurrent/qtconcurrent-5.15.6.9999.ebuild
index 769fd1c7..4f9e92a5 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.15.6.9999.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-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="qtbase"
 inherit qt5-build
 
 DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
 
-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}*:5="

diff --git a/dev-qt/qtcore/qtcore-5.15.6.9999.ebuild 
b/dev-qt/qtcore/qtcore-5.15.6.9999.ebuild
index 1f4a57ff..66e8d589 100644
--- a/dev-qt/qtcore/qtcore-5.15.6.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.6.9999.ebuild
@@ -3,16 +3,17 @@
 
 EAPI=8
 
+if [[ ${PV} != *9999* ]]; then
+       QT5_KDEPATCHSET_REV=1
+       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+fi
+
 QT5_MODULE="qtbase"
 inherit linux-info flag-o-matic qt5-build
 
 DESCRIPTION="Cross-platform application development framework"
 SLOT=5/${QT5_PV}
 
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
-fi
-
 IUSE="icu old-kernel systemd"
 
 DEPEND="

diff --git a/dev-qt/qtdbus/qtdbus-5.15.6.9999.ebuild 
b/dev-qt/qtdbus/qtdbus-5.15.6.9999.ebuild
index 88e61832..4cc42c34 100644
--- a/dev-qt/qtdbus/qtdbus-5.15.6.9999.ebuild
+++ b/dev-qt/qtdbus/qtdbus-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="qtbase"
 inherit qt5-build
 
 DESCRIPTION="Qt5 module for inter-process communication over the D-Bus 
protocol"
 
-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/qtdeclarative/qtdeclarative-5.15.6.9999.ebuild 
b/dev-qt/qtdeclarative/qtdeclarative-5.15.6.9999.ebuild
index 258f5833..cfca051f 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.6.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-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
+
 PYTHON_COMPAT=( python3_{8..11} )
 inherit flag-o-matic 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 ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
-fi
-
 IUSE="gles2-only +jit localstorage vulkan +widgets"
 
 # qtgui[gles2-only=] is needed because of bug 504322

diff --git a/dev-qt/qtgui/qtgui-5.15.6.9999.ebuild 
b/dev-qt/qtgui/qtgui-5.15.6.9999.ebuild
index abbe3a1f..e8389d10 100644
--- a/dev-qt/qtgui/qtgui-5.15.6.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.6.9999.ebuild
@@ -3,16 +3,17 @@
 
 EAPI=8
 
+if [[ ${PV} != *9999* ]]; then
+       QT5_KDEPATCHSET_REV=1
+       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+fi
+
 QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-SLOT=5/${QT5_PV} # bug 707658
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
-fi
 
+SLOT=5/${QT5_PV} # bug 707658
 IUSE="accessibility dbus egl eglfs evdev gles2-only ibus jpeg +libinput
        linuxfb +png tslib tuio +udev vnc vulkan wayland +X"
 REQUIRED_USE="

diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.6.9999.ebuild 
b/dev-qt/qtimageformats/qtimageformats-5.15.6.9999.ebuild
index 525d279d..c22a648f 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.15.6.9999.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.15.6.9999.ebuild
@@ -3,14 +3,15 @@
 
 EAPI=8
 
+if [[ ${PV} != *9999* ]]; then
+       QT5_KDEPATCHSET_REV=1
+       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
+fi
+
 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="

diff --git a/dev-qt/qtlocation/qtlocation-5.15.6.9999.ebuild 
b/dev-qt/qtlocation/qtlocation-5.15.6.9999.ebuild
index 24597882..ebcbd1ab 100644
--- a/dev-qt/qtlocation/qtlocation-5.15.6.9999.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.15.6.9999.ebuild
@@ -3,14 +3,15 @@
 
 EAPI=8
 
+if [[ ${PV} != *9999* ]]; then
+       QT5_KDEPATCHSET_REV=1
+       KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
 inherit qt5-build
 
 DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-       KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
 IUSE=""
 
 RDEPEND="

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.6.9999.ebuild 
b/dev-qt/qtmultimedia/qtmultimedia-5.15.6.9999.ebuild
index fab06033..68a45b0b 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.6.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.6.9999.ebuild
@@ -3,14 +3,15 @@
 
 EAPI=8
 
+if [[ ${PV} != *9999* ]]; then
+       QT5_KDEPATCHSET_REV=1
+       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+fi
+
 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 ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
-fi
-
 IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
 
 RDEPEND="

diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.6.9999.ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.15.6.9999.ebuild
index d0789ddb..0985121c 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15.6.9999.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-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="qtbase"
 inherit qt5-build
 
 DESCRIPTION="Network abstraction library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
-fi
-
 IUSE="connman gssapi libproxy networkmanager sctp +ssl"
 
 DEPEND="

diff --git a/dev-qt/qtopengl/qtopengl-5.15.6.9999.ebuild 
b/dev-qt/qtopengl/qtopengl-5.15.6.9999.ebuild
index ec72ce28..a83fb8cf 100644
--- a/dev-qt/qtopengl/qtopengl-5.15.6.9999.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.15.6.9999.ebuild
@@ -3,16 +3,17 @@
 
 EAPI=8
 
+if [[ ${PV} != *9999* ]]; then
+       QT5_KDEPATCHSET_REV=1
+       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+fi
+
 QT5_MODULE="qtbase"
 VIRTUALX_REQUIRED="test"
 inherit qt5-build
 
 DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
 
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
-fi
-
 IUSE="gles2-only"
 
 DEPEND="

diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.6.9999.ebuild 
b/dev-qt/qtprintsupport/qtprintsupport-5.15.6.9999.ebuild
index 95992ba0..0c06dff7 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.15.6.9999.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.15.6.9999.ebuild
@@ -3,16 +3,17 @@
 
 EAPI=8
 
+if [[ ${PV} != *9999* ]]; then
+       QT5_KDEPATCHSET_REV=1
+       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+fi
+
 QT5_MODULE="qtbase"
 VIRTUALX_REQUIRED="test"
 inherit qt5-build
 
 DESCRIPTION="Printing support library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
-fi
-
 IUSE="cups gles2-only"
 
 RDEPEND="

diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.6.9999.ebuild 
b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.6.9999.ebuild
index 2b878956..9d39a34c 100644
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.6.9999.ebuild
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.6.9999.ebuild
@@ -3,14 +3,15 @@
 
 EAPI=8
 
+if [[ ${PV} != *9999* ]]; then
+       QT5_KDEPATCHSET_REV=1
+       KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
 inherit qt5-build
 
 DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-       KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-fi
-
 IUSE="widgets"
 
 DEPEND="

diff --git a/dev-qt/qtspeech/qtspeech-5.15.6.9999.ebuild 
b/dev-qt/qtspeech/qtspeech-5.15.6.9999.ebuild
index 01b60743..4f2570ca 100644
--- a/dev-qt/qtspeech/qtspeech-5.15.6.9999.ebuild
+++ b/dev-qt/qtspeech/qtspeech-5.15.6.9999.ebuild
@@ -3,14 +3,15 @@
 
 EAPI=8
 
+if [[ ${PV} != *9999* ]]; then
+       QT5_KDEPATCHSET_REV=1
+       KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
 inherit qt5-build
 
 DESCRIPTION="Text-to-speech library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-       KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
 IUSE="alsa flite"
 
 RDEPEND="

diff --git a/dev-qt/qtsql/qtsql-5.15.6.9999.ebuild 
b/dev-qt/qtsql/qtsql-5.15.6.9999.ebuild
index 9ff37dd5..6797059c 100644
--- a/dev-qt/qtsql/qtsql-5.15.6.9999.ebuild
+++ b/dev-qt/qtsql/qtsql-5.15.6.9999.ebuild
@@ -3,16 +3,17 @@
 
 EAPI=8
 
+if [[ ${PV} != *9999* ]]; then
+       QT5_KDEPATCHSET_REV=1
+       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+fi
+
 QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="SQL abstraction library for the Qt5 framework"
-SLOT=5/${QT5_PV} # bug 639140
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
-fi
 
+SLOT=5/${QT5_PV} # bug 639140
 IUSE="freetds mysql oci8 odbc postgres +sqlite"
 REQUIRED_USE="
        || ( freetds mysql oci8 odbc postgres sqlite )

diff --git a/dev-qt/qtsvg/qtsvg-5.15.6.9999.ebuild 
b/dev-qt/qtsvg/qtsvg-5.15.6.9999.ebuild
index 00a3eb80..f692b31e 100644
--- a/dev-qt/qtsvg/qtsvg-5.15.6.9999.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.15.6.9999.ebuild
@@ -3,14 +3,15 @@
 
 EAPI=8
 
+if [[ ${PV} != *9999* ]]; then
+       QT5_KDEPATCHSET_REV=1
+       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+fi
+
 inherit qt5-build
 
 DESCRIPTION="SVG rendering library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
-fi
-
 IUSE=""
 
 RDEPEND="

diff --git a/dev-qt/qttest/qttest-5.15.6.9999.ebuild 
b/dev-qt/qttest/qttest-5.15.6.9999.ebuild
index ac3bbbfb..eab75c06 100644
--- a/dev-qt/qttest/qttest-5.15.6.9999.ebuild
+++ b/dev-qt/qttest/qttest-5.15.6.9999.ebuild
@@ -3,21 +3,20 @@
 
 EAPI=8
 
+if [[ ${PV} != *9999* ]]; then
+       QT5_KDEPATCHSET_REV=1
+       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+fi
+
 QT5_MODULE="qtbase"
 VIRTUALX_REQUIRED="test"
 inherit qt5-build
 
 DESCRIPTION="Unit testing library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
-fi
-
 IUSE=""
 
-RDEPEND="
-       =dev-qt/qtcore-${QT5_PV}*:5=
-"
+RDEPEND="=dev-qt/qtcore-${QT5_PV}*:5="
 DEPEND="${RDEPEND}
        test? (
                =dev-qt/qtgui-${QT5_PV}*

diff --git a/dev-qt/qttranslations/qttranslations-5.15.6.9999.ebuild 
b/dev-qt/qttranslations/qttranslations-5.15.6.9999.ebuild
index cf3a99f9..9bff406d 100644
--- a/dev-qt/qttranslations/qttranslations-5.15.6.9999.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.15.6.9999.ebuild
@@ -3,14 +3,15 @@
 
 EAPI=8
 
+if [[ ${PV} != *9999* ]]; then
+       QT5_KDEPATCHSET_REV=1
+       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+fi
+
 inherit qt5-build
 
 DESCRIPTION="Translation files for the Qt5 framework"
 
-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}*"

diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.6.9999.ebuild 
b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.6.9999.ebuild
index b114dce6..e44b24e6 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.6.9999.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.6.9999.ebuild
@@ -3,14 +3,15 @@
 
 EAPI=8
 
+if [[ ${PV} != *9999* ]]; then
+       QT5_KDEPATCHSET_REV=1
+       KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
 inherit qt5-build
 
 DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
 
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-       KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-fi
-
 # TODO: unbundle libraries for more layouts
 IUSE="handwriting +spell +X"
 

diff --git a/dev-qt/qtwayland/qtwayland-5.15.6.9999.ebuild 
b/dev-qt/qtwayland/qtwayland-5.15.6.9999.ebuild
index ee7fc050..1f287004 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.6.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-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
+
 inherit qt5-build
 
 DESCRIPTION="Wayland platform plugin for Qt"
-SLOT=5/${QT5_PV} # bug 815646
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
-fi
 
+SLOT=5/${QT5_PV} # bug 815646
 IUSE="vulkan X"
 
 DEPEND="
@@ -28,9 +29,7 @@ DEPEND="
        )
 "
 RDEPEND="${DEPEND}"
-BDEPEND="
-       dev-util/wayland-scanner
-"
+BDEPEND="dev-util/wayland-scanner"
 
 src_configure() {
        local myqmakeargs=(

diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.15.6.9999.ebuild 
b/dev-qt/qtwebchannel/qtwebchannel-5.15.6.9999.ebuild
index 383744de..a2b65971 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.15.6.9999.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.15.6.9999.ebuild
@@ -3,14 +3,15 @@
 
 EAPI=8
 
+if [[ ${PV} != *9999* ]]; then
+       QT5_KDEPATCHSET_REV=1
+       KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+
 inherit qt5-build
 
 DESCRIPTION="Qt5 module for integrating C++ and QML applications with 
HTML/JavaScript clients"
 
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-       KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-fi
-
 IUSE="qml"
 
 DEPEND="

diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.15.6.9999.ebuild 
b/dev-qt/qtwebsockets/qtwebsockets-5.15.6.9999.ebuild
index 1851be51..83977f47 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.15.6.9999.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.15.6.9999.ebuild
@@ -3,14 +3,15 @@
 
 EAPI=8
 
+if [[ ${PV} != *9999* ]]; then
+       QT5_KDEPATCHSET_REV=1
+       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
 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="

diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.6.9999.ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.15.6.9999.ebuild
index 7e18bf21..8050e865 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.6.9999.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.6.9999.ebuild
@@ -3,18 +3,18 @@
 
 EAPI=8
 
+if [[ ${PV} != *9999* ]]; then
+       QT5_KDEPATCHSET_REV=1
+       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+fi
+
 QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="Set of components for creating classic desktop-style UIs for the 
Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
-fi
-
 # keep IUSE defaults in sync with qtgui
 IUSE="dbus gles2-only gtk +png +X"
-
 REQUIRED_USE="gtk? ( dbus )"
 
 DEPEND="

diff --git a/dev-qt/qtxml/qtxml-5.15.6.9999.ebuild 
b/dev-qt/qtxml/qtxml-5.15.6.9999.ebuild
index e60a8b99..0f024eb6 100644
--- a/dev-qt/qtxml/qtxml-5.15.6.9999.ebuild
+++ b/dev-qt/qtxml/qtxml-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="qtbase"
 inherit qt5-build
 
 DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
-fi
-
 IUSE=""
 
-RDEPEND="
-       =dev-qt/qtcore-${QT5_PV}*:5=
-"
+RDEPEND="=dev-qt/qtcore-${QT5_PV}*:5="
 DEPEND="${RDEPEND}
        test? ( =dev-qt/qtnetwork-${QT5_PV}* )
 "

Reply via email to