gentoo resync : 25.08.2020

5 files changed, 25 insertions, 46 deletions

diff --git a/dev-util/rosinstall_generator/Manifest b/dev-util/rosinstall_generator/Manifest
index de563fa510e7..c5c000fced36 100644
--- a/dev-util/rosinstall_generator/Manifest
+++ b/dev-util/rosinstall_generator/Manifest
@@ -1,6 +1,5 @@
-DIST rosinstall_generator-0.1.13.tar.gz 11186 BLAKE2B bb6f95eba12ee6b9adfa22d46475d555aa9b3bed225e3be52a52f380bbd1ab3f86871a9a816c56c874f8545d2ef648e226ad5d8d3346444a92202865265260f1 SHA512 c8b5736066f8a42a324b2bed578e03282b6d8ae8df48fb30545617c2995ce53f35d7fea6fab3989383b958e7cb763b24deb67c5ec3496cc77f1ba51f110ab78c
-DIST rosinstall_generator-0.1.14.tar.gz 11419 BLAKE2B af9754f46589aac1e9bb265345319c4037d2b1e10ea8119859e2715b2828974bc4422cac25f84216c401f35b7cddde207e7562afb07e753328940db347b69a20 SHA512 45461917afaf93f38b118951c272ba71a408d2c276b4019739c9c8dc9407812bf166bb762910ce45cedc9b31e2796922a69681ad461c468c7ed2372a1d189904
-EBUILD rosinstall_generator-0.1.13.ebuild 927 BLAKE2B 740ba1c9f92b57910520ea268c5b750f4386644abee085671fcb18bd2d6dd9e3d9570e8936350e58cd3fd3357b95e5367970c83d7fac31ff7d09416eb60b4683 SHA512 e5fec4e1c60fb18156644ff02e0067eec142f316a7ec0265e975884a6b8618b238a061f87f489eeaff5e77827b203263173fae162285f0bcdb37658215a88375
-EBUILD rosinstall_generator-0.1.14.ebuild 1062 BLAKE2B f3775ef7c5961166c60dd37622bb6f24eed6b57c7893779686a161352e535f9e19ad0859ad27c8687bed21d5daed2a6b60cc676aeb607f04429d841660a9bd73 SHA512 82b38f11458e58c7fa269ed5c20a225148f0008f61d7e4fb2ebbc5388720d5258d45b0f708e3b0b1acfbf4d95fd5786afb49b44b2b8c56c9f5ca9080f29a3445
-EBUILD rosinstall_generator-9999.ebuild 1062 BLAKE2B f3775ef7c5961166c60dd37622bb6f24eed6b57c7893779686a161352e535f9e19ad0859ad27c8687bed21d5daed2a6b60cc676aeb607f04429d841660a9bd73 SHA512 82b38f11458e58c7fa269ed5c20a225148f0008f61d7e4fb2ebbc5388720d5258d45b0f708e3b0b1acfbf4d95fd5786afb49b44b2b8c56c9f5ca9080f29a3445
+AUX yaml.patch 493 BLAKE2B ce0d917dc54edda1423b29c1f39662c56e6be8b0c33012cc8cbb8a86b4fe20c9a25139ed2b59db9aca245ebae01a7a1f06f4956a8521bc046ffd46ed795752c9 SHA512 d63da158e7a496da2de41bbfe453e492cd32b9380b11f3201491fc40bc6a9f4057adc19ce0ce7e417080bb9ded0010790caf69d7cd50373cd53033f37a42c456
+DIST rosinstall_generator-0.1.22.tar.gz 11902 BLAKE2B 6dd41c8b86146a9e50d4a20fd4991ed247de915d29f051c6dc416b6820386497ccf3a9cf6dde16e039932c354d7dfc5b6706bc206c16b068633fbddb69686452 SHA512 c1801ea441d1765090684a12e559a39ce496d08f91021b13d026a4127e5bc16974daa2cb561f0ed6c54a31216f57c1f3e257b4a96aec8255c34b37c5545123c6
+EBUILD rosinstall_generator-0.1.22.ebuild 1100 BLAKE2B 975af506b78a86e7f6e7bef81e5ceef0d66d8becf9fef3c7541a9e74fcf269a6abb1030559ddd2d22f3826813e42c2270915b1790ec4f80d06de1fb6f077c05d SHA512 1efbb4fc3109308401ad998e20ca66abb6223fc04a5796a5dd0dac755da0eedc6c66f0f93c3b9259e6ff64a75e1d79c328163b2b52b6f4f68a43339e82ddf7ed
+EBUILD rosinstall_generator-9999.ebuild 1100 BLAKE2B 975af506b78a86e7f6e7bef81e5ceef0d66d8becf9fef3c7541a9e74fcf269a6abb1030559ddd2d22f3826813e42c2270915b1790ec4f80d06de1fb6f077c05d SHA512 1efbb4fc3109308401ad998e20ca66abb6223fc04a5796a5dd0dac755da0eedc6c66f0f93c3b9259e6ff64a75e1d79c328163b2b52b6f4f68a43339e82ddf7ed
 MISC metadata.xml 353 BLAKE2B 26692ca3eb76500607275909a9c86bc88f7c80114e7840763136902a59dddc8f23dcd766f821aa5beffff9419d39a48e18682f86c8148df7d640977c9b30ebcd SHA512 a681a9f31c4cf06a775ef57f7a942c76d0e8873c4c854fddaf44df0301f3e14bd836727e6816bc74f0ced9e54dfd9335c376c47b8af2a19455c42a3f6ed38a18
