Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/sci-libs/orocos_kdl
diff options
context:
space:
mode:
Diffstat (limited to 'sci-libs/orocos_kdl')
-rw-r--r--sci-libs/orocos_kdl/Manifest2
-rw-r--r--sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch22
-rw-r--r--sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch27
-rw-r--r--sci-libs/orocos_kdl/metadata.xml2
-rw-r--r--sci-libs/orocos_kdl/orocos_kdl-1.5.1.ebuild (renamed from sci-libs/orocos_kdl/orocos_kdl-1.4.0-r2.ebuild)19
-rw-r--r--sci-libs/orocos_kdl/orocos_kdl-9999.ebuild16
6 files changed, 13 insertions, 75 deletions
diff --git a/sci-libs/orocos_kdl/Manifest b/sci-libs/orocos_kdl/Manifest
index 1e4e4131ca21..6da107deeaef 100644
--- a/sci-libs/orocos_kdl/Manifest
+++ b/sci-libs/orocos_kdl/Manifest
@@ -1 +1 @@
-DIST orocos_kinematics_dynamics-1.4.0.tar.gz 215004 BLAKE2B 02ca44195af2ae2bd5c2293869893c56846501e2055ca1cacef602ffdd44824fc618ed528d351ee2212b7c087ff5e69438ab87e9fb8813d8a4eb4c143fdbfd27 SHA512 7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8
+DIST orocos_kinematics_dynamics-1.5.1.tar.gz 251074 BLAKE2B 6be8171c3ce3bc6613fc342b8d3c772de766bfab78c5530364339ce2f9c4a37e6bc5519482f30939b210d9cb9e7899b3da66784a5c301653493212bc690917a8 SHA512 9774b76b755ea81168390643813789783f60d0b1cdb46cd250e3e0d27f75a6cf2fd3bfd2081c04e30a14ff4fc70d0080c9b43b82ee181c2dda82f23f052b338d
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
deleted file mode 100644
index d3205b556284..000000000000
--- a/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644
index fe7eb126f84b..000000000000
--- a/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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/metadata.xml b/sci-libs/orocos_kdl/metadata.xml
index 8e818f01bbf4..1977fd3cda9e 100644
--- a/sci-libs/orocos_kdl/metadata.xml
+++ b/sci-libs/orocos_kdl/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>aballier@gentoo.org</email>
diff --git a/sci-libs/orocos_kdl/orocos_kdl-1.4.0-r2.ebuild b/sci-libs/orocos_kdl/orocos_kdl-1.5.1.ebuild
index 175baf488d17..496d229c6a7c 100644
--- a/sci-libs/orocos_kdl/orocos_kdl-1.4.0-r2.ebuild
+++ b/sci-libs/orocos_kdl/orocos_kdl-1.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,12 +14,12 @@ if [[ ${PV} = *9999 ]]; then
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"
+ KEYWORDS="amd64 ~arm ~x86"
S="${WORKDIR}/orocos_kinematics_dynamics-${PV}/${PN}"
fi
LICENSE="LGPL-2.1"
-SLOT="0/14"
+SLOT="0/15"
IUSE="doc examples models test"
REQUIRED_USE="examples? ( models )"
RESTRICT="!test? ( test )"
@@ -27,16 +27,13 @@ RESTRICT="!test? ( test )"
RDEPEND="dev-cpp/eigen:3"
DEPEND="${RDEPEND}"
BDEPEND="
- doc? ( app-doc/doxygen[dot] )
+ doc? ( app-text/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() {
+ # disable catkin support
+ sed -e 's/find_package(catkin/find_package(NoTcatkin/' -i CMakeLists.txt || die
local mycmakeargs=(
-DBUILD_MODELS=$(usex models ON OFF)
-DENABLE_EXAMPLES=$(usex examples)
@@ -73,8 +70,4 @@ src_install() {
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-9999.ebuild b/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
index d50c631a39c3..30eebff8b84d 100644
--- a/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
+++ b/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,7 +19,7 @@ else
fi
LICENSE="LGPL-2.1"
-SLOT="0/14"
+SLOT="0/15"
IUSE="doc examples models test"
REQUIRED_USE="examples? ( models )"
RESTRICT="!test? ( test )"
@@ -27,15 +27,13 @@ RESTRICT="!test? ( test )"
RDEPEND="dev-cpp/eigen:3"
DEPEND="${RDEPEND}"
BDEPEND="
- doc? ( app-doc/doxygen[dot] )
+ doc? ( app-text/doxygen[dot] )
test? ( dev-util/cppunit )
"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.4.0-0001-don-t-install-kdl.tag-file.patch
-)
-
src_configure() {
+ # disable catkin support
+ sed -e 's/find_package(catkin/find_package(NoTcatkin/' -i CMakeLists.txt || die
local mycmakeargs=(
-DBUILD_MODELS=$(usex models ON OFF)
-DENABLE_EXAMPLES=$(usex examples)
@@ -72,8 +70,4 @@ src_install() {
docinto examples
dodoc -r "${S}"/examples/.
fi
-
- # Need to have package.xml in our custom gentoo path
- insinto /usr/share/ros_packages/${PN}
- doins "${S}/package.xml"
}