| 1 |
commit: f44f9b521150adead631fdee000f8136f29fb977 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 28 10:41:51 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 28 11:26:50 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f44f9b52 |
| 7 |
|
| 8 |
sci-libs/orocos_kdl: Install package.xml in our custom gentoo path from ebuild instead of patching |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
sci-libs/orocos_kdl/files/gentoo.patch | 10 ---------- |
| 13 |
.../{orocos_kdl-1.3.1.ebuild => orocos_kdl-1.3.1-r1.ebuild} | 7 +++++-- |
| 14 |
sci-libs/orocos_kdl/orocos_kdl-9999.ebuild | 7 +++++-- |
| 15 |
3 files changed, 10 insertions(+), 14 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-libs/orocos_kdl/files/gentoo.patch b/sci-libs/orocos_kdl/files/gentoo.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index 3766e12f58..0000000000 |
| 20 |
--- a/sci-libs/orocos_kdl/files/gentoo.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,10 +0,0 @@ |
| 23 |
-Index: orocos_kdl/CMakeLists.txt |
| 24 |
-=================================================================== |
| 25 |
---- orocos_kdl.orig/CMakeLists.txt |
| 26 |
-+++ orocos_kdl/CMakeLists.txt |
| 27 |
-@@ -114,4 +114,4 @@ INSTALL(FILES ${PROJECT_BINARY_DIR}/oroc |
| 28 |
- INSTALL(FILES ${PROJECT_BINARY_DIR}/orocos_kdl-config-version.cmake DESTINATION share/orocos_kdl) |
| 29 |
- INSTALL(EXPORT OrocosKDLTargets DESTINATION share/orocos_kdl) |
| 30 |
- |
| 31 |
--INSTALL(FILES package.xml DESTINATION share/orocos_kdl) |
| 32 |
-+INSTALL(FILES package.xml DESTINATION share/ros_packages/orocos_kdl) |
| 33 |
|
| 34 |
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 |
| 35 |
similarity index 89% |
| 36 |
rename from sci-libs/orocos_kdl/orocos_kdl-1.3.1.ebuild |
| 37 |
rename to sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.ebuild |
| 38 |
index fac689144b..8207c1ea2f 100644 |
| 39 |
--- a/sci-libs/orocos_kdl/orocos_kdl-1.3.1.ebuild |
| 40 |
+++ b/sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.ebuild |
| 41 |
@@ -1,4 +1,4 @@ |
| 42 |
-# Copyright 1999-2016 Gentoo Foundation |
| 43 |
+# Copyright 1999-2017 Gentoo Foundation |
| 44 |
# Distributed under the terms of the GNU General Public License v2 |
| 45 |
# $Id$ |
| 46 |
|
| 47 |
@@ -33,7 +33,6 @@ DEPEND="${RDEPEND} |
| 48 |
REQUIRED_USE="examples? ( models )" |
| 49 |
|
| 50 |
DOCS=( README ) |
| 51 |
-PATCHES=( "${FILESDIR}/gentoo.patch" ) |
| 52 |
|
| 53 |
if [ "${PV#9999}" != "${PV}" ] ; then |
| 54 |
S=${WORKDIR}/${P}/orocos_kdl |
| 55 |
@@ -66,4 +65,8 @@ src_install() { |
| 56 |
cd "${BUILD_DIR}" |
| 57 |
use doc && dohtml -r doc/api/html/* |
| 58 |
use examples && dobin "${BUILD_DIR}/examples/"{geometry,trajectory_example,chainiksolverpos_lma_demo} |
| 59 |
+ |
| 60 |
+ # Need to have package.xml in our custom gentoo path |
| 61 |
+ insinto /usr/share/ros_packages/${PN} |
| 62 |
+ doins "${ED}/usr/share/${PN}/package.xml" |
| 63 |
} |
| 64 |
|
| 65 |
diff --git a/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild b/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild |
| 66 |
index fac689144b..8207c1ea2f 100644 |
| 67 |
--- a/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild |
| 68 |
+++ b/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild |
| 69 |
@@ -1,4 +1,4 @@ |
| 70 |
-# Copyright 1999-2016 Gentoo Foundation |
| 71 |
+# Copyright 1999-2017 Gentoo Foundation |
| 72 |
# Distributed under the terms of the GNU General Public License v2 |
| 73 |
# $Id$ |
| 74 |
|
| 75 |
@@ -33,7 +33,6 @@ DEPEND="${RDEPEND} |
| 76 |
REQUIRED_USE="examples? ( models )" |
| 77 |
|
| 78 |
DOCS=( README ) |
| 79 |
-PATCHES=( "${FILESDIR}/gentoo.patch" ) |
| 80 |
|
| 81 |
if [ "${PV#9999}" != "${PV}" ] ; then |
| 82 |
S=${WORKDIR}/${P}/orocos_kdl |
| 83 |
@@ -66,4 +65,8 @@ src_install() { |
| 84 |
cd "${BUILD_DIR}" |
| 85 |
use doc && dohtml -r doc/api/html/* |
| 86 |
use examples && dobin "${BUILD_DIR}/examples/"{geometry,trajectory_example,chainiksolverpos_lma_demo} |
| 87 |
+ |
| 88 |
+ # Need to have package.xml in our custom gentoo path |
| 89 |
+ insinto /usr/share/ros_packages/${PN} |
| 90 |
+ doins "${ED}/usr/share/${PN}/package.xml" |
| 91 |
} |
Archives