From 4f3b1ed890da4509aadc40c4cc77c410d3f8b1f0 Mon Sep 17 00:00:00 2001
From: Alexis Ballier <aballier@gentoo.org>
Date: Thu, 19 Nov 2015 10:58:32 +0100
Subject: dev-ros/roslaunch: Remove env.d values already set by catkin.

Package-Manager: portage-2.2.25
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
---
 dev-ros/roslaunch/files/40roslaunch           |  3 --
 dev-ros/roslaunch/roslaunch-1.11.16-r1.ebuild | 64 +++++++++++++++++++++++++++
 dev-ros/roslaunch/roslaunch-1.11.16.ebuild    | 64 ---------------------------
 3 files changed, 64 insertions(+), 67 deletions(-)
 create mode 100644 dev-ros/roslaunch/roslaunch-1.11.16-r1.ebuild
 delete mode 100644 dev-ros/roslaunch/roslaunch-1.11.16.ebuild

(limited to 'dev-ros')

diff --git a/dev-ros/roslaunch/files/40roslaunch b/dev-ros/roslaunch/files/40roslaunch
index 49bb4265eba8..1e8f4dadcf29 100644
--- a/dev-ros/roslaunch/files/40roslaunch
+++ b/dev-ros/roslaunch/files/40roslaunch
@@ -1,4 +1 @@
-CATKIN_PREFIX_PATH=/usr
-ROS_ROOT=/usr/share/ros
-ROS_PACKAGE_PATH=/usr/share
 ROS_MASTER_URI="http://localhost:11311/"
diff --git a/dev-ros/roslaunch/roslaunch-1.11.16-r1.ebuild b/dev-ros/roslaunch/roslaunch-1.11.16-r1.ebuild
new file mode 100644
index 000000000000..83dd9b8705ba
--- /dev/null
+++ b/dev-ros/roslaunch/roslaunch-1.11.16-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin user
+
+DESCRIPTION="Tool for easily launching multiple ROS nodes"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/rosclean[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosparam[${PYTHON_USEDEP}]
+	dev-ros/rosmaster[${PYTHON_USEDEP}]
+	dev-ros/rosout
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-util/rosdep[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-ros/test_rosmaster
+	)"
+PATCHES=( "${FILESDIR}/timeout.patch" )
+
+src_test() {
+	rosdep update
+	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.11.16.ebuild b/dev-ros/roslaunch/roslaunch-1.11.16.ebuild
deleted file mode 100644
index 83dd9b8705ba..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.11.16.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin user
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rosclean[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosparam[${PYTHON_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_USEDEP}]
-	dev-ros/rosout
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-util/rosdep[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/test_rosmaster
-	)"
-PATCHES=( "${FILESDIR}/timeout.patch" )
-
-src_test() {
-	rosdep update
-	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
-}
-- 
cgit v1.2.3-65-gdbad