reinit the tree, so we can have metadata

8 files changed, 192 insertions, 0 deletions

diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
new file mode 100644
index 000000000000..a11326490b7f
--- /dev/null
+++ b/dev-python/catkin_pkg/Manifest
@@ -0,0 +1,9 @@
+AUX argparse.patch 408 SHA256 6d8c796c4a1dbfeab2ea3bf1e86c31bd2fbb50319c6b36b2b988a87eb344a86b SHA512 c5a5067d3f7477935d775f5c9c39f9b5c9636e97ab567c6b7a5d34cb06f5fac58a4dff94868f2d856d792c270bc6d727fe3ec60cf8825b7ae2b4519aed999b90 WHIRLPOOL 560795db2a6a4b8116375f2b3677a382a90966957bc5fb3da3fe26c18a7ae41562de3686a498869d72b1d9d98fc31f567a1f96a9fc421ed7fb616a244ac7ef2f
+AUX catkin_prefix.patch 1619 SHA256 ca7f0d3febd5e86cc0a57d5f2eb0aa2c6954c9d835d07c47cdd8cc5039c93bec SHA512 c90f004db36fdbcc46c47fab5d800bcbc7f3b5237eaa78ceb4b47eaae0c1eba858a92d3fb673bfb9b4cd107675f8551eda4477cc419b26279bda4d55fa78f7f1 WHIRLPOOL 0e1ca510410aa67f24738e91fe709d874712611d86a655a35579928451aa725f4a33d23b7708ae68ad8045bb187ceb86c91d79faba2bda5e54c4bf914fb95d89
+AUX infinite_loop2.patch 1274 SHA256 545df24d04998671cd82ba130f8a1d69cf2576a3515b022fcdb2b04ddf45e662 SHA512 a736242c2e42d0e3c97556f565d7ebc3b06c203a21b805fa13db789ffcc396b5f79793874418c389dd0013c36f9ba6f5674026d03d26653ea2a69fb0a95bab9a WHIRLPOOL cf2dea7bf38538cbcf294a71c4a75dcc7ed8a8aec6066ab5e7ec5b22fc2c0f4b207c9ccd1e605a124c524520d2fdf6bce3bfb8cc0f09a8668e735267fecb88ff
+AUX ros_packages.patch 621 SHA256 950e261d19b15444034c1984e14878eb11ee9df5d6d6291d2aca2dd8347dd123 SHA512 446c19801306f2f0116a4bdfe228ddc192a84458fe0803bd5ce9b99d58620bf2c3bf31bcc3f078a4c18281f64f7e68cbfb711d683959e71457b05b7aa63a6ecf WHIRLPOOL 4052d22449e7f8ec48946a030c15a998fb724c2b25de727235e673618d4616edaa0d184c1e59edc291f3deac613bf3b632c61cd113ccbdab26aa860f8170f0d9
+DIST catkin_pkg-0.3.6-gh.tar.gz 47637 SHA256 b05797352a89986a6c637ef33685a8cd004a8e5138b553f42a82065bc02f808b SHA512 191ed93271c9e592040110c92a572570fa8dec328ae3203dfea9e1fb6a1cb906350c436d3a9416d6826e57a1d59ef42200797d6a5bdc390aa77d352f716e0cc8 WHIRLPOOL 83f73ddaad17b5cfef4945a4d0c900855586877c47962b903e68f821772f4281f7658d82c4adfdf8067889e82f1264d843f1c4f336876ac8afa1bdfe48edeb37
+EBUILD catkin_pkg-0.3.6.ebuild 1106 SHA256 bcc9ad16fdf1f91c3d3012202a17eba9b7333a293da9d1e293182c181310d7bb SHA512 98685de96bb42b0c36173fb4a03d2a28709469a9d63a6923beb1caf14e07fcd6e881511e79bb5f453558975b4fbe5d284d1ed2e8c965da4ab4beb3e97c54aef6 WHIRLPOOL 6df237d8c380e2c5f8fa545adb50f1b9fba07a41f868f98abf59d5c56b3ca4de65fff4924a150366fde9a5fe6413cb5ac0fdc8f300af97a27c43e7f40d841947
+EBUILD catkin_pkg-9999.ebuild 1106 SHA256 bcc9ad16fdf1f91c3d3012202a17eba9b7333a293da9d1e293182c181310d7bb SHA512 98685de96bb42b0c36173fb4a03d2a28709469a9d63a6923beb1caf14e07fcd6e881511e79bb5f453558975b4fbe5d284d1ed2e8c965da4ab4beb3e97c54aef6 WHIRLPOOL 6df237d8c380e2c5f8fa545adb50f1b9fba07a41f868f98abf59d5c56b3ca4de65fff4924a150366fde9a5fe6413cb5ac0fdc8f300af97a27c43e7f40d841947
+MISC ChangeLog 2147 SHA256 04a5fa7473218dc80a59d3d87d86663506564c00ca736c2a00be0756a36936c5 SHA512 1312dcb18e7ae5c84a8654fa8e336b34baa98492ce58fe9c790daff4522bc303ce4661e3561cc175790c1cc66dfb94cd11ff622f421d4c81d2e9e2c2f158dd16 WHIRLPOOL 1da74529ea3775f1eeed4cc6bf764777e95aab26acfa86e2e110b66d822e61b725720bf455495194eea8b90b31ca95bf9c49461fdb58882f1cf08486d470ca21
+MISC metadata.xml 343 SHA256 8e283f2089b6cb4306afba398198483765592713058d3ecffcd44157015973ee SHA512 3ca5d78edb7c7dd2283944af93b7a8b6b3bb176ffa9e0df31881c8b5d66a4abc7e080e11f25f285e0b8735b16ed1598cf032a37d62b7fbb0b5adb3296e9b5862 WHIRLPOOL 99cc69cbf235b08f27c40b2409ea3216a71d1cf9d663b5f3683d2e38e0828fd04468886d99249b0722a98bef55d67252d4cfe1ab49f6286afe7cdda136742f52
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.3.6.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.3.6.ebuild
new file mode 100644
index 000000000000..0967bd6ff8e6
--- /dev/null
+++ b/dev-python/catkin_pkg/catkin_pkg-0.3.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/catkin_pkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the catkin package system"
+HOMEPAGE="http://wiki.ros.org/catkin_pkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
+"
+PATCHES=(
+	"${FILESDIR}/catkin_prefix.patch"
+	"${FILESDIR}/argparse.patch"
+	"${FILESDIR}/ros_packages.patch"
+	"${FILESDIR}/infinite_loop2.patch"
+)
+
+python_test() {
+	nosetests -s --tests test || die
+}
diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
new file mode 100644
index 000000000000..0967bd6ff8e6
--- /dev/null
+++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/catkin_pkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the catkin package system"
+HOMEPAGE="http://wiki.ros.org/catkin_pkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
+"
+PATCHES=(
+	"${FILESDIR}/catkin_prefix.patch"
+	"${FILESDIR}/argparse.patch"
+	"${FILESDIR}/ros_packages.patch"
+	"${FILESDIR}/infinite_loop2.patch"
+)
+
+python_test() {
+	nosetests -s --tests test || die
+}
diff --git a/dev-python/catkin_pkg/files/argparse.patch b/dev-python/catkin_pkg/files/argparse.patch
new file mode 100644
index 000000000000..f39df4a40565
--- /dev/null
+++ b/dev-python/catkin_pkg/files/argparse.patch
@@ -0,0 +1,12 @@
+Index: catkin_pkg-0.3.1/setup.py
+===================================================================
+--- catkin_pkg-0.3.1.orig/setup.py
++++ catkin_pkg-0.3.1/setup.py
+@@ -31,7 +31,6 @@ kwargs = {
+     'long_description': 'Library for retrieving information about catkin packages.',
+     'license': 'BSD',
+     'install_requires': [
+-        'argparse',
+         'docutils',
+         'python-dateutil'
+     ],
diff --git a/dev-python/catkin_pkg/files/catkin_prefix.patch b/dev-python/catkin_pkg/files/catkin_prefix.patch
new file mode 100644
index 000000000000..c5f40db51cd1
--- /dev/null
+++ b/dev-python/catkin_pkg/files/catkin_prefix.patch
@@ -0,0 +1,28 @@
+Allow CATKIN_PREFIX_PATH to work as CMAKE_PREFIX_PATH:
+When building with SYSROOT!=/, CMAKE_PREFIX_PATH is the same as with SYSROOT=/
+but we need to find packages in SYSROOT.
+
+Index: catkin_pkg-0.2.8/src/catkin_pkg/workspaces.py
+===================================================================
+--- catkin_pkg-0.2.8.orig/src/catkin_pkg/workspaces.py
++++ catkin_pkg-0.2.8/src/catkin_pkg/workspaces.py
+@@ -42,15 +42,16 @@ CATKIN_WORKSPACE_MARKER_FILE = '.catkin_
+ 
+ def get_spaces(paths=None):
+     """
+-    Return a list of spaces based on the CMAKE_PREFIX_PATH or passed in list of workspaces.
++    Return a list of spaces based on the CMAKE_PREFIX_PATH/CATKIN_PREFIX_PATH or passed in list of workspaces.
+     It resolves the source space for each devel space and ignores non-catkin paths.
+     :param paths_to_order: list of paths
+     :param prefix_paths: list of prefixes, must not end with '/'
+     """
+     if paths is None:
+-        if 'CMAKE_PREFIX_PATH' not in os.environ:
+-            raise RuntimeError('Neither the environment variable CMAKE_PREFIX_PATH is set nor was a list of paths passed.')
++        if 'CMAKE_PREFIX_PATH' not in os.environ and 'CATKIN_PREFIX_PATH' not in os.environ :
++            raise RuntimeError('None of the environment variables CMAKE_PREFIX_PATH or CATKIN_PREFIX_PATH are set nor was a list of paths passed.')
+         paths = os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep) if os.environ['CMAKE_PREFIX_PATH'] else []
++        paths += os.environ['CATKIN_PREFIX_PATH'].split(os.pathsep) if os.environ['CATKIN_PREFIX_PATH'] else []
+ 
+     spaces = []
+     for path in paths:
diff --git a/dev-python/catkin_pkg/files/infinite_loop2.patch b/dev-python/catkin_pkg/files/infinite_loop2.patch
new file mode 100644
index 000000000000..7c5edba2b50c
--- /dev/null
+++ b/dev-python/catkin_pkg/files/infinite_loop2.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/show_bug.cgi?id=612860
+By Tim Rakowski
+We os.walk /usr with followlinks=True, but at least nodejs contains a "recursive" link in /usr/include/node
+
+Index: catkin_pkg-0.3.6/src/catkin_pkg/packages.py
+===================================================================
+--- catkin_pkg-0.3.6.orig/src/catkin_pkg/packages.py
++++ catkin_pkg-0.3.6/src/catkin_pkg/packages.py
+@@ -56,7 +56,9 @@ def find_package_paths(basepath, exclude
+     """
+     paths = []
+     real_exclude_paths = [os.path.realpath(p) for p in exclude_paths] if exclude_paths is not None else []
++    visited = set()
+     for dirpath, dirnames, filenames in os.walk(basepath, followlinks=True):
++        visited.add(dirpath)
+         if 'CATKIN_IGNORE' in filenames or \
+             os.path.realpath(dirpath) in real_exclude_paths or \
+                 (exclude_subspaces and '.catkin' in filenames):
+@@ -67,7 +69,7 @@ def find_package_paths(basepath, exclude
+             del dirnames[:]
+             continue
+         # filter out hidden directories in-place
+-        dirnames[:] = [d for d in dirnames if not d.startswith('.')]
++        dirnames[:] = [d for d in dirnames if not d.startswith('.') and not os.path.realpath(os.path.join(dirpath, d)) in visited]
+     return paths
+ 
+ 
diff --git a/dev-python/catkin_pkg/files/ros_packages.patch b/dev-python/catkin_pkg/files/ros_packages.patch
new file mode 100644
index 000000000000..6c9855d627c9
--- /dev/null
+++ b/dev-python/catkin_pkg/files/ros_packages.patch
@@ -0,0 +1,13 @@
+Index: catkin_pkg-0.3.1/src/catkin_pkg/packages.py
+===================================================================
+--- catkin_pkg-0.3.1.orig/src/catkin_pkg/packages.py
++++ catkin_pkg-0.3.1/src/catkin_pkg/packages.py
+@@ -59,7 +59,7 @@ def find_package_paths(basepath, exclude
+             del dirnames[:]
+             continue
+         elif PACKAGE_MANIFEST_FILENAME in filenames:
+-            paths.append(os.path.relpath(dirpath, basepath))
++            paths.append(os.path.relpath(dirpath.replace('ros_packages/',''), basepath))
+             del dirnames[:]
+             continue
+         for dirname in dirnames:
diff --git a/dev-python/catkin_pkg/metadata.xml b/dev-python/catkin_pkg/metadata.xml
new file mode 100644
index 000000000000..23a932120133
--- /dev/null
+++ b/dev-python/catkin_pkg/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-infrastructure/catkin_pkg</remote-id>
+	</upstream>
+</pkgmetadata>