gentoo resync : 25.08.2020

5 files changed, 46 insertions, 62 deletions

diff --git a/dev-ros/rosbridge_server/Manifest b/dev-ros/rosbridge_server/Manifest
index 9d6b8cd30e5d..60f0c8282c0a 100644
--- a/dev-ros/rosbridge_server/Manifest
+++ b/dev-ros/rosbridge_server/Manifest
@@ -1,6 +1,4 @@
-DIST rosbridge_suite-0.11.1.tar.gz 100994 BLAKE2B b6b21e1f8444b969d94ae1c86c70f242075c1494359df062179789920b3c03aa6ed44dd273c301098ed43f6084c656018349022158ec4b9b4672f20262952c05 SHA512 dd89d43b20589ac436cba673b3ee4f229eb14d47aabbe8352e04d6a2691b6f9e156315788178fbe345fa489fa84f86c626647b09ff3632562eb023bca688451c
-DIST rosbridge_suite-0.11.3.tar.gz 101992 BLAKE2B 122aebcd19daec339cd1f39ddcdbd81c7d5fc7b67020afc835e0e816958c413eeeb922654b1717adb7f1882e1b3287d0ddd6dd23bfd57e6542f21a8fcbb65e14 SHA512 818df696c2d0060af18fa1ee1abe365373c199d41d4dd5b25a9cc799665b1a69e76b3cd6425cd4fd8e11241efdd3acf43c5436a0ade5b45c5e9ce3ea831e4974
-EBUILD rosbridge_server-0.11.1.ebuild 626 BLAKE2B 104fa4df3e03367cbebc619c64066c2ae136a2db915a58955f2aa8be45e305d3c3bdcfadbd7343a2a5cf2ece6f2f68f16a332b240c277e263f24c52a3cb9959e SHA512 071d9c6b45dbcb06ba682b643c9a3fd1aee0dc0d194c6a0ba2ed2f275ffe4bc738c8ac5b840d5d307d1db784f5e1574fb8ded7b11ad602054fcf24f9661483b4
-EBUILD rosbridge_server-0.11.3.ebuild 626 BLAKE2B 104fa4df3e03367cbebc619c64066c2ae136a2db915a58955f2aa8be45e305d3c3bdcfadbd7343a2a5cf2ece6f2f68f16a332b240c277e263f24c52a3cb9959e SHA512 071d9c6b45dbcb06ba682b643c9a3fd1aee0dc0d194c6a0ba2ed2f275ffe4bc738c8ac5b840d5d307d1db784f5e1574fb8ded7b11ad602054fcf24f9661483b4
-EBUILD rosbridge_server-9999.ebuild 626 BLAKE2B 104fa4df3e03367cbebc619c64066c2ae136a2db915a58955f2aa8be45e305d3c3bdcfadbd7343a2a5cf2ece6f2f68f16a332b240c277e263f24c52a3cb9959e SHA512 071d9c6b45dbcb06ba682b643c9a3fd1aee0dc0d194c6a0ba2ed2f275ffe4bc738c8ac5b840d5d307d1db784f5e1574fb8ded7b11ad602054fcf24f9661483b4
+DIST rosbridge_suite-0.11.9.tar.gz 112209 BLAKE2B 7c874b397f8bf4f5d131e6ec40c6940e0648a0a401d270172b328cb0207b4d3974a37ebb776fc219adbbb77c24a8e77e20b24a93dc2edb3b41e157908648ed68 SHA512 a46aff0ca8b31a08f45c73af89296000d285cb6ca53587b0c2c0bd55c4a43bec2c86c4937082b59e2b6bd78793a3a2a1762aebc1223af0e1ba0d1c18f7d50963
+EBUILD rosbridge_server-0.11.9.ebuild 893 BLAKE2B e3ba10e13fc0aed87643d8170095ecd2e9798623bd64842ab0c20031e41c8aec6308761cd28fdebb3cc57ee5d3508242e0e709d67fde7b3b6516f5571d71768e SHA512 32e9eb7a72b8f9bde712b984caa7852668a50ad32c9cf14c7bb4c7c3ed13651f4d28fb080a8c80c7f09d181d7093835ea4660fdedc7911172668be6fedcc3908
+EBUILD rosbridge_server-9999.ebuild 893 BLAKE2B e3ba10e13fc0aed87643d8170095ecd2e9798623bd64842ab0c20031e41c8aec6308761cd28fdebb3cc57ee5d3508242e0e709d67fde7b3b6516f5571d71768e SHA512 32e9eb7a72b8f9bde712b984caa7852668a50ad32c9cf14c7bb4c7c3ed13651f4d28fb080a8c80c7f09d181d7093835ea4660fdedc7911172668be6fedcc3908
 MISC metadata.xml 343 BLAKE2B 54e565b139250d84a9adfb768099d530c91876a8d20dabdb1c5fdb61c7c4e799b3e4121ad704c09b8019693ccbf15be426100cdc8e9388f8ef68312d4ca75d31 SHA512 45889c0aa111bcf8050244d51f15ceef5501a722f3feac93c3795a4b9217a41098f44f6b06f906ff333e2c98d03b0f44e4a41d1acdc70942fa9c54b05dde1365
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.11.1.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.11.1.ebuild
deleted file mode 100644
index cf540ab83cad..000000000000
--- a/dev-ros/rosbridge_server/rosbridge_server-0.11.1.ebuild
+++ /dev/null
@@ -1,24 +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/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A WebSocket interface to rosbridge"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosauth[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.11.3.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.11.3.ebuild
deleted file mode 100644
index cf540ab83cad..000000000000
--- a/dev-ros/rosbridge_server/rosbridge_server-0.11.3.ebuild
+++ /dev/null
@@ -1,24 +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/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A WebSocket interface to rosbridge"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosauth[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.11.9.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.11.9.ebuild
new file mode 100644
index 000000000000..d0bbe719c0ac
--- /dev/null
+++ b/dev-ros/rosbridge_server/rosbridge_server-0.11.9.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="A WebSocket interface to rosbridge"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosbridge_library[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosbridge_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosapi[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosauth[${PYTHON_SINGLE_USEDEP}]
+
+	$(python_gen_cond_dep "www-servers/tornado[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/autobahn[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/twisted[\${PYTHON_USEDEP}]")
+	"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )
+"
diff --git a/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild b/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
index cf540ab83cad..d0bbe719c0ac 100644
--- a/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
+++ b/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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/RobotWebTools/rosbridge_suite"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -15,10 +14,16 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosauth[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
+	dev-ros/rosbridge_library[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosbridge_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosapi[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosauth[${PYTHON_SINGLE_USEDEP}]
+
+	$(python_gen_cond_dep "www-servers/tornado[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/autobahn[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/twisted[\${PYTHON_USEDEP}]")
 	"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )
+"