gentoo resync : 25.08.2020

5 files changed, 46 insertions, 70 deletions

diff --git a/dev-ros/interactive_markers/Manifest b/dev-ros/interactive_markers/Manifest
index 8648acd0904b..22019e8cfbf6 100644
--- a/dev-ros/interactive_markers/Manifest
+++ b/dev-ros/interactive_markers/Manifest
@@ -1,6 +1,4 @@
-DIST interactive_markers-1.11.3.tar.gz 30201 BLAKE2B 5f0ce32737bf6f61fe26ebbbaddf0222123fee26106eb0726817e6d2112bfa4861b0a2571beb2a94ed8d3fdeab6e8e4e0cf9820721349fddb82a68fe9e4adb5f SHA512 9d4c44b67474aefae33498e03f7dfaafd2b28bef42a780900f3c9b3c7b119e0f899bc9220d449e44f071257dff093f7af745f97cb2e75fc949ed54f53c60d46c
-DIST interactive_markers-1.11.4.tar.gz 29971 BLAKE2B cd260fe0f03fb10322f8c717f3532657123a8298f140db33ae927f054fa373b219fdcba1c4423bb38ed9b3cd5c5f10b4459e3b18e711b6acab5393b3019e4795 SHA512 e78d0ecd8c702aebcdbb28f4f227f1d0baeb71d4af952a2a2d385e2ced0bf5e6afd8e810ef99015bdf3c2284b583b0eb7776705caf30ba5ff3b4a77d16e12e94
-EBUILD interactive_markers-1.11.3.ebuild 737 BLAKE2B 3041406b61442fc95dde102c9c1a1bec3dcacb3705d1a236d9fbf357d92f4cd43f4ef1a2d5e56152aa7bde0bdd65fbc553d11f7cbf8e26d23276e6c639e0c113 SHA512 ff4e4f412fec60cd5a5ab4cf472101218ad230a337fc9bbe53b93473527c91b93ef0c59616e7a7df8e9020f9359e6aafc387058fa8e8644a6a952a254651cac9
-EBUILD interactive_markers-1.11.4.ebuild 737 BLAKE2B 93d435caa72c476bf26f9ca60dc34026ac66aa72de997125220a83d85724025017b1a41193fe9c8adf143e0216f9fa53b4db78c21f8965e42c6a660a9bf04a6a SHA512 1278189984374a320e82effca2039c96876a547afd8c8c52ecbafc3a4f47956a328de34bd53d738c6825f09d1520853dd31c5ddd236bef2caa21c17af83b6551
-EBUILD interactive_markers-9999.ebuild 737 BLAKE2B 3041406b61442fc95dde102c9c1a1bec3dcacb3705d1a236d9fbf357d92f4cd43f4ef1a2d5e56152aa7bde0bdd65fbc553d11f7cbf8e26d23276e6c639e0c113 SHA512 ff4e4f412fec60cd5a5ab4cf472101218ad230a337fc9bbe53b93473527c91b93ef0c59616e7a7df8e9020f9359e6aafc387058fa8e8644a6a952a254651cac9
+DIST interactive_markers-1.12.0.tar.gz 31698 BLAKE2B f71c9452688ae302f8053f7a75b471c833698bfd9eb99e95de2c42af4af3de7ea9d4f2327129e63f2b9327b92d560a9a8379c43ca02a3a3077eee8cda542f54b SHA512 9af0d27fa25ad9f56135948bc3aef523a5d2ac1018831268f224f3809646c770b19114904ba79dfdcefff96c7455f927cba692fd010c12d7cab6bf760820659b
+EBUILD interactive_markers-1.12.0-r1.ebuild 832 BLAKE2B ee820984c6412285b41ca1c746b18f735b9d7989d08064ee84ed9d6471e7efef86f360272ed86eb05b012f42decaf2a158e180def1fc748c9590075e65f68cc7 SHA512 962ca52f9e8f828f686cee33040033e9cdb37fbd72df9690dac9ac95185dfc6aed796535a1817eb070add55377c89c057a4d02eb887611c8d68d8e032c0650cd
+EBUILD interactive_markers-9999.ebuild 832 BLAKE2B ee820984c6412285b41ca1c746b18f735b9d7989d08064ee84ed9d6471e7efef86f360272ed86eb05b012f42decaf2a158e180def1fc748c9590075e65f68cc7 SHA512 962ca52f9e8f828f686cee33040033e9cdb37fbd72df9690dac9ac95185dfc6aed796535a1817eb070add55377c89c057a4d02eb887611c8d68d8e032c0650cd
 MISC metadata.xml 351 BLAKE2B b177ef1311b10a0939dc8778be7461072e9919a6318acca86e32a36d102698a50e6a77ec30ef99976d5d2b8660be7e658667f7f63ee80c30c8b8319fd618c655 SHA512 901123473444518fc3f02d2496a045d6154e35bce54f9e76d927cfa4cf268556f8479ec2a1f4f60655d7efaef3ee51b175301811012b171244c7667d6b8ecc49
diff --git a/dev-ros/interactive_markers/interactive_markers-1.11.3.ebuild b/dev-ros/interactive_markers/interactive_markers-1.11.3.ebuild
deleted file mode 100644
index edbf6132aa08..000000000000
--- a/dev-ros/interactive_markers/interactive_markers-1.11.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/interactive_markers"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="3D interactive marker communication library for RViz and similar tools"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/rosconsole
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/interactive_markers/interactive_markers-1.11.4.ebuild b/dev-ros/interactive_markers/interactive_markers-1.11.4.ebuild
deleted file mode 100644
index c9e821947cd1..000000000000
--- a/dev-ros/interactive_markers/interactive_markers-1.11.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/interactive_markers"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="3D interactive marker communication library for RViz and similar tools"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/rosconsole
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/interactive_markers/interactive_markers-1.12.0-r1.ebuild b/dev-ros/interactive_markers/interactive_markers-1.12.0-r1.ebuild
new file mode 100644
index 000000000000..213935ea9d54
--- /dev/null
+++ b/dev-ros/interactive_markers/interactive_markers-1.12.0-r1.ebuild
@@ -0,0 +1,31 @@
+# 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-visualization/interactive_markers"
+KEYWORDS="~amd64"
+
+inherit ros-catkin
+
+DESCRIPTION="3D interactive marker communication library for RViz and similar tools"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/tf2_ros
+
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/interactive_markers/interactive_markers-9999.ebuild b/dev-ros/interactive_markers/interactive_markers-9999.ebuild
index edbf6132aa08..213935ea9d54 100644
--- a/dev-ros/interactive_markers/interactive_markers-9999.ebuild
+++ b/dev-ros/interactive_markers/interactive_markers-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 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-visualization/interactive_markers"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,14 +14,18 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roscpp
 	dev-ros/rosconsole
-	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/roscpp
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/tf2_ros
+
 	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	test? ( dev-cpp/gtest )"