gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-25 07:08:13 -07:00
Code Issues Projects Releases Wiki Activity

sci-libs/orocos_kdl: remove catkin support

Browse Source 
and unused patches
and bump subslot

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
This commit is contained in:
Alexis Ballier
2021-08-06 16:02:23 +02:00
parent 141c788f5a
commit 01e128e3a3
4 changed files with 6 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch
View File

@@ -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

27
sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch
View File

@@ -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

13
sci-libs/orocos_kdl/orocos_kdl-1.5.0.ebuild
View File

@@ -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 )"
@@ -31,12 +31,9 @@ BDEPEND="
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"
}

12
sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
View File

@@ -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 )"
@@ -31,11 +31,9 @@ BDEPEND="
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"
}