gentoo resync : 14.07.2018

5 files changed, 86 insertions, 0 deletions

diff --git a/dev-ros/ros_environment/Manifest b/dev-ros/ros_environment/Manifest
new file mode 100644
index 000000000000..fa5db4025f7b
--- /dev/null
+++ b/dev-ros/ros_environment/Manifest
@@ -0,0 +1,5 @@
+AUX catkinprefixpath.patch 1035 BLAKE2B 8054e8f2ae8a7f0060d44558fe32bdf607b81054249a2f7255878801e8abc2fdaa695609fc056b5a4cfc1fdbf7eae9adbd5057bd8f0831820bbb564b4778c8f2 SHA512 ce669139250c78e521e82ea23ca288c0b12cf7da17bbf06cf4cb3c425b3bc61ad182a475af3923fdbdf7c07f574077e2ad935d6c0c133d408ffc0f0d3f2d02ae
+DIST ros_environment-1.2.0.tar.gz 6366 BLAKE2B ff540b9e861d039739253b9effbfe06ec703f47b48d9bb7009b5caed5010ed8219a207bfd363c03b115d018965c2e584abbf58f649ea868e66e79d4dda11d1ae SHA512 1b89e3d6ea88fc0972bbe980bae0b663e9335adece8eb0d517cac76b0a412cbe6b9783a967d4a9b5ca1c3bf2a432bb826d28f6f1d9a33fcc33a75edeef0be20b
+EBUILD ros_environment-1.2.0-r1.ebuild 553 BLAKE2B 54d329b8384ea3b8e000b5f9275995bd19ae2dbb4a5579e0bfb853416fab4e22999039506e60cabb7fd939755400b77218f030efc42fe32ebac8de0130b9c52e SHA512 b6706f03c5ae5ad81be45651bd4f6562617213b0e66ddcf7d3ca7e7015f845993c21eebfe06f86405e2e0e827bfdaaf603fbd99bba3a2cdda8c90f5466b8c2fa
+EBUILD ros_environment-9999.ebuild 553 BLAKE2B 54d329b8384ea3b8e000b5f9275995bd19ae2dbb4a5579e0bfb853416fab4e22999039506e60cabb7fd939755400b77218f030efc42fe32ebac8de0130b9c52e SHA512 b6706f03c5ae5ad81be45651bd4f6562617213b0e66ddcf7d3ca7e7015f845993c21eebfe06f86405e2e0e827bfdaaf603fbd99bba3a2cdda8c90f5466b8c2fa
+MISC metadata.xml 333 BLAKE2B 87f510ba6f10a5a9473d242879151d307c5357749325c127ccd415d525968f1f4f3ae23e9e11d328f7cdc115f98b4dfc492dced529627229c6f01f133f67a032 SHA512 85ed3e7f2098353f25e0e6fd77afb64a602f828ab76ae6ac3c5a47eb02cfbb884e6b25473b1488ad9746fdba3ed50db47b90a191c5f2ec145587e33f0761406b
diff --git a/dev-ros/ros_environment/files/catkinprefixpath.patch b/dev-ros/ros_environment/files/catkinprefixpath.patch
new file mode 100644
index 000000000000..67f16ec9348a
--- /dev/null
+++ b/dev-ros/ros_environment/files/catkinprefixpath.patch
@@ -0,0 +1,20 @@
+Support CATKIN_PREFIX_PATH; let CMAKE_PREFIX_PATH come first, so that standard ROS methods still work even if we do not
+use them.
+
+Index: ros_environment-1.2.0/env-hooks/1.ros_package_path.sh.em
+===================================================================
+--- ros_environment-1.2.0.orig/env-hooks/1.ros_package_path.sh.em
++++ ros_environment-1.2.0/env-hooks/1.ros_package_path.sh.em
+@@ -4,8 +4,10 @@
+ PYTHON_CODE_BUILD_ROS_PACKAGE_PATH=$(cat <<EOF
+ from __future__ import print_function
+ import os
+-env_name = 'CMAKE_PREFIX_PATH'
+-paths = [path for path in os.environ[env_name].split(os.pathsep)] if env_name in os.environ and os.environ[env_name] != '' else []
++env_names = [ 'CMAKE_PREFIX_PATH', 'CATKIN_PREFIX_PATH' ]
++paths = []
++for env_name in env_names:
++    paths += [path for path in os.environ[env_name].split(os.pathsep)] if env_name in os.environ and os.environ[env_name] != '' else []
+ workspaces = [path for path in paths if os.path.exists(os.path.join(path, '.catkin'))]
+ paths = []
+ for workspace in workspaces:
diff --git a/dev-ros/ros_environment/metadata.xml b/dev-ros/ros_environment/metadata.xml
new file mode 100644
index 000000000000..7476e60efa62
--- /dev/null
+++ b/dev-ros/ros_environment/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ros/ros_environment</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/ros_environment/ros_environment-1.2.0-r1.ebuild b/dev-ros/ros_environment/ros_environment-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..14906c3050db
--- /dev/null
+++ b/dev-ros/ros_environment/ros_environment-1.2.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_environment"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit ros-catkin
+
+DESCRIPTION="ROS environment variables"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="!!<dev-ros/roslib-1.14.3"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/catkinprefixpath.patch" )
+
+src_configure() {
+	export ROS_DISTRO="Gentoo"
+	export ROS_DISTRO_OVERRIDE="Gentoo"
+	ros-catkin_src_configure
+}
diff --git a/dev-ros/ros_environment/ros_environment-9999.ebuild b/dev-ros/ros_environment/ros_environment-9999.ebuild
new file mode 100644
index 000000000000..14906c3050db
--- /dev/null
+++ b/dev-ros/ros_environment/ros_environment-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_environment"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit ros-catkin
+
+DESCRIPTION="ROS environment variables"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="!!<dev-ros/roslib-1.14.3"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/catkinprefixpath.patch" )
+
+src_configure() {
+	export ROS_DISTRO="Gentoo"
+	export ROS_DISTRO_OVERRIDE="Gentoo"
+	ros-catkin_src_configure
+}