[gentoo-commits] proj/kde:master commit in: dev-libs/qcoro/

[gentoo-commits] proj/kde:master commit in: dev-libs/qcoro/

[Andreas Sturmlechner]

commit:     b650f407ac9738fc2fb6be6317f2732115dc3e0b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 18 15:10:22 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 18 15:10:22 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b650f407

dev-libs/qcoro: Add missing dependency on dev-qt/qtbase:6[gui]

Bug: https://bugs.gentoo.org/922283
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/qcoro/qcoro-9999.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-libs/qcoro/qcoro-9999.ebuild b/dev-libs/qcoro/qcoro-9999.ebuild
index 22fa5ba5db..6f989857cd 100644
--- a/dev-libs/qcoro/qcoro-9999.ebuild
+++ b/dev-libs/qcoro/qcoro-9999.ebuild
@@ -25,7 +25,10 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-qt/qtbase:6[dbus?,network?]
-	qml? ( dev-qt/qtdeclarative:6= )
+	qml? (
+		dev-qt/qtbase:6[gui]
+		dev-qt/qtdeclarative:6=
+	)
 	websockets? ( dev-qt/qtwebsockets:6 )
 "
 DEPEND="${RDEPEND}

[gentoo-commits] proj/kde:master commit in: dev-libs/qcoro/

[Sam James]

commit:     f3bd35f7f062e5373895eb00f17bc325027ebaef
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 16:01:01 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f3bd35f7

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-9999.ebuild | 9 ++++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/dev-libs/qcoro/metadata.xml b/dev-libs/qcoro/metadata.xml
index 726702f081..60c7061a3a 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-9999.ebuild b/dev-libs/qcoro/qcoro-9999.ebuild
index 1089332563..f399329e11 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)
 	)

[gentoo-commits] proj/kde:master commit in: dev-libs/qcoro/

[Sam James]

commit:     875a45d8cfb6f9e4308667ae9a1f646979a09097
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  2 21:35:44 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec  2 21:35:44 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=875a45d8

dev-libs/qcoro: tweak DESCRIPTION

Bug: https://bugs.gentoo.org/918994
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/qcoro/qcoro-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/qcoro/qcoro-9999.ebuild b/dev-libs/qcoro/qcoro-9999.ebuild
index 787c61337a..1089332563 100644
--- a/dev-libs/qcoro/qcoro-9999.ebuild
+++ b/dev-libs/qcoro/qcoro-9999.ebuild
@@ -13,7 +13,7 @@ else
 	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
-DESCRIPTION="C++ Coroutine Library for Qt5"
+DESCRIPTION="C++ Coroutine Library for Qt"
 HOMEPAGE="https://qcoro.dvratil.cz/ https://github.com/danvratil/qcoro"
 
 LICENSE="MIT"

[gentoo-commits] proj/kde:master commit in: dev-libs/qcoro/

[Andreas Sturmlechner]

commit:     fa20441bd6e38dec2ca35fcca36ea30864802dfa
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  2 16:36:32 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  2 16:39:36 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fa20441b

dev-libs/qcoro: new package, add 9999

Bug: https://bugs.gentoo.org/918994
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/qcoro/metadata.xml      | 18 +++++++++++++
 dev-libs/qcoro/qcoro-9999.ebuild | 58 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)

diff --git a/dev-libs/qcoro/metadata.xml b/dev-libs/qcoro/metadata.xml
new file mode 100644
index 0000000000..726702f081
--- /dev/null
+++ b/dev-libs/qcoro/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/danvratil/qcoro/issues</bugs-to>
+		<remote-id type="github">danvratil/qcoro</remote-id>
+	</upstream>
+	<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-9999.ebuild b/dev-libs/qcoro/qcoro-9999.ebuild
new file mode 100644
index 0000000000..787c61337a
--- /dev/null
+++ b/dev-libs/qcoro/qcoro-9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/danvratil/${PN}"
+else
+	SRC_URI="https://github.com/danvratil/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="C++ Coroutine Library for Qt5"
+HOMEPAGE="https://qcoro.dvratil.cz/ https://github.com/danvratil/qcoro"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="dbus examples +network qml test testlib websockets"
+
+REQUIRED_USE="examples? ( network ) test? ( testlib )"
+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] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_QT_VERSION=6
+		-DQCORO_BUILD_EXAMPLES=$(usex examples)
+		-DQCORO_WITH_QTDBUS=$(usex dbus)
+		-DQCORO_WITH_QTNETWORK=$(usex network)
+		-DQCORO_WITH_QML=$(usex qml)
+		-DQCORO_WITH_QTQUICK=$(usex qml)
+		-DQCORO_WITH_QTTEST=$(usex testlib)
+		-DBUILD_TESTING=$(usex test)
+		-DQCORO_WITH_QTWEBSOCKETS=$(usex websockets)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	if use examples; then
+		docinto examples
+		dodoc -r examples/*
+	fi
+	cmake_src_install
+}