gentoo resync : 13.11.2021

3 files changed, 72 insertions, 23 deletions

diff --git a/dev-python/python_orocos_kdl/Manifest b/dev-python/python_orocos_kdl/Manifest
index 8feff88f7e9d..765faf2bc570 100644
--- a/dev-python/python_orocos_kdl/Manifest
+++ b/dev-python/python_orocos_kdl/Manifest
@@ -1,4 +1,6 @@
 DIST orocos_kinematics_dynamics-1.5.0.tar.gz 251515 BLAKE2B 53c14354b0833867b6fd030cde91c9524b6f0537ea0d0f3977e7aeb8482030edd5723a571030e8b78e4d6d01eba38c6a8e5c49d66c49c4b1b0f2e7a3d8159c74 SHA512 5fc9c336d6ed31ad59a5bdf6ee06444cac29beae090b9026b34f35a3cb4cdf1cd6c33af621205b8d6a5201070e679531c8b5bbdeb8a91cd1d8061153b0e47e49
+DIST orocos_kinematics_dynamics-1.5.1.tar.gz 251074 BLAKE2B 6be8171c3ce3bc6613fc342b8d3c772de766bfab78c5530364339ce2f9c4a37e6bc5519482f30939b210d9cb9e7899b3da66784a5c301653493212bc690917a8 SHA512 9774b76b755ea81168390643813789783f60d0b1cdb46cd250e3e0d27f75a6cf2fd3bfd2081c04e30a14ff4fc70d0080c9b43b82ee181c2dda82f23f052b338d
 EBUILD python_orocos_kdl-1.5.0.ebuild 1513 BLAKE2B 65134936ded2bfc06912b2fa15aa7eb9eb9eaab717f01ae29431f7ebedb08e74a856d9b734ce84266ea2921cd01dd87c60840f1f48e63db73b4ebe4b64d0896b SHA512 285b544d07eff109415b9c92b5dcfce5e4f5df3f920d6bec6903969b7942dbeab2a51cbef5fa3a4b19c415850bcb5ba51c1b0c82a73115dcd94db3915103e7dc
-EBUILD python_orocos_kdl-9999.ebuild 1513 BLAKE2B 65134936ded2bfc06912b2fa15aa7eb9eb9eaab717f01ae29431f7ebedb08e74a856d9b734ce84266ea2921cd01dd87c60840f1f48e63db73b4ebe4b64d0896b SHA512 285b544d07eff109415b9c92b5dcfce5e4f5df3f920d6bec6903969b7942dbeab2a51cbef5fa3a4b19c415850bcb5ba51c1b0c82a73115dcd94db3915103e7dc
+EBUILD python_orocos_kdl-1.5.1.ebuild 1383 BLAKE2B 5afe5e59334c474d1e59fe4b2d16257a7a45326e3ce3b313e6b6f6e7b347758646f993358ef3b5d6ae1d74a74d20a3d584df86f08f891d26a90de714f8b11c45 SHA512 99bd926c539914067505d606d221a201977498152243bcbd7b720e5e0fb6b61b9a4881eb0e7ca08f25aa30b81584df51081fd522ac52f00cce8ad2102acdf539
+EBUILD python_orocos_kdl-9999.ebuild 1383 BLAKE2B 5afe5e59334c474d1e59fe4b2d16257a7a45326e3ce3b313e6b6f6e7b347758646f993358ef3b5d6ae1d74a74d20a3d584df86f08f891d26a90de714f8b11c45 SHA512 99bd926c539914067505d606d221a201977498152243bcbd7b720e5e0fb6b61b9a4881eb0e7ca08f25aa30b81584df51081fd522ac52f00cce8ad2102acdf539
 MISC metadata.xml 348 BLAKE2B 24d15c62289bd5137e3faf1375eac0664a376eea167ca46192ddfb04e2d6ffa1992efe8ebc1844c984f3d359d1898d4461c007795e2bf9e8663f28ad47d8fe57 SHA512 a7d33155beab65af1f583ced9eed5f76e6e3121a1eb9ae65cf11eb3e1245bb8c26f8c6da0f716db6248558b202aa8b019f607257713e7c9e33bd016e64c123ca
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.5.1.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.5.1.ebuild
new file mode 100644
index 000000000000..3c9273f16a74
--- /dev/null
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.5.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-r1 cmake
+
+DESCRIPTION="Python bindings for KDL"
+HOMEPAGE="https://www.orocos.org/kdl"
+if [[ ${PV} = *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
+	S="${WORKDIR}/${P}/python_orocos_kdl"
+else
+	SRC_URI="https://github.com/orocos/orocos_kinematics_dynamics/archive/v${PV}.tar.gz -> orocos_kinematics_dynamics-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+	S="${WORKDIR}/orocos_kinematics_dynamics-${PV}/python_orocos_kdl"
+fi
+
+# pybind11 strips targets at build otherwise...
+# https://bugs.gentoo.org/806857
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=sci-libs/orocos_kdl-1.4.0:=
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+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
+}
+
+src_compile() {
+	python_foreach_impl cmake_src_compile
+}
+
+src_test() {
+	python_foreach_impl cmake_src_test
+}
+
+src_install() {
+	python_foreach_impl cmake_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
index cb5f4ef382d9..3c9273f16a74 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
@@ -2,32 +2,28 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_8,3_9,3_10} )
 
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-r1 cmake
+
+DESCRIPTION="Python bindings for KDL"
+HOMEPAGE="https://www.orocos.org/kdl"
+if [[ ${PV} = *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
+	S="${WORKDIR}/${P}/python_orocos_kdl"
+else
+	SRC_URI="https://github.com/orocos/orocos_kinematics_dynamics/archive/v${PV}.tar.gz -> orocos_kinematics_dynamics-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+	S="${WORKDIR}/orocos_kinematics_dynamics-${PV}/python_orocos_kdl"
 fi
 
 # pybind11 strips targets at build otherwise...
 # https://bugs.gentoo.org/806857
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
-inherit ${SCM} python-r1 cmake
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/orocos/orocos_kinematics_dynamics/archive/v${PV}.tar.gz -> orocos_kinematics_dynamics-${PV}.tar.gz"
-fi
-
-DESCRIPTION="Python bindings for KDL"
-HOMEPAGE="https://www.orocos.org/kdl"
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
@@ -36,12 +32,6 @@ RDEPEND="
 	dev-python/pybind11[${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_prepare() {
 	sed -e 's/find_package(catkin/find_package(NoTcatkin/' \
 		-e 's/add_subdirectory(pybind11/find_package(pybind11/' \