[gentoo-commits] repo/gentoo:master commit in: dev-python/python_orocos_kdl/

[Alexis Ballier]

commit:     4c5dced023349a27c314bee6b41cb08b6cd18390
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 10:43:53 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=4c5dced0

dev-python/python_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

 dev-python/python_orocos_kdl/python_orocos_kdl-1.3.1-r1.ebuild | 5 ++++-
 dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild     | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

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
index 227c40d706..c8144ed108 100644
--- 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
@@ -32,7 +32,6 @@ RDEPEND="
        dev-python/sip[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
 
 if [ "${PV#9999}" != "${PV}" ] ; then
        S=${WORKDIR}/${P}/python_orocos_kdl
@@ -54,4 +53,8 @@ src_test() {
 
 src_install() {
        python_foreach_impl cmake-utils_src_install
+
+       # 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/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild 
b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
index 89a4b94a28..c8144ed108 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
+++ b/dev-python/python_orocos_kdl/python_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$
 
@@ -32,7 +32,6 @@ RDEPEND="
        dev-python/sip[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
 
 if [ "${PV#9999}" != "${PV}" ] ; then
        S=${WORKDIR}/${P}/python_orocos_kdl
@@ -54,4 +53,8 @@ src_test() {
 
 src_install() {
        python_foreach_impl cmake-utils_src_install
+
+       # Need to have package.xml in our custom gentoo path
+       insinto /usr/share/ros_packages/${PN}
+       doins "${ED}/usr/share/${PN}/package.xml"
 }