gentoo auto-resync : 01:02:2025 - 22:43:06

3 files changed, 64 insertions, 46 deletions

diff --git a/dev-libs/OpenNI/Manifest b/dev-libs/OpenNI/Manifest
index 30f7d3d72c0f..f11db25b6b74 100644
--- a/dev-libs/OpenNI/Manifest
+++ b/dev-libs/OpenNI/Manifest
@@ -4,6 +4,6 @@ AUX jpeg.patch 704 BLAKE2B a3261b7834fec0134929782a8283840bf9a5c2483272f57598c93
 AUX soname.patch 670 BLAKE2B 2fa9843c9be26474a9ba7d5a45ce258ff97ac32ffd4e32c23d572de94f9b7b3722e8f6a61ec5f6ed7d96837eb7e423163536960f07a5b4ecb86c96835ef841b8 SHA512 422c90b220b9366320f2513798d00c2d8a17b0db0ccb87150038c2f237d22c7f0d28206e6d00a7c73b758b6b021886a666a8860586f27fe9b57ddb14094ba7f4
 AUX tinyxml.patch 828 BLAKE2B 33698417dada91b4dbefe81de4f41f0fb9990478a1b0db9e4cc6fea4bb6951c49f7bdf09830cce81c4faf87213318fd0137e8058a7f4dc83b5ed9d688ec2655e SHA512 97cdcbbcd1d4ab4990c7a96ce21c4da983347f73c8064959bbb66d49cc9cda5e293b0273f19d1595ef5b26a6c32267b54cdd45fd4a86b2d8881501a3cea5724a
 DIST OpenNI-1.5.7.10.tar.gz 23378582 BLAKE2B c3532e3fb03bce9a30c94dc950591064d7b62d9eec8d5321c4dc65433be47652f9323a12401b8cbe4d3b81516120712720c1497ab51f220889b26fb33a4fcbc8 SHA512 f7b6106198c4314584cf327744e9d8b193ff9f2e8d416769aafb2aeeda0593ccbb37c3187ed75f1960d2ae8e80e8f30e0fced9ff82e20fe6f24c54246f77d512
-EBUILD OpenNI-1.5.7.10-r3.ebuild 2576 BLAKE2B b54fd247e804217ea5dbfccc639d017cff5eba3dd35f2942802bc7abe3f56134b27a484778d6550933de44d337e47507317c5328a57146f0956d3277c97f9ef5 SHA512 4a2b5902ea5fbf7d49faf9b387b913962d7c789119c3af3542366e99ada9f40e941aafda6677841e458b2c31de0d2e30b275bb4e3014892ef18960b1bdebefda
-EBUILD OpenNI-9999.ebuild 2552 BLAKE2B 4bfef35132d2f9c3c07e299f05271b224d9a2922d3229b8a5ca7fbebb9b206dd12dedc2a8e8030f83b72f9b5f4afc68ecbb669a1fbc10c12220ff016e953017b SHA512 a51b140962228fa174143dc2f0a2cb60a26ede6f3f1f11737aaa4cdf88d36f07f44c573a71305fb67efff28ad6da6ade2dc6b8fed7f4ae4644dc3bf86b865b8e
+EBUILD OpenNI-1.5.7.10-r4.ebuild 2738 BLAKE2B ceff84938c4c0e4832781ac8e7331e97b5f4e0ef42a4b2d405edefafabdfbf9cc3b80dbb8b4e15c2fc0ff9e3fc58708fc50bc62181f89b3e6f762bc5d07d8a7c SHA512 3236da3022d1ac972611e0ba4acfc36a2844daafc55f3822510cb34ebac2f1af25875d2152b7cda7dba54b80b989fa8783b608c32e9b006e10c739e09673a17f
+EBUILD OpenNI-9999.ebuild 2714 BLAKE2B 1e478d0b45cd18977fd3d784d61d8b610e42ffedb85b583ec42f635f021daa0d2253a7fa539b7bc441328107735fb9bcf2015d084a8ceb6bc20e5375bb935c8f SHA512 4da3a049c46f4e74b954f39b87f527312d43c200069c2c448d0e0b93bb7a8f7ce6684bf20a3752458fca19b8ce797dc1114be41da714ee6b731433b0495ae275
 MISC metadata.xml 338 BLAKE2B 57b81adc9f4d40e4f9bc2af7e6ccd5023be4ee0fcdd61b2dee36bd451d22ff6c1d36e06f56fadb1b3a52743a3444751b86e5f0ba7d52b4c0560677aaa957343e SHA512 42212b13a7e8fdd7a60fe0a9a4c80ac7c379ed73a929aa1fbf59dc9fc746c00219e5ed012d5e09e198a0a69aaf721162af2adb2fa0de157439b582021fd07e1d
