From eaec3cd47b054a268f01405fe25f0fe4b4258a57 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Sat, 1 Feb 2025 11:25:31 +0100 Subject: [PATCH] =?UTF-8?q?dev-libs/OpenNI:=20improve=20ebuild:=20add=20mi?= =?UTF-8?q?ssing=20die,=20use=20bash=20test=20builtin,=20=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Florian Schmaus --- dev-libs/OpenNI/OpenNI-1.5.7.10-r4.ebuild | 28 ++++++++++------------ dev-libs/OpenNI/OpenNI-9999.ebuild | 29 +++++++++++------------ 2 files changed, 27 insertions(+), 30 deletions(-) diff --git a/dev-libs/OpenNI/OpenNI-1.5.7.10-r4.ebuild b/dev-libs/OpenNI/OpenNI-1.5.7.10-r4.ebuild index 953a8814d8d89..5bfdd8618663d 100644 --- a/dev-libs/OpenNI/OpenNI-1.5.7.10-r4.ebuild +++ b/dev-libs/OpenNI/OpenNI-1.5.7.10-r4.ebuild @@ -3,17 +3,14 @@ EAPI=8 -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" +if [[ ${PV} == 9999 ]]; then + inherit git-r3 EGIT_REPO_URI="https://github.com/OpenNI/OpenNI" fi -inherit ${SCM} eapi9-pipestatus flag-o-matic java-pkg-opt-2 toolchain-funcs +inherit eapi9-pipestatus flag-o-matic java-pkg-opt-2 toolchain-funcs -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" -else +if [[ ${PV} != 9999 ]]; then KEYWORDS="amd64 ~arm" SRC_URI="https://github.com/OpenNI/OpenNI/archive/Stable-${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-Stable-${PV}" @@ -58,7 +55,7 @@ src_prepare() { rm -rf External/{LibJPEG,TinyXml} for i in Platform/Linux/Build/Common/Platform.* Externals/PSCommon/Linux/Build/Platform.* ; do - echo "" > ${i} + echo "" > ${i} || die done local status @@ -82,22 +79,23 @@ src_compile() { MONO_FORMS_SAMPLES="" if use doc ; then - cd "${S}/Source/DoxyGen" + cd Source/DoxyGen || die doxygen || die fi } src_install() { - dolib.so "${S}/Platform/Linux/Bin/"*Release/*.so + dolib.so Platform/Linux/Bin/*Release/*.so insinto /usr/include/openni doins -r Include/* - dobin "${S}/Platform/Linux/Bin/"*Release/{ni*,Ni*,Sample-*} + dobin Platform/Linux/Bin/*Release/{ni*,Ni*,Sample-*} if use java ; then - java-pkg_dojar "${S}/Platform/Linux/Bin/"*Release/*.jar - echo "java -jar ${JAVA_PKG_JARDEST}/org.openni.Samples.SimpleViewer.jar" > org.openni.Samples.SimpleViewer + java-pkg_dojar Platform/Linux/Bin/*Release/*.jar + echo "java -jar ${JAVA_PKG_JARDEST}/org.openni.Samples.SimpleViewer.jar" \ + > org.openni.Samples.SimpleViewer || die dobin org.openni.Samples.SimpleViewer fi @@ -108,7 +106,7 @@ src_install() { if use doc ; then docinto html - dodoc -r "${S}/Source/DoxyGen/html/"* + dodoc -r Source/DoxyGen/html/* dodoc Source/DoxyGen/Text/*.txt fi @@ -116,7 +114,7 @@ src_install() { } pkg_postinst() { - if [ "${ROOT:-/}" = "/" ] ; then + if [[ "${ROOT:-/}" = "/" ]]; then for i in "${EROOR}/usr/$(get_libdir)"/libnim*.so ; do einfo "Registering module ${i}" niReg -r "${i}" diff --git a/dev-libs/OpenNI/OpenNI-9999.ebuild b/dev-libs/OpenNI/OpenNI-9999.ebuild index 49cb5d355e76a..df0ce9a54b7a8 100644 --- a/dev-libs/OpenNI/OpenNI-9999.ebuild +++ b/dev-libs/OpenNI/OpenNI-9999.ebuild @@ -3,17 +3,14 @@ EAPI=8 -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" +if [[ ${PV} == 9999 ]]; then + inherit git-r3 EGIT_REPO_URI="https://github.com/OpenNI/OpenNI" fi -inherit ${SCM} eapi9-pipestatus flag-o-matic java-pkg-opt-2 toolchain-funcs +inherit eapi9-pipestatus flag-o-matic java-pkg-opt-2 toolchain-funcs -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" -else +if [[ ${PV} != 9999 ]]; then KEYWORDS="~amd64 ~arm" SRC_URI="https://github.com/OpenNI/OpenNI/archive/Stable-${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-Stable-${PV}" @@ -57,9 +54,10 @@ src_prepare() { rm -rf External/{LibJPEG,TinyXml} for i in Platform/Linux/Build/Common/Platform.* Externals/PSCommon/Linux/Build/Platform.* ; do - echo "" > ${i} + echo "" > ${i} || die done + local status find . -type f -print0 | xargs -0 sed -i "s:\".*/SamplesConfig.xml:\"${EPREFIX}/usr/share/${PN}/SamplesConfig.xml:" status=$(pipestatus -v) || die "fails to sed SamplesConfig, (PIPESTATUS: ${status})" @@ -80,22 +78,23 @@ src_compile() { MONO_FORMS_SAMPLES="" if use doc ; then - cd "${S}/Source/DoxyGen" + cd Source/DoxyGen || die doxygen || die fi } src_install() { - dolib.so "${S}/Platform/Linux/Bin/"*Release/*.so + dolib.so Platform/Linux/Bin/*Release/*.so insinto /usr/include/openni doins -r Include/* - dobin "${S}/Platform/Linux/Bin/"*Release/{ni*,Ni*,Sample-*} + dobin Platform/Linux/Bin/*Release/{ni*,Ni*,Sample-*} if use java ; then - java-pkg_dojar "${S}/Platform/Linux/Bin/"*Release/*.jar - echo "java -jar ${JAVA_PKG_JARDEST}/org.openni.Samples.SimpleViewer.jar" > org.openni.Samples.SimpleViewer + java-pkg_dojar Platform/Linux/Bin/*Release/*.jar + echo "java -jar ${JAVA_PKG_JARDEST}/org.openni.Samples.SimpleViewer.jar" \ + > org.openni.Samples.SimpleViewer || die dobin org.openni.Samples.SimpleViewer fi @@ -106,7 +105,7 @@ src_install() { if use doc ; then docinto html - dodoc -r "${S}/Source/DoxyGen/html/"* + dodoc -r Source/DoxyGen/html/* dodoc Source/DoxyGen/Text/*.txt fi @@ -114,7 +113,7 @@ src_install() { } pkg_postinst() { - if [ "${ROOT:-/}" = "/" ] ; then + if [[ "${ROOT:-/}" = "/" ]]; then for i in "${EROOR}/usr/$(get_libdir)"/libnim*.so ; do einfo "Registering module ${i}" niReg -r "${i}"