public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: sys-libs/cyclonedds/
@ 2024-01-07 16:22 Takuya Wakazono
  0 siblings, 0 replies; 4+ messages in thread
From: Takuya Wakazono @ 2024-01-07 16:22 UTC (permalink / raw
  To: gentoo-commits

commit:     0996ed1d6d662a41f6fe342381870c4693127519
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Sun Jan  7 16:18:27 2024 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Sun Jan  7 16:18:27 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0996ed1d

sys-libs/cyclonedds: describe unknown USE flags

Fixes other QA issues as well.

- MissingRemoteId
- BadDescription
- DoubleEmptyLine
- UnknownUseFlags
- UnquotedVariable
- WhitespaceFound
- WrongIndentFound

Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild | 45 +++++++++++-----------------
 sys-libs/cyclonedds/cyclonedds-9999.ebuild   | 45 +++++++++++-----------------
 sys-libs/cyclonedds/metadata.xml             | 14 +++++++++
 3 files changed, 48 insertions(+), 56 deletions(-)

diff --git a/sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild b/sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild
index fbdaecca1f..14cd2e34ba 100644
--- a/sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild
+++ b/sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild
@@ -1,28 +1,25 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit cmake
 
-
 if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/eclipse-cyclonedds/"
+	EGIT_REPO_URI="https://github.com/eclipse-cyclonedds/cyclonedds.git"
 	inherit git-r3
-
 else
-
 	SRC_URI="https://github.com/eclipse-cyclonedds/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
 S="${WORKDIR}/${P}"
-DESCRIPTION="Eclipse Cyclone DDS is a very performant and robust open-source implementation of the OMG DDS specification."
+DESCRIPTION="Eclipse Cyclone DDS project"
 HOMEPAGE="https://cyclonedds.io/"
 
 LICENSE="EPL-2.0"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="test ssl shm parser doc examples ipv6 idlc get_kind"
+IUSE="test ssl shm parser doc examples ipv6 idlc get-kind"
 RESTRICT="!test? ( test )"
 
 RDEPEND=(
@@ -33,34 +30,26 @@ RDEPEND=(
 )
 DEPEND="${RDEPEND[@]}"
 
-
 CMAKE_BUILD_TYPE=Release
 
-#PATCHES=()
-
-src_prepare() { 
-	use get_kind  &&  eapply  ${FILESDIR}/${PN}-0.10.3-get_kind.patch 
+src_prepare() {
+	use get_kind && eapply "${FILESDIR}/${PN}-0.10.3-get_kind.patch"
 	cmake_src_prepare
 }
 
 src_configure() {
-
 	local mycmakeargs=(
-	 -DBUILD_DOCS= $(usex doc)
-	 -DBUILD_DDSPERF=OFF
-	 -DBUILD_EXAMPLES=$(usex examples)
-
-
- 	 -DBUILD_TESTING=$(usex test)
-  	 -DBUILD_IDLC_TESTING=$(usex test)
-  	 
-  	 -DBUILD_IDLC=$(usex idlc)
-	 -DENABLE_SSL=$(usex ssl)
- 	 -DENABLE_SECURITY=$(usex ssl)
- 	 -DENABLE_SECURITY=$(usex ssl)
- 	 -DENABLE_IPV6=$(usex ipv6)
- 	 -DENABLE_SHM=$(usex shm)
+		-DBUILD_DOCS= $(usex doc)
+		-DBUILD_DDSPERF=OFF
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DBUILD_TESTING=$(usex test)
+		-DBUILD_IDLC_TESTING=$(usex test)
+		-DBUILD_IDLC=$(usex idlc)
+		-DENABLE_SSL=$(usex ssl)
+		-DENABLE_SECURITY=$(usex ssl)
+		-DENABLE_SECURITY=$(usex ssl)
+		-DENABLE_IPV6=$(usex ipv6)
+		-DENABLE_SHM=$(usex shm)
 	)
-
 	cmake_src_configure
 }

diff --git a/sys-libs/cyclonedds/cyclonedds-9999.ebuild b/sys-libs/cyclonedds/cyclonedds-9999.ebuild
index fbdaecca1f..14cd2e34ba 100644
--- a/sys-libs/cyclonedds/cyclonedds-9999.ebuild
+++ b/sys-libs/cyclonedds/cyclonedds-9999.ebuild
@@ -1,28 +1,25 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit cmake
 
-
 if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/eclipse-cyclonedds/"
+	EGIT_REPO_URI="https://github.com/eclipse-cyclonedds/cyclonedds.git"
 	inherit git-r3
-
 else
-
 	SRC_URI="https://github.com/eclipse-cyclonedds/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
 S="${WORKDIR}/${P}"
-DESCRIPTION="Eclipse Cyclone DDS is a very performant and robust open-source implementation of the OMG DDS specification."
+DESCRIPTION="Eclipse Cyclone DDS project"
 HOMEPAGE="https://cyclonedds.io/"
 
 LICENSE="EPL-2.0"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="test ssl shm parser doc examples ipv6 idlc get_kind"
+IUSE="test ssl shm parser doc examples ipv6 idlc get-kind"
 RESTRICT="!test? ( test )"
 
 RDEPEND=(
@@ -33,34 +30,26 @@ RDEPEND=(
 )
 DEPEND="${RDEPEND[@]}"
 
-
 CMAKE_BUILD_TYPE=Release
 
-#PATCHES=()
-
-src_prepare() { 
-	use get_kind  &&  eapply  ${FILESDIR}/${PN}-0.10.3-get_kind.patch 
+src_prepare() {
+	use get_kind && eapply "${FILESDIR}/${PN}-0.10.3-get_kind.patch"
 	cmake_src_prepare
 }
 
 src_configure() {
-
 	local mycmakeargs=(
-	 -DBUILD_DOCS= $(usex doc)
-	 -DBUILD_DDSPERF=OFF
-	 -DBUILD_EXAMPLES=$(usex examples)
-
-
- 	 -DBUILD_TESTING=$(usex test)
-  	 -DBUILD_IDLC_TESTING=$(usex test)
-  	 
-  	 -DBUILD_IDLC=$(usex idlc)
-	 -DENABLE_SSL=$(usex ssl)
- 	 -DENABLE_SECURITY=$(usex ssl)
- 	 -DENABLE_SECURITY=$(usex ssl)
- 	 -DENABLE_IPV6=$(usex ipv6)
- 	 -DENABLE_SHM=$(usex shm)
+		-DBUILD_DOCS= $(usex doc)
+		-DBUILD_DDSPERF=OFF
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DBUILD_TESTING=$(usex test)
+		-DBUILD_IDLC_TESTING=$(usex test)
+		-DBUILD_IDLC=$(usex idlc)
+		-DENABLE_SSL=$(usex ssl)
+		-DENABLE_SECURITY=$(usex ssl)
+		-DENABLE_SECURITY=$(usex ssl)
+		-DENABLE_IPV6=$(usex ipv6)
+		-DENABLE_SHM=$(usex shm)
 	)
-
 	cmake_src_configure
 }

diff --git a/sys-libs/cyclonedds/metadata.xml b/sys-libs/cyclonedds/metadata.xml
new file mode 100644
index 0000000000..2c9b431453
--- /dev/null
+++ b/sys-libs/cyclonedds/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">eclipse-cyclonedds/cyclonedds</remote-id>
+	</upstream>
+	<use>
+		<flag name="get-kind">Apply patch for additional interface which returns type of entity</flag>
+		<flag name="idlc">Build IDL preprocessor</flag>
+		<flag name="parser">Regenerate parser</flag>
+		<flag name="shm">Enable shared memory support</flag>
+	</use>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: sys-libs/cyclonedds/
@ 2024-01-10 10:14 Takuya Wakazono
  0 siblings, 0 replies; 4+ messages in thread
From: Takuya Wakazono @ 2024-01-10 10:14 UTC (permalink / raw
  To: gentoo-commits

commit:     90cc4dd54dcf1c27c6a38e87ef8ed7454694fb56
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Wed Jan 10 10:11:10 2024 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Wed Jan 10 10:13:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=90cc4dd5

sys-libs/cyclonedds: fix USE=get-kind

Closes: https://bugs.gentoo.org/921629
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild | 2 +-
 sys-libs/cyclonedds/cyclonedds-9999.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild b/sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild
index 14cd2e34ba..b01dfb4918 100644
--- a/sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild
+++ b/sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND[@]}"
 CMAKE_BUILD_TYPE=Release
 
 src_prepare() {
-	use get_kind && eapply "${FILESDIR}/${PN}-0.10.3-get_kind.patch"
+	use get-kind && eapply "${FILESDIR}/${PN}-0.10.3-get_kind.patch"
 	cmake_src_prepare
 }
 

diff --git a/sys-libs/cyclonedds/cyclonedds-9999.ebuild b/sys-libs/cyclonedds/cyclonedds-9999.ebuild
index 14cd2e34ba..b01dfb4918 100644
--- a/sys-libs/cyclonedds/cyclonedds-9999.ebuild
+++ b/sys-libs/cyclonedds/cyclonedds-9999.ebuild
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND[@]}"
 CMAKE_BUILD_TYPE=Release
 
 src_prepare() {
-	use get_kind && eapply "${FILESDIR}/${PN}-0.10.3-get_kind.patch"
+	use get-kind && eapply "${FILESDIR}/${PN}-0.10.3-get_kind.patch"
 	cmake_src_prepare
 }
 


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: sys-libs/cyclonedds/
@ 2024-11-02  9:22 Takuya Wakazono
  0 siblings, 0 replies; 4+ messages in thread
From: Takuya Wakazono @ 2024-11-02  9:22 UTC (permalink / raw
  To: gentoo-commits

commit:     6188c37bf1ac4e086bdda4e5fbbe7c891788d331
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Sat Nov  2 09:19:08 2024 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Sat Nov  2 09:19:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6188c37b

sys-libs/cyclonedds: fix tests and RDEPEND

Closes: https://bugs.gentoo.org/921847
Closes: https://bugs.gentoo.org/933210
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 ...edds-0.10.3.ebuild => cyclonedds-0.10.3-r1.ebuild} | 19 ++++++++++++-------
 sys-libs/cyclonedds/cyclonedds-9999.ebuild            | 19 ++++++++++++-------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild b/sys-libs/cyclonedds/cyclonedds-0.10.3-r1.ebuild
similarity index 78%
rename from sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild
rename to sys-libs/cyclonedds/cyclonedds-0.10.3-r1.ebuild
index b1e0bed51..4e05f3e6f 100644
--- a/sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild
+++ b/sys-libs/cyclonedds/cyclonedds-0.10.3-r1.ebuild
@@ -21,18 +21,23 @@ SLOT="0/$(ver_cut 1-2)"
 IUSE="test ssl shm parser doc examples ipv6 idlc get-kind"
 RESTRICT="!test? ( test )"
 
-RDEPEND=(
-	"doc? ( app-text/doxygen )"
-	"ssl? ( dev-libs/openssl )"
-	"shm? ( sys-libs/iceoryx )"
-	"parser? ( sys-devel/bison )"
-)
-DEPEND="${RDEPEND[@]}"
+RDEPEND="
+	doc? ( app-text/doxygen )
+	ssl? ( dev-libs/openssl:= )
+	shm? ( sys-libs/iceoryx:= )
+	parser? ( sys-devel/bison )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-util/cunit )"
 
 CMAKE_BUILD_TYPE=Release
 
 src_prepare() {
 	use get-kind && eapply "${FILESDIR}/${PN}-0.10.3-get_kind.patch"
+
+	# disable tests that requires FEATURES=-network-sandbox
+	sed -i '/ifaddrs.c$/d' src/ddsrt/tests/CMakeLists.txt || die
+
 	cmake_src_prepare
 }
 

diff --git a/sys-libs/cyclonedds/cyclonedds-9999.ebuild b/sys-libs/cyclonedds/cyclonedds-9999.ebuild
index b1e0bed51..4e05f3e6f 100644
--- a/sys-libs/cyclonedds/cyclonedds-9999.ebuild
+++ b/sys-libs/cyclonedds/cyclonedds-9999.ebuild
@@ -21,18 +21,23 @@ SLOT="0/$(ver_cut 1-2)"
 IUSE="test ssl shm parser doc examples ipv6 idlc get-kind"
 RESTRICT="!test? ( test )"
 
-RDEPEND=(
-	"doc? ( app-text/doxygen )"
-	"ssl? ( dev-libs/openssl )"
-	"shm? ( sys-libs/iceoryx )"
-	"parser? ( sys-devel/bison )"
-)
-DEPEND="${RDEPEND[@]}"
+RDEPEND="
+	doc? ( app-text/doxygen )
+	ssl? ( dev-libs/openssl:= )
+	shm? ( sys-libs/iceoryx:= )
+	parser? ( sys-devel/bison )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-util/cunit )"
 
 CMAKE_BUILD_TYPE=Release
 
 src_prepare() {
 	use get-kind && eapply "${FILESDIR}/${PN}-0.10.3-get_kind.patch"
+
+	# disable tests that requires FEATURES=-network-sandbox
+	sed -i '/ifaddrs.c$/d' src/ddsrt/tests/CMakeLists.txt || die
+
 	cmake_src_prepare
 }
 


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: sys-libs/cyclonedds/
@ 2024-11-05 13:45 Takuya Wakazono
  0 siblings, 0 replies; 4+ messages in thread
From: Takuya Wakazono @ 2024-11-05 13:45 UTC (permalink / raw
  To: gentoo-commits

commit:     4020e29ebb4c2127633d6338b18527b00534da8d
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Tue Nov  5 13:44:14 2024 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Tue Nov  5 13:44:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4020e29e

sys-libs/cyclonedds: fix USE=doc

Closes: https://bugs.gentoo.org/942855
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 sys-libs/cyclonedds/cyclonedds-0.10.3-r1.ebuild | 33 ++++++++++++++++++++++---
 sys-libs/cyclonedds/cyclonedds-9999.ebuild      | 33 ++++++++++++++++++++++---
 2 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/sys-libs/cyclonedds/cyclonedds-0.10.3-r1.ebuild b/sys-libs/cyclonedds/cyclonedds-0.10.3-r1.ebuild
index 4e05f3e6f..9dec7e453 100644
--- a/sys-libs/cyclonedds/cyclonedds-0.10.3-r1.ebuild
+++ b/sys-libs/cyclonedds/cyclonedds-0.10.3-r1.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
-inherit cmake
+PYTHON_COMPAT=( python3_{12..13} )
+
+inherit cmake python-any-r1
 
 DESCRIPTION="Eclipse Cyclone DDS project"
 HOMEPAGE="https://cyclonedds.io/"
@@ -22,28 +24,51 @@ IUSE="test ssl shm parser doc examples ipv6 idlc get-kind"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	doc? ( app-text/doxygen )
 	ssl? ( dev-libs/openssl:= )
 	shm? ( sys-libs/iceoryx:= )
 	parser? ( sys-devel/bison )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-util/cunit )"
+BDEPEND="
+	doc? (
+		app-text/doxygen
+		$(python_gen_any_dep '
+			dev-python/breathe[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+		')
+	)
+	test? ( dev-util/cunit )
+"
 
 CMAKE_BUILD_TYPE=Release
 
+python_check_deps() {
+	if use doc; then
+		python_has_version \
+			"dev-python/breathe[${PYTHON_USEDEP}]" \
+			"dev-python/sphinx[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
 src_prepare() {
 	use get-kind && eapply "${FILESDIR}/${PN}-0.10.3-get_kind.patch"
 
 	# disable tests that requires FEATURES=-network-sandbox
 	sed -i '/ifaddrs.c$/d' src/ddsrt/tests/CMakeLists.txt || die
 
+	# fix the dependency detection in cmake
+	sed -i "/set(/s/\${_Sphinx_shebang}/${EPYTHON}/" cmake/Modules/FindSphinx.cmake || die
+
 	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_DOCS= $(usex doc)
+		-DBUILD_DOCS=$(usex doc)
 		-DBUILD_DDSPERF=OFF
 		-DBUILD_EXAMPLES=$(usex examples)
 		-DBUILD_TESTING=$(usex test)

diff --git a/sys-libs/cyclonedds/cyclonedds-9999.ebuild b/sys-libs/cyclonedds/cyclonedds-9999.ebuild
index 4e05f3e6f..9dec7e453 100644
--- a/sys-libs/cyclonedds/cyclonedds-9999.ebuild
+++ b/sys-libs/cyclonedds/cyclonedds-9999.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
-inherit cmake
+PYTHON_COMPAT=( python3_{12..13} )
+
+inherit cmake python-any-r1
 
 DESCRIPTION="Eclipse Cyclone DDS project"
 HOMEPAGE="https://cyclonedds.io/"
@@ -22,28 +24,51 @@ IUSE="test ssl shm parser doc examples ipv6 idlc get-kind"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	doc? ( app-text/doxygen )
 	ssl? ( dev-libs/openssl:= )
 	shm? ( sys-libs/iceoryx:= )
 	parser? ( sys-devel/bison )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-util/cunit )"
+BDEPEND="
+	doc? (
+		app-text/doxygen
+		$(python_gen_any_dep '
+			dev-python/breathe[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+		')
+	)
+	test? ( dev-util/cunit )
+"
 
 CMAKE_BUILD_TYPE=Release
 
+python_check_deps() {
+	if use doc; then
+		python_has_version \
+			"dev-python/breathe[${PYTHON_USEDEP}]" \
+			"dev-python/sphinx[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
 src_prepare() {
 	use get-kind && eapply "${FILESDIR}/${PN}-0.10.3-get_kind.patch"
 
 	# disable tests that requires FEATURES=-network-sandbox
 	sed -i '/ifaddrs.c$/d' src/ddsrt/tests/CMakeLists.txt || die
 
+	# fix the dependency detection in cmake
+	sed -i "/set(/s/\${_Sphinx_shebang}/${EPYTHON}/" cmake/Modules/FindSphinx.cmake || die
+
 	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_DOCS= $(usex doc)
+		-DBUILD_DOCS=$(usex doc)
 		-DBUILD_DDSPERF=OFF
 		-DBUILD_EXAMPLES=$(usex examples)
 		-DBUILD_TESTING=$(usex test)


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-11-05 13:45 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-02  9:22 [gentoo-commits] repo/proj/guru:dev commit in: sys-libs/cyclonedds/ Takuya Wakazono
  -- strict thread matches above, loose matches on Subject: below --
2024-11-05 13:45 Takuya Wakazono
2024-01-10 10:14 Takuya Wakazono
2024-01-07 16:22 Takuya Wakazono

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox