gentoo resync : 24.07.2021

6 files changed, 23 insertions, 147 deletions

diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 242ba84d0276..806cc9190888 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/roslaunch/Manifest b/dev-ros/roslaunch/Manifest
index 8fe934d42c1e..83939db14de7 100644
--- a/dev-ros/roslaunch/Manifest
+++ b/dev-ros/roslaunch/Manifest
@@ -5,10 +5,6 @@ AUX roscore.xml.in 347 BLAKE2B 05c90bd6a2cffeaab16d1fb576e2cbe5768a848c5b6231af9
 AUX roslaunch.confd 46 BLAKE2B 24fcab885cf07185c751da12863e3af0ac8f1097a636c3641be1b6357e26b5178d13ee42d04bbacea27763df075f5436813afc2025dd9013461059b0c5feacd9 SHA512 0a86b0beb7b4bad2c01f3814070d27a3c85a99629ab26fa3aa6cce19d178d500c912665b152403cf7301f210e3cf9e6bd03103c3654b1ef61dae165ba5ac704d
 AUX roslaunch.initd 915 BLAKE2B 11f2c6f2db2ad1084332a1b704a90ed3a3fc9fe671f96f6ca74bbabdab3b7f22bed96c077dd994e3c3fc54eb299e93001167fe16e688eb062033f3da86ac168d SHA512 4f8bb2dfe085d09245ec2343e423e1dacbd02108868c5d9523d63929c939b753f45ce963d5d44b5ad0f547f7d85b82ea6d3a80f8984dfe72ade7f8a5372c850c
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD roslaunch-1.15.10.ebuild 1638 BLAKE2B 0aef70b6a9423d1a01bb703f5bdcb14871d602950c778fc143ac643036645c79b381428ff68db92c23b92a5daa08276ebcde11eb80cab95863bfef49704b3b72 SHA512 889c71478fea43c38557a1e8ab8f3800de5fde0a42479eabff930ad4e0385a6a4c01622e91214fe21c63789e29e5b2a08120076e70da63918f95ec21801f16c2
-EBUILD roslaunch-1.15.8-r1.ebuild 1638 BLAKE2B 3b0bbdda497ad507283016a803a75d67ffaa47c766295f887fcae53ac0cf03622c4497263888b42dc1f705e5699ef443692b1fcad48e950352e2998bea287141 SHA512 2929c876f90e4feb4411f39dc3dabf24bb30858411ca9d5f39f4b956ccbcbaba5cb278d593f9db0b10e69314fdca43c952f4d9b1840d946f6bb01088093f3a8e
-EBUILD roslaunch-1.15.9.ebuild 1638 BLAKE2B 3b0bbdda497ad507283016a803a75d67ffaa47c766295f887fcae53ac0cf03622c4497263888b42dc1f705e5699ef443692b1fcad48e950352e2998bea287141 SHA512 2929c876f90e4feb4411f39dc3dabf24bb30858411ca9d5f39f4b956ccbcbaba5cb278d593f9db0b10e69314fdca43c952f4d9b1840d946f6bb01088093f3a8e
-EBUILD roslaunch-9999.ebuild 1638 BLAKE2B 3b0bbdda497ad507283016a803a75d67ffaa47c766295f887fcae53ac0cf03622c4497263888b42dc1f705e5699ef443692b1fcad48e950352e2998bea287141 SHA512 2929c876f90e4feb4411f39dc3dabf24bb30858411ca9d5f39f4b956ccbcbaba5cb278d593f9db0b10e69314fdca43c952f4d9b1840d946f6bb01088093f3a8e
+EBUILD roslaunch-1.15.10-r1.ebuild 1615 BLAKE2B 520bb52d2fd22675c70bc5b78160016f00c5c3ecaed2fee42f111067c5c01699ec120b88fe7e150331b6b08d25705e79149734fbe07245d5879f41d37a6baf48 SHA512 61313cb9c6d97ed313577208471f4fe589213f8eb7bd04d9333de017175a17f7cf47ec77574204b4c91db7774c9ce5b470d8d67395225c502aa8baec6a7e985a
+EBUILD roslaunch-9999.ebuild 1615 BLAKE2B 520bb52d2fd22675c70bc5b78160016f00c5c3ecaed2fee42f111067c5c01699ec120b88fe7e150331b6b08d25705e79149734fbe07245d5879f41d37a6baf48 SHA512 61313cb9c6d97ed313577208471f4fe589213f8eb7bd04d9333de017175a17f7cf47ec77574204b4c91db7774c9ce5b470d8d67395225c502aa8baec6a7e985a
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roslaunch/roslaunch-1.15.10.ebuild b/dev-ros/roslaunch/roslaunch-1.15.10-r1.ebuild
index da9d039bce6a..2cc8912dd83a 100644
--- a/dev-ros/roslaunch/roslaunch-1.15.10.ebuild
+++ b/dev-ros/roslaunch/roslaunch-1.15.10-r1.ebuild
@@ -7,14 +7,13 @@ ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=tools/${PN}
 
