From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- dev-ros/test_roscpp/Manifest | 12 ++++---- dev-ros/test_roscpp/files/boost.patch | 26 ----------------- dev-ros/test_roscpp/files/tests.patch | 12 ++++++++ dev-ros/test_roscpp/test_roscpp-1.14.3-r1.ebuild | 32 --------------------- dev-ros/test_roscpp/test_roscpp-1.15.4.ebuild | 31 -------------------- dev-ros/test_roscpp/test_roscpp-1.15.7.ebuild | 30 ++++++++++++++++++++ dev-ros/test_roscpp/test_roscpp-1.15.8.ebuild | 36 ++++++++++++++++++++++++ dev-ros/test_roscpp/test_roscpp-9999.ebuild | 15 ++++++---- 8 files changed, 94 insertions(+), 100 deletions(-) delete mode 100644 dev-ros/test_roscpp/files/boost.patch create mode 100644 dev-ros/test_roscpp/files/tests.patch delete mode 100644 dev-ros/test_roscpp/test_roscpp-1.14.3-r1.ebuild delete mode 100644 dev-ros/test_roscpp/test_roscpp-1.15.4.ebuild create mode 100644 dev-ros/test_roscpp/test_roscpp-1.15.7.ebuild create mode 100644 dev-ros/test_roscpp/test_roscpp-1.15.8.ebuild (limited to 'dev-ros/test_roscpp') diff --git a/dev-ros/test_roscpp/Manifest b/dev-ros/test_roscpp/Manifest index 8610b8f14a07..cd4330808e80 100644 --- a/dev-ros/test_roscpp/Manifest +++ b/dev-ros/test_roscpp/Manifest @@ -1,7 +1,7 @@ -AUX boost.patch 1046 BLAKE2B f74c7018f277fa2cb525f68602599127eba9fa43cd29b706960de70c3757f9e4e22a3491f3f2d549a0c20abcdf70051449765bc0bad24bfb018a96b5f30022be SHA512 9391547e16815bd065bb467f13468c020006aaac0e49b6b86505ea3aefc110a2a342b47cf3c235fd5522d9881a8c9c85e142c15f00e4b1a627c6be9516738d37 -DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3 -DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc -EBUILD test_roscpp-1.14.3-r1.ebuild 721 BLAKE2B 2cfdd691aedc99cda218504cacc6eeffcc96c75eed937fca3d5c2c04235363cc7a876ac87f6af5f1c318616aecb6c4838ea9d970bb2ce5991eb488175cd334bc SHA512 cf2c48391e89b87a39e3d368907a711a7ed7b470ce6ddcb676bd83dfe21df9c66d060c238307b333a38f3221ddc1a1e0d0cbb3614f7609120a60b4b0e8706622 -EBUILD test_roscpp-1.15.4.ebuild 683 BLAKE2B 1b890234f56dcc228bb2d1846de3c9a52bd4083634fafbf433daabcef6a388c5a6f59df7a9c820b4edf8d79f900b3f51b06514315cb9e62c0e271cf68e66a32b SHA512 c0dd1645817bfadae0ba1865cc219802378fbaaf0782d03784f3d14857ebade42c2380578bba87814e31b38ea0c10706e35d7712b399c2b0515eb5a150328b5b -EBUILD test_roscpp-9999.ebuild 686 BLAKE2B 913ebd162894a4839ac240006a07f9007384d8066f71fcbef889b020b1283e5d528edc297e9f81497a984e152b6d0f1d91149bbaf0cdb437b2a6074ea51b9326 SHA512 88523b4bd636f6c066a7132bb0509c92cdfbfdbf24db72adef2c4461358c31c40f5c4f7db655aecbc41766429b50f73f1c7e247b7a956fefe2184e9079cd8df8 +AUX tests.patch 512 BLAKE2B 1744807e87cdf18c3c2d74e971828a3f34986f2aff6c17e663e464a7ad522abdbaf96f20771c0f699ef24a5afd572a4a6431a7f21b851e95408e1c7c57032694 SHA512 2f923f01f7b5c869ff1279e6cb1d82f0699388c16caa615b84dd6b3f914355a79ffddb55491bea227980404ff85b3663f51c84e242d5540e3c88f10d912cdca7 +DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e +DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9 +EBUILD test_roscpp-1.15.7.ebuild 669 BLAKE2B 70791b7e565532c36eb3e6120c1a32824bfcfd46b14e141231f3909ebef51544cec10871114ed60707f42097a78091f48d48f90d65e4c406ae3273bca07161c6 SHA512 36cd0566c4887c7e7545610c83c11501a83a8d120006bf03b7b14f91cf221df1297efe10cc49abd0d8d2fa811542491091a87c1dddee77ab8032f5e2edd15612 +EBUILD test_roscpp-1.15.8.ebuild 796 BLAKE2B f70d279c5a51d662fd400a2950cdf7b4e76ad06194363b33bc25dfadda7c4e80c9fd71603c500fdc16d6f7642d6b61454840f28c0ed6e84388c729a697b1e1f6 SHA512 be11987a97ce19777f720e6f6ab7cff2b4babf28ab34938572e50caf4b8f5346ad051345325282ebef4c63ba5c11edb2d16cc68dc5cfa8edca198ef831b2e916 +EBUILD test_roscpp-9999.ebuild 796 BLAKE2B f70d279c5a51d662fd400a2950cdf7b4e76ad06194363b33bc25dfadda7c4e80c9fd71603c500fdc16d6f7642d6b61454840f28c0ed6e84388c729a697b1e1f6 SHA512 be11987a97ce19777f720e6f6ab7cff2b4babf28ab34938572e50caf4b8f5346ad051345325282ebef4c63ba5c11edb2d16cc68dc5cfa8edca198ef831b2e916 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45 diff --git a/dev-ros/test_roscpp/files/boost.patch b/dev-ros/test_roscpp/files/boost.patch deleted file mode 100644 index 41bac154d6ce..000000000000 --- a/dev-ros/test_roscpp/files/boost.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit 41f18edc9f2f0b1ef304ea25f148bd56a6bf3d70 -Author: Maarten de Vries -Date: Thu Jan 31 00:58:29 2019 +0100 - - Remove signals from find_package(Boost COMPONENTS ...) (#1580) - - The packages use signals2, not signals. Only boost libraries with - compiled code should be passed to find_package(Boost COMPONENTS ...), - and the signals2 library has always been header only. - - Boost 1.69 has removed the deprecated signals library, so the otherwise - useless but harmless `signals` component now breaks the build. - -diff --git a/test/test_roscpp/CMakeLists.txt b/test/test_roscpp/CMakeLists.txt -index 519767362..01c3d6672 100644 ---- a/test/test_roscpp/CMakeLists.txt -+++ b/test/test_roscpp/CMakeLists.txt -@@ -11,7 +11,7 @@ find_package(catkin REQUIRED COMPONENTS - ) - - if(CATKIN_ENABLE_TESTING) -- find_package(Boost REQUIRED COMPONENTS signals filesystem system) -+ find_package(Boost REQUIRED COMPONENTS filesystem system) - - include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}) - diff --git a/dev-ros/test_roscpp/files/tests.patch b/dev-ros/test_roscpp/files/tests.patch new file mode 100644 index 000000000000..80c18962dee0 --- /dev/null +++ b/dev-ros/test_roscpp/files/tests.patch @@ -0,0 +1,12 @@ +Index: test_roscpp/test/src/CMakeLists.txt +=================================================================== +--- test_roscpp.orig/test/src/CMakeLists.txt ++++ test_roscpp/test/src/CMakeLists.txt +@@ -290,6 +290,7 @@ if(TARGET tests) + ${PROJECT_NAME}-left_right + ${PROJECT_NAME}-string_msg_expect + ${PROJECT_NAME}-publisher ++ ${PROJECT_NAME}-publisher_rate + ${PROJECT_NAME}-subscriber + ${PROJECT_NAME}-stamped_topic_statistics_empty_timestamp + ${PROJECT_NAME}-topic_statistic_frequency diff --git a/dev-ros/test_roscpp/test_roscpp-1.14.3-r1.ebuild b/dev-ros/test_roscpp/test_roscpp-1.14.3-r1.ebuild deleted file mode 100644 index 8e988cf0c461..000000000000 --- a/dev-ros/test_roscpp/test_roscpp-1.14.3-r1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -ROS_REPO_URI="https://github.com/ros/ros_comm" -KEYWORDS="~amd64 ~arm" -ROS_SUBDIR=test/${PN} -CATKIN_HAS_MESSAGES=yes -PYTHON_COMPAT=( python2_7 ) -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs" - -inherit ros-catkin - -DESCRIPTION="Unit tests for roscpp" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-ros/roscpp - dev-ros/rostest[${PYTHON_USEDEP}] - dev-ros/rosunit[${PYTHON_USEDEP}] - dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-libs/boost:=[threads] - test? ( - dev-cpp/gtest - ) -" -REQUIRED_USE="test? ( ros_messages_cxx )" -PATCHES=( "${FILESDIR}/boost.patch" ) diff --git a/dev-ros/test_roscpp/test_roscpp-1.15.4.ebuild b/dev-ros/test_roscpp/test_roscpp-1.15.4.ebuild deleted file mode 100644 index e1720ee72889..000000000000 --- a/dev-ros/test_roscpp/test_roscpp-1.15.4.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -ROS_REPO_URI="https://github.com/ros/ros_comm" -KEYWORDS="~amd64 ~arm" -ROS_SUBDIR=test/${PN} -CATKIN_HAS_MESSAGES=yes -PYTHON_COMPAT=( python2_7 ) -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs" - -inherit ros-catkin - -DESCRIPTION="Unit tests for roscpp" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-ros/roscpp - dev-ros/rostest[${PYTHON_USEDEP}] - dev-ros/rosunit[${PYTHON_USEDEP}] - dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-libs/boost:=[threads] - test? ( - dev-cpp/gtest - ) -" -REQUIRED_USE="test? ( ros_messages_cxx )" diff --git a/dev-ros/test_roscpp/test_roscpp-1.15.7.ebuild b/dev-ros/test_roscpp/test_roscpp-1.15.7.ebuild new file mode 100644 index 000000000000..d1b28ba0acaa --- /dev/null +++ b/dev-ros/test_roscpp/test_roscpp-1.15.7.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=test/${PN} +CATKIN_HAS_MESSAGES=yes +CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs" + +inherit ros-catkin + +DESCRIPTION="Unit tests for roscpp" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND} + dev-ros/roscpp + dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] + dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}] + dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-libs/boost:=[threads] + test? ( + dev-cpp/gtest + ) +" +REQUIRED_USE="test? ( ros_messages_cxx )" diff --git a/dev-ros/test_roscpp/test_roscpp-1.15.8.ebuild b/dev-ros/test_roscpp/test_roscpp-1.15.8.ebuild new file mode 100644 index 000000000000..39bfc4bf09a4 --- /dev/null +++ b/dev-ros/test_roscpp/test_roscpp-1.15.8.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=test/${PN} +CATKIN_HAS_MESSAGES=yes +CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs" + +inherit ros-catkin + +DESCRIPTION="Unit tests for roscpp" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND} + dev-ros/roscpp + dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] + dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}] + dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-libs/boost:=[threads] + test? ( + dev-cpp/gtest + ) +" +REQUIRED_USE="test? ( ros_messages_cxx )" +PATCHES=( "${FILESDIR}/tests.patch" ) + +src_test() { + export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}" + ros-catkin_src_test +} diff --git a/dev-ros/test_roscpp/test_roscpp-9999.ebuild b/dev-ros/test_roscpp/test_roscpp-9999.ebuild index 13637bb57f1f..39bfc4bf09a4 100644 --- a/dev-ros/test_roscpp/test_roscpp-9999.ebuild +++ b/dev-ros/test_roscpp/test_roscpp-9999.ebuild @@ -1,13 +1,12 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 ROS_REPO_URI="https://github.com/ros/ros_comm" KEYWORDS="~amd64 ~arm" ROS_SUBDIR=test/${PN} CATKIN_HAS_MESSAGES=yes -PYTHON_COMPAT=( python2_7 ) CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs" inherit ros-catkin @@ -20,8 +19,8 @@ IUSE="" RDEPEND="" DEPEND="${RDEPEND} dev-ros/roscpp - dev-ros/rostest[${PYTHON_USEDEP}] - dev-ros/rosunit[${PYTHON_USEDEP}] + dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] + dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}] dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] dev-libs/boost:=[threads] test? ( @@ -29,3 +28,9 @@ DEPEND="${RDEPEND} ) " REQUIRED_USE="test? ( ros_messages_cxx )" +PATCHES=( "${FILESDIR}/tests.patch" ) + +src_test() { + export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}" + ros-catkin_src_test +} -- cgit v1.2.3