diff --git a/dev-libs/qcoro/metadata.xml b/dev-libs/qcoro/metadata.xml index 726702f081d..60c7061a3a8 100644 --- a/dev-libs/qcoro/metadata.xml +++ b/dev-libs/qcoro/metadata.xml @@ -12,7 +12,6 @@ Build dev-qt/qtbase network support Enable QML/QtQuick support via dev-qt/qtdeclarative - Install coroutine-friendly versions of dev-qt/qtbase test macros Build dev-qt/qtwebsockets support diff --git a/dev-libs/qcoro/qcoro-9999.ebuild b/dev-libs/qcoro/qcoro-9999.ebuild index 1089332563c..f399329e116 100644 --- a/dev-libs/qcoro/qcoro-9999.ebuild +++ b/dev-libs/qcoro/qcoro-9999.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) )