From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5C1EA1580E0 for ; Sat, 01 Feb 2025 10:51:32 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 1C447343186 for ; Sat, 01 Feb 2025 10:51:32 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 50E79110472; Sat, 01 Feb 2025 10:51:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 472AD110472 for ; Sat, 01 Feb 2025 10:51:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E795833BE3B for ; Sat, 01 Feb 2025 10:51:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 297B92082 for ; Sat, 01 Feb 2025 10:51:23 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1738407043.59be1c4cba9b62e9b3b61c33c2e8f8aeef1ceb05.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/OpenNI/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/OpenNI/OpenNI-1.5.7.10-r3.ebuild dev-libs/OpenNI/OpenNI-1.5.7.10-r4.ebuild dev-libs/OpenNI/OpenNI-9999.ebuild X-VCS-Directories: dev-libs/OpenNI/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 59be1c4cba9b62e9b3b61c33c2e8f8aeef1ceb05 X-VCS-Branch: master Date: Sat, 01 Feb 2025 10:51:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6f03bedd-cd3c-4894-b3c2-4ced507f590c X-Archives-Hash: f546a22bfca4fedc9942d50b453ed013 commit: 59be1c4cba9b62e9b3b61c33c2e8f8aeef1ceb05 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Sat Dec 28 00:01:42 2024 +0000 Commit: Florian Schmaus gentoo 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 pogatzki.net> Signed-off-by: Florian Schmaus 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() {