diff options
Diffstat (limited to 'sci-libs/orocos_kdl')
| -rw-r--r-- | sci-libs/orocos_kdl/Manifest | 8 | ||||
| -rw-r--r-- | sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch | 22 | ||||
| -rw-r--r-- | sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch | 27 | ||||
| -rw-r--r-- | sci-libs/orocos_kdl/orocos_kdl-1.5.0.ebuild (renamed from sci-libs/orocos_kdl/orocos_kdl-1.4.0-r2.ebuild) | 13 | ||||
| -rw-r--r-- | sci-libs/orocos_kdl/orocos_kdl-9999.ebuild | 12 |
5 files changed, 9 insertions, 73 deletions
diff --git a/sci-libs/orocos_kdl/Manifest b/sci-libs/orocos_kdl/Manifest index a8c0b2ab730d..006efabe1859 100644 --- a/sci-libs/orocos_kdl/Manifest +++ b/sci-libs/orocos_kdl/Manifest @@ -1,6 +1,4 @@ -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-r2.ebuild 1782 BLAKE2B a0788001c6eab7a3c5208776b47a6aa07ee00e71f530bd1d07134a696e94e5c101f00672faf8a9b50291ac033402f07e35cfb8f3c9cc9c349b48df2c9b7af7b2 SHA512 4130d847b169ca69a0a7ab3da52b5c2cc034eb155b78881e426557760800b20e60bdf5be353f72c0fb4ae229d7577389bdf2f2083645875bbdba94d0adbb2c9e -EBUILD orocos_kdl-9999.ebuild 1707 BLAKE2B 0f42c6fe09c59e3e91c20aa24fc3f20bc4288e5ca321ff0b801d0ff269118d73b3848a65d7a1cce2d1ee348fc5ea0c07664a456423a8546acdabcf103cd1816f SHA512 bb290e4d6a1667aa98f9a80deea798ef3d7ca54ab8fb1315f57afbdbb9dd9f54f6d53a490f0562e02f880320092c19e7912cd69fa4b58e7b1a346ecf421405f4 +DIST orocos_kinematics_dynamics-1.5.0.tar.gz 251515 BLAKE2B 53c14354b0833867b6fd030cde91c9524b6f0537ea0d0f3977e7aeb8482030edd5723a571030e8b78e4d6d01eba38c6a8e5c49d66c49c4b1b0f2e7a3d8159c74 SHA512 5fc9c336d6ed31ad59a5bdf6ee06444cac29beae090b9026b34f35a3cb4cdf1cd6c33af621205b8d6a5201070e679531c8b5bbdeb8a91cd1d8061153b0e47e49 +EBUILD orocos_kdl-1.5.0.ebuild 1616 BLAKE2B 3b7daf7074e00e3d735e330a53b09964eeb685d3771814798e40cb75d717779e73f028d7e7bd23612f8cb106c04b6e3d429f3c1fbea99a96daf55d3c3e386484 SHA512 ea14a1fa34bb8ff8ff83529f5e5990a5829cfcdf26382a1d97fbde7367cd4c6c0017ea368fb2e1766d055483f8c350c5957a33f77adc87f0668ec246892be8b3 +EBUILD orocos_kdl-9999.ebuild 1616 BLAKE2B 3b7daf7074e00e3d735e330a53b09964eeb685d3771814798e40cb75d717779e73f028d7e7bd23612f8cb106c04b6e3d429f3c1fbea99a96daf55d3c3e386484 SHA512 ea14a1fa34bb8ff8ff83529f5e5990a5829cfcdf26382a1d97fbde7367cd4c6c0017ea368fb2e1766d055483f8c350c5957a33f77adc87f0668ec246892be8b3 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 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/orocos_kdl-1.4.0-r2.ebuild b/sci-libs/orocos_kdl/orocos_kdl-1.5.0.ebuild index 175baf488d17..bb20a06d821c 100644 --- a/sci-libs/orocos_kdl/orocos_kdl-1.4.0-r2.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 d50c631a39c3..bb20a06d821c 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" } |