summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2016-10-07 18:16:33 +0200
committerAlexis Ballier <aballier@gentoo.org>2016-10-07 18:16:40 +0200
commit388afd787a605fcaa732f3863cd88bbc8f461059 (patch)
treeceeb434791182ffa35fb57b3206eb2f872e51faa
parentdev-ros/mavlink-gbp-release: nstall package.xml in /usr/share/ros_packages/$PN (diff)
downloadgentoo-388afd787a605fcaa732f3863cd88bbc8f461059.tar.gz
gentoo-388afd787a605fcaa732f3863cd88bbc8f461059.tar.bz2
gentoo-388afd787a605fcaa732f3863cd88bbc8f461059.zip
dev-python/python_orocos_kdl: install package.xml in /usr/share/ros_packages/$PN
Package-Manager: portage-2.3.1
-rw-r--r--dev-python/python_orocos_kdl/files/gentoo.patch11
-rw-r--r--dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r2.ebuild (renamed from dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r1.ebuild)4
-rw-r--r--dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild3
3 files changed, 15 insertions, 3 deletions
diff --git a/dev-python/python_orocos_kdl/files/gentoo.patch b/dev-python/python_orocos_kdl/files/gentoo.patch
new file mode 100644
index 00000000000..f5e66384365
--- /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
index 928ce27e5f4..a281238922d 100644
--- 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 036c759d0b7..2d7c7184c90 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-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