| 1 |
commit: 4c5dced023349a27c314bee6b41cb08b6cd18390 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 28 10:43:53 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=4c5dced0 |
| 7 |
|
| 8 |
dev-python/python_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 |
dev-python/python_orocos_kdl/python_orocos_kdl-1.3.1-r1.ebuild | 5 ++++- |
| 13 |
dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild | 7 +++++-- |
| 14 |
2 files changed, 9 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.1-r1.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.1-r1.ebuild |
| 17 |
index 227c40d706..c8144ed108 100644 |
| 18 |
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.1-r1.ebuild |
| 19 |
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.1-r1.ebuild |
| 20 |
@@ -32,7 +32,6 @@ RDEPEND=" |
| 21 |
dev-python/sip[${PYTHON_USEDEP}] |
| 22 |
" |
| 23 |
DEPEND="${RDEPEND}" |
| 24 |
-PATCHES=( "${FILESDIR}/gentoo.patch" ) |
| 25 |
|
| 26 |
if [ "${PV#9999}" != "${PV}" ] ; then |
| 27 |
S=${WORKDIR}/${P}/python_orocos_kdl |
| 28 |
@@ -54,4 +53,8 @@ src_test() { |
| 29 |
|
| 30 |
src_install() { |
| 31 |
python_foreach_impl cmake-utils_src_install |
| 32 |
+ |
| 33 |
+ # Need to have package.xml in our custom gentoo path |
| 34 |
+ insinto /usr/share/ros_packages/${PN} |
| 35 |
+ doins "${ED}/usr/share/${PN}/package.xml" |
| 36 |
} |
| 37 |
|
| 38 |
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild |
| 39 |
index 89a4b94a28..c8144ed108 100644 |
| 40 |
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild |
| 41 |
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild |
| 42 |
@@ -1,4 +1,4 @@ |
| 43 |
-# Copyright 1999-2016 Gentoo Foundation |
| 44 |
+# Copyright 1999-2017 Gentoo Foundation |
| 45 |
# Distributed under the terms of the GNU General Public License v2 |
| 46 |
# $Id$ |
| 47 |
|
| 48 |
@@ -32,7 +32,6 @@ RDEPEND=" |
| 49 |
dev-python/sip[${PYTHON_USEDEP}] |
| 50 |
" |
| 51 |
DEPEND="${RDEPEND}" |
| 52 |
-PATCHES=( "${FILESDIR}/gentoo.patch" ) |
| 53 |
|
| 54 |
if [ "${PV#9999}" != "${PV}" ] ; then |
| 55 |
S=${WORKDIR}/${P}/python_orocos_kdl |
| 56 |
@@ -54,4 +53,8 @@ src_test() { |
| 57 |
|
| 58 |
src_install() { |
| 59 |
python_foreach_impl cmake-utils_src_install |
| 60 |
+ |
| 61 |
+ # Need to have package.xml in our custom gentoo path |
| 62 |
+ insinto /usr/share/ros_packages/${PN} |
| 63 |
+ doins "${ED}/usr/share/${PN}/package.xml" |
| 64 |
} |
Archives