gentoo resync : 25.08.2020

10 files changed, 19 insertions, 226 deletions

diff --git a/dev-ros/roslib/Manifest b/dev-ros/roslib/Manifest
index fe24ee18d21c..87190f1a4a90 100644
--- a/dev-ros/roslib/Manifest
+++ b/dev-ros/roslib/Manifest
@@ -1,17 +1,4 @@
-AUX envhook.patch 1627 BLAKE2B 5cdc90c1828c9bad7777b6ae113f6f44a1e26a3fb5ace8f103958cedbdd3039ccffcae44a7ecdc97f12559aa0f11ebbc6719f861fb65409bff7759852151fe7d SHA512 a2d76712b068918c52a77d610a2a235298069b0ee0cbdac8d06b7a5ff5ed04cc824c7b8dba3cafb141910eb09a0a2d1a42b8cf96cb19b2f4b5982a21d0817c26
-DIST ros-1.14.0.tar.gz 167371 BLAKE2B 07a046b44a327febe2f5aa6793a27f8ee5547254500ade917484674aefd8b91d651c8f48c187704b4174659c3a983cd6a864f316180f2de4d45ef4f6e0c7cd86 SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31
-DIST ros-1.14.1.tar.gz 167768 BLAKE2B 1d4ec3b2af505be4995ade962c8d7c8f165af40b6911986e82d34c79baf8a3b36d553caa35395e006348bbae3e15b551831065b6185373e7451bafd444ac5d66 SHA512 b8d3ea058cd53d5ecd3aa3302ecdd89ef183cb0b58a0f39949e8215ffd7361111e0d926c3c8eb93bab7867d166870e9acc411c931df543f9ba9e5031739a399a
-DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
-DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
-DIST ros-1.14.4.tar.gz 166818 BLAKE2B cbe56006ba8e318a9b94e67ea2035b209d206b6f2783c9a923c227ad92f932879a14d08cb076168159a5eb190e82e3375a70474ffae6305887086f8c0aaf3599 SHA512 ba6a25b5aae6786a9033ada747293b10e5aab2cf55b68fd8f40090f13dac7615b332993201795d6dac729dce0dcc4438df22f520bdca16c5ed127ad33eca1e9c
-DIST ros-1.14.6.tar.gz 174375 BLAKE2B bb3c7b60c1d89ff2b219802c60fbb39ad54cb15250f6c17ef27f64a66e148bbf8da5b836ff38f0a83cf3e2fa3615ce298ef888c95607f6f33d8511a1bb04e6a5 SHA512 f30f33553aeae267b608b705b4e8b2502260ed47e3461c36da265318b5d78369a857e3fb67fc55f20f2dd9010bac6eda213bbe0442a142fbe223ebf34a48ea38
-DIST ros-1.14.7.tar.gz 175854 BLAKE2B 713ad5036a14a27556c9cc68f12b737562148f786c5d5ac32ba8328a05d63df3154222762af1fba7db34b11123a2cdc6f3a23770f9ddf1f30a7d14ef47a26ecc SHA512 b4ea471586630754c5d212ec32c5d5d20b4bb25b707c69249bf976384eb23ad6e2fa95906167ce48c916ca4ab12747a031184073c70fe6986efcc3258a1f5498
-EBUILD roslib-1.14.0-r1.ebuild 581 BLAKE2B 116b650156b83d1a5edebeb5fee143f9e2bed22eb58733f7d04a87445ab9f7c5685a84365f764bcd9a775048db3e2771e4b9dfea81d2608de593c06bb658503e SHA512 a9a49a50da67d53d2ae6d98065cdf8009244fac05c1c08d808b97583c02a8d8ea15cebb94ff962dfd3c3f8ce7322c3b272e6b7e42c63fd2bd381ed8469ad3b90
-EBUILD roslib-1.14.1.ebuild 581 BLAKE2B 116b650156b83d1a5edebeb5fee143f9e2bed22eb58733f7d04a87445ab9f7c5685a84365f764bcd9a775048db3e2771e4b9dfea81d2608de593c06bb658503e SHA512 a9a49a50da67d53d2ae6d98065cdf8009244fac05c1c08d808b97583c02a8d8ea15cebb94ff962dfd3c3f8ce7322c3b272e6b7e42c63fd2bd381ed8469ad3b90
-EBUILD roslib-1.14.2.ebuild 581 BLAKE2B 116b650156b83d1a5edebeb5fee143f9e2bed22eb58733f7d04a87445ab9f7c5685a84365f764bcd9a775048db3e2771e4b9dfea81d2608de593c06bb658503e SHA512 a9a49a50da67d53d2ae6d98065cdf8009244fac05c1c08d808b97583c02a8d8ea15cebb94ff962dfd3c3f8ce7322c3b272e6b7e42c63fd2bd381ed8469ad3b90
-EBUILD roslib-1.14.3.ebuild 566 BLAKE2B 9f4ee16e1b0af983334e47a55f4915d9680aa8f56637e79b7c890343b5c212187b62ba0b88754ec601b66b63fd034f858546e8b4dadd2d9d177576bdc53e6bea SHA512 266d92524154e94817141fec4c1c6111c4d5e5d291058a1e2a434a40b4e4a1a3c104c6f64405b7a9f8df63f92421cd31171694fd48f49b92f7718eb0f387b8a0
-EBUILD roslib-1.14.4.ebuild 566 BLAKE2B 9f4ee16e1b0af983334e47a55f4915d9680aa8f56637e79b7c890343b5c212187b62ba0b88754ec601b66b63fd034f858546e8b4dadd2d9d177576bdc53e6bea SHA512 266d92524154e94817141fec4c1c6111c4d5e5d291058a1e2a434a40b4e4a1a3c104c6f64405b7a9f8df63f92421cd31171694fd48f49b92f7718eb0f387b8a0
-EBUILD roslib-1.14.6.ebuild 566 BLAKE2B 9f4ee16e1b0af983334e47a55f4915d9680aa8f56637e79b7c890343b5c212187b62ba0b88754ec601b66b63fd034f858546e8b4dadd2d9d177576bdc53e6bea SHA512 266d92524154e94817141fec4c1c6111c4d5e5d291058a1e2a434a40b4e4a1a3c104c6f64405b7a9f8df63f92421cd31171694fd48f49b92f7718eb0f387b8a0
-EBUILD roslib-1.14.7.ebuild 566 BLAKE2B 9f4ee16e1b0af983334e47a55f4915d9680aa8f56637e79b7c890343b5c212187b62ba0b88754ec601b66b63fd034f858546e8b4dadd2d9d177576bdc53e6bea SHA512 266d92524154e94817141fec4c1c6111c4d5e5d291058a1e2a434a40b4e4a1a3c104c6f64405b7a9f8df63f92421cd31171694fd48f49b92f7718eb0f387b8a0
-EBUILD roslib-9999.ebuild 566 BLAKE2B 9f4ee16e1b0af983334e47a55f4915d9680aa8f56637e79b7c890343b5c212187b62ba0b88754ec601b66b63fd034f858546e8b4dadd2d9d177576bdc53e6bea SHA512 266d92524154e94817141fec4c1c6111c4d5e5d291058a1e2a434a40b4e4a1a3c104c6f64405b7a9f8df63f92421cd31171694fd48f49b92f7718eb0f387b8a0
+DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
+EBUILD roslib-1.15.6.ebuild 654 BLAKE2B 805e9c77fd269f613d293ea6050de03e66071f62d7d171b99f6d35976cc04a8a42e59a56cbbd4cbb9e96491363092d277e601a10e5a248106cace80f3f9e015c SHA512 d91fdb48693a37e9b68e7e0f03744cd5845aacb66f46edeb07428e182cba0587511a45095206886374dd59bbb023aa99b5d6e1e379a2f42438ed1e2be69dceeb
+EBUILD roslib-9999.ebuild 654 BLAKE2B 805e9c77fd269f613d293ea6050de03e66071f62d7d171b99f6d35976cc04a8a42e59a56cbbd4cbb9e96491363092d277e601a10e5a248106cace80f3f9e015c SHA512 d91fdb48693a37e9b68e7e0f03744cd5845aacb66f46edeb07428e182cba0587511a45095206886374dd59bbb023aa99b5d6e1e379a2f42438ed1e2be69dceeb
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/roslib/files/envhook.patch b/dev-ros/roslib/files/envhook.patch
deleted file mode 100644
index d4e24e937351..000000000000
--- a/dev-ros/roslib/files/envhook.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Use env python for running python so that it uses the proper version on Gentoo.
-Honour CATKIN_PREFIX_PATH gentoo addition.
-
-Index: roslib/env-hooks/10.ros.sh.em
-===================================================================
---- roslib.orig/env-hooks/10.ros.sh.em
-+++ roslib/env-hooks/10.ros.sh.em
-@@ -1,8 +1,5 @@
- # generated from ros/env-hooks/10.ros.sh.em
- 
--# scrub old ROS bin dirs, to avoid accidentally finding the wrong executables
--export PATH="`@(PYTHON_EXECUTABLE) -c \"import os; print(os.pathsep.join([x for x in \\\"$PATH\\\".split(os.pathsep) if not any([d for d in ['cturtle', 'diamondback', 'electric', 'fuerte'] if d in x])]))\"`"
--
- @{
- # This is a build-time environment variable which allows a build engineer to override the expected
- # ROS_DISTRO value for a workspace, for example to deliberately use a newer version of roslib with
-@@ -19,7 +16,7 @@ export ROS_DISTRO=@(ROS_DISTRO)
- PYTHON_CODE_BUILD_ROS_PACKAGE_PATH=$(cat <<EOF
- from __future__ import print_function
- import os
--env_name = 'CMAKE_PREFIX_PATH'
-+env_name = 'CATKIN_PREFIX_PATH'
- paths = [path for path in os.environ[env_name].split(os.pathsep)] if env_name in os.environ and os.environ[env_name] != '' else []
- workspaces = [path for path in paths if os.path.exists(os.path.join(path, '.catkin'))]
- paths = []
-@@ -38,7 +35,7 @@ for workspace in workspaces:
- print(os.pathsep.join(paths))
- EOF
- )
--export ROS_PACKAGE_PATH="`@(PYTHON_EXECUTABLE) -c \"$PYTHON_CODE_BUILD_ROS_PACKAGE_PATH\"`"
-+export ROS_PACKAGE_PATH="`/usr/bin/env python -c \"$PYTHON_CODE_BUILD_ROS_PACKAGE_PATH\"`"
- 
- @[if DEVELSPACE]@
- # env variables in develspace
diff --git a/dev-ros/roslib/roslib-1.14.0-r1.ebuild b/dev-ros/roslib/roslib-1.14.0-r1.ebuild
deleted file mode 100644
index 22d5f9d983e3..000000000000
--- a/dev-ros/roslib/roslib-1.14.0-r1.ebuild
+++ /dev/null
@@ -1,28 +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"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Base dependencies and support libraries for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/rospkg-1.0.37[${PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
-	dev-ros/rospack
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-PATCHES=( "${FILESDIR}/envhook.patch" )
diff --git a/dev-ros/roslib/roslib-1.14.1.ebuild b/dev-ros/roslib/roslib-1.14.1.ebuild
deleted file mode 100644
index 22d5f9d983e3..000000000000
--- a/dev-ros/roslib/roslib-1.14.1.ebuild
+++ /dev/null
@@ -1,28 +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"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Base dependencies and support libraries for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/rospkg-1.0.37[${PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
-	dev-ros/rospack
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-PATCHES=( "${FILESDIR}/envhook.patch" )
diff --git a/dev-ros/roslib/roslib-1.14.2.ebuild b/dev-ros/roslib/roslib-1.14.2.ebuild
deleted file mode 100644
index 22d5f9d983e3..000000000000
--- a/dev-ros/roslib/roslib-1.14.2.ebuild
+++ /dev/null
@@ -1,28 +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"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Base dependencies and support libraries for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/rospkg-1.0.37[${PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
-	dev-ros/rospack
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-PATCHES=( "${FILESDIR}/envhook.patch" )
diff --git a/dev-ros/roslib/roslib-1.14.4.ebuild b/dev-ros/roslib/roslib-1.14.4.ebuild
deleted file mode 100644
index 941ea404b20b..000000000000
--- a/dev-ros/roslib/roslib-1.14.4.ebuild
+++ /dev/null
@@ -1,28 +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"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Base dependencies and support libraries for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/rospkg-1.0.37[${PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
-	dev-ros/rospack
-	dev-ros/ros_environment
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/roslib/roslib-1.14.6.ebuild b/dev-ros/roslib/roslib-1.14.6.ebuild
deleted file mode 100644
index 941ea404b20b..000000000000
--- a/dev-ros/roslib/roslib-1.14.6.ebuild
+++ /dev/null
@@ -1,28 +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"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Base dependencies and support libraries for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/rospkg-1.0.37[${PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
-	dev-ros/rospack
-	dev-ros/ros_environment
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/roslib/roslib-1.14.7.ebuild b/dev-ros/roslib/roslib-1.14.7.ebuild
deleted file mode 100644
index 941ea404b20b..000000000000
--- a/dev-ros/roslib/roslib-1.14.7.ebuild
+++ /dev/null
@@ -1,28 +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"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Base dependencies and support libraries for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/rospkg-1.0.37[${PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
-	dev-ros/rospack
-	dev-ros/ros_environment
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/roslib/roslib-1.14.3.ebuild b/dev-ros/roslib/roslib-1.15.6.ebuild
index 941ea404b20b..26e633c4c21c 100644
--- a/dev-ros/roslib/roslib-1.14.3.ebuild
+++ b/dev-ros/roslib/roslib-1.15.6.ebuild
@@ -1,11 +1,10 @@
 # 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"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=core/${PN}
 
 inherit ros-catkin
@@ -16,7 +15,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	>=dev-python/rospkg-1.0.37[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep ">=dev-python/rospkg-1.0.37[\${PYTHON_USEDEP}]")
 	dev-libs/boost:=[threads]
 	dev-ros/rospack
 	dev-ros/ros_environment
@@ -24,5 +23,10 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? (
 		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
 	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}/../../"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/roslib/roslib-9999.ebuild b/dev-ros/roslib/roslib-9999.ebuild
index 941ea404b20b..26e633c4c21c 100644
--- a/dev-ros/roslib/roslib-9999.ebuild
+++ b/dev-ros/roslib/roslib-9999.ebuild
@@ -1,11 +1,10 @@
 # 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"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=core/${PN}
 
 inherit ros-catkin
@@ -16,7 +15,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	>=dev-python/rospkg-1.0.37[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep ">=dev-python/rospkg-1.0.37[\${PYTHON_USEDEP}]")
 	dev-libs/boost:=[threads]
 	dev-ros/rospack
 	dev-ros/ros_environment
@@ -24,5 +23,10 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? (
 		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
 	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}/../../"
+	ros-catkin_src_test
+}