From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 309BC13933E for ; Thu, 8 Jul 2021 10:42:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 63655E0D14; Thu, 8 Jul 2021 10:42:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3B7BFE0D14 for ; Thu, 8 Jul 2021 10:42:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 02E2C340955 for ; Thu, 8 Jul 2021 10:42:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6908363F for ; Thu, 8 Jul 2021 10:42:28 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1625740938.1aa58ef166e215fabe14931238a80bfc3a728ff0.juippis@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-r2.ebuild dev-libs/OpenNI/OpenNI-9999.ebuild X-VCS-Directories: dev-libs/OpenNI/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 1aa58ef166e215fabe14931238a80bfc3a728ff0 X-VCS-Branch: master Date: Thu, 8 Jul 2021 10:42:28 +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: 6abe412e-c6a8-4ad1-b056-938df9459273 X-Archives-Hash: 38e83ecfdfc1a013230ea12dc8fcb218 commit: 1aa58ef166e215fabe14931238a80bfc3a728ff0 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Thu Jun 24 15:13:10 2021 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Thu Jul 8 10:42:18 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aa58ef1 dev-libs/OpenNI: min java 1.8:* Bug: https://bugs.gentoo.org/787359 Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Joonas Niilola gentoo.org> ...penNI-9999.ebuild => OpenNI-1.5.7.10-r2.ebuild} | 25 +++++++++++++--------- dev-libs/OpenNI/OpenNI-9999.ebuild | 24 ++++++++++++--------- 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/dev-libs/OpenNI/OpenNI-9999.ebuild b/dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild similarity index 86% copy from dev-libs/OpenNI/OpenNI-9999.ebuild copy to dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild index aef879f68ea..fcd54b00b17 100644 --- a/dev-libs/OpenNI/OpenNI-9999.ebuild +++ b/dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 SCM="" if [ "${PV#9999}" != "${PV}" ] ; then @@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then EGIT_REPO_URI="https://github.com/OpenNI/OpenNI" fi -inherit ${SCM} toolchain-funcs epatch multilib java-pkg-opt-2 +inherit ${SCM} toolchain-funcs multilib java-pkg-opt-2 if [ "${PV#9999}" != "${PV}" ] ; then SRC_URI="" @@ -31,18 +31,22 @@ RDEPEND=" virtual/jpeg:0 dev-libs/tinyxml opengl? ( media-libs/freeglut !dev-libs/OpenNI2[opengl] ) - java? ( >=virtual/jre-1.5 ) + java? ( virtual/jre:1.8 ) " DEPEND="${RDEPEND} doc? ( app-doc/doxygen ) - java? ( >=virtual/jdk-1.5 )" + java? ( virtual/jdk:1.8 )" + +PATCHES=( + "${FILESDIR}/tinyxml.patch" + "${FILESDIR}/jpeg.patch" + "${FILESDIR}/soname.patch" + "${FILESDIR}/${P}-gcc6.patch" + "${FILESDIR}/betterdefines.patch" +) src_prepare() { - epatch \ - "${FILESDIR}/tinyxml.patch" \ - "${FILESDIR}/jpeg.patch" \ - "${FILESDIR}/soname.patch" \ - "${FILESDIR}/${PN}-1.5.7.10-gcc6.patch" + default rm -rf External/{LibJPEG,TinyXml} for i in Platform/Linux/Build/Common/Platform.* Externals/PSCommon/Linux/Build/Platform.* ; do @@ -89,7 +93,8 @@ src_install() { dodoc Documentation/OpenNI_UserGuide.pdf CHANGES NOTICE README if use doc ; then - dohtml -r "${S}/Source/DoxyGen/html/"* + docinto html + dodoc -r "${S}/Source/DoxyGen/html/"* dodoc Source/DoxyGen/Text/*.txt fi diff --git a/dev-libs/OpenNI/OpenNI-9999.ebuild b/dev-libs/OpenNI/OpenNI-9999.ebuild index aef879f68ea..0febb7dba0b 100644 --- a/dev-libs/OpenNI/OpenNI-9999.ebuild +++ b/dev-libs/OpenNI/OpenNI-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 SCM="" if [ "${PV#9999}" != "${PV}" ] ; then @@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then EGIT_REPO_URI="https://github.com/OpenNI/OpenNI" fi -inherit ${SCM} toolchain-funcs epatch multilib java-pkg-opt-2 +inherit ${SCM} toolchain-funcs multilib java-pkg-opt-2 if [ "${PV#9999}" != "${PV}" ] ; then SRC_URI="" @@ -31,18 +31,21 @@ RDEPEND=" virtual/jpeg:0 dev-libs/tinyxml opengl? ( media-libs/freeglut !dev-libs/OpenNI2[opengl] ) - java? ( >=virtual/jre-1.5 ) + java? ( virtual/jre:1.8 ) " DEPEND="${RDEPEND} doc? ( app-doc/doxygen ) - java? ( >=virtual/jdk-1.5 )" + java? ( virtual/jdk:1.8 )" + +PATCHES=( + "${FILESDIR}/tinyxml.patch" + "${FILESDIR}/jpeg.patch" + "${FILESDIR}/soname.patch" + "${FILESDIR}/${PN}-1.5.7.10-gcc6.patch" +) src_prepare() { - epatch \ - "${FILESDIR}/tinyxml.patch" \ - "${FILESDIR}/jpeg.patch" \ - "${FILESDIR}/soname.patch" \ - "${FILESDIR}/${PN}-1.5.7.10-gcc6.patch" + default rm -rf External/{LibJPEG,TinyXml} for i in Platform/Linux/Build/Common/Platform.* Externals/PSCommon/Linux/Build/Platform.* ; do @@ -89,7 +92,8 @@ src_install() { dodoc Documentation/OpenNI_UserGuide.pdf CHANGES NOTICE README if use doc ; then - dohtml -r "${S}/Source/DoxyGen/html/"* + docinto html + dodoc -r "${S}/Source/DoxyGen/html/"* dodoc Source/DoxyGen/Text/*.txt fi