Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/python_orocos_kdl/, dev-python/python_orocos_kdl/files/
Date: Fri, 07 Oct 2016 16:16:55
Message-Id: 1475857000.388afd787a605fcaa732f3863cd88bbc8f461059.aballier@gentoo
1 commit: 388afd787a605fcaa732f3863cd88bbc8f461059
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 7 16:16:33 2016 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 7 16:16:40 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=388afd78
7
8 dev-python/python_orocos_kdl: install package.xml in /usr/share/ros_packages/$PN
9
10 Package-Manager: portage-2.3.1
11
12 dev-python/python_orocos_kdl/files/gentoo.patch | 11 +++++++++++
13 ..._kdl-1.3.0-r1.ebuild => python_orocos_kdl-1.3.0-r2.ebuild} | 4 ++--
14 dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild | 3 ++-
15 3 files changed, 15 insertions(+), 3 deletions(-)
16
17 diff --git a/dev-python/python_orocos_kdl/files/gentoo.patch b/dev-python/python_orocos_kdl/files/gentoo.patch
18 new file mode 100644
19 index 00000000..f5e6638
20 --- /dev/null
21 +++ b/dev-python/python_orocos_kdl/files/gentoo.patch
22 @@ -0,0 +1,11 @@
23 +Index: python_orocos_kdl/CMakeLists.txt
24 +===================================================================
25 +--- python_orocos_kdl.orig/CMakeLists.txt
26 ++++ python_orocos_kdl/CMakeLists.txt
27 +@@ -21,4 +21,4 @@ set(SIP_EXTRA_OPTIONS "-o")
28 + set(PYTHON_SITE_PACKAGES_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE_PACKAGES})
29 + add_sip_python_module(PyKDL PyKDL/PyKDL.sip ${orocos_kdl_LIBRARIES})
30 +
31 +-install(FILES package.xml DESTINATION share/python_orocos_kdl)
32 +\ No newline at end of file
33 ++install(FILES package.xml DESTINATION share/ros_packages/python_orocos_kdl)
34
35 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
36 similarity index 91%
37 rename from dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r1.ebuild
38 rename to dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r2.ebuild
39 index 928ce27..a281238 100644
40 --- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r1.ebuild
41 +++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r2.ebuild
42 @@ -1,4 +1,4 @@
43 -# Copyright 1999-2014 Gentoo Foundation
44 +# Copyright 1999-2016 Gentoo Foundation
45 # Distributed under the terms of the GNU General Public License v2
46 # $Id$
47
48 @@ -32,7 +32,7 @@ RDEPEND="
49 dev-python/sip[${PYTHON_USEDEP}]
50 "
51 DEPEND="${RDEPEND}"
52 -PATCHES=( "${FILESDIR}/py3.patch" )
53 +PATCHES=( "${FILESDIR}/py3.patch" "${FILESDIR}/gentoo.patch" )
54
55 if [ "${PV#9999}" != "${PV}" ] ; then
56 S=${WORKDIR}/${P}/python_orocos_kdl
57
58 diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
59 index 036c759..2d7c718 100644
60 --- a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
61 +++ b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
62 @@ -1,4 +1,4 @@
63 -# Copyright 1999-2014 Gentoo Foundation
64 +# Copyright 1999-2016 Gentoo Foundation
65 # Distributed under the terms of the GNU General Public License v2
66 # $Id$
67
68 @@ -32,6 +32,7 @@ RDEPEND="
69 dev-python/sip[${PYTHON_USEDEP}]
70 "
71 DEPEND="${RDEPEND}"
72 +PATCHES=( "${FILESDIR}/gentoo.patch" )
73
74 if [ "${PV#9999}" != "${PV}" ] ; then
75 S=${WORKDIR}/${P}/python_orocos_kdl