commit: af1f8224368ed2ad5dc3fe32a17b4c909076c959 Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net> AuthorDate: Sat Apr 3 17:14:47 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Apr 4 21:28:05 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af1f8224
sci-libs/orocos_kdl: bump to EAPI 7 Port to cmake.eclass using ninja Bugday 2021-04-03 Bug: https://bugs.gentoo.org/770595 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net> Closes: https://github.com/gentoo/gentoo/pull/20248 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch | 22 ++++++ ....0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch | 27 ++++++++ sci-libs/orocos_kdl/orocos_kdl-1.4.0-r1.ebuild | 81 ++++++++++++++++++++++ 3 files changed, 130 insertions(+) diff --git a/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch b/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch new file mode 100644 index 00000000000..d3205b55628 --- /dev/null +++ b/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch @@ -0,0 +1,22 @@ +From 719735a7d36f079f63c4be06bf3118581f628562 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gen...@posteo.net> +Date: Sat, 3 Apr 2021 18:39:42 +0200 +Subject: [PATCH] don't install kdl.tag file + +Signed-off-by: Bernd Waibel <waebbl-gen...@posteo.net> +--- + doc/CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt +index dcc81b0..cc1774e 100644 +--- a/doc/CMakeLists.txt ++++ b/doc/CMakeLists.txt +@@ -1,4 +1,3 @@ + + CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in" "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile" IMMEDIATE @ONLY) + ADD_CUSTOM_TARGET(docs "doxygen" "Doxyfile") +-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdl.tag DESTINATION share/doc/liborocos-kdl/ OPTIONAL) # only installs if found. +-- +2.31.1 + diff --git a/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch b/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch new file mode 100644 index 00000000000..fe7eb126f84 --- /dev/null +++ b/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch @@ -0,0 +1,27 @@ +From 54e66339b734639dc42b63b65a8a4b100f2549c3 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gen...@posteo.net> +Date: Sat, 3 Apr 2021 18:46:42 +0200 +Subject: [PATCH] add LIB_SUFFIX in pkg-config file + +Add the LIB_SUFFIX suffix to the libdir variable +in the kdl.pc.in file. + +Signed-off-by: Bernd Waibel <waebbl-gen...@posteo.net> +--- + src/kdl.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/kdl.pc.in b/src/kdl.pc.in +index 49e2ab9..1650e2e 100644 +--- a/src/kdl.pc.in ++++ b/src/kdl.pc.in +@@ -1,5 +1,5 @@ + prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=${prefix}/lib ++libdir=${prefix}/lib@LIB_SUFFIX@ + includedir=${prefix}/include + + Name: orocos-kdl +-- +2.31.1 + diff --git a/sci-libs/orocos_kdl/orocos_kdl-1.4.0-r1.ebuild b/sci-libs/orocos_kdl/orocos_kdl-1.4.0-r1.ebuild new file mode 100644 index 00000000000..175a5740937 --- /dev/null +++ b/sci-libs/orocos_kdl/orocos_kdl-1.4.0-r1.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Kinematics and Dynamics Library (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}/${PN}" +else + SRC_URI="https://github.com/orocos/orocos_kinematics_dynamics/archive/v${PV}.tar.gz -> orocos_kinematics_dynamics-${PV}.tar.gz" + KEYWORDS="~amd64 ~arm ~x86" + S="${WORKDIR}/orocos_kinematics_dynamics-${PV}/${PN}" +fi + +LICENSE="LGPL-2.1" +SLOT="0/14" +IUSE="doc examples models test" +REQUIRED_USE="examples? ( models )" +RESTRICT="!test? ( test )" + +RDEPEND="dev-cpp/eigen:3" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( app-doc/doxygen[dot] ) + test? ( dev-util/cppunit ) +" + +PATCHES=( + "${FILESDIR}"/${P}-0001-don-t-install-kdl.tag-file.patch + "${FILESDIR}"/${P}-0002-add-LIB_SUFFIX-in-pkg-config-file.patch +) + +src_configure() { + local mycmakeargs=( + -DBUILD_MODELS=$(usex models ON OFF) + -DENABLE_EXAMPLES=$(usex examples) + -DENABLE_TESTS=$(usex test) + ) + if use examples; then + mycmakeargs+=( + -DBUILD_MODELS_DEMO=ON + ) + fi + cmake_src_configure +} + +src_compile() { + cmake_src_compile + if use doc; then + cmake_build docs + rm "${BUILD_DIR}/doc/kdl.tag" || die + fi +} + +src_test() { + pushd "${BUILD_DIR}" > /dev/null || die + eninja check + popd > /dev/null || die +} + +src_install() { + use doc && local HTML_DOCS=( "${BUILD_DIR}/doc/api/html/." ) + cmake_src_install + + if use examples; then + docompress -x /usr/share/doc/${PF}/examples + docinto examples + dodoc -r "${S}"/examples/. + fi + + # Need to have package.xml in our custom gentoo path + insinto /usr/share/ros_packages/${PN} + doins "${ED}/usr/share/${PN}/package.xml" + rm "${ED}/usr/share/${PN}/package.xml" || die +}
