[gentoo-commits] repo/gentoo:master commit in: dev-ros/roslaunch/

["Conrad Kostecki" <conikost@gentoo.org>]

commit:     81dc912f4e024ded119078a9a67b0696ec3710c2
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 20 21:07:02 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Jul 20 21:09:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81dc912f

dev-ros/roslaunch: migrate to GLEP 81

Bug: https://bugs.gentoo.org/781296
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 ...unch-9999.ebuild => roslaunch-1.15.10-r1.ebuild} | 21 +++++++++++----------
 dev-ros/roslaunch/roslaunch-9999.ebuild             | 21 +++++++++++----------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/dev-ros/roslaunch/roslaunch-9999.ebuild b/dev-ros/roslaunch/roslaunch-1.15.10-r1.ebuild
similarity index 90%
copy from dev-ros/roslaunch/roslaunch-9999.ebuild
copy to dev-ros/roslaunch/roslaunch-1.15.10-r1.ebuild
index b0c3d9412aa..2cc8912dd83 100644
--- a/dev-ros/roslaunch/roslaunch-9999.ebuild
+++ b/dev-ros/roslaunch/roslaunch-1.15.10-r1.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
-}

diff --git a/dev-ros/roslaunch/roslaunch-9999.ebuild b/dev-ros/roslaunch/roslaunch-9999.ebuild
index b0c3d9412aa..2cc8912dd83 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
-}