dev-python/python_orocos_kdl: install package.xml in /usr/share/ros_packages/$PN

Package-Manager: portage-2.3.1

diff --git a/dev-python/python_orocos_kdl/files/gentoo.patch b/dev-python/python_orocos_kdl/files/gentoo.patch
new file mode 100644 (file)
index 0000000..f5e6638
--- /dev/null
+++ b/dev-python/python_orocos_kdl/files/gentoo.patch
@@ -0,0 +1,11 @@
+Index: python_orocos_kdl/CMakeLists.txt
+===================================================================
+--- python_orocos_kdl.orig/CMakeLists.txt
++++ python_orocos_kdl/CMakeLists.txt
+@@ -21,4 +21,4 @@ set(SIP_EXTRA_OPTIONS "-o")
+ set(PYTHON_SITE_PACKAGES_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE_PACKAGES})
+ add_sip_python_module(PyKDL PyKDL/PyKDL.sip ${orocos_kdl_LIBRARIES})
+ 
+-install(FILES package.xml DESTINATION share/python_orocos_kdl)
+\ No newline at end of file
++install(FILES package.xml DESTINATION share/ros_packages/python_orocos_kdl)

diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r1.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r2.ebuild
similarity index 91%
rename from dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r1.ebuild
rename to dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r2.ebuild
index 928ce27e5f42db92bf516ab72bda9ae93514b996..a281238922d167b4a0c15119163739b84c7d712d 100644 (file)
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r1.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -32,7 +32,7 @@ RDEPEND="
        dev-python/sip[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/py3.patch" )
+PATCHES=( "${FILESDIR}/py3.patch" "${FILESDIR}/gentoo.patch" )
 
 if [ "${PV#9999}" != "${PV}" ] ; then
        S=${WORKDIR}/${P}/python_orocos_kdl

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 036c759d0b7ead0f083d33b6dee7991dc9656c22..2d7c7184c9061b0f2eab1b64e0d639bebcc02068 100644 (file)
--- 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-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -32,6 +32,7 @@ RDEPEND="
        dev-python/sip[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/gentoo.patch" )
 
 if [ "${PV#9999}" != "${PV}" ] ; then
        S=${WORKDIR}/${P}/python_orocos_kdl