summaryrefslogtreecommitdiff
path: root/dev-ros/rosparam
diff options
context:
space:
mode:
Diffstat (limited to 'dev-ros/rosparam')
-rw-r--r--dev-ros/rosparam/Manifest18
-rw-r--r--dev-ros/rosparam/files/yaml.patch22
-rw-r--r--dev-ros/rosparam/files/yaml2.patch76
-rw-r--r--dev-ros/rosparam/rosparam-1.13.1.ebuild22
-rw-r--r--dev-ros/rosparam/rosparam-1.13.2.ebuild22
-rw-r--r--dev-ros/rosparam/rosparam-1.13.4.ebuild22
-rw-r--r--dev-ros/rosparam/rosparam-1.13.5.ebuild22
-rw-r--r--dev-ros/rosparam/rosparam-1.13.6.ebuild22
-rw-r--r--dev-ros/rosparam/rosparam-1.14.2.ebuild22
-rw-r--r--dev-ros/rosparam/rosparam-1.14.3-r1.ebuild (renamed from dev-ros/rosparam/rosparam-1.13.0.ebuild)1
-rw-r--r--dev-ros/rosparam/rosparam-1.14.3.ebuild22
11 files changed, 102 insertions, 169 deletions
diff --git a/dev-ros/rosparam/Manifest b/dev-ros/rosparam/Manifest
index a3e89c70e284..46b869dc3a58 100644
--- a/dev-ros/rosparam/Manifest
+++ b/dev-ros/rosparam/Manifest
@@ -1,18 +1,6 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+AUX yaml.patch 895 BLAKE2B 983493cadf83e5eee7646769ddc8560bbcff3756ebdb77f4365e0a3e10d97b104c4a6ec3ceb0d7e3504502c250cc21ee07b3f5582e3521a5eafe7f5925c622a1 SHA512 92a6ba5660b2cc0a490477d4e4fd39ebbd95912804d5c32c76eec5dc4fc5a67e043dc9cce2ee13d44c623b7a7b710d045fabd68ff3968d2e5ea555d97eb219f2
+AUX yaml2.patch 3279 BLAKE2B 8ca2d9dcd99eeefe7ca2c5039a894bfcda02586995a2982c8f6ea6ac61c19c16325e53bd0733b1c3272160f3dd572ed8aa5c754ad7d182adfc8e85f7b39e0c99 SHA512 23856b931f203fc3c0adfddbcc3c94ea1b827eb2a1f8550d130ac25abdb09a2167da5f4ae9aaf9d869326a80f1964e0f5a00e68895133fb101e4accdf6f5a4c4
DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-EBUILD rosparam-1.13.0.ebuild 506 BLAKE2B 32fcc9ac03bcbda6275f080cc5beec6915f0978ac13d0d0d6b05f1f4c41b017e6f0d3ee11a701efd2cd8676fc54b7d53ebf8f122fbced0834221a20b37e1f61d SHA512 1ed7ef11d4a878df4bbea652c74c8edca42e67104688784286f6c3978a0fb80ecb5a2f1ee441edcb341452a4391bbf1375c151a05d8d2f9ab4e721da5630f114
-EBUILD rosparam-1.13.1.ebuild 506 BLAKE2B 32fcc9ac03bcbda6275f080cc5beec6915f0978ac13d0d0d6b05f1f4c41b017e6f0d3ee11a701efd2cd8676fc54b7d53ebf8f122fbced0834221a20b37e1f61d SHA512 1ed7ef11d4a878df4bbea652c74c8edca42e67104688784286f6c3978a0fb80ecb5a2f1ee441edcb341452a4391bbf1375c151a05d8d2f9ab4e721da5630f114
-EBUILD rosparam-1.13.2.ebuild 506 BLAKE2B 32fcc9ac03bcbda6275f080cc5beec6915f0978ac13d0d0d6b05f1f4c41b017e6f0d3ee11a701efd2cd8676fc54b7d53ebf8f122fbced0834221a20b37e1f61d SHA512 1ed7ef11d4a878df4bbea652c74c8edca42e67104688784286f6c3978a0fb80ecb5a2f1ee441edcb341452a4391bbf1375c151a05d8d2f9ab4e721da5630f114
-EBUILD rosparam-1.13.4.ebuild 506 BLAKE2B 32fcc9ac03bcbda6275f080cc5beec6915f0978ac13d0d0d6b05f1f4c41b017e6f0d3ee11a701efd2cd8676fc54b7d53ebf8f122fbced0834221a20b37e1f61d SHA512 1ed7ef11d4a878df4bbea652c74c8edca42e67104688784286f6c3978a0fb80ecb5a2f1ee441edcb341452a4391bbf1375c151a05d8d2f9ab4e721da5630f114
-EBUILD rosparam-1.13.5.ebuild 506 BLAKE2B 32fcc9ac03bcbda6275f080cc5beec6915f0978ac13d0d0d6b05f1f4c41b017e6f0d3ee11a701efd2cd8676fc54b7d53ebf8f122fbced0834221a20b37e1f61d SHA512 1ed7ef11d4a878df4bbea652c74c8edca42e67104688784286f6c3978a0fb80ecb5a2f1ee441edcb341452a4391bbf1375c151a05d8d2f9ab4e721da5630f114
-EBUILD rosparam-1.13.6.ebuild 506 BLAKE2B 32fcc9ac03bcbda6275f080cc5beec6915f0978ac13d0d0d6b05f1f4c41b017e6f0d3ee11a701efd2cd8676fc54b7d53ebf8f122fbced0834221a20b37e1f61d SHA512 1ed7ef11d4a878df4bbea652c74c8edca42e67104688784286f6c3978a0fb80ecb5a2f1ee441edcb341452a4391bbf1375c151a05d8d2f9ab4e721da5630f114
-EBUILD rosparam-1.14.2.ebuild 506 BLAKE2B 32fcc9ac03bcbda6275f080cc5beec6915f0978ac13d0d0d6b05f1f4c41b017e6f0d3ee11a701efd2cd8676fc54b7d53ebf8f122fbced0834221a20b37e1f61d SHA512 1ed7ef11d4a878df4bbea652c74c8edca42e67104688784286f6c3978a0fb80ecb5a2f1ee441edcb341452a4391bbf1375c151a05d8d2f9ab4e721da5630f114
-EBUILD rosparam-1.14.3.ebuild 506 BLAKE2B 32fcc9ac03bcbda6275f080cc5beec6915f0978ac13d0d0d6b05f1f4c41b017e6f0d3ee11a701efd2cd8676fc54b7d53ebf8f122fbced0834221a20b37e1f61d SHA512 1ed7ef11d4a878df4bbea652c74c8edca42e67104688784286f6c3978a0fb80ecb5a2f1ee441edcb341452a4391bbf1375c151a05d8d2f9ab4e721da5630f114
+EBUILD rosparam-1.14.3-r1.ebuild 569 BLAKE2B 5e8ff4a5aa9b7d866727a832858c0d551ab1b713632ce59e73a85050004cd1b8a7e58f64d3542a829a208fc065dd33956ca17b0c81af316632b49e459bcfe5c9 SHA512 013b49130707f51c08c0deb5bf60e4c64a5c839174f1b7c1fd3605bd8e2e749e499005b147ce0cb119697be31524d813e7a827f22d879eaa8ed31acdbdd32508
EBUILD rosparam-9999.ebuild 506 BLAKE2B 32fcc9ac03bcbda6275f080cc5beec6915f0978ac13d0d0d6b05f1f4c41b017e6f0d3ee11a701efd2cd8676fc54b7d53ebf8f122fbced0834221a20b37e1f61d SHA512 1ed7ef11d4a878df4bbea652c74c8edca42e67104688784286f6c3978a0fb80ecb5a2f1ee441edcb341452a4391bbf1375c151a05d8d2f9ab4e721da5630f114
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosparam/files/yaml.patch b/dev-ros/rosparam/files/yaml.patch
new file mode 100644
index 000000000000..a4ed42758f13
--- /dev/null
+++ b/dev-ros/rosparam/files/yaml.patch
@@ -0,0 +1,22 @@
+From 481ad19689561052afde658ab0c54c91b0e5e04a Mon Sep 17 00:00:00 2001
+From: Maxime St-Pierre <me@maximest-pierre.me>
+Date: Sun, 10 Nov 2019 06:27:40 -0500
+Subject: [PATCH] Fix #1833 change unsafe yaml.load to yaml.safe_load
+
+---
+ tools/rosparam/src/rosparam/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/rosparam/src/rosparam/__init__.py b/tools/rosparam/src/rosparam/__init__.py
+index 3279ab97d..fd8b0569f 100644
+--- a/tools/rosparam/src/rosparam/__init__.py
++++ b/tools/rosparam/src/rosparam/__init__.py
+@@ -368,7 +368,7 @@ def set_param(param, value, verbose=False):
+ :param param: parameter name, ``str``
+ :param value: yaml-encoded value, ``str``
+ """
+- set_param_raw(param, yaml.load(value), verbose=verbose)
++ set_param_raw(param, yaml.safe_load(value), verbose=verbose)
+
+ def upload_params(ns, values, verbose=False):
+ """
diff --git a/dev-ros/rosparam/files/yaml2.patch b/dev-ros/rosparam/files/yaml2.patch
new file mode 100644
index 000000000000..1e36844ee38c
--- /dev/null
+++ b/dev-ros/rosparam/files/yaml2.patch
@@ -0,0 +1,76 @@
+From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
+From: Martijn Buijs <Martijn.buijs@gmail.com>
+Date: Tue, 23 Apr 2019 18:20:12 +0200
+Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+ (#1688)
+
+* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+
+* Change all usages of yaml.load to yaml.safe_load
+
+* Extend PyYAML's SafeLoader and use it with `yaml.load`
+
+Also added convenience functions for using this loader for reuse in
+`roslaunch`
+
+* fix typo in rosparam.yaml_load_all
+
+* Modify Loader and SafeLoader in yaml module directly
+
+* Revert whitespace change
+
+* Revert unrelated change to import through global variable construction
+---
+ clients/rospy/src/rospy/client.py | 2 +-
+ .../test/test_roslib_message.py | 2 +-
+ .../client_verification/test_slave_api.py | 2 +-
+ test/test_rosparam/test/check_rosparam.py | 8 ++---
+ .../check_rosparam_command_line_online.py | 2 +-
+ .../check_rosservice_command_line_online.py | 4 +--
+ test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
+ tools/rosbag/src/rosbag/bag.py | 2 +-
+ tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
+ tools/roslaunch/src/roslaunch/loader.py | 4 +--
+ .../test/unit/test_roslaunch_dump_params.py | 4 +--
+ tools/rosparam/src/rosparam/__init__.py | 7 ++++-
+ tools/rosservice/src/rosservice/__init__.py | 4 +--
+ tools/rostopic/src/rostopic/__init__.py | 6 ++--
+ tools/topic_tools/scripts/relay_field | 2 +-
+ 15 files changed, 43 insertions(+), 38 deletions(-)
+
+diff --git a/tools/rosparam/src/rosparam/__init__.py b/tools/rosparam/src/rosparam/__init__.py
+index 41b806711..3279ab97d 100644
+--- a/tools/rosparam/src/rosparam/__init__.py
++++ b/tools/rosparam/src/rosparam/__init__.py
+@@ -99,6 +99,7 @@ def construct_yaml_binary(loader, node):
+ # register the (de)serializers with pyyaml
+ yaml.add_representer(Binary,represent_xml_binary)
+ yaml.add_constructor(u'tag:yaml.org,2002:binary', construct_yaml_binary)
++yaml.SafeLoader.add_constructor(u'tag:yaml.org,2002:binary', construct_yaml_binary)
+
+ def construct_angle_radians(loader, node):
+ """
+@@ -185,7 +186,7 @@ def load_str(str, filename, default_namespace=None, verbose=False):
+ """
+ paramlist = []
+ default_namespace = default_namespace or get_ros_namespace()
+- for doc in yaml.load_all(str):
++ for doc in yaml.safe_load_all(str):
+ if NS in doc:
+ ns = ns_join(default_namespace, doc.get(NS, None))
+ if verbose:
+@@ -633,10 +634,14 @@ def yamlmain(argv=None):
+
+ yaml.add_constructor(u'!radians', construct_angle_radians)
+ yaml.add_constructor(u'!degrees', construct_angle_degrees)
++yaml.SafeLoader.add_constructor(u'!radians', construct_angle_radians)
++yaml.SafeLoader.add_constructor(u'!degrees', construct_angle_degrees)
+
+ # allow both !degrees 180, !radians 2*pi
+ pattern = re.compile(r'^deg\([^\)]*\)$')
+ yaml.add_implicit_resolver(u'!degrees', pattern, first="deg(")
++yaml.SafeLoader.add_implicit_resolver(u'!degrees', pattern, first="deg(")
+ pattern = re.compile(r'^rad\([^\)]*\)$')
+ yaml.add_implicit_resolver(u'!radians', pattern, first="rad(")
++yaml.SafeLoader.add_implicit_resolver(u'!radians', pattern, first="rad(")
+
diff --git a/dev-ros/rosparam/rosparam-1.13.1.ebuild b/dev-ros/rosparam/rosparam-1.13.1.ebuild
deleted file mode 100644
index bdb18d0b8521..000000000000
--- a/dev-ros/rosparam/rosparam-1.13.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosparam/rosparam-1.13.2.ebuild b/dev-ros/rosparam/rosparam-1.13.2.ebuild
deleted file mode 100644
index bdb18d0b8521..000000000000
--- a/dev-ros/rosparam/rosparam-1.13.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosparam/rosparam-1.13.4.ebuild b/dev-ros/rosparam/rosparam-1.13.4.ebuild
deleted file mode 100644
index bdb18d0b8521..000000000000
--- a/dev-ros/rosparam/rosparam-1.13.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosparam/rosparam-1.13.5.ebuild b/dev-ros/rosparam/rosparam-1.13.5.ebuild
deleted file mode 100644
index bdb18d0b8521..000000000000
--- a/dev-ros/rosparam/rosparam-1.13.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosparam/rosparam-1.13.6.ebuild b/dev-ros/rosparam/rosparam-1.13.6.ebuild
deleted file mode 100644
index bdb18d0b8521..000000000000
--- a/dev-ros/rosparam/rosparam-1.13.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosparam/rosparam-1.14.2.ebuild b/dev-ros/rosparam/rosparam-1.14.2.ebuild
deleted file mode 100644
index bdb18d0b8521..000000000000
--- a/dev-ros/rosparam/rosparam-1.14.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosparam/rosparam-1.13.0.ebuild b/dev-ros/rosparam/rosparam-1.14.3-r1.ebuild
index bdb18d0b8521..844e4cb3b011 100644
--- a/dev-ros/rosparam/rosparam-1.13.0.ebuild
+++ b/dev-ros/rosparam/rosparam-1.14.3-r1.ebuild
@@ -20,3 +20,4 @@ RDEPEND="
dev-python/pyyaml[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/yaml.patch" "${FILESDIR}/yaml2.patch" )
diff --git a/dev-ros/rosparam/rosparam-1.14.3.ebuild b/dev-ros/rosparam/rosparam-1.14.3.ebuild
deleted file mode 100644
index bdb18d0b8521..000000000000
--- a/dev-ros/rosparam/rosparam-1.14.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"