* [gentoo-commits] repo/gentoo:master commit in: sci-libs/orocos_kdl/, sci-libs/orocos_kdl/files/
@ 2017-02-28 11:27 Alexis Ballier
0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier @ 2017-02-28 11:27 UTC (permalink / raw
To: gentoo-commits
commit: f44f9b521150adead631fdee000f8136f29fb977
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 10:41:51 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 11:26:50 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f44f9b52
sci-libs/orocos_kdl: Install package.xml in our custom gentoo path from ebuild instead of patching
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sci-libs/orocos_kdl/files/gentoo.patch | 10 ----------
.../{orocos_kdl-1.3.1.ebuild => orocos_kdl-1.3.1-r1.ebuild} | 7 +++++--
sci-libs/orocos_kdl/orocos_kdl-9999.ebuild | 7 +++++--
3 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/sci-libs/orocos_kdl/files/gentoo.patch b/sci-libs/orocos_kdl/files/gentoo.patch
deleted file mode 100644
index 3766e12f58..0000000000
--- a/sci-libs/orocos_kdl/files/gentoo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: orocos_kdl/CMakeLists.txt
-===================================================================
---- orocos_kdl.orig/CMakeLists.txt
-+++ orocos_kdl/CMakeLists.txt
-@@ -114,4 +114,4 @@ INSTALL(FILES ${PROJECT_BINARY_DIR}/oroc
- INSTALL(FILES ${PROJECT_BINARY_DIR}/orocos_kdl-config-version.cmake DESTINATION share/orocos_kdl)
- INSTALL(EXPORT OrocosKDLTargets DESTINATION share/orocos_kdl)
-
--INSTALL(FILES package.xml DESTINATION share/orocos_kdl)
-+INSTALL(FILES package.xml DESTINATION share/ros_packages/orocos_kdl)
diff --git a/sci-libs/orocos_kdl/orocos_kdl-1.3.1.ebuild b/sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.ebuild
similarity index 89%
rename from sci-libs/orocos_kdl/orocos_kdl-1.3.1.ebuild
rename to sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.ebuild
index fac689144b..8207c1ea2f 100644
--- a/sci-libs/orocos_kdl/orocos_kdl-1.3.1.ebuild
+++ b/sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -33,7 +33,6 @@ DEPEND="${RDEPEND}
REQUIRED_USE="examples? ( models )"
DOCS=( README )
-PATCHES=( "${FILESDIR}/gentoo.patch" )
if [ "${PV#9999}" != "${PV}" ] ; then
S=${WORKDIR}/${P}/orocos_kdl
@@ -66,4 +65,8 @@ 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 fac689144b..8207c1ea2f 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-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -33,7 +33,6 @@ DEPEND="${RDEPEND}
REQUIRED_USE="examples? ( models )"
DOCS=( README )
-PATCHES=( "${FILESDIR}/gentoo.patch" )
if [ "${PV#9999}" != "${PV}" ] ; then
S=${WORKDIR}/${P}/orocos_kdl
@@ -66,4 +65,8 @@ 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"
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/orocos_kdl/, sci-libs/orocos_kdl/files/
@ 2021-08-06 14:35 Alexis Ballier
0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier @ 2021-08-06 14:35 UTC (permalink / raw
To: gentoo-commits
commit: 01e128e3a34c87c5d8dca408bd48153e9a4894a0
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 6 14:02:23 2021 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Aug 6 14:35:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01e128e3
sci-libs/orocos_kdl: remove catkin support
and unused patches
and bump subslot
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier <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.5.0.ebuild | 13 +++--------
sci-libs/orocos_kdl/orocos_kdl-9999.ebuild | 12 +++-------
4 files changed, 6 insertions(+), 68 deletions(-)
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 d3205b55628..00000000000
--- 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 fe7eb126f84..00000000000
--- 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/orocos_kdl-1.5.0.ebuild b/sci-libs/orocos_kdl/orocos_kdl-1.5.0.ebuild
index 175baf488d1..bb20a06d821 100644
--- a/sci-libs/orocos_kdl/orocos_kdl-1.5.0.ebuild
+++ b/sci-libs/orocos_kdl/orocos_kdl-1.5.0.ebuild
@@ -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"
}
diff --git a/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild b/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
index d50c631a39c..bb20a06d821 100644
--- a/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
+++ b/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
@@ -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"
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-08-06 14:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-28 11:27 [gentoo-commits] repo/gentoo:master commit in: sci-libs/orocos_kdl/, sci-libs/orocos_kdl/files/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2021-08-06 14:35 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox