gentoo resync : 30.05.2020

5 files changed, 21 insertions, 33 deletions

diff --git a/dev-ros/genpy/Manifest b/dev-ros/genpy/Manifest
index f081ed2d83fd..756379708e70 100644
--- a/dev-ros/genpy/Manifest
+++ b/dev-ros/genpy/Manifest
@@ -1,6 +1,5 @@
-DIST genpy-0.6.7.tar.gz 52001 BLAKE2B 6c2a6cbbac6b0c72b1d5bec160f2f06ac86852afa2664835a4223e5adc5df6ae13a3a506d1c684f39f1066094f437fc54e4deb927c9e58209231af599b70af77 SHA512 645db3b343d53a640c6cbae91ec178bb99249899632b88f54831a524c2c3d76a68c8e45e2820b536509eb3d84a37735f9a3cd04f46522a98748a38534cc9d6b8
-DIST genpy-0.6.8.tar.gz 52344 BLAKE2B 1b58011126d577c7c16c0b37940d491f18e9a1013296b873dfa6e53697c2b6a3e7a829b760e591b3fa502a5fd53461256547212483cd13e27f476e0a16e8121a SHA512 5de1bea04a08c4fa72ae369d56c0f4b6a0106f7317490bc9c9c65c4506028f4aa44cb149d85d270c85c72ce5847db9110e7d48a1a4331a7d588222647f3dfc5f
-EBUILD genpy-0.6.7.ebuild 522 BLAKE2B 33d9d2ba05b851c41096951342382384a51e8e6803bbf66f722038f163eac286a024d0810ac255c751b7ccdeb85729d08b26484cb3bc06285e6980b75005c0de SHA512 8ea305fe253b0dbf03328261f0df46554fda381dd8a8e8578c4a379eb119754299103aa9d1978e823ac6d74f99a87687e56eeb7ee3cabe1baee91edba41450b0
-EBUILD genpy-0.6.8.ebuild 522 BLAKE2B 33d9d2ba05b851c41096951342382384a51e8e6803bbf66f722038f163eac286a024d0810ac255c751b7ccdeb85729d08b26484cb3bc06285e6980b75005c0de SHA512 8ea305fe253b0dbf03328261f0df46554fda381dd8a8e8578c4a379eb119754299103aa9d1978e823ac6d74f99a87687e56eeb7ee3cabe1baee91edba41450b0
-EBUILD genpy-9999.ebuild 522 BLAKE2B 33d9d2ba05b851c41096951342382384a51e8e6803bbf66f722038f163eac286a024d0810ac255c751b7ccdeb85729d08b26484cb3bc06285e6980b75005c0de SHA512 8ea305fe253b0dbf03328261f0df46554fda381dd8a8e8578c4a379eb119754299103aa9d1978e823ac6d74f99a87687e56eeb7ee3cabe1baee91edba41450b0
+AUX yaml.patch 543 BLAKE2B c476c582c2363bd5bdf9b472dc784726eb2bd65081d3629f7d822decbb92ecfe0c695691219c661b7bad850521346eb591c9c00498c3ab1e0f85597b8497c3a8 SHA512 4fc53e0c904d5dfa637476b833e8a5038305ebd0672f5acf08f81b2ae97970b0e4996df483ff087a2eb16957b659d0a528545fe8704cc26f1f6029105a2aea87
+DIST genpy-0.6.11.tar.gz 53128 BLAKE2B c0c6d9aa8d713e873a5cbceda8763c23e4b6259f5708be1575c4eae600b3f96bd8f05cda281711c799a0a4e00d69623ed0ddcb7812b4894d7c45717121f51c00 SHA512 267391cce6119085ae974f00fa4a33767b2b62a5d61bd290b3d2164cee275ce88b21d124b2da9ca9d85ac6a3a030ceddef766be34fba9c0d57ba26d6e1e41186
+EBUILD genpy-0.6.11.ebuild 519 BLAKE2B 9f3ce5dfb4bf2fbf28fefb6039d5b62075de77e5b51acecc86ead5c897e01850c805b6cf488a9a587a76ec4dcab42303f55f092c5baee81dd81707d5f5a6f395 SHA512 54bb873005224a1dcf347c02bd26282d0dfd67f4b526bb9aa674e9be8e557366afbcb7a2bdf6e887dac2b3778b8b5a40dbf6995e1bf788bd7530e67e51eea872
+EBUILD genpy-9999.ebuild 519 BLAKE2B 9f3ce5dfb4bf2fbf28fefb6039d5b62075de77e5b51acecc86ead5c897e01850c805b6cf488a9a587a76ec4dcab42303f55f092c5baee81dd81707d5f5a6f395 SHA512 54bb873005224a1dcf347c02bd26282d0dfd67f4b526bb9aa674e9be8e557366afbcb7a2bdf6e887dac2b3778b8b5a40dbf6995e1bf788bd7530e67e51eea872
 MISC metadata.xml 323 BLAKE2B 025145a67d18622d14ea6ac43585246aac2cdc4f65e63b04dbfd32aa6f04f4e301e22f2e326a486e2fad3c1ef82f9890179a8dc142f4aa551b5b9db155e616da SHA512 523ec83e710fb0b80d731b536c8605a4211bfa176951a1af5ee6f6e60fee1ca3634c0d659b2d3ae71f3bb9d3765cc44cfdada5c7a364cea63f323c462227f364
diff --git a/dev-ros/genpy/files/yaml.patch b/dev-ros/genpy/files/yaml.patch
new file mode 100644
index 000000000000..f4959213f356
--- /dev/null
+++ b/dev-ros/genpy/files/yaml.patch
@@ -0,0 +1,13 @@
+Index: genpy-0.6.11/test/test_genpy_message.py
+===================================================================
+--- genpy-0.6.11.orig/test/test_genpy_message.py
++++ genpy-0.6.11/test/test_genpy_message.py
+@@ -612,7 +612,7 @@ d: """ + """
+         def roundtrip(m):
+             yaml_text = strify_message(m)
+             print(yaml_text)
+-            loaded = yaml.load(yaml_text)
++            loaded = yaml.safe_load(yaml_text)
+             print('loaded', loaded)
+             new_inst = m.__class__()
+             if loaded is not None:
diff --git a/dev-ros/genpy/genpy-0.6.7.ebuild b/dev-ros/genpy/genpy-0.6.11.ebuild
index 68c34049dcc0..29c86a165741 100644
--- a/dev-ros/genpy/genpy-0.6.7.ebuild
+++ b/dev-ros/genpy/genpy-0.6.11.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/genpy"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin
 
@@ -22,3 +21,4 @@ DEPEND="${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
 	)
 "
+PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/genpy/genpy-0.6.8.ebuild b/dev-ros/genpy/genpy-0.6.8.ebuild
deleted file mode 100644
index 68c34049dcc0..000000000000
--- a/dev-ros/genpy/genpy-0.6.8.ebuild
+++ /dev/null
@@ -1,24 +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/genpy"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Python ROS message and service generators"
-HOMEPAGE="http://wiki.ros.org/genpy"
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE=""
-
-RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/genpy/genpy-9999.ebuild b/dev-ros/genpy/genpy-9999.ebuild
index 68c34049dcc0..29c86a165741 100644
--- a/dev-ros/genpy/genpy-9999.ebuild
+++ b/dev-ros/genpy/genpy-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/genpy"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin
 
@@ -22,3 +21,4 @@ DEPEND="${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
 	)
 "
+PATCHES=( "${FILESDIR}/yaml.patch" )