gentoo resync : 25.08.2020

5 files changed, 48 insertions, 55 deletions

diff --git a/dev-ros/resource_retriever/Manifest b/dev-ros/resource_retriever/Manifest
index 28d4c5104d3c..4612847fa54f 100644
--- a/dev-ros/resource_retriever/Manifest
+++ b/dev-ros/resource_retriever/Manifest
@@ -1,6 +1,4 @@
-DIST resource_retriever-1.12.3.tar.gz 6385 BLAKE2B eea0a548976acd6de95da9b1bdc2d108f8c74012d6f8df3ce055444dfcdc41765e020fda6b2894a74cab5f26a0419868ed7da6d62a2655c72c68819c946a452c SHA512 3ca22eafa54019e2763f089bb8072a6af7956e1281ad9aad3a4166c7e0350baa762b2d5127051acf8927d07b3b711e60eaec6349c730f9f656494cef71391862
-DIST resource_retriever-1.12.4.tar.gz 6624 BLAKE2B 16e5dfaf0af3ac02c1c3ad48a4ab2e664235b5e13dbaa5e760fcb5841c57af78184c336f55b18f06b6916657ee69bb1c0304b736869cf008cc8faeaebe53f596 SHA512 b8f584bf21f6744eeacdf169cc0da82e5dcdf902205d4c49784818c203ebdc1f2c9147dbb97353d3d94fd2dd3d1b9a56a36562ed3af6630c1a18f56b8ff89a0f
-EBUILD resource_retriever-1.12.3.ebuild 499 BLAKE2B 63786d9d6f3da33cc9e023e169d29d03ba6d6136485424a1943883ee8a35ca721e71f276fa38ca26853be10788a503f3021a95740bf91495e255521f37bc3b55 SHA512 be3103eb9409a6f009b8df4b672f37c17c3fecfce6e0ae92ca7b0e48e9d29a0eb6edea6d4e780bfbe9ef2bbe023ef23c192b598920830e619be17937d2345386
-EBUILD resource_retriever-1.12.4.ebuild 499 BLAKE2B 63786d9d6f3da33cc9e023e169d29d03ba6d6136485424a1943883ee8a35ca721e71f276fa38ca26853be10788a503f3021a95740bf91495e255521f37bc3b55 SHA512 be3103eb9409a6f009b8df4b672f37c17c3fecfce6e0ae92ca7b0e48e9d29a0eb6edea6d4e780bfbe9ef2bbe023ef23c192b598920830e619be17937d2345386
-EBUILD resource_retriever-9999.ebuild 499 BLAKE2B 63786d9d6f3da33cc9e023e169d29d03ba6d6136485424a1943883ee8a35ca721e71f276fa38ca26853be10788a503f3021a95740bf91495e255521f37bc3b55 SHA512 be3103eb9409a6f009b8df4b672f37c17c3fecfce6e0ae92ca7b0e48e9d29a0eb6edea6d4e780bfbe9ef2bbe023ef23c192b598920830e619be17937d2345386
+DIST resource_retriever-1.12.6.tar.gz 6916 BLAKE2B 11c3cfd06f750e90863ccff2540cc3828cc02929418a1e4c274811fce606e512a3afb45548100f80f56fb58dae00d1ac81f7b152bda1ecc12623584cca1923c3 SHA512 a946cef7e55e2acf01ba605beb36c3ec24f22037bca38d93afcfb36cad579e58ff57efb69311e3cb69ddd9d53d7eab5f9072f3903da539d1fbd001a3a342f7dc
+EBUILD resource_retriever-1.12.6.ebuild 766 BLAKE2B b34eb0342e2a90551c81450443328c3b3701db92579ef9d9734773d105542b670f159ec33155299e1058c34eda9f86f7809eed39a7ddf7d22cdff642ce29cb5c SHA512 65c8702de80b1d9dbfaf6057cb213f61bfe2de4a48722be29e9b391f4155fb529ea47e48123cc5e9c6352144865957e27fb6fb2a0a1071107468881b90e97899
+EBUILD resource_retriever-9999.ebuild 766 BLAKE2B b34eb0342e2a90551c81450443328c3b3701db92579ef9d9734773d105542b670f159ec33155299e1058c34eda9f86f7809eed39a7ddf7d22cdff642ce29cb5c SHA512 65c8702de80b1d9dbfaf6057cb213f61bfe2de4a48722be29e9b391f4155fb529ea47e48123cc5e9c6352144865957e27fb6fb2a0a1071107468881b90e97899
 MISC metadata.xml 336 BLAKE2B eae58f27fd60ea173eaee68e804d9f5924e8aa31fcb21262e12bb73ab3186e29e41402e19117631a0d2a8b4b5715e2ef0e2bb0e1c6d7b06f258e0e128f5d94db SHA512 bcb84806eabff85c76b6f7d9317299f17a017404c512634d6e2d6e275687dd130e6f8cb73d86afb6ef57377dcb34ee997db4d0b099bfeb6649c38930c3f2fb24
diff --git a/dev-ros/resource_retriever/resource_retriever-1.12.3.ebuild b/dev-ros/resource_retriever/resource_retriever-1.12.3.ebuild
deleted file mode 100644
index 5eb72827b5c6..000000000000
--- a/dev-ros/resource_retriever/resource_retriever-1.12.3.ebuild
+++ /dev/null
@@ -1,23 +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/resource_retriever"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Retrieves data from url-format files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	net-misc/curl
-	dev-python/rospkg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/resource_retriever/resource_retriever-1.12.4.ebuild b/dev-ros/resource_retriever/resource_retriever-1.12.4.ebuild
deleted file mode 100644
index 5eb72827b5c6..000000000000
--- a/dev-ros/resource_retriever/resource_retriever-1.12.4.ebuild
+++ /dev/null
@@ -1,23 +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/resource_retriever"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Retrieves data from url-format files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	net-misc/curl
-	dev-python/rospkg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/resource_retriever/resource_retriever-1.12.6.ebuild b/dev-ros/resource_retriever/resource_retriever-1.12.6.ebuild
new file mode 100644
index 000000000000..4a7691efbe1e
--- /dev/null
+++ b/dev-ros/resource_retriever/resource_retriever-1.12.6.ebuild
@@ -0,0 +1,32 @@
+# 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/resource_retriever"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Retrieves data from url-format files"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosconsole
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	net-misc/curl
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	if has network-sandbox ${FEATURES}; then
+		einfo "Skipping network tests due to network sandbox"
+		export GTEST_FILTER='-Retriever.http'
+		export NOSE_TESTMATCH='^(?!test_http).*'
+	fi
+	ros-catkin_src_test
+}
diff --git a/dev-ros/resource_retriever/resource_retriever-9999.ebuild b/dev-ros/resource_retriever/resource_retriever-9999.ebuild
index 5eb72827b5c6..4a7691efbe1e 100644
--- a/dev-ros/resource_retriever/resource_retriever-9999.ebuild
+++ b/dev-ros/resource_retriever/resource_retriever-9999.ebuild
@@ -1,10 +1,9 @@
 # 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/resource_retriever"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin
 
@@ -15,9 +14,19 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/rosconsole
-	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
 	net-misc/curl
-	dev-python/rospkg[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	if has network-sandbox ${FEATURES}; then
+		einfo "Skipping network tests due to network sandbox"
+		export GTEST_FILTER='-Retriever.http'
+		export NOSE_TESTMATCH='^(?!test_http).*'
+	fi
+	ros-catkin_src_test
+}