From c6e8a5cdf68eb5c66693c88e6ed02c040b2d5883 Mon Sep 17 00:00:00 2001
From: Alexis Ballier <aballier@gentoo.org>
Date: Mon, 18 May 2020 17:33:28 +0200
Subject: dev-ros/genpy: bump to 0.6.11

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
---
 dev-ros/genpy/Manifest            |  1 +
 dev-ros/genpy/files/yaml.patch    | 13 +++++++++++++
 dev-ros/genpy/genpy-0.6.11.ebuild | 24 ++++++++++++++++++++++++
 dev-ros/genpy/genpy-9999.ebuild   |  4 ++--
 4 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 dev-ros/genpy/files/yaml.patch
 create mode 100644 dev-ros/genpy/genpy-0.6.11.ebuild

(limited to 'dev-ros')

diff --git a/dev-ros/genpy/Manifest b/dev-ros/genpy/Manifest
index 12ff7bac0b3b..4bb11e7690e5 100644
--- a/dev-ros/genpy/Manifest
+++ b/dev-ros/genpy/Manifest
@@ -1,2 +1,3 @@
+DIST genpy-0.6.11.tar.gz 53128 BLAKE2B c0c6d9aa8d713e873a5cbceda8763c23e4b6259f5708be1575c4eae600b3f96bd8f05cda281711c799a0a4e00d69623ed0ddcb7812b4894d7c45717121f51c00 SHA512 267391cce6119085ae974f00fa4a33767b2b62a5d61bd290b3d2164cee275ce88b21d124b2da9ca9d85ac6a3a030ceddef766be34fba9c0d57ba26d6e1e41186
 DIST genpy-0.6.7.tar.gz 52001 BLAKE2B 6c2a6cbbac6b0c72b1d5bec160f2f06ac86852afa2664835a4223e5adc5df6ae13a3a506d1c684f39f1066094f437fc54e4deb927c9e58209231af599b70af77 SHA512 645db3b343d53a640c6cbae91ec178bb99249899632b88f54831a524c2c3d76a68c8e45e2820b536509eb3d84a37735f9a3cd04f46522a98748a38534cc9d6b8
 DIST genpy-0.6.8.tar.gz 52344 BLAKE2B 1b58011126d577c7c16c0b37940d491f18e9a1013296b873dfa6e53697c2b6a3e7a829b760e591b3fa502a5fd53461256547212483cd13e27f476e0a16e8121a SHA512 5de1bea04a08c4fa72ae369d56c0f4b6a0106f7317490bc9c9c65c4506028f4aa44cb149d85d270c85c72ce5847db9110e7d48a1a4331a7d588222647f3dfc5f
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.11.ebuild b/dev-ros/genpy/genpy-0.6.11.ebuild
new file mode 100644
index 000000000000..29c86a165741
--- /dev/null
+++ b/dev-ros/genpy/genpy-0.6.11.ebuild
@@ -0,0 +1,24 @@
+# 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/genpy"
+KEYWORDS="~amd64 ~arm"
+
+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}]
+	)
+"
+PATCHES=( "${FILESDIR}/yaml.patch" )
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" )
-- 
cgit v1.2.3-65-gdbad