commit: 59be1c4cba9b62e9b3b61c33c2e8f8aeef1ceb05
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Dec 28 00:01:42 2024 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Feb 1 10:50:43 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59be1c4c
dev-libs/OpenNI: 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 <AT> pogatzki.net>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
....5.7.10-r3.ebuild => OpenNI-1.5.7.10-r4.ebuild} | 23 +++++++++++++++-------
dev-libs/OpenNI/OpenNI-9999.ebuild | 23 +++++++++++++++-------
2 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/dev-libs/OpenNI/OpenNI-1.5.7.10-r3.ebuild
b/dev-libs/OpenNI/OpenNI-1.5.7.10-r4.ebuild
similarity index 87%
rename from dev-libs/OpenNI/OpenNI-1.5.7.10-r3.ebuild
rename to dev-libs/OpenNI/OpenNI-1.5.7.10-r4.ebuild
index 1f0d665ef90f..ddb774905643 100644
--- a/dev-libs/OpenNI/OpenNI-1.5.7.10-r3.ebuild
+++ b/dev-libs/OpenNI/OpenNI-1.5.7.10-r4.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
@@ -25,16 +25,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=(
@@ -53,7 +61,8 @@ src_prepare() {
echo "" > ${i}
done
- find . -type f -print0 | xargs -0 sed -i
"s:\".*/SamplesConfig.xml:\"${EPREFIX}/usr/share/${PN}/SamplesConfig.xml:" ||
die
+ find . -type f -print0 |
+ xargs -0 sed -i
"s:\".*/SamplesConfig.xml:\"${EPREFIX}/usr/share/${PN}/SamplesConfig.xml:" ||
die
}
src_compile() {
diff --git a/dev-libs/OpenNI/OpenNI-9999.ebuild
b/dev-libs/OpenNI/OpenNI-9999.ebuild
index c9fcc45b7700..be002df28a15 100644
--- a/dev-libs/OpenNI/OpenNI-9999.ebuild
+++ b/dev-libs/OpenNI/OpenNI-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
@@ -25,16 +25,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=(
@@ -52,7 +60,8 @@ src_prepare() {
echo "" > ${i}
done
- find . -type f -print0 | xargs -0 sed -i
"s:\".*/SamplesConfig.xml:\"${EPREFIX}/usr/share/${PN}/SamplesConfig.xml:" ||
die
+ find . -type f -print0 |
+ xargs -0 sed -i
"s:\".*/SamplesConfig.xml:\"${EPREFIX}/usr/share/${PN}/SamplesConfig.xml:" ||
die
}
src_compile() {
