commit: 4c89449c5a11a3981573795595ca27c5acde83f7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 5 11:21:56 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 5 18:23:36 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=4c89449c
dev-qt: Restore QT5_TARGET_SUBDIRS for QT5_MODULE=qttools
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/designer/designer-5.15.9999.ebuild | 4 ++++
dev-qt/pixeltool/pixeltool-5.15.9999.ebuild | 4 ++++
dev-qt/qdoc/qdoc-5.15.9999.ebuild | 11 ++++++-----
dev-qt/qtdiag/qtdiag-5.15.9999.ebuild | 11 ++++++-----
dev-qt/qtpaths/qtpaths-5.15.9999.ebuild | 4 ++++
dev-qt/qtplugininfo/qtplugininfo-5.15.9999.ebuild | 11 ++++++-----
6 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/dev-qt/designer/designer-5.15.9999.ebuild
b/dev-qt/designer/designer-5.15.9999.ebuild
index 57b94cf6..7896c59f 100644
--- a/dev-qt/designer/designer-5.15.9999.ebuild
+++ b/dev-qt/designer/designer-5.15.9999.ebuild
@@ -25,6 +25,10 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+QT5_TARGET_SUBDIRS=(
+ src/designer
+)
+
src_prepare() {
qt_use_disable_mod declarative quickwidgets \
src/designer/src/plugins/plugins.pro
diff --git a/dev-qt/pixeltool/pixeltool-5.15.9999.ebuild
b/dev-qt/pixeltool/pixeltool-5.15.9999.ebuild
index 1d39a96b..e7d56697 100644
--- a/dev-qt/pixeltool/pixeltool-5.15.9999.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.15.9999.ebuild
@@ -20,3 +20,7 @@ DEPEND="
~dev-qt/qtwidgets-${PV}
"
RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+ src/pixeltool
+)
diff --git a/dev-qt/qdoc/qdoc-5.15.9999.ebuild
b/dev-qt/qdoc/qdoc-5.15.9999.ebuild
index 09d86b11..5dfef52d 100644
--- a/dev-qt/qdoc/qdoc-5.15.9999.ebuild
+++ b/dev-qt/qdoc/qdoc-5.15.9999.ebuild
@@ -14,15 +14,16 @@ fi
IUSE="qml"
-RDEPEND="
+DEPEND="
~dev-qt/qtcore-${PV}:5=
sys-devel/clang:=
qml? ( ~dev-qt/qtdeclarative-${PV} )
"
-# TODO: we know it is bogus, figure out how to disable checks, bug 802492
-DEPEND="${RDEPEND}
- ~dev-qt/qtxml-${PV}
-"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+ src/qdoc
+)
src_prepare() {
qt_use_disable_mod qml qmldevtools-private \
diff --git a/dev-qt/qtdiag/qtdiag-5.15.9999.ebuild
b/dev-qt/qtdiag/qtdiag-5.15.9999.ebuild
index 5b1f06f1..1f1a2a0b 100644
--- a/dev-qt/qtdiag/qtdiag-5.15.9999.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.15.9999.ebuild
@@ -14,16 +14,17 @@ fi
IUSE="+network +widgets"
-RDEPEND="
+DEPEND="
~dev-qt/qtcore-${PV}:5=
~dev-qt/qtgui-${PV}:5=
network? ( ~dev-qt/qtnetwork-${PV}[ssl] )
widgets? ( ~dev-qt/qtwidgets-${PV} )
"
-# TODO: we know it is bogus, figure out how to disable checks, bug 728278
-DEPEND="${RDEPEND}
- ~dev-qt/qtxml-${PV}
-"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+ src/qtdiag
+)
src_prepare() {
qt_use_disable_mod network network \
diff --git a/dev-qt/qtpaths/qtpaths-5.15.9999.ebuild
b/dev-qt/qtpaths/qtpaths-5.15.9999.ebuild
index 291930ca..febed8e6 100644
--- a/dev-qt/qtpaths/qtpaths-5.15.9999.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.15.9999.ebuild
@@ -18,3 +18,7 @@ DEPEND="
~dev-qt/qtcore-${PV}
"
RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+ src/qtpaths
+)
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.15.9999.ebuild
b/dev-qt/qtplugininfo/qtplugininfo-5.15.9999.ebuild
index 064b136f..33090834 100644
--- a/dev-qt/qtplugininfo/qtplugininfo-5.15.9999.ebuild
+++ b/dev-qt/qtplugininfo/qtplugininfo-5.15.9999.ebuild
@@ -14,10 +14,11 @@ fi
IUSE=""
-RDEPEND="
+DEPEND="
~dev-qt/qtcore-${PV}
"
-# TODO: we know it is bogus, figure out how to disable checks, bug 795237
-DEPEND="${RDEPEND}
- ~dev-qt/qtxml-${PV}
-"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+ src/qtplugininfo
+)
