* [gentoo-commits] repo/gentoo:master commit in: sci-libs/octomap/
@ 2016-06-28 14:36 Alexis Ballier
0 siblings, 0 replies; 10+ messages in thread
From: Alexis Ballier @ 2016-06-28 14:36 UTC (permalink / raw
To: gentoo-commits
commit: 073cfe4fe7f386daea48b28c864d9df4a4039284
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 28 14:11:14 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Jun 28 14:35:39 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=073cfe4f
sci-libs/octomap: bump to 1.8.0
Package-Manager: portage-2.3.0
sci-libs/octomap/Manifest | 1 +
sci-libs/octomap/octomap-1.8.0.ebuild | 81 +++++++++++++++++++++++++++++++++++
2 files changed, 82 insertions(+)
diff --git a/sci-libs/octomap/Manifest b/sci-libs/octomap/Manifest
index b0a4538..283c59b 100644
--- a/sci-libs/octomap/Manifest
+++ b/sci-libs/octomap/Manifest
@@ -1 +1,2 @@
DIST octomap-1.6.8.tar.gz 1588042 SHA256 833adba0d3b203cab0e28a0180490e74bc852a7fea9adf6ee53bbfb8f10bc79a SHA512 43c049f6b53081b83bbf0a38c2f319dc2fb3d799dafb3f45779b2e615d0ac1f6d83bfba592abd93afe34cc51ac39d9081bd7e20f69c4390b68fcc8386a1cb68d WHIRLPOOL f27ad8efbaba51d02d7f1e856607d5a1890354aa2bc172bf20341148c6503cefdb06aacb39c8345de80dd54e6a8f91e59aa254c60b67e9a76c546813aaabca2c
+DIST octomap-1.8.0.tar.gz 1584799 SHA256 158f66af55bb660a2aa7d0a00c60c9e5320f6594bd0924748af1471d315d5633 SHA512 61ceeee80de8bcdcfde69c3dd30a218ec7f9e4362b1bae8e80d29dde74875a717cc1cbcfba1a7c3ee7ec0ee954297796ac35052782b98af36448f5c3305bdfa9 WHIRLPOOL 12d1dd64d0b7999aa41c5ed878af63385f25536a32a38b28d168a10560dc6de5ce1148d6f20c310082da765066a8f3f826860f481ae11e1669aa9a15f6365b71
diff --git a/sci-libs/octomap/octomap-1.8.0.ebuild b/sci-libs/octomap/octomap-1.8.0.ebuild
new file mode 100644
index 0000000..182eea1
--- /dev/null
+++ b/sci-libs/octomap/octomap-1.8.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+ SCM="git-r3"
+ EGIT_REPO_URI="https://github.com/OctoMap/octomap"
+fi
+
+inherit ${SCM} cmake-utils
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+ SRC_URI=""
+else
+ KEYWORDS="~amd64 ~arm"
+ SRC_URI="https://github.com/OctoMap/octomap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="An Efficient Probabilistic 3D Mapping Framework Based on Octrees"
+HOMEPAGE="http://octomap.github.io/"
+IUSE="qt4 dynamicEDT3D doc"
+LICENSE="BSD qt4? ( GPL-2 )"
+SLOT="0"
+
+RDEPEND="
+ qt4? (
+ virtual/opengl
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ x11-libs/libQGLViewer
+ )
+"
+DEPEND="${RDEPEND}
+ doc? (
+ app-doc/doxygen
+ media-gfx/graphviz
+ )
+"
+
+src_prepare() {
+ sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \
+ -i */CMakeLists.txt \
+ -i */CMakeModules/InstallPkgConfigFile.cmake || die
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ "-DBUILD_OCTOVIS_SUBPROJECT=$(usex qt4 ON OFF)"
+ "-DBUILD_DYNAMICETD3D_SUBPROJECT=$(usex dynamicEDT3D ON OFF)"
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_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
+}
+
+src_install() {
+ cmake-utils_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
+ fi
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/octomap/
@ 2016-09-29 12:53 Alexis Ballier
0 siblings, 0 replies; 10+ messages in thread
From: Alexis Ballier @ 2016-09-29 12:53 UTC (permalink / raw
To: gentoo-commits
commit: 790c0dd67b8b9ed2f78be7d8c3ccdfe90e24cccc
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 29 12:52:19 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 12:52:51 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=790c0dd6
sci-libs/octomap: add := dep on qglviewer
Package-Manager: portage-2.3.1
sci-libs/octomap/{octomap-1.8.0.ebuild => octomap-1.8.0-r1.ebuild} | 2 +-
sci-libs/octomap/octomap-9999.ebuild | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sci-libs/octomap/octomap-1.8.0.ebuild b/sci-libs/octomap/octomap-1.8.0-r1.ebuild
similarity index 98%
rename from sci-libs/octomap/octomap-1.8.0.ebuild
rename to sci-libs/octomap/octomap-1.8.0-r1.ebuild
index 182eea1..2b3509c 100644
--- a/sci-libs/octomap/octomap-1.8.0.ebuild
+++ b/sci-libs/octomap/octomap-1.8.0-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
virtual/opengl
dev-qt/qtcore:4
dev-qt/qtgui:4
- x11-libs/libQGLViewer
+ x11-libs/libQGLViewer:=
)
"
DEPEND="${RDEPEND}
diff --git a/sci-libs/octomap/octomap-9999.ebuild b/sci-libs/octomap/octomap-9999.ebuild
index 11055fe..2b3509c 100644
--- a/sci-libs/octomap/octomap-9999.ebuild
+++ b/sci-libs/octomap/octomap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -31,7 +31,7 @@ RDEPEND="
virtual/opengl
dev-qt/qtcore:4
dev-qt/qtgui:4
- x11-libs/libQGLViewer
+ x11-libs/libQGLViewer:=
)
"
DEPEND="${RDEPEND}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/octomap/
@ 2016-09-29 12:53 Alexis Ballier
0 siblings, 0 replies; 10+ messages in thread
From: Alexis Ballier @ 2016-09-29 12:53 UTC (permalink / raw
To: gentoo-commits
commit: 4f352e7b4f4394f5b3cac1084d73011421401c52
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 29 12:34:31 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 12:52:51 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f352e7b
sci-libs/octomap: remove old
Package-Manager: portage-2.3.1
sci-libs/octomap/Manifest | 1 -
sci-libs/octomap/octomap-1.6.8.ebuild | 81 -----------------------------------
2 files changed, 82 deletions(-)
diff --git a/sci-libs/octomap/Manifest b/sci-libs/octomap/Manifest
index 283c59b..3d1141a 100644
--- a/sci-libs/octomap/Manifest
+++ b/sci-libs/octomap/Manifest
@@ -1,2 +1 @@
-DIST octomap-1.6.8.tar.gz 1588042 SHA256 833adba0d3b203cab0e28a0180490e74bc852a7fea9adf6ee53bbfb8f10bc79a SHA512 43c049f6b53081b83bbf0a38c2f319dc2fb3d799dafb3f45779b2e615d0ac1f6d83bfba592abd93afe34cc51ac39d9081bd7e20f69c4390b68fcc8386a1cb68d WHIRLPOOL f27ad8efbaba51d02d7f1e856607d5a1890354aa2bc172bf20341148c6503cefdb06aacb39c8345de80dd54e6a8f91e59aa254c60b67e9a76c546813aaabca2c
DIST octomap-1.8.0.tar.gz 1584799 SHA256 158f66af55bb660a2aa7d0a00c60c9e5320f6594bd0924748af1471d315d5633 SHA512 61ceeee80de8bcdcfde69c3dd30a218ec7f9e4362b1bae8e80d29dde74875a717cc1cbcfba1a7c3ee7ec0ee954297796ac35052782b98af36448f5c3305bdfa9 WHIRLPOOL 12d1dd64d0b7999aa41c5ed878af63385f25536a32a38b28d168a10560dc6de5ce1148d6f20c310082da765066a8f3f826860f481ae11e1669aa9a15f6365b71
diff --git a/sci-libs/octomap/octomap-1.6.8.ebuild b/sci-libs/octomap/octomap-1.6.8.ebuild
deleted file mode 100644
index 11055fe..00000000
--- a/sci-libs/octomap/octomap-1.6.8.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/OctoMap/octomap"
-fi
-
-inherit ${SCM} cmake-utils
-
-if [ "${PV#9999}" != "${PV}" ] ; then
- KEYWORDS=""
- SRC_URI=""
-else
- KEYWORDS="~amd64 ~arm"
- SRC_URI="https://github.com/OctoMap/octomap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="An Efficient Probabilistic 3D Mapping Framework Based on Octrees"
-HOMEPAGE="http://octomap.github.io/"
-IUSE="qt4 dynamicEDT3D doc"
-LICENSE="BSD qt4? ( GPL-2 )"
-SLOT="0"
-
-RDEPEND="
- qt4? (
- virtual/opengl
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- x11-libs/libQGLViewer
- )
-"
-DEPEND="${RDEPEND}
- doc? (
- app-doc/doxygen
- media-gfx/graphviz
- )
-"
-
-src_prepare() {
- sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \
- -i */CMakeLists.txt \
- -i */CMakeModules/InstallPkgConfigFile.cmake || die
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- "-DBUILD_OCTOVIS_SUBPROJECT=$(usex qt4 ON OFF)"
- "-DBUILD_DYNAMICETD3D_SUBPROJECT=$(usex dynamicEDT3D ON OFF)"
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_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
-}
-
-src_install() {
- cmake-utils_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
- fi
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/octomap/
@ 2017-02-28 11:27 Alexis Ballier
0 siblings, 0 replies; 10+ messages in thread
From: Alexis Ballier @ 2017-02-28 11:27 UTC (permalink / raw
To: gentoo-commits
commit: 6a4b07fb26999efa7b5627ed31fad3732fa0860c
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 10:53:39 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 11:26:51 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a4b07fb
sci-libs/octomap: Bump to 1.8.1 and install package.xml in our custom gentoo path from ebuild instead of patching.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sci-libs/octomap/Manifest | 1 +
sci-libs/octomap/{octomap-9999.ebuild => octomap-1.8.1.ebuild} | 10 ++++++++--
sci-libs/octomap/octomap-9999.ebuild | 10 ++++++++--
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/sci-libs/octomap/Manifest b/sci-libs/octomap/Manifest
index 3d1141a389..228b4b3140 100644
--- a/sci-libs/octomap/Manifest
+++ b/sci-libs/octomap/Manifest
@@ -1 +1,2 @@
DIST octomap-1.8.0.tar.gz 1584799 SHA256 158f66af55bb660a2aa7d0a00c60c9e5320f6594bd0924748af1471d315d5633 SHA512 61ceeee80de8bcdcfde69c3dd30a218ec7f9e4362b1bae8e80d29dde74875a717cc1cbcfba1a7c3ee7ec0ee954297796ac35052782b98af36448f5c3305bdfa9 WHIRLPOOL 12d1dd64d0b7999aa41c5ed878af63385f25536a32a38b28d168a10560dc6de5ce1148d6f20c310082da765066a8f3f826860f481ae11e1669aa9a15f6365b71
+DIST octomap-1.8.1.tar.gz 1679526 SHA256 8b18ef7693e87f1400b9a8bc41f86e3b28259ac98c0b458037232652380aa6af SHA512 e35567da0d6741747abbc87de49733d0e92bae8aedfe66a63766740cc6566f3cfdbc3c986369177497cc9a8fb208ed9b727da496cec48e2ad23328df06fbc8d6 WHIRLPOOL 7bad33e4bb01ef0d0599d4e7ea6b323e4aacb06d9f5e8d4a05b52aa0be72d205735402ed25f2ff3fcad6636f838124453f61bff1808fbe75154a4e7d32d1ded3
diff --git a/sci-libs/octomap/octomap-9999.ebuild b/sci-libs/octomap/octomap-1.8.1.ebuild
similarity index 87%
copy from sci-libs/octomap/octomap-9999.ebuild
copy to sci-libs/octomap/octomap-1.8.1.ebuild
index 19df370fdb..a80cadce5c 100644
--- a/sci-libs/octomap/octomap-9999.ebuild
+++ b/sci-libs/octomap/octomap-1.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -40,7 +40,6 @@ DEPEND="${RDEPEND}
media-gfx/graphviz
)
"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
src_prepare() {
sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \
@@ -79,4 +78,11 @@ src_install() {
doins -r "${S}/dynamicEDT3D/doc/html/"*
fi
fi
+
+ insinto /usr/share/ros_packages/${PN}
+ doins "${ED}/usr/share/${PN}/package.xml"
+ if use qt4; then
+ insinto /usr/share/ros_packages/octovis
+ doins "${ED}/usr/share/octovis/package.xml"
+ fi
}
diff --git a/sci-libs/octomap/octomap-9999.ebuild b/sci-libs/octomap/octomap-9999.ebuild
index 19df370fdb..a80cadce5c 100644
--- a/sci-libs/octomap/octomap-9999.ebuild
+++ b/sci-libs/octomap/octomap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -40,7 +40,6 @@ DEPEND="${RDEPEND}
media-gfx/graphviz
)
"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
src_prepare() {
sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \
@@ -79,4 +78,11 @@ src_install() {
doins -r "${S}/dynamicEDT3D/doc/html/"*
fi
fi
+
+ insinto /usr/share/ros_packages/${PN}
+ doins "${ED}/usr/share/${PN}/package.xml"
+ if use qt4; then
+ insinto /usr/share/ros_packages/octovis
+ doins "${ED}/usr/share/octovis/package.xml"
+ fi
}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/octomap/
@ 2018-02-28 15:50 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2018-02-28 15:50 UTC (permalink / raw
To: gentoo-commits
commit: 364e5fe712aaabda8731dbb5d8774e0677661703
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 22:31:37 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 15:37:52 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=364e5fe7
sci-libs/octomap: Drop 1.8.1
Package-Manager: Portage-2.3.24, Repoman-2.3.6
sci-libs/octomap/Manifest | 1 -
sci-libs/octomap/octomap-1.8.1.ebuild | 87 -----------------------------------
2 files changed, 88 deletions(-)
diff --git a/sci-libs/octomap/Manifest b/sci-libs/octomap/Manifest
index b1420dcc0f1..8f52f98c8b5 100644
--- a/sci-libs/octomap/Manifest
+++ b/sci-libs/octomap/Manifest
@@ -1,2 +1 @@
-DIST octomap-1.8.1.tar.gz 1679526 BLAKE2B 89d71ca43ce4e353d8cf758420907c8bb1e11aa42854178174594d03aaf04ed753a35c6e4ffc60a5ebe0297307aedee92bd69138af8598a8b5ae7ac716193c44 SHA512 e35567da0d6741747abbc87de49733d0e92bae8aedfe66a63766740cc6566f3cfdbc3c986369177497cc9a8fb208ed9b727da496cec48e2ad23328df06fbc8d6
DIST octomap-1.9.0.tar.gz 1682421 BLAKE2B a299b4a956d5f9b6a67b05548f2239ad1181a4a1e673e5868d56d6e2d8f0101b2c75b114d1b7995c244c138fe04c8972104c25ca2f4ca6f75639f7326f06d8d7 SHA512 335a4ee3fe20f456afd2d8491f8fe6cfc2527d6e26aa690a69a39c1468e41d312fd84c85a1247deb11f513b9d50b8c69d34b46876f8257c205b0a99bac826237
diff --git a/sci-libs/octomap/octomap-1.8.1.ebuild b/sci-libs/octomap/octomap-1.8.1.ebuild
deleted file mode 100644
index 30141845c39..00000000000
--- a/sci-libs/octomap/octomap-1.8.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/OctoMap/octomap"
-fi
-
-inherit ${SCM} cmake-utils
-
-if [ "${PV#9999}" != "${PV}" ] ; then
- KEYWORDS=""
- SRC_URI=""
-else
- KEYWORDS="~amd64 ~arm"
- SRC_URI="https://github.com/OctoMap/octomap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="An Efficient Probabilistic 3D Mapping Framework Based on Octrees"
-HOMEPAGE="http://octomap.github.io/"
-IUSE="qt4 dynamicEDT3D doc"
-LICENSE="BSD qt4? ( GPL-2 )"
-SLOT="0"
-
-RDEPEND="
- qt4? (
- virtual/opengl
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- x11-libs/libQGLViewer:=
- )
-"
-DEPEND="${RDEPEND}
- doc? (
- app-doc/doxygen
- media-gfx/graphviz
- )
-"
-
-src_prepare() {
- sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \
- -i */CMakeLists.txt \
- -i */CMakeModules/InstallPkgConfigFile.cmake || die
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- "-DBUILD_OCTOVIS_SUBPROJECT=$(usex qt4 ON OFF)"
- "-DBUILD_DYNAMICETD3D_SUBPROJECT=$(usex dynamicEDT3D ON OFF)"
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_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
-}
-
-src_install() {
- cmake-utils_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
- fi
-
- insinto /usr/share/ros_packages/${PN}
- doins "${ED}/usr/share/${PN}/package.xml"
- if use qt4; then
- insinto /usr/share/ros_packages/octovis
- doins "${ED}/usr/share/octovis/package.xml"
- fi
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/octomap/
@ 2020-07-15 16:53 Dennis Lamm
0 siblings, 0 replies; 10+ messages in thread
From: Dennis Lamm @ 2020-07-15 16:53 UTC (permalink / raw
To: gentoo-commits
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"
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/octomap/
@ 2020-07-15 16:53 Dennis Lamm
0 siblings, 0 replies; 10+ messages in thread
From: Dennis Lamm @ 2020-07-15 16:53 UTC (permalink / raw
To: gentoo-commits
commit: a7b1a26e27b5291e347baf5f9ba579e3db0b00b0
Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 10 20:45:45 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=a7b1a26e
sci-libs/octomap: version bump 1.9.5
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>
sci-libs/octomap/Manifest | 1 +
sci-libs/octomap/octomap-1.9.5.ebuild | 90 +++++++++++++++++++++++++++++++++++
2 files changed, 91 insertions(+)
diff --git a/sci-libs/octomap/Manifest b/sci-libs/octomap/Manifest
index 8f52f98c8b5..8b77e993358 100644
--- a/sci-libs/octomap/Manifest
+++ b/sci-libs/octomap/Manifest
@@ -1 +1,2 @@
DIST octomap-1.9.0.tar.gz 1682421 BLAKE2B a299b4a956d5f9b6a67b05548f2239ad1181a4a1e673e5868d56d6e2d8f0101b2c75b114d1b7995c244c138fe04c8972104c25ca2f4ca6f75639f7326f06d8d7 SHA512 335a4ee3fe20f456afd2d8491f8fe6cfc2527d6e26aa690a69a39c1468e41d312fd84c85a1247deb11f513b9d50b8c69d34b46876f8257c205b0a99bac826237
+DIST octomap-1.9.5.tar.gz 1682781 BLAKE2B 1ced023160d10c424d4bff76a0481ffe6c87c5bf8133480afe6c47ee0ee116304a811293cc0af0b303ebcad370b7ce433e85212f070ac921a9c5be41905a94ea SHA512 e58c6d33c351b14e9596e18a8702715d167c136fd029b1078ddd13a5926fe451d3b619231b5a8ccfb64b6e5fc6db8b57e6ef329099828d2f5195c0988700b581
diff --git a/sci-libs/octomap/octomap-1.9.5.ebuild b/sci-libs/octomap/octomap-1.9.5.ebuild
new file mode 100644
index 00000000000..38cae5f6770
--- /dev/null
+++ b/sci-libs/octomap/octomap-1.9.5.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="An Efficient Probabilistic 3D Mapping Framework Based on Octrees"
+HOMEPAGE="http://octomap.github.io/"
+SRC_URI="https://github.com/OctoMap/octomap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD qt5? ( GPL-2 )"
+SLOT="0/19"
+KEYWORDS="~amd64 ~arm"
+IUSE="qt5 dynamicEDT3D doc"
+
+RDEPEND="
+ qt5? (
+ virtual/opengl
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ x11-libs/libQGLViewer:=
+ )
+"
+BDEPEND="${RDEPEND}
+ doc? (
+ app-doc/doxygen
+ media-gfx/graphviz
+ )
+"
+
+# https://github.com/OctoMap/octomap/issues/194
+PATCHES=( "${FILESDIR}/qglqt5.patch" )
+
+src_prepare() {
+ rm -r octovis/src/extern
+
+ sed --in-place \
+ --expression='s/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \
+ */CMakeLists.txt */CMakeModules/InstallPkgConfigFile.cmake || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ "-DBUILD_OCTOVIS_SUBPROJECT=$(usex qt5 ON OFF)"
+ "-DOCTOVIS_QT5=ON"
+ "-DBUILD_DYNAMICETD3D_SUBPROJECT=$(usex dynamicEDT3D ON OFF)"
+ )
+ cmake_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
+}
+
+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
+ fi
+
+ 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"
+ fi
+}
+
+src_test() {
+ # override parallel mode only for tests
+ local myctestargs=( "-j 1" )
+ cmake_src_test
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/octomap/
@ 2021-01-27 3:52 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2021-01-27 3:52 UTC (permalink / raw
To: gentoo-commits
commit: b606d356e6b5443db3d7edacf6a367de7fdd621b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 27 03:51:21 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 27 03:51:21 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b606d356
sci-libs/octomap: fix WhitespaceFound
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/octomap/octomap-1.9.5.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/octomap/octomap-1.9.5.ebuild b/sci-libs/octomap/octomap-1.9.5.ebuild
index 230100c8176..b38b3ab44bf 100644
--- a/sci-libs/octomap/octomap-1.9.5.ebuild
+++ b/sci-libs/octomap/octomap-1.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -68,7 +68,7 @@ src_install() {
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
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/octomap/
@ 2021-06-12 9:50 Patrice Clement
0 siblings, 0 replies; 10+ messages in thread
From: Patrice Clement @ 2021-06-12 9:50 UTC (permalink / raw
To: gentoo-commits
commit: 141b63735c1d7ebdbf4eb6af5638874c2a49d308
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 22 18:31:08 2021 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Jun 12 09:50:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=141b6373
sci-libs/octomap: drop unmaintained 9999 ebuild.
Closes: https://bugs.gentoo.org/770601
Closes: https://github.com/gentoo/gentoo/pull/20938
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
sci-libs/octomap/octomap-9999.ebuild | 90 ------------------------------------
1 file changed, 90 deletions(-)
diff --git a/sci-libs/octomap/octomap-9999.ebuild b/sci-libs/octomap/octomap-9999.ebuild
deleted file mode 100644
index c53f4e28eaf..00000000000
--- a/sci-libs/octomap/octomap-9999.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/OctoMap/octomap"
-fi
-
-inherit ${SCM} cmake-utils
-
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
-else
- KEYWORDS="~amd64 ~arm"
- SRC_URI="https://github.com/OctoMap/octomap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="An Efficient Probabilistic 3D Mapping Framework Based on Octrees"
-HOMEPAGE="http://octomap.github.io/"
-IUSE="qt5 dynamicEDT3D doc"
-LICENSE="BSD qt5? ( GPL-2 )"
-SLOT="0/19"
-
-RDEPEND="
- qt5? (
- virtual/opengl
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- x11-libs/libQGLViewer:=
- )
-"
-DEPEND="${RDEPEND}
- doc? (
- app-doc/doxygen
- media-gfx/graphviz
- )
-"
-
-src_prepare() {
- sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \
- -i */CMakeLists.txt \
- -i */CMakeModules/InstallPkgConfigFile.cmake || die
- sed -e 's/iewer-qt4/iewer-qt5/g' \
- -i octovis/CMakeModules/FindQGLViewer.cmake || die
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- "-DBUILD_OCTOVIS_SUBPROJECT=$(usex qt5 ON OFF)"
- "-DOCTOVIS_QT5=TRUE"
- "-DBUILD_DYNAMICETD3D_SUBPROJECT=$(usex dynamicEDT3D ON OFF)"
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_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
-}
-
-src_install() {
- cmake-utils_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
- fi
-
- 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"
- fi
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/octomap/
@ 2022-07-07 10:27 Alexis Ballier
0 siblings, 0 replies; 10+ messages in thread
From: Alexis Ballier @ 2022-07-07 10:27 UTC (permalink / raw
To: gentoo-commits
commit: 6a52ccfba763b4bf26e47053a5f8a81ffe181eea
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 7 09:07:42 2022 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jul 7 10:27:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a52ccfb
sci-libs/octomap: bump to 1.9.8
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
sci-libs/octomap/Manifest | 2 +-
sci-libs/octomap/{octomap-1.9.7.ebuild => octomap-1.9.8.ebuild} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/octomap/Manifest b/sci-libs/octomap/Manifest
index 86ee75a8455f..1b96b736d561 100644
--- a/sci-libs/octomap/Manifest
+++ b/sci-libs/octomap/Manifest
@@ -1 +1 @@
-DIST octomap-1.9.7.tar.gz 1684088 BLAKE2B 357b574f770d553a51c936c84772c729754a822e1c1e840a179a2cb3d3ef1b15f1c7173a4333b1262b10aa5d2f64d1b1c063ad90d4cc0edfcbaee9799ceb24a8 SHA512 639ff65cf020865d5302ba9785089782aec1e46496982c11bbf86919b6938c01c7921d84e60880091b89a949dd05f4d1151871f63503d19342462b74e6791ddd
+DIST octomap-1.9.8.tar.gz 1693311 BLAKE2B 476e4a644287e5ebcaa36de3051b7a2079b733bee3cd80b192fecfab0a85c5de70e3ad087a6cb499141167c735692de72ba2a7b1fb8b318e461f8f21f20020ae SHA512 60afeecc36a190f136dcbe33cb9cd6c06c16233988b383b0b010f65f81e6a3630b55902c5b5ad756ac35dee4c4ec26ec5722d6bd9b8e079f70b7d286293c518e
diff --git a/sci-libs/octomap/octomap-1.9.7.ebuild b/sci-libs/octomap/octomap-1.9.8.ebuild
similarity index 97%
rename from sci-libs/octomap/octomap-1.9.7.ebuild
rename to sci-libs/octomap/octomap-1.9.8.ebuild
index 9d9bd32c85f7..0902d3e3b2a0 100644
--- a/sci-libs/octomap/octomap-1.9.7.ebuild
+++ b/sci-libs/octomap/octomap-1.9.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-07-07 10:27 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-07 10:27 [gentoo-commits] repo/gentoo:master commit in: sci-libs/octomap/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2021-06-12 9:50 Patrice Clement
2021-01-27 3:52 Sam James
2020-07-15 16:53 Dennis Lamm
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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox