gentoo resync : 28.04.2021

6 files changed, 178 insertions, 110 deletions

diff --git a/sci-libs/orocos_kdl/Manifest b/sci-libs/orocos_kdl/Manifest
index 5776daa93832..a8c0b2ab730d 100644
--- a/sci-libs/orocos_kdl/Manifest
+++ b/sci-libs/orocos_kdl/Manifest
@@ -1,4 +1,6 @@
+AUX orocos_kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch 763 BLAKE2B 2d8c88ae2261b9f8689dc9900bb93d554656135c5507246db8b6280bce20a18e932b9ec69737adf7a00e32d384784681cbe95cc5b747b85d189be5356ab606b1 SHA512 e7cba8158efcf3b7638f344d717666070a545baf8b96e52bb9a10ed11575e062806569a3c5299c4439491709ebcc2eef1113623479b641df8ea1a45190a8938f
+AUX orocos_kdl-1.4.0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch 686 BLAKE2B ad47abd10972b668a8656be08c24fc1cca356e33177b2949aa3e9cc07022bd0d8bdfaf16daa4957cb81f84a3806f0617ee464e0c6067045520ad18e8cf85aa40 SHA512 1223b4f503d8f394a0c73c91c231e96e83b241f31afcc7dfb3ae7f7b6a96e367fa294bfa9759be4e8de419f00f18a489713fe25bf1a037dedd116da314856f1b
 DIST orocos_kinematics_dynamics-1.4.0.tar.gz 215004 BLAKE2B 02ca44195af2ae2bd5c2293869893c56846501e2055ca1cacef602ffdd44824fc618ed528d351ee2212b7c087ff5e69438ab87e9fb8813d8a4eb4c143fdbfd27 SHA512 7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8
