commit: 297e8d8cc000bcf046fe5945f7c3f8c318d28a97
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 15:56:40 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 15:59:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=297e8d8c
dev-libs/qcoro: drop USE=testlib
qtbase always installs qttest so we can drop USE=testlib here and always build
it instead.
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/qcoro/metadata.xml | 1 -
dev-libs/qcoro/qcoro-0.10.0.ebuild | 9 ++++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/dev-libs/qcoro/metadata.xml b/dev-libs/qcoro/metadata.xml
index 726702f081d1..60c7061a3a86 100644
--- a/dev-libs/qcoro/metadata.xml
+++ b/dev-libs/qcoro/metadata.xml
@@ -12,7 +12,6 @@
<use>
<flag name="network">Build <pkg>dev-qt/qtbase</pkg> network
support</flag>
<flag name="qml">Enable QML/QtQuick support via
<pkg>dev-qt/qtdeclarative</pkg></flag>
- <flag name="testlib">Install coroutine-friendly versions of
<pkg>dev-qt/qtbase</pkg> test macros</flag>
<flag name="websockets">Build <pkg>dev-qt/qtwebsockets</pkg>
support</flag>
</use>
</pkgmetadata>
diff --git a/dev-libs/qcoro/qcoro-0.10.0.ebuild
b/dev-libs/qcoro/qcoro-0.10.0.ebuild
index 3d15e281be59..c9f8f4e20583 100644
--- a/dev-libs/qcoro/qcoro-0.10.0.ebuild
+++ b/dev-libs/qcoro/qcoro-0.10.0.ebuild
@@ -18,20 +18,19 @@ HOMEPAGE="https://qcoro.dvratil.cz/
https://github.com/danvratil/qcoro"
LICENSE="MIT"
SLOT="0"
-IUSE="dbus examples +network qml test testlib websockets"
+IUSE="dbus examples +network qml test websockets"
-REQUIRED_USE="examples? ( network ) test? ( testlib )"
+REQUIRED_USE="examples? ( network )"
RESTRICT="!test? ( test )"
RDEPEND="
dev-qt/qtbase:6[dbus?,network?]
qml? ( dev-qt/qtdeclarative:6= )
- testlib? ( dev-qt/qtbase:6[test] )
websockets? ( dev-qt/qtwebsockets:6 )
"
DEPEND="${RDEPEND}
examples? ( dev-qt/qtbase:6[concurrent,network,widgets] )
- test? ( dev-qt/qtbase:6[concurrent,test] )
+ test? ( dev-qt/qtbase:6[concurrent] )
"
src_configure() {
@@ -42,7 +41,7 @@ src_configure() {
-DQCORO_WITH_QTNETWORK=$(usex network)
-DQCORO_WITH_QML=$(usex qml)
-DQCORO_WITH_QTQUICK=$(usex qml)
- -DQCORO_WITH_QTTEST=$(usex testlib)
+ -DQCORO_WITH_QTTEST=ON
-DBUILD_TESTING=$(usex test)
-DQCORO_WITH_QTWEBSOCKETS=$(usex websockets)
)