[gentoo-commits] repo/gentoo:master commit in: sci-libs/octomap/

[Alexis Ballier]

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
 }