-EBUILD orocos_kdl-1.4.0.ebuild 1636 BLAKE2B 34cf739206371c11710773f620f3f6b3dbacb8610322280e3cc3f5821cbd11ce5f534e83bbd658f99959be9ed11183e19c62e69fa053e01e0ce8e4f3b1a652be SHA512 68ea5df624f63c3e418ec924023a383a377165ba229de61bf28e9ee5980ff1fecf4f0e3ecad8659d26cb48c446072573ece4816f83e73e0a4fed525a4505095d
-EBUILD orocos_kdl-9999.ebuild 1636 BLAKE2B 34cf739206371c11710773f620f3f6b3dbacb8610322280e3cc3f5821cbd11ce5f534e83bbd658f99959be9ed11183e19c62e69fa053e01e0ce8e4f3b1a652be SHA512 68ea5df624f63c3e418ec924023a383a377165ba229de61bf28e9ee5980ff1fecf4f0e3ecad8659d26cb48c446072573ece4816f83e73e0a4fed525a4505095d
+EBUILD orocos_kdl-1.4.0-r2.ebuild 1782 BLAKE2B a0788001c6eab7a3c5208776b47a6aa07ee00e71f530bd1d07134a696e94e5c101f00672faf8a9b50291ac033402f07e35cfb8f3c9cc9c349b48df2c9b7af7b2 SHA512 4130d847b169ca69a0a7ab3da52b5c2cc034eb155b78881e426557760800b20e60bdf5be353f72c0fb4ae229d7577389bdf2f2083645875bbdba94d0adbb2c9e
+EBUILD orocos_kdl-9999.ebuild 1707 BLAKE2B 0f42c6fe09c59e3e91c20aa24fc3f20bc4288e5ca321ff0b801d0ff269118d73b3848a65d7a1cce2d1ee348fc5ea0c07664a456423a8546acdabcf103cd1816f SHA512 bb290e4d6a1667aa98f9a80deea798ef3d7ca54ab8fb1315f57afbdbb9dd9f54f6d53a490f0562e02f880320092c19e7912cd69fa4b58e7b1a346ecf421405f4
 MISC metadata.xml 934 BLAKE2B d82ddb6554a65a4221e67f46cfc6ff218c8caff71662090cd22332bc8f77c88b54c0ed8a7ccde53f00c6ef9c7faa386a82ca4654652ed7876c84105cd4426451 SHA512 09dc8b8c362da950ea685ee6cb2d7eb3ee400f34fca286fa0bf064f3cc4338a5ad2ca8917c951211e9407122a3bd7a1f23e5d394bfed901d6f69e9caefe5eaed
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 000000000000..d3205b556284
--- /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-gentoo@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-gentoo@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 000000000000..fe7eb126f84b
--- /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-gentoo@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-gentoo@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-r2.ebuild b/sci-libs/orocos_kdl/orocos_kdl-1.4.0-r2.ebuild
new file mode 100644
index 000000000000..175baf488d17
--- /dev/null
+++ b/sci-libs/orocos_kdl/orocos_kdl-1.4.0-r2.ebuild
@@ -0,0 +1,80 @@
+# 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"
+}
diff --git a/sci-libs/orocos_kdl/orocos_kdl-1.4.0.ebuild b/sci-libs/orocos_kdl/orocos_kdl-1.4.0.ebuild
deleted file mode 100644
index da34c1969851..000000000000
--- a/sci-libs/orocos_kdl/orocos_kdl-1.4.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
-fi
-
-inherit ${SCM} cmake-utils
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm ~x86"
-	SRC_URI="https://github.com/orocos/orocos_kinematics_dynamics/archive/v${PV}.tar.gz -> orocos_kinematics_dynamics-${PV}.tar.gz"
-fi
-
-DESCRIPTION="Kinematics and Dynamics Library (KDL)"
-HOMEPAGE="https://www.orocos.org/kdl"
-LICENSE="LGPL-2.1"
-SLOT="0/14"
-IUSE="doc test examples models"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-cpp/eigen:3"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cppunit )
-	doc? ( app-doc/doxygen )"
-REQUIRED_USE="examples? ( models )"
-
-DOCS=( README )
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	S=${WORKDIR}/${P}/orocos_kdl
-else
-	S=${WORKDIR}/orocos_kinematics_dynamics-${PV}/orocos_kdl
-fi
-
-src_configure() {
-	local mycmakeargs=(
-		"$(cmake-utils_use_enable test TESTS)"
-		"$(cmake-utils_use_enable examples EXAMPLES)"
-		"-DBUILD_MODELS=$(usex models ON OFF)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	cd "${BUILD_DIR}"
-	use doc && emake docs
-}
-
-src_test() {
-	cd "${BUILD_DIR}"
-	emake check
-}
-
-src_install() {
-	cmake-utils_src_install
-	cd "${BUILD_DIR}"
-	use doc && dohtml -r doc/api/html/*
-	use examples && dobin "${BUILD_DIR}/examples/"{geometry,trajectory_example,chainiksolverpos_lma_demo}
-
-	# 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/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild b/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
index da34c1969851..d50c631a39c3 100644
--- a/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
+++ b/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
@@ -1,71 +1,79 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
-fi
+inherit cmake
 
-inherit ${SCM} cmake-utils
+DESCRIPTION="Kinematics and Dynamics Library (KDL)"
+HOMEPAGE="https://www.orocos.org/kdl"
 
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
+	S="${WORKDIR}/${P}/${PN}"
 else
-	KEYWORDS="~amd64 ~arm ~x86"
 	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
 
-DESCRIPTION="Kinematics and Dynamics Library (KDL)"
-HOMEPAGE="https://www.orocos.org/kdl"
 LICENSE="LGPL-2.1"
 SLOT="0/14"
-IUSE="doc test examples models"
+IUSE="doc examples models test"
+REQUIRED_USE="examples? ( models )"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-cpp/eigen:3"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( app-doc/doxygen[dot] )
 	test? ( dev-util/cppunit )
-	doc? ( app-doc/doxygen )"
-REQUIRED_USE="examples? ( models )"
+"
 
-DOCS=( README )
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	S=${WORKDIR}/${P}/orocos_kdl
-else
-	S=${WORKDIR}/orocos_kinematics_dynamics-${PV}/orocos_kdl
-fi
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0-0001-don-t-install-kdl.tag-file.patch
+)
 
 src_configure() {
 	local mycmakeargs=(
-		"$(cmake-utils_use_enable test TESTS)"
-		"$(cmake-utils_use_enable examples EXAMPLES)"
-		"-DBUILD_MODELS=$(usex models ON OFF)"
+		-DBUILD_MODELS=$(usex models ON OFF)
+		-DENABLE_EXAMPLES=$(usex examples)
+		-DENABLE_TESTS=$(usex test)
 	)
-	cmake-utils_src_configure
+	if use examples; then
+		mycmakeargs+=(
+			-DBUILD_MODELS_DEMO=ON
+		)
+	fi
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
-	cd "${BUILD_DIR}"
-	use doc && emake docs
+	cmake_src_compile
+	if use doc; then
+		cmake_build docs
+		rm "${BUILD_DIR}/doc/kdl.tag" || die
+	fi
 }
 
 src_test() {
-	cd "${BUILD_DIR}"
-	emake check
+	pushd "${BUILD_DIR}" > /dev/null || die
+	eninja check
+	popd > /dev/null || die
 }
 
 src_install() {
-	cmake-utils_src_install
-	cd "${BUILD_DIR}"
-	use doc && dohtml -r doc/api/html/*
-	use examples && dobin "${BUILD_DIR}/examples/"{geometry,trajectory_example,chainiksolverpos_lma_demo}
+	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"
+	doins "${S}/package.xml"
 }