diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-ros/rosmaster | |
parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) |
gentoo resync : 25.08.2020
Diffstat (limited to 'dev-ros/rosmaster')
-rw-r--r-- | dev-ros/rosmaster/Manifest | 24 | ||||
-rw-r--r-- | dev-ros/rosmaster/rosmaster-1.13.2.ebuild | 23 | ||||
-rw-r--r-- | dev-ros/rosmaster/rosmaster-1.13.4.ebuild | 23 | ||||
-rw-r--r-- | dev-ros/rosmaster/rosmaster-1.13.5.ebuild | 23 | ||||
-rw-r--r-- | dev-ros/rosmaster/rosmaster-1.13.6.ebuild | 23 | ||||
-rw-r--r-- | dev-ros/rosmaster/rosmaster-1.14.2.ebuild | 23 | ||||
-rw-r--r-- | dev-ros/rosmaster/rosmaster-1.14.3.ebuild | 23 | ||||
-rw-r--r-- | dev-ros/rosmaster/rosmaster-1.15.4.ebuild | 23 | ||||
-rw-r--r-- | dev-ros/rosmaster/rosmaster-1.15.7.ebuild (renamed from dev-ros/rosmaster/rosmaster-1.13.0.ebuild) | 9 | ||||
-rw-r--r-- | dev-ros/rosmaster/rosmaster-1.15.8.ebuild (renamed from dev-ros/rosmaster/rosmaster-1.13.1.ebuild) | 9 | ||||
-rw-r--r-- | dev-ros/rosmaster/rosmaster-9999.ebuild | 9 |
11 files changed, 17 insertions, 195 deletions
diff --git a/dev-ros/rosmaster/Manifest b/dev-ros/rosmaster/Manifest index 413b419d58c9..bd0271937e80 100644 --- a/dev-ros/rosmaster/Manifest +++ b/dev-ros/rosmaster/Manifest @@ -1,20 +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 -DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3 -DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc -EBUILD rosmaster-1.13.0.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4 -EBUILD rosmaster-1.13.1.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4 -EBUILD rosmaster-1.13.2.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4 -EBUILD rosmaster-1.13.4.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4 -EBUILD rosmaster-1.13.5.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4 -EBUILD rosmaster-1.13.6.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4 -EBUILD rosmaster-1.14.2.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4 -EBUILD rosmaster-1.14.3.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4 -EBUILD rosmaster-1.15.4.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4 -EBUILD rosmaster-9999.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4 +DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e +DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9 +EBUILD rosmaster-1.15.7.ebuild 512 BLAKE2B 2bc45ed2f61251e6c25fe3caaf50536f5379356d9aacd1840d1011ce17cd8954a5ffd1dfa2e9164afd6c0b03ed77c4e9a6f73ad0f1f071c1e9c086f666d73e01 SHA512 f07ee64c88f466b5bcd95cf59a43340aca286e9367b9a9c4975cbd6cfee013389062b6d08e87828bbd55a6e732bb16dd12b297703aae324d4b158de39d47ce99 +EBUILD rosmaster-1.15.8.ebuild 512 BLAKE2B 2bc45ed2f61251e6c25fe3caaf50536f5379356d9aacd1840d1011ce17cd8954a5ffd1dfa2e9164afd6c0b03ed77c4e9a6f73ad0f1f071c1e9c086f666d73e01 SHA512 f07ee64c88f466b5bcd95cf59a43340aca286e9367b9a9c4975cbd6cfee013389062b6d08e87828bbd55a6e732bb16dd12b297703aae324d4b158de39d47ce99 +EBUILD rosmaster-9999.ebuild 512 BLAKE2B 2bc45ed2f61251e6c25fe3caaf50536f5379356d9aacd1840d1011ce17cd8954a5ffd1dfa2e9164afd6c0b03ed77c4e9a6f73ad0f1f071c1e9c086f666d73e01 SHA512 f07ee64c88f466b5bcd95cf59a43340aca286e9367b9a9c4975cbd6cfee013389062b6d08e87828bbd55a6e732bb16dd12b297703aae324d4b158de39d47ce99 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45 diff --git a/dev-ros/rosmaster/rosmaster-1.13.2.ebuild b/dev-ros/rosmaster/rosmaster-1.13.2.ebuild deleted file mode 100644 index a339d31c4b73..000000000000 --- a/dev-ros/rosmaster/rosmaster-1.13.2.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/ros_comm" -KEYWORDS="~amd64 ~arm" -PYTHON_COMPAT=( python{2_7,3_6} pypy3 ) -ROS_SUBDIR=tools/${PN} - -inherit ros-catkin - -DESCRIPTION="ROS Master implementation" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-python/defusedxml[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - test? ( dev-python/nose[${PYTHON_USEDEP}] )" diff --git a/dev-ros/rosmaster/rosmaster-1.13.4.ebuild b/dev-ros/rosmaster/rosmaster-1.13.4.ebuild deleted file mode 100644 index a339d31c4b73..000000000000 --- a/dev-ros/rosmaster/rosmaster-1.13.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/ros_comm" -KEYWORDS="~amd64 ~arm" -PYTHON_COMPAT=( python{2_7,3_6} pypy3 ) -ROS_SUBDIR=tools/${PN} - -inherit ros-catkin - -DESCRIPTION="ROS Master implementation" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-python/defusedxml[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - test? ( dev-python/nose[${PYTHON_USEDEP}] )" diff --git a/dev-ros/rosmaster/rosmaster-1.13.5.ebuild b/dev-ros/rosmaster/rosmaster-1.13.5.ebuild deleted file mode 100644 index a339d31c4b73..000000000000 --- a/dev-ros/rosmaster/rosmaster-1.13.5.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/ros_comm" -KEYWORDS="~amd64 ~arm" -PYTHON_COMPAT=( python{2_7,3_6} pypy3 ) -ROS_SUBDIR=tools/${PN} - -inherit ros-catkin - -DESCRIPTION="ROS Master implementation" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-python/defusedxml[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - test? ( dev-python/nose[${PYTHON_USEDEP}] )" diff --git a/dev-ros/rosmaster/rosmaster-1.13.6.ebuild b/dev-ros/rosmaster/rosmaster-1.13.6.ebuild deleted file mode 100644 index a339d31c4b73..000000000000 --- a/dev-ros/rosmaster/rosmaster-1.13.6.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/ros_comm" -KEYWORDS="~amd64 ~arm" -PYTHON_COMPAT=( python{2_7,3_6} pypy3 ) -ROS_SUBDIR=tools/${PN} - -inherit ros-catkin - -DESCRIPTION="ROS Master implementation" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-python/defusedxml[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - test? ( dev-python/nose[${PYTHON_USEDEP}] )" diff --git a/dev-ros/rosmaster/rosmaster-1.14.2.ebuild b/dev-ros/rosmaster/rosmaster-1.14.2.ebuild deleted file mode 100644 index a339d31c4b73..000000000000 --- a/dev-ros/rosmaster/rosmaster-1.14.2.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/ros_comm" -KEYWORDS="~amd64 ~arm" -PYTHON_COMPAT=( python{2_7,3_6} pypy3 ) -ROS_SUBDIR=tools/${PN} - -inherit ros-catkin - -DESCRIPTION="ROS Master implementation" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-python/defusedxml[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - test? ( dev-python/nose[${PYTHON_USEDEP}] )" diff --git a/dev-ros/rosmaster/rosmaster-1.14.3.ebuild b/dev-ros/rosmaster/rosmaster-1.14.3.ebuild deleted file mode 100644 index a339d31c4b73..000000000000 --- a/dev-ros/rosmaster/rosmaster-1.14.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/ros_comm" -KEYWORDS="~amd64 ~arm" -PYTHON_COMPAT=( python{2_7,3_6} pypy3 ) -ROS_SUBDIR=tools/${PN} - -inherit ros-catkin - -DESCRIPTION="ROS Master implementation" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-python/defusedxml[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - test? ( dev-python/nose[${PYTHON_USEDEP}] )" diff --git a/dev-ros/rosmaster/rosmaster-1.15.4.ebuild b/dev-ros/rosmaster/rosmaster-1.15.4.ebuild deleted file mode 100644 index a339d31c4b73..000000000000 --- a/dev-ros/rosmaster/rosmaster-1.15.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/ros_comm" -KEYWORDS="~amd64 ~arm" -PYTHON_COMPAT=( python{2_7,3_6} pypy3 ) -ROS_SUBDIR=tools/${PN} - -inherit ros-catkin - -DESCRIPTION="ROS Master implementation" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-python/defusedxml[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - test? ( dev-python/nose[${PYTHON_USEDEP}] )" diff --git a/dev-ros/rosmaster/rosmaster-1.13.0.ebuild b/dev-ros/rosmaster/rosmaster-1.15.7.ebuild index a339d31c4b73..82438464c6ff 100644 --- a/dev-ros/rosmaster/rosmaster-1.13.0.ebuild +++ b/dev-ros/rosmaster/rosmaster-1.15.7.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/ros_comm" KEYWORDS="~amd64 ~arm" -PYTHON_COMPAT=( python{2_7,3_6} pypy3 ) ROS_SUBDIR=tools/${PN} inherit ros-catkin @@ -16,8 +15,8 @@ SLOT="0" IUSE="" RDEPEND=" - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-python/defusedxml[${PYTHON_USEDEP}] + dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep "dev-python/defusedxml[\${PYTHON_USEDEP}]") " DEPEND="${RDEPEND} - test? ( dev-python/nose[${PYTHON_USEDEP}] )" + test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )" diff --git a/dev-ros/rosmaster/rosmaster-1.13.1.ebuild b/dev-ros/rosmaster/rosmaster-1.15.8.ebuild index a339d31c4b73..82438464c6ff 100644 --- a/dev-ros/rosmaster/rosmaster-1.13.1.ebuild +++ b/dev-ros/rosmaster/rosmaster-1.15.8.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/ros_comm" KEYWORDS="~amd64 ~arm" -PYTHON_COMPAT=( python{2_7,3_6} pypy3 ) ROS_SUBDIR=tools/${PN} inherit ros-catkin @@ -16,8 +15,8 @@ SLOT="0" IUSE="" RDEPEND=" - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-python/defusedxml[${PYTHON_USEDEP}] + dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep "dev-python/defusedxml[\${PYTHON_USEDEP}]") " DEPEND="${RDEPEND} - test? ( dev-python/nose[${PYTHON_USEDEP}] )" + test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )" diff --git a/dev-ros/rosmaster/rosmaster-9999.ebuild b/dev-ros/rosmaster/rosmaster-9999.ebuild index a339d31c4b73..82438464c6ff 100644 --- a/dev-ros/rosmaster/rosmaster-9999.ebuild +++ b/dev-ros/rosmaster/rosmaster-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/ros_comm" KEYWORDS="~amd64 ~arm" -PYTHON_COMPAT=( python{2_7,3_6} pypy3 ) ROS_SUBDIR=tools/${PN} inherit ros-catkin @@ -16,8 +15,8 @@ SLOT="0" IUSE="" RDEPEND=" - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-python/defusedxml[${PYTHON_USEDEP}] + dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep "dev-python/defusedxml[\${PYTHON_USEDEP}]") " DEPEND="${RDEPEND} - test? ( dev-python/nose[${PYTHON_USEDEP}] )" + test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )" |