gentoo resync : 25.11.2020

4 files changed, 23 insertions, 23 deletions

diff --git a/dev-python/python_orocos_kdl/Manifest b/dev-python/python_orocos_kdl/Manifest
index a9cc71fdfd5f..c601ec1a347d 100644
--- a/dev-python/python_orocos_kdl/Manifest
+++ b/dev-python/python_orocos_kdl/Manifest
@@ -1,5 +1,5 @@
-AUX 0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch 4287 BLAKE2B f3dead6103ff71bccb2ed535fb8e95e4cf0679b57d5ae5bf3ee5888b60c5853db9998ca90ede222b6a2162ec378f76c8bd90aebef1a5747fe95adf4d9b3743fe SHA512 c2bb4a8593de9ed5f9c819939466ba25181d02163000edaaa5130931f20d0fb77cfba587025465e4d086f956d86e3b8574ca2d0ca8e350ff793ca59d5f0db95e
+AUX 0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch 4179 BLAKE2B 376165750100ca16cc1ce21825b4ada44f90847f0b126d1fb96e9afa8279f3629e89470a2fdec0a12a1a855896aedacdbea64b799f7e929da3fa0bbe3b076630 SHA512 5300db08820cce2584da4a4f5e45ffd7d047d5dd0e5cb9bada7e967bb894e07d86760241db437b16973d1ea47d80bd94bcddd1be2435886b1767a0f19384350c
 DIST orocos_kinematics_dynamics-1.4.0.tar.gz 215004 BLAKE2B 02ca44195af2ae2bd5c2293869893c56846501e2055ca1cacef602ffdd44824fc618ed528d351ee2212b7c087ff5e69438ab87e9fb8813d8a4eb4c143fdbfd27 SHA512 7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8
-EBUILD python_orocos_kdl-1.4.0-r1.ebuild 1440 BLAKE2B 61121d421f7eb521c8b784559bc2e8228dcaa32f9217b97557519eb5a0635f57e9a399f903000c62a85215942c3edf8c00d06923d8a14b36b07e1e74773d6c88 SHA512 c86bda45241932f1890c20868dbfa08a0296763c08d4ec1244fb4e6051d6731985ac992e147899629e074c238f99176ce6f4ae8e62575ac7aa4dc50cbfe3106a
-EBUILD python_orocos_kdl-9999.ebuild 1350 BLAKE2B c0ef6a5b62097d40f4f075841dcdfa5be72060e70e6d17ce277fdda4a3d2fc9a596e32698ecf628fec422863cdb6d98d1793876c96aba0533cda6e66d649f165 SHA512 d85586c93404943304671969e1ed51cb160bff98d9b46b70bca94e2f90e78a2a26e39f78b9b41b3d82c38153c957cc230a8e818cd17738750d31b2765f3ba92a
+EBUILD python_orocos_kdl-1.4.0-r1.ebuild 1414 BLAKE2B 241ef2f028861641a0fe8ff4d600af00e439b4121c5870302678555b6cde3e5b0203c03ec9933829d6a07e30ae3580c00f71e311c366b8530771e82fa7e6496c SHA512 e64c606c1dd0dd8830b53765d7890588255c16f0e403e90fc5759a108b922999e0e095170369f9b8f4f00a6ff6c3c669c03dfe0651deeb26f8fbdbeea113cd4b
+EBUILD python_orocos_kdl-9999.ebuild 1324 BLAKE2B 928e9a4b8b80833b0d4b727960f518ac3f2f7e4249f7f5b497125300c97d8a47559b8f0b29d3986258bae424089072df192aa9873afe34727244bbfc6f8a0e37 SHA512 71c25a35f3eab7ffd98e3c08b1ff6469c156d15da621aaaba4fb9ad7209dfa6cea1ab0de9b3a99b6d4e2f8894b838e418ee8476dc3ce4eee4cfcc7bd54f34bde
 MISC metadata.xml 347 BLAKE2B f798f437c41d07bbcf1918138506db38727087f9437d0abb5082bde5802cc5f7a29173d788fb8b8b8f6c150f5f1c642795dbde30e848512e6d1f9ada39a951d9 SHA512 a32a6de7eece8df29d9542f14dccacb7d046e7205af6bd996d41279175111c9416cddf78cc8a87e2319cc1b25bf880b38e8d2d0573ba6747820a5c328d809074
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 b02f18747cfe..6c8d93ed62e7 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 a1f82a9e03ef..dbb79e0ff7f7 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 06e204006f9f..228748e30394 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}