* [gentoo-commits] repo/gentoo:master commit in: dev-python/python_orocos_kdl/files/, dev-python/python_orocos_kdl/
@ 2021-08-06 14:35 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2021-08-06 14:35 UTC (permalink / raw
To: gentoo-commits
commit: 87bd36a3ee50b8b44083f3d7e3bf74616180d0a9
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 6 14:30:09 2021 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Aug 6 14:35:50 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87bd36a3
dev-python/python_orocos_kdl: fix build
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
...ignment-operator-private-for-SIP-Closes-2.patch | 134 ---------------------
.../python_orocos_kdl-1.5.0.ebuild | 14 ++-
.../python_orocos_kdl-9999.ebuild | 14 ++-
3 files changed, 18 insertions(+), 144 deletions(-)
diff --git a/dev-python/python_orocos_kdl/files/0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch b/dev-python/python_orocos_kdl/files/0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch
deleted file mode 100644
index 6c8d93ed62e..00000000000
--- a/dev-python/python_orocos_kdl/files/0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-https://bugs.gentoo.org/728618
-
-Backported by Victor Mataré
-
-From 30e5057f01627539dd170a1e831bb14278433deb Mon Sep 17 00:00:00 2001
-From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
-Date: Fri, 26 Jun 2020 17:04:12 +0200
-Subject: [PATCH] Declare assignment operator private for SIP (Closes: #260)
-
-Starting with v4.19.23 SIP expects a working operator= or one marked
-private explicitly. All classes in this PR have a reference member
-(&chain) resulting in the compiler deleting the default assignment
-operator. This PR makes this known to SIP as well.
----
- python_orocos_kdl/PyKDL/dynamics.sip | 3 +++
- python_orocos_kdl/PyKDL/kinfam.sip | 29 ++++++++++++++++++++++++++++
- 2 files changed, 32 insertions(+)
-
-diff --git a/PyKDL/dynamics.sip b/python_orocos_kdl/PyKDL/dynamics.sip
-index e0096dd..36f833c 100644
---- a/PyKDL/dynamics.sip
-+++ b/PyKDL/dynamics.sip
-@@ -72,4 +72,7 @@ public:
- int JntToCoriolis(const JntArray &q, const JntArray &q_dot, JntArray &coriolis);
- int JntToMass(const JntArray &q, JntSpaceInertiaMatrix& H);
- int JntToGravity(const JntArray &q,JntArray &gravity);
-+
-+private:
-+ ChainDynParam& operator=(const ChainDynParam&);
- };
-diff --git a/PyKDL/kinfam.sip b/python_orocos_kdl/PyKDL/kinfam.sip
-index d87fd00..e87ceb8 100644
---- a/PyKDL/kinfam.sip
-+++ b/PyKDL/kinfam.sip
-@@ -344,6 +344,9 @@ public:
- ChainFkSolverPos_recursive(const Chain& chain);
- virtual int JntToCart(const JntArray& q_in, Frame& p_out,int segmentNr=-1);
- virtual void updateInternalDataStructures();
-+
-+private:
-+ ChainFkSolverPos_recursive& operator=(const ChainFkSolverPos_recursive&);
- };
-
- class ChainFkSolverVel_recursive : ChainFkSolverVel
-@@ -357,6 +360,9 @@ public:
- virtual int JntToCart(const JntArrayVel& q_in ,FrameVel& out,int
- segmentNr=-1 );
- virtual void updateInternalDataStructures();
-+
-+private:
-+ ChainFkSolverVel_recursive& operator=(const ChainFkSolverVel_recursive&);
- };
-
- class ChainIkSolverPos : SolverI {
-@@ -392,6 +398,9 @@ public:
-
- virtual int CartToJnt(const JntArray& q_init , const Frame& p_in ,JntArray& q_out);
- virtual void updateInternalDataStructures();
-+
-+private:
-+ ChainIkSolverPos_NR& operator=(const ChainIkSolverPos_NR&);
- };
-
- class ChainIkSolverPos_NR_JL : ChainIkSolverPos
-@@ -407,6 +416,9 @@ public:
-
- virtual int CartToJnt(const JntArray& q_init , const Frame& p_in ,JntArray& q_out);
- virtual void updateInternalDataStructures();
-+
-+private:
-+ ChainIkSolverPos_NR_JL& operator=(const ChainIkSolverPos_NR_JL&);
- };
-
- class ChainIkSolverVel_pinv : ChainIkSolverVel
-@@ -420,6 +432,9 @@ public:
-
- virtual int CartToJnt(const JntArray& q_in, const Twist& v_in, JntArray& qdot_out);
- virtual void updateInternalDataStructures();
-+
-+private:
-+ ChainIkSolverVel_pinv& operator=(const ChainIkSolverVel_pinv&);
- };
-
- class ChainIkSolverVel_wdls : ChainIkSolverVel
-@@ -506,6 +521,8 @@ public:
-
- void setLambda(const double& lambda);
-
-+private:
-+ ChainIkSolverVel_wdls& operator=(const ChainIkSolverVel_wdls&);
- };
-
-
-@@ -520,6 +537,9 @@ public:
-
- virtual int CartToJnt(const JntArray& q_init , const Frame& p_in ,JntArray& q_out);
- virtual void updateInternalDataStructures();
-+
-+private:
-+ ChainIkSolverPos_LMA& operator=(const ChainIkSolverPos_LMA&);
- };
-
-
-@@ -546,6 +566,9 @@ public:
- const JntArray& getOptPos()const /Factory/;
-
- const double& getAlpha()const /Factory/;
-+
-+private:
-+ ChainIkSolverVel_pinv_nso& operator=(const ChainIkSolverVel_pinv_nso&);
- };
-
- class ChainIkSolverVel_pinv_givens : ChainIkSolverVel
-@@ -559,6 +582,9 @@ public:
-
- virtual int CartToJnt(const JntArray& q_in, const Twist& v_in, JntArray& qdot_out);
- virtual void updateInternalDataStructures();
-+
-+private:
-+ ChainIkSolverVel_pinv_givens& operator=(const ChainIkSolverVel_pinv_givens&);
- };
-
- class ChainJntToJacSolver : SolverI
-@@ -571,4 +597,7 @@ public:
- ChainJntToJacSolver(const Chain& chain);
- int JntToJac(const JntArray& q_in,Jacobian& jac);
- virtual void updateInternalDataStructures();
-+
-+private:
-+ ChainJntToJacSolver& operator=(const ChainJntToJacSolver&);
- };
---
-2.27.0
-
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.5.0.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.5.0.ebuild
index 12ffb7c93b4..767537fafa5 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.5.0.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.5.0.ebuild
@@ -29,7 +29,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
${PYTHON_DEPS}
>=sci-libs/orocos_kdl-1.4.0:=
- <dev-python/sip-5[${PYTHON_USEDEP}]"
+ dev-python/pybind11[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}"
if [ "${PV#9999}" != "${PV}" ] ; then
@@ -38,6 +38,14 @@ else
S=${WORKDIR}/orocos_kinematics_dynamics-${PV}/python_orocos_kdl
fi
+src_prepare() {
+ sed -e 's/find_package(catkin/find_package(NoTcatkin/' \
+ -e 's/add_subdirectory(pybind11/find_package(pybind11/' \
+ -e 's/dist-packages/site-packages/' \
+ -i CMakeLists.txt || die
+ cmake_src_prepare
+}
+
src_configure() {
python_foreach_impl cmake_src_configure
}
@@ -52,8 +60,4 @@ src_test() {
src_install() {
python_foreach_impl cmake_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 12ffb7c93b4..767537fafa5 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
@@ -29,7 +29,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
${PYTHON_DEPS}
>=sci-libs/orocos_kdl-1.4.0:=
- <dev-python/sip-5[${PYTHON_USEDEP}]"
+ dev-python/pybind11[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}"
if [ "${PV#9999}" != "${PV}" ] ; then
@@ -38,6 +38,14 @@ else
S=${WORKDIR}/orocos_kinematics_dynamics-${PV}/python_orocos_kdl
fi
+src_prepare() {
+ sed -e 's/find_package(catkin/find_package(NoTcatkin/' \
+ -e 's/add_subdirectory(pybind11/find_package(pybind11/' \
+ -e 's/dist-packages/site-packages/' \
+ -i CMakeLists.txt || die
+ cmake_src_prepare
+}
+
src_configure() {
python_foreach_impl cmake_src_configure
}
@@ -52,8 +60,4 @@ src_test() {
src_install() {
python_foreach_impl cmake_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"
}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/python_orocos_kdl/files/, dev-python/python_orocos_kdl/
@ 2020-10-13 12:24 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2020-10-13 12:24 UTC (permalink / raw
To: gentoo-commits
commit: 56a2f42fd91994056b8ea403a2953ecd0aa199ae
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 12:22:35 2020 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 12:24:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56a2f42f
dev-python/python_orocos_kdl: add py39
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
...lare-assignment-operator-private-for-SIP-Closes-2.patch | 12 ++++++------
.../python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild | 14 +++++++-------
dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild | 14 +++++++-------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/dev-python/python_orocos_kdl/files/0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch b/dev-python/python_orocos_kdl/files/0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch
index b02f18747cf..6c8d93ed62e 100644
--- a/dev-python/python_orocos_kdl/files/0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch
+++ b/dev-python/python_orocos_kdl/files/0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch
@@ -16,10 +16,10 @@ operator. This PR makes this known to SIP as well.
python_orocos_kdl/PyKDL/kinfam.sip | 29 ++++++++++++++++++++++++++++
2 files changed, 32 insertions(+)
-diff --git a/python_orocos_kdl/PyKDL/dynamics.sip b/python_orocos_kdl/PyKDL/dynamics.sip
+diff --git a/PyKDL/dynamics.sip b/python_orocos_kdl/PyKDL/dynamics.sip
index e0096dd..36f833c 100644
---- a/python_orocos_kdl/PyKDL/dynamics.sip
-+++ b/python_orocos_kdl/PyKDL/dynamics.sip
+--- a/PyKDL/dynamics.sip
++++ b/PyKDL/dynamics.sip
@@ -72,4 +72,7 @@ public:
int JntToCoriolis(const JntArray &q, const JntArray &q_dot, JntArray &coriolis);
int JntToMass(const JntArray &q, JntSpaceInertiaMatrix& H);
@@ -28,10 +28,10 @@ index e0096dd..36f833c 100644
+private:
+ ChainDynParam& operator=(const ChainDynParam&);
};
-diff --git a/python_orocos_kdl/PyKDL/kinfam.sip b/python_orocos_kdl/PyKDL/kinfam.sip
+diff --git a/PyKDL/kinfam.sip b/python_orocos_kdl/PyKDL/kinfam.sip
index d87fd00..e87ceb8 100644
---- a/python_orocos_kdl/PyKDL/kinfam.sip
-+++ b/python_orocos_kdl/PyKDL/kinfam.sip
+--- a/PyKDL/kinfam.sip
++++ b/PyKDL/kinfam.sip
@@ -344,6 +344,9 @@ public:
ChainFkSolverPos_recursive(const Chain& chain);
virtual int JntToCart(const JntArray& q_in, Frame& p_out,int segmentNr=-1);
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
index a1f82a9e03e..dbb79e0ff7f 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+EAPI=7
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
SCM=""
if [ "${PV#9999}" != "${PV}" ] ; then
@@ -10,7 +10,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
fi
-inherit ${SCM} python-r1 cmake-utils
+inherit ${SCM} python-r1 cmake
if [ "${PV#9999}" != "${PV}" ] ; then
KEYWORDS=""
@@ -41,19 +41,19 @@ else
fi
src_configure() {
- python_foreach_impl cmake-utils_src_configure
+ python_foreach_impl cmake_src_configure
}
src_compile() {
- python_foreach_impl cmake-utils_src_compile
+ python_foreach_impl cmake_src_compile
}
src_test() {
- python_foreach_impl cmake-utils_src_test
+ python_foreach_impl cmake_src_test
}
src_install() {
- python_foreach_impl cmake-utils_src_install
+ python_foreach_impl cmake_src_install
# Need to have package.xml in our custom gentoo path
insinto /usr/share/ros_packages/${PN}
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 06e204006f9..228748e3039 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+EAPI=7
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
SCM=""
if [ "${PV#9999}" != "${PV}" ] ; then
@@ -10,7 +10,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
fi
-inherit ${SCM} python-r1 cmake-utils
+inherit ${SCM} python-r1 cmake
if [ "${PV#9999}" != "${PV}" ] ; then
KEYWORDS=""
@@ -40,19 +40,19 @@ else
fi
src_configure() {
- python_foreach_impl cmake-utils_src_configure
+ python_foreach_impl cmake_src_configure
}
src_compile() {
- python_foreach_impl cmake-utils_src_compile
+ python_foreach_impl cmake_src_compile
}
src_test() {
- python_foreach_impl cmake-utils_src_test
+ python_foreach_impl cmake_src_test
}
src_install() {
- python_foreach_impl cmake-utils_src_install
+ python_foreach_impl cmake_src_install
# Need to have package.xml in our custom gentoo path
insinto /usr/share/ros_packages/${PN}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/python_orocos_kdl/files/, dev-python/python_orocos_kdl/
@ 2017-02-28 11:27 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2017-02-28 11:27 UTC (permalink / raw
To: gentoo-commits
commit: e5a802869b1eb1c8300176a550d290b24f347e78
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 09:34:35 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 11:26:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5a80286
dev-python/python_orocos_kdl: Install package.xml in ros_packages and standard location.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-python/python_orocos_kdl/files/gentoo.patch | 3 ++-
...ython_orocos_kdl-1.3.1.ebuild => python_orocos_kdl-1.3.1-r1.ebuild} | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dev-python/python_orocos_kdl/files/gentoo.patch b/dev-python/python_orocos_kdl/files/gentoo.patch
index f5e6638436..571ee03482 100644
--- a/dev-python/python_orocos_kdl/files/gentoo.patch
+++ b/dev-python/python_orocos_kdl/files/gentoo.patch
@@ -2,10 +2,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")
+@@ -21,4 +21,5 @@ 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/python_orocos_kdl)
+install(FILES package.xml DESTINATION share/ros_packages/python_orocos_kdl)
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.1.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.1-r1.ebuild
similarity index 96%
rename from dev-python/python_orocos_kdl/python_orocos_kdl-1.3.1.ebuild
rename to dev-python/python_orocos_kdl/python_orocos_kdl-1.3.1-r1.ebuild
index 89a4b94a28..227c40d706 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.1.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.1-r1.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$
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/python_orocos_kdl/files/, dev-python/python_orocos_kdl/
@ 2015-09-17 11:59 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2015-09-17 11:59 UTC (permalink / raw
To: gentoo-commits
commit: 62a295688c3af8ea72516065a898bd675eeaeb52
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 17 11:58:58 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 11:59:44 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62a29568
dev-python/python_orocos_kdl: initial import. ebuild by me.
Package-Manager: portage-2.2.20.1
dev-python/python_orocos_kdl/Manifest | 1 +
dev-python/python_orocos_kdl/files/py3.patch | 58 ++++++++++++++++++++++
dev-python/python_orocos_kdl/metadata.xml | 5 ++
.../python_orocos_kdl-1.3.0.ebuild | 57 +++++++++++++++++++++
.../python_orocos_kdl-9999.ebuild | 56 +++++++++++++++++++++
5 files changed, 177 insertions(+)
diff --git a/dev-python/python_orocos_kdl/Manifest b/dev-python/python_orocos_kdl/Manifest
new file mode 100644
index 0000000..1e0cce1
--- /dev/null
+++ b/dev-python/python_orocos_kdl/Manifest
@@ -0,0 +1 @@
+DIST orocos_kinematics_dynamics-1.3.0.tar.gz 200229 SHA256 7be2dd5e4f4c1ceac2cdf1f4fae3d94d4ffd9fc1af8d483c05f04e80ef84b3f9 SHA512 09ff63f74f1eac3ee8b1090364e0d95b4ae96c9d4435ca34adacb3ded7385f948ddca9be2c1c2c2214c9342b17bbffb7da89ba9b7cd402e7fd4f2c6dbd06a930 WHIRLPOOL 4085fa4aba77e0c24a3c1aab4ab5f98e8b349037525e6a596ff027075ea1dcd33c4f13fa3abd61bbe6a2a3bd13b62616d7b614c030ecda8343be3ed59406bae6
diff --git a/dev-python/python_orocos_kdl/files/py3.patch b/dev-python/python_orocos_kdl/files/py3.patch
new file mode 100644
index 0000000..dd22f2d
--- /dev/null
+++ b/dev-python/python_orocos_kdl/files/py3.patch
@@ -0,0 +1,58 @@
+Upstream status: Pending.
+https://github.com/orocos/orocos_kinematics_dynamics/pull/44
+
+Index: orocos_kinematics_dynamics-1.3.0/python_orocos_kdl/CMakeLists.txt
+===================================================================
+--- orocos_kinematics_dynamics-1.3.0.orig/python_orocos_kdl/CMakeLists.txt
++++ orocos_kinematics_dynamics-1.3.0/python_orocos_kdl/CMakeLists.txt
+@@ -8,7 +8,7 @@ link_directories(${orocos_kdl_LIBRARY_DI
+
+ find_package(PythonInterp REQUIRED)
+ find_package(PythonLibs ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} REQUIRED)
+-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)
++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)
+ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+ find_package(SIP REQUIRED)
+ include(SIPMacros)
+Index: orocos_kinematics_dynamics-1.3.0/python_orocos_kdl/PyKDL/std_string.sip
+===================================================================
+--- orocos_kinematics_dynamics-1.3.0.orig/python_orocos_kdl/PyKDL/std_string.sip
++++ orocos_kinematics_dynamics-1.3.0/python_orocos_kdl/PyKDL/std_string.sip
+@@ -27,7 +27,7 @@
+ newstring = PyUnicode_DecodeUTF8(sipCpp->c_str(), sipCpp->length(), NULL);
+ if(newstring == NULL) {
+ PyErr_Clear();
+- newstring = PyString_FromString(sipCpp->c_str());
++ newstring = PyUnicode_FromString(sipCpp->c_str());
+ }
+ return newstring;
+ %End
+@@ -38,21 +38,27 @@
+ // If argument is a Unicode string, just decode it to UTF-8
+ // If argument is a Python string, assume it's UTF-8
+ if (sipIsErr == NULL)
++#if PY_MAJOR_VERSION < 3
+ return (PyString_Check(sipPy) || PyUnicode_Check(sipPy));
++#else
++ return PyUnicode_Check(sipPy);
++#endif
+ if (sipPy == Py_None) {
+ *sipCppPtr = new std::string;
+ return 1;
+ }
+ if (PyUnicode_Check(sipPy)) {
+ PyObject* s = PyUnicode_AsEncodedString(sipPy, "UTF-8", "");
+- *sipCppPtr = new std::string(PyString_AS_STRING(s));
++ *sipCppPtr = new std::string(PyUnicode_AS_DATA(s));
+ Py_DECREF(s);
+ return 1;
+ }
++#if PY_MAJOR_VERSION < 3
+ if (PyString_Check(sipPy)) {
+ *sipCppPtr = new std::string(PyString_AS_STRING(sipPy));
+ return 1;
+ }
++#endif
+
+ return 0;
+ %End
diff --git a/dev-python/python_orocos_kdl/metadata.xml b/dev-python/python_orocos_kdl/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-python/python_orocos_kdl/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild
new file mode 100644
index 0000000..5b48080
--- /dev/null
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+ SCM="git-r3"
+ EGIT_REPO_URI="http://github.com/orocos/orocos_kinematics_dynamics"
+fi
+
+inherit ${SCM} python-r1 cmake-utils
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+ SRC_URI=""
+else
+ KEYWORDS="~amd64 ~arm"
+ SRC_URI="http://github.com/orocos/orocos_kinematics_dynamics/archive/v${PV}.tar.gz -> orocos_kinematics_dynamics-${PV}.tar.gz"
+fi
+
+DESCRIPTION="Python bindings for KDL"
+HOMEPAGE="http://www.orocos.org/kdl"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ sci-libs/orocos_kdl
+ dev-python/sip[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/py3.patch" )
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+ S=${WORKDIR}/${P}/python_orocos_kdl
+else
+ S=${WORKDIR}/orocos_kinematics_dynamics-${PV}/python_orocos_kdl
+fi
+
+src_configure() {
+ python_foreach_impl cmake-utils_src_configure
+}
+
+src_compile() {
+ python_foreach_impl cmake-utils_src_compile
+}
+
+src_test() {
+ python_foreach_impl cmake-utils_src_test
+}
+
+src_install() {
+ python_foreach_impl cmake-utils_src_install
+}
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
new file mode 100644
index 0000000..0d22bd2
--- /dev/null
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+ SCM="git-r3"
+ EGIT_REPO_URI="http://github.com/orocos/orocos_kinematics_dynamics"
+fi
+
+inherit ${SCM} python-r1 cmake-utils
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+ SRC_URI=""
+else
+ KEYWORDS="~amd64 ~arm"
+ SRC_URI="http://github.com/orocos/orocos_kinematics_dynamics/archive/v${PV}.tar.gz -> orocos_kinematics_dynamics-${PV}.tar.gz"
+fi
+
+DESCRIPTION="Python bindings for KDL"
+HOMEPAGE="http://www.orocos.org/kdl"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ sci-libs/orocos_kdl
+ dev-python/sip[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+ S=${WORKDIR}/${P}/python_orocos_kdl
+else
+ S=${WORKDIR}/orocos_kinematics_dynamics-${PV}/python_orocos_kdl
+fi
+
+src_configure() {
+ python_foreach_impl cmake-utils_src_configure
+}
+
+src_compile() {
+ python_foreach_impl cmake-utils_src_compile
+}
+
+src_test() {
+ python_foreach_impl cmake-utils_src_test
+}
+
+src_install() {
+ python_foreach_impl cmake-utils_src_install
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-08-06 14:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-06 14:35 [gentoo-commits] repo/gentoo:master commit in: dev-python/python_orocos_kdl/files/, dev-python/python_orocos_kdl/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2020-10-13 12:24 Alexis Ballier
2017-02-28 11:27 Alexis Ballier
2015-09-17 11:59 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox