public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Dennis Lamm" <expeditioneer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/octomap/
Date: Wed, 15 Jul 2020 16:53:18 +0000 (UTC)	[thread overview]
Message-ID: <1594831991.5b4746d280a14730544877179beeffd0199a9283.expeditioneer@gentoo> (raw)

commit:     5b4746d280a14730544877179beeffd0199a9283
Author:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 14 19:23:28 2020 +0000
Commit:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Wed Jul 15 16:53:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b4746d2

dev-python/sentry-sdk: doc creation and installation adapted, also fixed QA violations

Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/16175
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>

 sci-libs/octomap/octomap-1.9.5.ebuild | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/sci-libs/octomap/octomap-1.9.5.ebuild b/sci-libs/octomap/octomap-1.9.5.ebuild
index 38cae5f6770..230100c8176 100644
--- a/sci-libs/octomap/octomap-1.9.5.ebuild
+++ b/sci-libs/octomap/octomap-1.9.5.ebuild
@@ -54,29 +54,23 @@ src_configure() {
 
 src_compile() {
 	cmake_src_compile
-	if use doc ; then
-		cd "${BUILD_DIR}/octomap"
-		emake docs
-		if use dynamicEDT3D ; then
-			cd "${BUILD_DIR}/dynamicEDT3D"
-			emake docs_dynamicEDT3D
-		fi
-	fi
+	use doc && cmake_build docs docs_dynamicEDT3D
 }
 
 src_install() {
 	cmake_src_install
-	if use doc ; then
-		insinto /usr/share/doc/${PF}/html/octomap
-		doins -r "${S}/octomap/doc/html/"*
-		if use dynamicEDT3D ; then
-			insinto /usr/share/doc/${PF}/html/dynamicEDT3D
-			doins -r "${S}/dynamicEDT3D/doc/html/"*
-		fi
+
+	if use doc; then
+		docinto html/octomap
+		dodoc -r octomap/doc/html/*
+
+		docinto html/dynamicEDT3D
+		dodoc -r dynamicEDT3D/doc/html/*
 	fi
 
-	insinto /usr/share/ros_packages/${PN}
+  insinto /usr/share/ros_packages/${PN}
 	doins "${ED}/usr/share/${PN}/package.xml"
+
 	if use qt5; then
 		insinto /usr/share/ros_packages/octovis
 		doins "${ED}/usr/share/octovis/package.xml"


             reply	other threads:[~2020-07-15 16:53 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-15 16:53 Dennis Lamm [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-06-06 12:51 [gentoo-commits] repo/gentoo:master commit in: sci-libs/octomap/ Alexis Ballier
2025-03-30 21:42 Andreas Sturmlechner
2022-07-07 10:27 Alexis Ballier
2021-06-12  9:50 Patrice Clement
2021-01-27  3:52 Sam James
2020-07-15 16:53 Dennis Lamm
2018-02-28 15:50 Andreas Sturmlechner
2017-02-28 11:27 Alexis Ballier
2016-09-29 12:53 Alexis Ballier
2016-09-29 12:53 Alexis Ballier
2016-06-28 14:36 Alexis Ballier

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=1594831991.5b4746d280a14730544877179beeffd0199a9283.expeditioneer@gentoo \
    --to=expeditioneer@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