From: "Florian Schmaus" <flow@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/OpenNI2/
Date: Sat, 01 Feb 2025 10:51:23 +0000 (UTC) [thread overview]
Message-ID: <1738407045.f111be2e7a895e3be39cce5d904b5b94c44f8d4b.flow@gentoo> (raw)
commit: f111be2e7a895e3be39cce5d904b5b94c44f8d4b
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 1 10:39:28 2025 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Feb 1 10:50:45 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f111be2e
dev-libs/OpenNI2: improve ebuild: add missing die, use bash test builtin, …
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-libs/OpenNI2/OpenNI2-2.2_beta2-r2.ebuild | 32 +++++++++++++---------------
dev-libs/OpenNI2/OpenNI2-9999.ebuild | 32 +++++++++++++---------------
2 files changed, 30 insertions(+), 34 deletions(-)
diff --git a/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r2.ebuild b/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r2.ebuild
index 180c55e50764..3545f1ca97c4 100644
--- a/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r2.ebuild
+++ b/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r2.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/occipital/openni2"
fi
-inherit ${SCM} flag-o-matic toolchain-funcs java-pkg-opt-2
+inherit flag-o-matic toolchain-funcs java-pkg-opt-2
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
-else
+if [[ ${PV} != 9999 ]]; then
KEYWORDS="amd64 ~arm"
SRC_URI="https://github.com/structureio/OpenNI2/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${P/_/-}"
@@ -56,7 +53,7 @@ src_prepare() {
rm -rf ThirdParty/LibJPEG
for i in ThirdParty/PSCommon/BuildSystem/Platform.* ; do
- echo "" > ${i}
+ echo "" > ${i} || die
done
}
@@ -77,26 +74,27 @@ src_compile() {
$(usex java "" JAVA_SAMPLES="")
if use doc ; then
- cd "${S}/Source/Documentation"
+ cd Source/Documentation || die
doxygen || die
fi
}
src_install() {
- dolib.so "${S}/Bin/"*Release/*.so
- cp -a "${S}/Bin/"*Release/OpenNI2 "${ED}/usr/$(get_libdir)"
+ dolib.so Bin/*Release/*.so
+ cp -a Bin/*Release/OpenNI2 "${ED}/usr/$(get_libdir)" || die
- use static-libs && dolib.a "${S}/Bin/"*Release/*.a
+ use static-libs && dolib.a Bin/*Release/*.a
insinto /usr/include/openni2
doins -r Include/*
- dobin "${S}/Bin/"*Release/{PS1080Console,PSLinkConsole,SimpleRead,EventBasedRead,MultipleStreamRead,MWClosestPointApp}
- use opengl && dobin "${S}/Bin/"*Release/{NiViewer,SimpleViewer,MultiDepthViewer,ClosestPointViewer}
+ dobin Bin/*Release/{PS1080Console,PSLinkConsole,SimpleRead,EventBasedRead,MultipleStreamRead,MWClosestPointApp}
+ use opengl && dobin Bin/*Release/{NiViewer,SimpleViewer,MultiDepthViewer,ClosestPointViewer}
if use java ; then
- java-pkg_dojar "${S}/Bin/"*Release/*.jar
- echo "java -jar ${JAVA_PKG_JARDEST}/org.openni.Samples.SimpleViewer.jar" > org.openni.Samples.SimpleViewer
+ java-pkg_dojar 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
@@ -104,7 +102,7 @@ src_install() {
if use doc ; then
docinto html
- dodoc -r "${S}/Source/Documentation/html/"*
+ dodoc -r 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 68dd73cd6c5e..413f8a32f97e 100644
--- a/dev-libs/OpenNI2/OpenNI2-9999.ebuild
+++ b/dev-libs/OpenNI2/OpenNI2-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/occipital/openni2"
fi
-inherit ${SCM} flag-o-matic toolchain-funcs java-pkg-opt-2
+inherit flag-o-matic toolchain-funcs java-pkg-opt-2
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
-else
+if [[ ${PV} != 9999 ]]; then
KEYWORDS="~amd64 ~arm"
SRC_URI="https://github.com/occipital/OpenNI2/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${P/_/-}"
@@ -54,7 +51,7 @@ src_prepare() {
rm -rf ThirdParty/LibJPEG
for i in ThirdParty/PSCommon/BuildSystem/Platform.* ; do
- echo "" > ${i}
+ echo "" > ${i} || die
done
}
@@ -75,26 +72,27 @@ src_compile() {
$(usex java "" JAVA_SAMPLES="")
if use doc ; then
- cd "${S}/Source/Documentation"
+ cd Source/Documentation || die
doxygen || die
fi
}
src_install() {
- dolib.so "${S}/Bin/"*Release/*.so
- cp -a "${S}/Bin/"*Release/OpenNI2 "${ED}/usr/$(get_libdir)"
+ dolib.so Bin/*Release/*.so
+ cp -a Bin/*Release/OpenNI2 "${ED}/usr/$(get_libdir)" || die
- use static-libs && dolib.a "${S}/Bin/"*Release/*.a
+ use static-libs && dolib.a Bin/*Release/*.a
insinto /usr/include/openni2
doins -r Include/*
- dobin "${S}/Bin/"*Release/{PS1080Console,PSLinkConsole,SimpleRead,EventBasedRead,MultipleStreamRead,MWClosestPointApp}
- use opengl && dobin "${S}/Bin/"*Release/{NiViewer,SimpleViewer,MultiDepthViewer,ClosestPointViewer}
+ dobin Bin/*Release/{PS1080Console,PSLinkConsole,SimpleRead,EventBasedRead,MultipleStreamRead,MWClosestPointApp}
+ use opengl && dobin Bin/*Release/{NiViewer,SimpleViewer,MultiDepthViewer,ClosestPointViewer}
if use java ; then
- java-pkg_dojar "${S}/Bin/"*Release/*.jar
- echo "java -jar ${JAVA_PKG_JARDEST}/org.openni.Samples.SimpleViewer.jar" > org.openni.Samples.SimpleViewer
+ java-pkg_dojar 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
@@ -102,7 +100,7 @@ src_install() {
if use doc ; then
docinto html
- dodoc -r "${S}/Source/Documentation/html/"*
+ dodoc -r Source/Documentation/html/*
fi
dodir /usr/$(get_libdir)/pkgconfig
next reply other threads:[~2025-02-01 10:51 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-01 10:51 Florian Schmaus [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-02-01 10:51 [gentoo-commits] repo/gentoo:master commit in: dev-libs/OpenNI2/ Florian Schmaus
2025-02-01 10:51 Florian Schmaus
2023-01-15 21:51 Sam James
2023-01-15 21:50 Sam James
2022-07-15 7:58 David Seifert
2022-05-19 12:12 Joonas Niilola
2021-07-08 10:42 Joonas Niilola
2021-07-08 10:42 Joonas Niilola
2019-09-25 17:31 Michał Górny
2018-02-22 20:19 Alexis Ballier
2017-01-29 9:12 David Seifert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1738407045.f111be2e7a895e3be39cce5d904b5b94c44f8d4b.flow@gentoo \
--to=flow@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox