From e196efa8c28e9baaf86bda12fff953f8fd29e2be Mon Sep 17 00:00:00 2001
From: "Volkmar W. Pogatzki" <gentoo@pogatzki.net>
Date: Sat, 28 Dec 2024 00:47:57 +0100
Subject: [PATCH] dev-libs/OpenNI2: allow Java higher than 1.8

ebuilds which are pinned to 1.8 should go away before eol of openjdk:8

Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Signed-off-by: Florian Schmaus <flow@gentoo.org>
---
 ...-r1.ebuild => OpenNI2-2.2_beta2-r2.ebuild} | 23 ++++++++++++-------
 dev-libs/OpenNI2/OpenNI2-9999.ebuild          | 21 +++++++++++------
 2 files changed, 29 insertions(+), 15 deletions(-)
 rename dev-libs/OpenNI2/{OpenNI2-2.2_beta2-r1.ebuild => OpenNI2-2.2_beta2-r2.ebuild} (87%)

diff --git a/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild b/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r2.ebuild
similarity index 87%
rename from dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild
rename to dev-libs/OpenNI2/OpenNI2-2.2_beta2-r2.ebuild
index 606cfeb0619af..180c55e507641 100644
--- a/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild
+++ b/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r2.ebuild
@@ -1,7 +1,7 @@
-# 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
@@ -15,26 +15,33 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 else
 	KEYWORDS="amd64 ~arm"
-	SRC_URI="https://github.com/occipital/OpenNI2/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/structureio/OpenNI2/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P/_/-}"
 fi
 
 DESCRIPTION="OpenNI2 SDK"
-HOMEPAGE="https://structure.io/openni"
+HOMEPAGE="https://structure.io/openni/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="cpu_flags_arm_neon doc java opengl static-libs"
 
-RDEPEND="
+COMMON_DEPEND="
 	media-libs/libjpeg-turbo:=
 	virtual/libusb:1
 	virtual/libudev
 	opengl? ( media-libs/freeglut )
-	java? ( virtual/jre:1.8 )
 "
-DEPEND="${RDEPEND}
+
+DEPEND="
+	${COMMON_DEPEND}
 	doc? ( app-text/doxygen )
-	java? ( virtual/jdk:1.8 )"
+	java? ( >=virtual/jdk-1.8:* !dev-libs/OpenNI[java] )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* !dev-libs/OpenNI[java] )
+"
 
 PATCHES=(
 	"${FILESDIR}/jpeg.patch"
diff --git a/dev-libs/OpenNI2/OpenNI2-9999.ebuild b/dev-libs/OpenNI2/OpenNI2-9999.ebuild
index fc73839fa7df9..68dd73cd6c5ee 100644
--- a/dev-libs/OpenNI2/OpenNI2-9999.ebuild
+++ b/dev-libs/OpenNI2/OpenNI2-9999.ebuild
@@ -1,7 +1,7 @@
-# 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
@@ -20,21 +20,28 @@ else
 fi
 
 DESCRIPTION="OpenNI2 SDK"
-HOMEPAGE="https://structure.io/openni"
+HOMEPAGE="https://structure.io/openni/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="cpu_flags_arm_neon doc java opengl static-libs"
 
-RDEPEND="
+COMMON_DEPEND="
 	media-libs/libjpeg-turbo:=
 	virtual/libusb:1
 	virtual/libudev
 	opengl? ( media-libs/freeglut )
-	java? ( virtual/jre:1.8 )
 "
-DEPEND="${RDEPEND}
+
+DEPEND="
+	${COMMON_DEPEND}
 	doc? ( app-text/doxygen )
-	java? ( virtual/jdk:1.8 )"
+	java? ( >=virtual/jdk-1.8:* !dev-libs/OpenNI[java] )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* !dev-libs/OpenNI[java] )
+"
 
 PATCHES=(
 	"${FILESDIR}/jpeg.patch"