commit: dc51531bfd51c2792c0855fc4168eed258ce6834 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Thu Jun 24 15:35:39 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Thu Jul 8 10:42:19 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc51531b
dev-libs/OpenNI2: min java 1.8 Bug: https://bugs.gentoo.org/787356 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> ...NI2-9999.ebuild => OpenNI2-2.2_beta2-r1.ebuild} | 26 +++++++++++++--------- dev-libs/OpenNI2/OpenNI2-9999.ebuild | 22 ++++++++++-------- 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/dev-libs/OpenNI2/OpenNI2-9999.ebuild b/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild similarity index 82% copy from dev-libs/OpenNI2/OpenNI2-9999.ebuild copy to dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild index 13ff01010ca..8650fe29453 100644 --- a/dev-libs/OpenNI2/OpenNI2-9999.ebuild +++ b/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.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/occipital/openni2"; fi -inherit ${SCM} toolchain-funcs epatch multilib java-pkg-opt-2 flag-o-matic +inherit ${SCM} toolchain-funcs multilib java-pkg-opt-2 flag-o-matic if [ "${PV#9999}" != "${PV}" ] ; then SRC_URI="" @@ -30,17 +30,22 @@ RDEPEND=" virtual/libudev virtual/jpeg:0 opengl? ( media-libs/freeglut ) - 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}/jpeg.patch" + "${FILESDIR}/rpath.patch" + "${FILESDIR}/soname.patch" + "${FILESDIR}/pthread.patch" + "${FILESDIR}/c++14.patch" +) src_prepare() { - epatch \ - "${FILESDIR}/jpeg.patch" \ - "${FILESDIR}/rpath.patch" \ - "${FILESDIR}/soname.patch" + default rm -rf ThirdParty/LibJPEG for i in ThirdParty/PSCommon/BuildSystem/Platform.* ; do @@ -82,10 +87,11 @@ src_install() { dobin org.openni.Samples.SimpleViewer fi - dodoc CHANGES.txt NOTICE README.md ReleaseNotes.txt Source/Documentation/Text/*.txt + dodoc CHANGES.txt NOTICE README ReleaseNotes.txt Source/Documentation/Text/*.txt if use doc ; then - dohtml -r "${S}/Source/Documentation/html/"* + docinto html + dodoc -r "${S}/Source/Documentation/html/"* fi dodir /usr/$(get_libdir)/pkgconfig diff --git a/dev-libs/OpenNI2/OpenNI2-9999.ebuild b/dev-libs/OpenNI2/OpenNI2-9999.ebuild index 13ff01010ca..210a3efeea3 100644 --- a/dev-libs/OpenNI2/OpenNI2-9999.ebuild +++ b/dev-libs/OpenNI2/OpenNI2-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/occipital/openni2"; fi -inherit ${SCM} toolchain-funcs epatch multilib java-pkg-opt-2 flag-o-matic +inherit ${SCM} toolchain-funcs multilib java-pkg-opt-2 flag-o-matic if [ "${PV#9999}" != "${PV}" ] ; then SRC_URI="" @@ -30,17 +30,20 @@ RDEPEND=" virtual/libudev virtual/jpeg:0 opengl? ( media-libs/freeglut ) - 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}/jpeg.patch" + "${FILESDIR}/rpath.patch" + "${FILESDIR}/soname.patch" +) src_prepare() { - epatch \ - "${FILESDIR}/jpeg.patch" \ - "${FILESDIR}/rpath.patch" \ - "${FILESDIR}/soname.patch" + default rm -rf ThirdParty/LibJPEG for i in ThirdParty/PSCommon/BuildSystem/Platform.* ; do @@ -85,7 +88,8 @@ src_install() { dodoc CHANGES.txt NOTICE README.md ReleaseNotes.txt Source/Documentation/Text/*.txt if use doc ; then - dohtml -r "${S}/Source/Documentation/html/"* + docinto html + dodoc -r "${S}/Source/Documentation/html/"* fi dodir /usr/$(get_libdir)/pkgconfig
