commit: f44f9b521150adead631fdee000f8136f29fb977
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 10:41:51 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 11:26:50 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f44f9b52
sci-libs/orocos_kdl: 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/orocos_kdl/files/gentoo.patch | 10 ----------
.../{orocos_kdl-1.3.1.ebuild => orocos_kdl-1.3.1-r1.ebuild} | 7 +++++--
sci-libs/orocos_kdl/orocos_kdl-9999.ebuild | 7 +++++--
3 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/sci-libs/orocos_kdl/files/gentoo.patch
b/sci-libs/orocos_kdl/files/gentoo.patch
deleted file mode 100644
index 3766e12f58..0000000000
--- a/sci-libs/orocos_kdl/files/gentoo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: orocos_kdl/CMakeLists.txt
-===================================================================
---- orocos_kdl.orig/CMakeLists.txt
-+++ orocos_kdl/CMakeLists.txt
-@@ -114,4 +114,4 @@ INSTALL(FILES ${PROJECT_BINARY_DIR}/oroc
- INSTALL(FILES ${PROJECT_BINARY_DIR}/orocos_kdl-config-version.cmake
DESTINATION share/orocos_kdl)
- INSTALL(EXPORT OrocosKDLTargets DESTINATION share/orocos_kdl)
-
--INSTALL(FILES package.xml DESTINATION share/orocos_kdl)
-+INSTALL(FILES package.xml DESTINATION share/ros_packages/orocos_kdl)
diff --git a/sci-libs/orocos_kdl/orocos_kdl-1.3.1.ebuild
b/sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.ebuild
similarity index 89%
rename from sci-libs/orocos_kdl/orocos_kdl-1.3.1.ebuild
rename to sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.ebuild
index fac689144b..8207c1ea2f 100644
--- a/sci-libs/orocos_kdl/orocos_kdl-1.3.1.ebuild
+++ b/sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.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$
@@ -33,7 +33,6 @@ DEPEND="${RDEPEND}
REQUIRED_USE="examples? ( models )"
DOCS=( README )
-PATCHES=( "${FILESDIR}/gentoo.patch" )
if [ "${PV#9999}" != "${PV}" ] ; then
S=${WORKDIR}/${P}/orocos_kdl
@@ -66,4 +65,8 @@ src_install() {
cd "${BUILD_DIR}"
use doc && dohtml -r doc/api/html/*
use examples && dobin
"${BUILD_DIR}/examples/"{geometry,trajectory_example,chainiksolverpos_lma_demo}
+
+ # Need to have package.xml in our custom gentoo path
+ insinto /usr/share/ros_packages/${PN}
+ doins "${ED}/usr/share/${PN}/package.xml"
}
diff --git a/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
b/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
index fac689144b..8207c1ea2f 100644
--- a/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
+++ b/sci-libs/orocos_kdl/orocos_kdl-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$
@@ -33,7 +33,6 @@ DEPEND="${RDEPEND}
REQUIRED_USE="examples? ( models )"
DOCS=( README )
-PATCHES=( "${FILESDIR}/gentoo.patch" )
if [ "${PV#9999}" != "${PV}" ] ; then
S=${WORKDIR}/${P}/orocos_kdl
@@ -66,4 +65,8 @@ src_install() {
cd "${BUILD_DIR}"
use doc && dohtml -r doc/api/html/*
use examples && dobin
"${BUILD_DIR}/examples/"{geometry,trajectory_example,chainiksolverpos_lma_demo}
+
+ # Need to have package.xml in our custom gentoo path
+ insinto /usr/share/ros_packages/${PN}
+ doins "${ED}/usr/share/${PN}/package.xml"
}