-inherit ros-catkin user
+inherit ros-catkin
 
 DESCRIPTION="Tool for easily launching multiple ROS nodes"
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
 
-RDEPEND="
+CDEPEND="
 	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
 	dev-ros/rosclean[${PYTHON_SINGLE_USEDEP}]
@@ -24,7 +23,14 @@ RDEPEND="
 	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/rosout
 "
-DEPEND="${RDEPEND}
+
+RDEPEND="
+	${CDEPEND}
+	acct-group/ros
+	acct-user/ros
+"
+DEPEND="
+	${CDEPEND}
 	test? (
 		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
 		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
@@ -54,8 +60,3 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins test/xml/noop.launch
 }
-
-pkg_preinst() {
-	enewgroup ros
-	enewuser ros -1 -1 /home/ros ros
-}
diff --git a/dev-ros/roslaunch/roslaunch-1.15.8-r1.ebuild b/dev-ros/roslaunch/roslaunch-1.15.8-r1.ebuild
deleted file mode 100644
index b0c3d9412aae..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.15.8-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin user
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rosclean[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosout
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/test_rosmaster
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${S}/../rosmaster/:${EPREFIX}/usr/share/ros_packages/rosparam:${EPREFIX}/usr/share/ros_packages/roslib:${EPREFIX}/usr/share/ros_packages/rosout"
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-
-	dodir /etc/ros
-	sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
-	newinitd "${FILESDIR}/roscore.initd" roscore
-	newconfd "${FILESDIR}/roscore.confd" roscore
-
-	newinitd "${FILESDIR}/roslaunch.initd" roslaunch
-	newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
-	doenvd "${FILESDIR}/40roslaunch"
-
-	# Needed by test_roslaunch
-	insinto /usr/share/${PN}
-	doins test/xml/noop.launch
-}
-
-pkg_preinst() {
-	enewgroup ros
-	enewuser ros -1 -1 /home/ros ros
-}
diff --git a/dev-ros/roslaunch/roslaunch-1.15.9.ebuild b/dev-ros/roslaunch/roslaunch-1.15.9.ebuild
deleted file mode 100644
index b0c3d9412aae..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.15.9.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin user
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rosclean[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosout
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/test_rosmaster
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${S}/../rosmaster/:${EPREFIX}/usr/share/ros_packages/rosparam:${EPREFIX}/usr/share/ros_packages/roslib:${EPREFIX}/usr/share/ros_packages/rosout"
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-
-	dodir /etc/ros
-	sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
-	newinitd "${FILESDIR}/roscore.initd" roscore
-	newconfd "${FILESDIR}/roscore.confd" roscore
-
-	newinitd "${FILESDIR}/roslaunch.initd" roslaunch
-	newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
-	doenvd "${FILESDIR}/40roslaunch"
-
-	# Needed by test_roslaunch
-	insinto /usr/share/${PN}
-	doins test/xml/noop.launch
-}
-
-pkg_preinst() {
-	enewgroup ros
-	enewuser ros -1 -1 /home/ros ros
-}
diff --git a/dev-ros/roslaunch/roslaunch-9999.ebuild b/dev-ros/roslaunch/roslaunch-9999.ebuild
index b0c3d9412aae..2cc8912dd83a 100644
--- a/dev-ros/roslaunch/roslaunch-9999.ebuild
+++ b/dev-ros/roslaunch/roslaunch-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,14 +7,13 @@ ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=tools/${PN}
 
-inherit ros-catkin user
+inherit ros-catkin
 
 DESCRIPTION="Tool for easily launching multiple ROS nodes"
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
 
-RDEPEND="
+CDEPEND="
 	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
 	dev-ros/rosclean[${PYTHON_SINGLE_USEDEP}]
@@ -24,7 +23,14 @@ RDEPEND="
 	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/rosout
 "
-DEPEND="${RDEPEND}
+
+RDEPEND="
+	${CDEPEND}
+	acct-group/ros
+	acct-user/ros
+"
+DEPEND="
+	${CDEPEND}
 	test? (
 		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
 		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
@@ -54,8 +60,3 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins test/xml/noop.launch
 }
-
-pkg_preinst() {
-	enewgroup ros
-	enewuser ros -1 -1 /home/ros ros
-}