Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/interactive_markers/files/, dev-ros/interactive_markers/
Date: Sun, 10 Sep 2017 18:43:41
Message-Id: 1505069002.3f91ce15dd3a4e813bc48984bbfeeab22e302d67.aballier@gentoo
1 commit: 3f91ce15dd3a4e813bc48984bbfeeab22e302d67
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 10 18:35:58 2017 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 10 18:43:22 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f91ce15
7
8 dev-ros/interactive_markers: Remove old
9
10 Package-Manager: Portage-2.3.8, Repoman-2.3.3
11
12 dev-ros/interactive_markers/Manifest | 1 -
13 dev-ros/interactive_markers/files/tests.patch | 37 ----------------------
14 .../interactive_markers-1.11.1.ebuild | 29 -----------------
15 3 files changed, 67 deletions(-)
16
17 diff --git a/dev-ros/interactive_markers/Manifest b/dev-ros/interactive_markers/Manifest
18 index cb550e83a46..709ef1590c5 100644
19 --- a/dev-ros/interactive_markers/Manifest
20 +++ b/dev-ros/interactive_markers/Manifest
21 @@ -1,2 +1 @@
22 -DIST interactive_markers-1.11.1.tar.gz 29686 SHA256 cd426826681b769d5ae60ea379b6c607f5ca69462955058ab34b275c4a0028a0 SHA512 059a8f84ec86acd79733f76bcd10ba4dbcad38b69a644bac72cc8099ead6c62a1da89289af059fa8b17bddf2b5631c18ea88a69c7864b2b7246c9d8302c1d67e WHIRLPOOL 53963bb1b431238d9da54136e804c39a4b29ab57440c0f0cbe79e11dd13839b6f97bfde33a7aa86a8bc82a87d59f63234d5747094763a1263dd671d86835c93f
23 DIST interactive_markers-1.11.3.tar.gz 30201 SHA256 85f9fc72045cac4ef873f80fca9ce2d7dcfee8762024dd07427431b32760551a SHA512 9d4c44b67474aefae33498e03f7dfaafd2b28bef42a780900f3c9b3c7b119e0f899bc9220d449e44f071257dff093f7af745f97cb2e75fc949ed54f53c60d46c WHIRLPOOL 4f4423a79ebd9eb71ca928ea1891db6732706946e520b5d3b6d2b163ffe0dc19841c22f357bc1987ccfcf9015d1824adf7ea60c542cbb4072a7dbdb72fea70ae
24
25 diff --git a/dev-ros/interactive_markers/files/tests.patch b/dev-ros/interactive_markers/files/tests.patch
26 deleted file mode 100644
27 index 8dac7e8aca3..00000000000
28 --- a/dev-ros/interactive_markers/files/tests.patch
29 +++ /dev/null
30 @@ -1,37 +0,0 @@
31 -Upstream status: Pending
32 -https://github.com/ros-visualization/interactive_markers/pull/26
33 -
34 -commit e6b735989a15e840ba100bdd578b51caba614d37
35 -Author: Alexis Ballier <aballier@g.o>
36 -Date: Tue Feb 3 11:27:33 2015 +0100
37 -
38 - Fix build with -DCATKIN_ENABLE_TESTING=OFF
39 -
40 -diff --git a/CMakeLists.txt b/CMakeLists.txt
41 -index 0fbb8a9..2d6be3a 100644
42 ---- a/CMakeLists.txt
43 -+++ b/CMakeLists.txt
44 -@@ -55,14 +55,14 @@ if(GTEST_FOUND)
45 - target_link_libraries(server_client_test ${PROJECT_NAME} ${GTEST_LIBRARIES})
46 - add_dependencies(tests server_client_test)
47 - add_rostest(test/cpp_server_client.test)
48 --endif()
49 -
50 --# Test program to simulate Interactive Marker with missing tf information
51 --add_executable(bursty_tf EXCLUDE_FROM_ALL src/test/bursty_tf.cpp)
52 --target_link_libraries(bursty_tf ${PROJECT_NAME})
53 --add_dependencies(tests bursty_tf)
54 -+ # Test program to simulate Interactive Marker with missing tf information
55 -+ add_executable(bursty_tf EXCLUDE_FROM_ALL src/test/bursty_tf.cpp)
56 -+ target_link_libraries(bursty_tf ${PROJECT_NAME})
57 -+ add_dependencies(tests bursty_tf)
58 -
59 --# Test program to simulate Interactive Marker with wrong tf information
60 --add_executable(missing_tf EXCLUDE_FROM_ALL src/test/missing_tf.cpp)
61 --target_link_libraries(missing_tf ${PROJECT_NAME})
62 --add_dependencies(tests missing_tf)
63 -+ # Test program to simulate Interactive Marker with wrong tf information
64 -+ add_executable(missing_tf EXCLUDE_FROM_ALL src/test/missing_tf.cpp)
65 -+ target_link_libraries(missing_tf ${PROJECT_NAME})
66 -+ add_dependencies(tests missing_tf)
67 -+endif()
68
69 diff --git a/dev-ros/interactive_markers/interactive_markers-1.11.1.ebuild b/dev-ros/interactive_markers/interactive_markers-1.11.1.ebuild
70 deleted file mode 100644
71 index a311633471c..00000000000
72 --- a/dev-ros/interactive_markers/interactive_markers-1.11.1.ebuild
73 +++ /dev/null
74 @@ -1,29 +0,0 @@
75 -# Copyright 1999-2014 Gentoo Foundation
76 -# Distributed under the terms of the GNU General Public License v2
77 -
78 -EAPI=5
79 -
80 -ROS_REPO_URI="https://github.com/ros-visualization/interactive_markers"
81 -KEYWORDS="~amd64"
82 -PYTHON_COMPAT=( python2_7 )
83 -
84 -inherit ros-catkin
85 -
86 -DESCRIPTION="3D interactive marker communication library for RViz and similar tools"
87 -LICENSE="BSD"
88 -SLOT="0"
89 -IUSE=""
90 -
91 -RDEPEND="
92 - dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
93 - dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
94 - dev-ros/tf
95 - dev-ros/rospy[${PYTHON_USEDEP}]
96 - dev-ros/roscpp
97 - dev-ros/rosconsole
98 - dev-ros/rostest[${PYTHON_USEDEP}]
99 -"
100 -DEPEND="${RDEPEND}
101 - test? ( dev-cpp/gtest )"
102 -
103 -PATCHES=( "${FILESDIR}/tests.patch" )