diff --git a/dev-util/rosinstall_generator/files/yaml.patch b/dev-util/rosinstall_generator/files/yaml.patch
new file mode 100644
index 000000000000..668e1ef58b71
--- /dev/null
+++ b/dev-util/rosinstall_generator/files/yaml.patch
@@ -0,0 +1,13 @@
+Index: rosinstall_generator-0.1.22/test/test_distro.py
+===================================================================
+--- rosinstall_generator-0.1.22.orig/test/test_distro.py
++++ rosinstall_generator-0.1.22/test/test_distro.py
+@@ -53,7 +53,7 @@ def _get_test_dist():
+       type: distribution
+       version: 2
+     '''
+-    return DistributionFile('test', yaml.load(test_dist_yaml))
++    return DistributionFile('test', yaml.safe_load(test_dist_yaml))
+ 
+ 
+ def test_get_package_names():
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild
deleted file mode 100644
index 7419030810a4..000000000000
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosinstall_generator"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Generates rosinstall metadata about repositories with ROS packages/stacks"
-HOMEPAGE="http://wiki.ros.org/rosinstall_generator"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ros-infrastructure/rosinstall_generator/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/catkin_pkg-0.1.28[${PYTHON_USEDEP}]
-	>=dev-python/rosdistro-0.5.0[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.14.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.22.ebuild
index 2b89625c44ca..58ee6bf23a0d 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.14.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-0.1.22.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python3_6 pypy3 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -13,7 +13,7 @@ fi
 inherit ${SCM} distutils-r1
 
 DESCRIPTION="Generates rosinstall metadata about repositories with ROS packages/stacks"
-HOMEPAGE="http://wiki.ros.org/rosinstall_generator"
+HOMEPAGE="https://wiki.ros.org/rosinstall_generator"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 	KEYWORDS=""
@@ -35,6 +35,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+PATCHES=( "${FILESDIR}/yaml.patch" )
 
 python_test() {
 	nosetests --with-coverage || die
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
index 2b89625c44ca..58ee6bf23a0d 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python3_6 pypy3 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -13,7 +13,7 @@ fi
 inherit ${SCM} distutils-r1
 
 DESCRIPTION="Generates rosinstall metadata about repositories with ROS packages/stacks"
-HOMEPAGE="http://wiki.ros.org/rosinstall_generator"
+HOMEPAGE="https://wiki.ros.org/rosinstall_generator"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 	KEYWORDS=""
@@ -35,6 +35,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+PATCHES=( "${FILESDIR}/yaml.patch" )
 
 python_test() {
 	nosetests --with-coverage || die