commit: 1aa58ef166e215fabe14931238a80bfc3a728ff0 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Thu Jun 24 15:13:10 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> 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 <gentoo <AT> pogatzki.net> Signed-off-by: Joonas Niilola <juippis <AT> 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