diff --git a/dev-libs/OpenNI/OpenNI-1.5.7.10-r3.ebuild b/dev-libs/OpenNI/OpenNI-1.5.7.10-r4.ebuild
index 1f0d665ef90f..5bfdd8618663 100644
--- a/dev-libs/OpenNI/OpenNI-1.5.7.10-r3.ebuild
+++ b/dev-libs/OpenNI/OpenNI-1.5.7.10-r4.ebuild
@@ -1,19 +1,16 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/OpenNI/OpenNI"
 fi
 
-inherit ${SCM} flag-o-matic toolchain-funcs java-pkg-opt-2
+inherit eapi9-pipestatus flag-o-matic java-pkg-opt-2 toolchain-funcs
 
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-else
+if [[ ${PV} != 9999 ]]; then
 	KEYWORDS="amd64 ~arm"
 	SRC_URI="https://github.com/OpenNI/OpenNI/archive/Stable-${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-Stable-${PV}"
@@ -25,16 +22,24 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="doc java opengl"
 
-RDEPEND="
+COMMON_DEPEND="
 	media-libs/libjpeg-turbo:=
 	virtual/libusb:1
 	virtual/libudev
 	dev-libs/tinyxml
 	opengl? ( media-libs/freeglut !dev-libs/OpenNI2[opengl] )
-	java? ( virtual/jre:1.8 )
 "
