dev-python/python_orocos_kdl: fix build

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier@gentoo.org>

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 6c8d93ed62e7..000000000000
--- 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 12ffb7c93b4f..767537fafa58 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 12ffb7c93b4f..767537fafa58 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"
 }