1 |
commit: fb1d5acebd21da9856b796632880466163197dfe |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 28 10:44:33 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=fb1d5ace |
7 |
|
8 |
dev-python/python_orocos_kdl: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
dev-python/python_orocos_kdl/Manifest | 1 - |
13 |
dev-python/python_orocos_kdl/files/gentoo.patch | 12 ----- |
14 |
dev-python/python_orocos_kdl/files/py3.patch | 58 ---------------------- |
15 |
.../python_orocos_kdl-1.3.0-r2.ebuild | 57 --------------------- |
16 |
4 files changed, 128 deletions(-) |
17 |
|
18 |
diff --git a/dev-python/python_orocos_kdl/Manifest b/dev-python/python_orocos_kdl/Manifest |
19 |
index a695dc0384..a441a3f027 100644 |
20 |
--- a/dev-python/python_orocos_kdl/Manifest |
21 |
+++ b/dev-python/python_orocos_kdl/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST orocos_kinematics_dynamics-1.3.0.tar.gz 200229 SHA256 7be2dd5e4f4c1ceac2cdf1f4fae3d94d4ffd9fc1af8d483c05f04e80ef84b3f9 SHA512 09ff63f74f1eac3ee8b1090364e0d95b4ae96c9d4435ca34adacb3ded7385f948ddca9be2c1c2c2214c9342b17bbffb7da89ba9b7cd402e7fd4f2c6dbd06a930 WHIRLPOOL 4085fa4aba77e0c24a3c1aab4ab5f98e8b349037525e6a596ff027075ea1dcd33c4f13fa3abd61bbe6a2a3bd13b62616d7b614c030ecda8343be3ed59406bae6 |
24 |
DIST orocos_kinematics_dynamics-1.3.1.tar.gz 202471 SHA256 aff361d2b4e2c6d30ae959308a124022eeef5dc5bea2ce779900f9b36b0537bd SHA512 93abd9dd5aef3710f784f9db8eea4738458bffa5295923993e2d77656c18f7354559412fb7eb5f1e9da7112de19aa36d3f0f68f149852f955bce960fd3b719e7 WHIRLPOOL b7b4d897f4d5f170b73fe5bb48e357051ae37a244b9c44e8c2f120d71fc75c80cc1f69d30cb1463bbe10658ba0af98965f18f3055436910f24ebaab0ce1bd8e7 |
25 |
|
26 |
diff --git a/dev-python/python_orocos_kdl/files/gentoo.patch b/dev-python/python_orocos_kdl/files/gentoo.patch |
27 |
deleted file mode 100644 |
28 |
index 571ee03482..0000000000 |
29 |
--- a/dev-python/python_orocos_kdl/files/gentoo.patch |
30 |
+++ /dev/null |
31 |
@@ -1,12 +0,0 @@ |
32 |
-Index: python_orocos_kdl/CMakeLists.txt |
33 |
-=================================================================== |
34 |
---- python_orocos_kdl.orig/CMakeLists.txt |
35 |
-+++ python_orocos_kdl/CMakeLists.txt |
36 |
-@@ -21,4 +21,5 @@ set(SIP_EXTRA_OPTIONS "-o") |
37 |
- set(PYTHON_SITE_PACKAGES_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE_PACKAGES}) |
38 |
- add_sip_python_module(PyKDL PyKDL/PyKDL.sip ${orocos_kdl_LIBRARIES}) |
39 |
- |
40 |
--install(FILES package.xml DESTINATION share/python_orocos_kdl) |
41 |
-\ No newline at end of file |
42 |
-+install(FILES package.xml DESTINATION share/python_orocos_kdl) |
43 |
-+install(FILES package.xml DESTINATION share/ros_packages/python_orocos_kdl) |
44 |
|
45 |
diff --git a/dev-python/python_orocos_kdl/files/py3.patch b/dev-python/python_orocos_kdl/files/py3.patch |
46 |
deleted file mode 100644 |
47 |
index dd22f2d412..0000000000 |
48 |
--- a/dev-python/python_orocos_kdl/files/py3.patch |
49 |
+++ /dev/null |
50 |
@@ -1,58 +0,0 @@ |
51 |
-Upstream status: Pending. |
52 |
-https://github.com/orocos/orocos_kinematics_dynamics/pull/44 |
53 |
- |
54 |
-Index: orocos_kinematics_dynamics-1.3.0/python_orocos_kdl/CMakeLists.txt |
55 |
-=================================================================== |
56 |
---- orocos_kinematics_dynamics-1.3.0.orig/python_orocos_kdl/CMakeLists.txt |
57 |
-+++ orocos_kinematics_dynamics-1.3.0/python_orocos_kdl/CMakeLists.txt |
58 |
-@@ -8,7 +8,7 @@ link_directories(${orocos_kdl_LIBRARY_DI |
59 |
- |
60 |
- find_package(PythonInterp REQUIRED) |
61 |
- find_package(PythonLibs ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} REQUIRED) |
62 |
--execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(plat_specific=True, prefix='')" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE) |
63 |
-+execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True, prefix=''))" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE) |
64 |
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) |
65 |
- find_package(SIP REQUIRED) |
66 |
- include(SIPMacros) |
67 |
-Index: orocos_kinematics_dynamics-1.3.0/python_orocos_kdl/PyKDL/std_string.sip |
68 |
-=================================================================== |
69 |
---- orocos_kinematics_dynamics-1.3.0.orig/python_orocos_kdl/PyKDL/std_string.sip |
70 |
-+++ orocos_kinematics_dynamics-1.3.0/python_orocos_kdl/PyKDL/std_string.sip |
71 |
-@@ -27,7 +27,7 @@ |
72 |
- newstring = PyUnicode_DecodeUTF8(sipCpp->c_str(), sipCpp->length(), NULL); |
73 |
- if(newstring == NULL) { |
74 |
- PyErr_Clear(); |
75 |
-- newstring = PyString_FromString(sipCpp->c_str()); |
76 |
-+ newstring = PyUnicode_FromString(sipCpp->c_str()); |
77 |
- } |
78 |
- return newstring; |
79 |
- %End |
80 |
-@@ -38,21 +38,27 @@ |
81 |
- // If argument is a Unicode string, just decode it to UTF-8 |
82 |
- // If argument is a Python string, assume it's UTF-8 |
83 |
- if (sipIsErr == NULL) |
84 |
-+#if PY_MAJOR_VERSION < 3 |
85 |
- return (PyString_Check(sipPy) || PyUnicode_Check(sipPy)); |
86 |
-+#else |
87 |
-+ return PyUnicode_Check(sipPy); |
88 |
-+#endif |
89 |
- if (sipPy == Py_None) { |
90 |
- *sipCppPtr = new std::string; |
91 |
- return 1; |
92 |
- } |
93 |
- if (PyUnicode_Check(sipPy)) { |
94 |
- PyObject* s = PyUnicode_AsEncodedString(sipPy, "UTF-8", ""); |
95 |
-- *sipCppPtr = new std::string(PyString_AS_STRING(s)); |
96 |
-+ *sipCppPtr = new std::string(PyUnicode_AS_DATA(s)); |
97 |
- Py_DECREF(s); |
98 |
- return 1; |
99 |
- } |
100 |
-+#if PY_MAJOR_VERSION < 3 |
101 |
- if (PyString_Check(sipPy)) { |
102 |
- *sipCppPtr = new std::string(PyString_AS_STRING(sipPy)); |
103 |
- return 1; |
104 |
- } |
105 |
-+#endif |
106 |
- |
107 |
- return 0; |
108 |
- %End |
109 |
|
110 |
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r2.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r2.ebuild |
111 |
deleted file mode 100644 |
112 |
index 040977f5ca..0000000000 |
113 |
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r2.ebuild |
114 |
+++ /dev/null |
115 |
@@ -1,57 +0,0 @@ |
116 |
-# Copyright 1999-2016 Gentoo Foundation |
117 |
-# Distributed under the terms of the GNU General Public License v2 |
118 |
-# $Id$ |
119 |
- |
120 |
-EAPI=5 |
121 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
122 |
- |
123 |
-SCM="" |
124 |
-if [ "${PV#9999}" != "${PV}" ] ; then |
125 |
- SCM="git-r3" |
126 |
- EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics" |
127 |
-fi |
128 |
- |
129 |
-inherit ${SCM} python-r1 cmake-utils |
130 |
- |
131 |
-if [ "${PV#9999}" != "${PV}" ] ; then |
132 |
- KEYWORDS="" |
133 |
- SRC_URI="" |
134 |
-else |
135 |
- KEYWORDS="~amd64 ~arm" |
136 |
- SRC_URI="https://github.com/orocos/orocos_kinematics_dynamics/archive/v${PV}.tar.gz -> orocos_kinematics_dynamics-${PV}.tar.gz" |
137 |
-fi |
138 |
- |
139 |
-DESCRIPTION="Python bindings for KDL" |
140 |
-HOMEPAGE="http://www.orocos.org/kdl" |
141 |
-LICENSE="LGPL-2.1" |
142 |
-SLOT="0" |
143 |
-IUSE="" |
144 |
- |
145 |
-RDEPEND=" |
146 |
- sci-libs/orocos_kdl |
147 |
- dev-python/sip[${PYTHON_USEDEP}] |
148 |
-" |
149 |
-DEPEND="${RDEPEND}" |
150 |
-PATCHES=( "${FILESDIR}/py3.patch" "${FILESDIR}/gentoo.patch" ) |
151 |
- |
152 |
-if [ "${PV#9999}" != "${PV}" ] ; then |
153 |
- S=${WORKDIR}/${P}/python_orocos_kdl |
154 |
-else |
155 |
- S=${WORKDIR}/orocos_kinematics_dynamics-${PV}/python_orocos_kdl |
156 |
-fi |
157 |
- |
158 |
-src_configure() { |
159 |
- python_foreach_impl cmake-utils_src_configure |
160 |
-} |
161 |
- |
162 |
-src_compile() { |
163 |
- python_foreach_impl cmake-utils_src_compile |
164 |
-} |
165 |
- |
166 |
-src_test() { |
167 |
- python_foreach_impl cmake-utils_src_test |
168 |
-} |
169 |
- |
170 |
-src_install() { |
171 |
- python_foreach_impl cmake-utils_src_install |
172 |
-} |