-DEPEND="${RDEPEND}
-	java? ( virtual/jdk:1.8 )"
+
+DEPEND="
+	${COMMON_DEPEND}
+	java? ( >=virtual/jdk-1.8:* !dev-libs/OpenNI2[java] )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* !dev-libs/OpenNI2[java] )
+"
+
 BDEPEND="doc? ( app-text/doxygen )"
 
 PATCHES=(
@@ -50,10 +55,13 @@ src_prepare() {
 
 	rm -rf External/{LibJPEG,TinyXml}
 	for i in Platform/Linux/Build/Common/Platform.* Externals/PSCommon/Linux/Build/Platform.* ; do
-		echo "" > ${i}
+		echo "" > ${i} || die
 	done
 
-	find . -type f -print0 | xargs -0 sed -i "s:\".*/SamplesConfig.xml:\"${EPREFIX}/usr/share/${PN}/SamplesConfig.xml:" || die
+	local status
+	find . -type f -print0 |
+		xargs -0 sed -i "s:\".*/SamplesConfig.xml:\"${EPREFIX}/usr/share/${PN}/SamplesConfig.xml:"
+	status=$(pipestatus -v) || die "fails to sed SamplesConfig, (PIPESTATUS: ${status})"
 }
 
 src_compile() {
@@ -71,22 +79,23 @@ src_compile() {
 		MONO_FORMS_SAMPLES=""
 
 	if use doc ; then
-		cd "${S}/Source/DoxyGen"
+		cd Source/DoxyGen || die
 		doxygen || die
 	fi
 }
 
 src_install() {
-	dolib.so "${S}/Platform/Linux/Bin/"*Release/*.so
+	dolib.so Platform/Linux/Bin/*Release/*.so
 
 	insinto /usr/include/openni
 	doins -r Include/*
 
-	dobin "${S}/Platform/Linux/Bin/"*Release/{ni*,Ni*,Sample-*}
+	dobin Platform/Linux/Bin/*Release/{ni*,Ni*,Sample-*}
 
 	if use java ; then
-		java-pkg_dojar "${S}/Platform/Linux/Bin/"*Release/*.jar
-		echo "java -jar ${JAVA_PKG_JARDEST}/org.openni.Samples.SimpleViewer.jar" > org.openni.Samples.SimpleViewer
+		java-pkg_dojar Platform/Linux/Bin/*Release/*.jar
+		echo "java -jar ${JAVA_PKG_JARDEST}/org.openni.Samples.SimpleViewer.jar" \
+			 > org.openni.Samples.SimpleViewer || die
 		dobin org.openni.Samples.SimpleViewer
 	fi
 
@@ -97,7 +106,7 @@ src_install() {
 
 	if use doc ; then
 		docinto html
-		dodoc -r "${S}/Source/DoxyGen/html/"*
+		dodoc -r Source/DoxyGen/html/*
 		dodoc Source/DoxyGen/Text/*.txt
 	fi
 
@@ -105,7 +114,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [ "${ROOT:-/}" = "/" ] ; then
+	if [[ "${ROOT:-/}" = "/" ]]; then
 		for i in "${EROOR}/usr/$(get_libdir)"/libnim*.so ; do
 			einfo "Registering module ${i}"
 			niReg -r "${i}"
diff --git a/dev-libs/OpenNI/OpenNI-9999.ebuild b/dev-libs/OpenNI/OpenNI-9999.ebuild
index c9fcc45b7700..df0ce9a54b7a 100644
--- a/dev-libs/OpenNI/OpenNI-9999.ebuild
+++ b/dev-libs/OpenNI/OpenNI-9999.ebuild
@@ -1,19 +1,16 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/OpenNI/OpenNI"
 fi
 
-inherit ${SCM} flag-o-matic toolchain-funcs java-pkg-opt-2
+inherit eapi9-pipestatus flag-o-matic java-pkg-opt-2 toolchain-funcs
 
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-else
+if [[ ${PV} != 9999 ]]; then
 	KEYWORDS="~amd64 ~arm"
 	SRC_URI="https://github.com/OpenNI/OpenNI/archive/Stable-${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-Stable-${PV}"
@@ -25,16 +22,24 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="doc java opengl"
 
-RDEPEND="
+COMMON_DEPEND="
 	media-libs/libjpeg-turbo:=
 	virtual/libusb:1
 	virtual/libudev
 	dev-libs/tinyxml
 	opengl? ( media-libs/freeglut !dev-libs/OpenNI2[opengl] )
-	java? ( virtual/jre:1.8 )
 "
-DEPEND="${RDEPEND}
-	java? ( virtual/jdk:1.8 )"
+
+DEPEND="
+	${COMMON_DEPEND}
+	java? ( >=virtual/jdk-1.8:* !dev-libs/OpenNI2[java] )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* !dev-libs/OpenNI2[java] )
+"
+
 BDEPEND="doc? ( app-text/doxygen )"
 
 PATCHES=(
@@ -49,10 +54,13 @@ src_prepare() {
 
 	rm -rf External/{LibJPEG,TinyXml}
 	for i in Platform/Linux/Build/Common/Platform.* Externals/PSCommon/Linux/Build/Platform.* ; do
-		echo "" > ${i}
+		echo "" > ${i} || die
 	done
 
-	find . -type f -print0 | xargs -0 sed -i "s:\".*/SamplesConfig.xml:\"${EPREFIX}/usr/share/${PN}/SamplesConfig.xml:" || die
+	local status
+	find . -type f -print0 |
+		xargs -0 sed -i "s:\".*/SamplesConfig.xml:\"${EPREFIX}/usr/share/${PN}/SamplesConfig.xml:"
+	status=$(pipestatus -v) || die "fails to sed SamplesConfig, (PIPESTATUS: ${status})"
 }
 
 src_compile() {
@@ -70,22 +78,23 @@ src_compile() {
 		MONO_FORMS_SAMPLES=""
 
 	if use doc ; then
-		cd "${S}/Source/DoxyGen"
+		cd Source/DoxyGen || die
 		doxygen || die
 	fi
 }
 
 src_install() {
-	dolib.so "${S}/Platform/Linux/Bin/"*Release/*.so
+	dolib.so Platform/Linux/Bin/*Release/*.so
 
 	insinto /usr/include/openni
 	doins -r Include/*
 
-	dobin "${S}/Platform/Linux/Bin/"*Release/{ni*,Ni*,Sample-*}
+	dobin Platform/Linux/Bin/*Release/{ni*,Ni*,Sample-*}
 
 	if use java ; then
-		java-pkg_dojar "${S}/Platform/Linux/Bin/"*Release/*.jar
-		echo "java -jar ${JAVA_PKG_JARDEST}/org.openni.Samples.SimpleViewer.jar" > org.openni.Samples.SimpleViewer
+		java-pkg_dojar Platform/Linux/Bin/*Release/*.jar
+		echo "java -jar ${JAVA_PKG_JARDEST}/org.openni.Samples.SimpleViewer.jar" \
+			 > org.openni.Samples.SimpleViewer || die
 		dobin org.openni.Samples.SimpleViewer
 	fi
 
@@ -96,7 +105,7 @@ src_install() {
 
 	if use doc ; then
 		docinto html
-		dodoc -r "${S}/Source/DoxyGen/html/"*
+		dodoc -r Source/DoxyGen/html/*
 		dodoc Source/DoxyGen/Text/*.txt
 	fi
 
@@ -104,7 +113,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [ "${ROOT:-/}" = "/" ] ; then
+	if [[ "${ROOT:-/}" = "/" ]]; then
 		for i in "${EROOR}/usr/$(get_libdir)"/libnim*.so ; do
 			einfo "Registering module ${i}"
 			niReg -r "${i}"