gentoo resync : 25.08.2018

6 files changed, 20 insertions, 116 deletions

diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
index c87610792a17..50568d183c02 100644
--- a/dev-python/catkin_pkg/Manifest
+++ b/dev-python/catkin_pkg/Manifest
@@ -1,14 +1,10 @@
 AUX argparse.patch 408 BLAKE2B f0c41a7e581082e0ca8ed4dc0a0e08643dc2d144c63bfcfe4a27b1044e589e72db37d5731b236d7eb2bc2d7dc682c0b64792d2a8b22ad0d7f88d5cafb2757f3d SHA512 c5a5067d3f7477935d775f5c9c39f9b5c9636e97ab567c6b7a5d34cb06f5fac58a4dff94868f2d856d792c270bc6d727fe3ec60cf8825b7ae2b4519aed999b90
-AUX catkin_prefix.patch 1618 BLAKE2B 68d6a3bd4837d6fde4561e16a23d99037aaf4e0708e8b163e7484bc89bc0aed66c160ec1fca77324e8ea8d81524bc162b6c0eeae366c041799e612e8af25c851 SHA512 42eb43d1da82271f1b3279d5cbd8d1d0f211a3919c2329191716ff32433f57b0c279af527e79fedbcd6791746517c6938643ecdf561be7621b0605a66869c804
 AUX catkin_prefix2.patch 1620 BLAKE2B 7c6824c35ac840429646e1804e417ea09971be6a497ba6e45daccd453aaf0a6e17608ddabdfbc681d5d83f0bf42496425aaf4c0fbc3c3f282fb62a4639bf0a0a SHA512 2750d043373d5a7ae0761feaf5210847fad08bbef96804cf6c4931fa751918241e0517bc538b1db12ae981d6a3a89afb53cfce8b2dfd7d80b849a6de203edb13
-AUX infinite_loop2.patch 1274 BLAKE2B 1d3bac0f73f5e568dd0e100db51a554162955ae053853bce1adbda280c9fec5fdee0dbd0cd4aefdec58bc953979ff8624fcea20be3a77e35feda1a12523c23c5 SHA512 a736242c2e42d0e3c97556f565d7ebc3b06c203a21b805fa13db789ffcc396b5f79793874418c389dd0013c36f9ba6f5674026d03d26653ea2a69fb0a95bab9a
 AUX infinite_loop3.patch 1236 BLAKE2B f236f05623b5ee4414fe3da7efebf61d62ed8617d47a659e980907aafabe3c0f4a0fc41779c73872235a186c7457ece6991433c67acace597fe86f5088ab9cca SHA512 4d07d04cfe1a10531129494000be11fe6b2598c077658b212f888b24d3de997fa6730641055caa181a5a071585f41f82cd4783c46b314cf66fe1f34b70f538cf
 AUX ros_packages.patch 622 BLAKE2B d155ddb5cf084b660914028b89f061be243ff15ca934a0513afa10f64ae31adbf25acdb294e6fcff441fe598f2210f31f91733038519ce01765cf51b0cf5ba02 SHA512 6675a4a1396b5f8ad0f62b6a2d1c59511950685c85f820f3b2c34f3c701052e2e678aa9d5c6f6e6dca72ed8b94372cd3f442dd1634c53981166efb8ec1f30164
-DIST catkin_pkg-0.4.2-gh.tar.gz 52930 BLAKE2B 2b8589441d241197c661975c07c60856c614c4c328e441e6fbb1cb41ea2919f57864f67198b684eba7183004671df0980ddcf0070a53099074433166b5d7db20 SHA512 cb47771172d88792bc7039f072175a6f410aa046e2611ccc75e46bda388d620ac0059e0fa9e087fbb7f2833600a7233d714c1aeeab65e264606d8ae2e64d76bb
-DIST catkin_pkg-0.4.6-gh.tar.gz 60713 BLAKE2B 88442adafcedd90a53a37c5aa3632d06dd88c1c685427708e7801d2a6702b229dfc3f81ac3dfb0ac6ad7c932865b9a61b8c6da28165acef8fa45859cd3a8aaf6 SHA512 d95362a56680f3ca1eb33299e041d6a0a8bbe35bb4a20f411c3b846a2b6fe91f583ffa7a1ed1884604a420dcc1b5e88fe3336ebfebe9a51a7a9f2c8a80f79f8f
 DIST catkin_pkg-0.4.7-gh.tar.gz 60765 BLAKE2B 905de7f4f013f8e7d6472b5159cb0e9ac82bb06dfca0308a7a5f8881402a721d987a016f7980f7a435a7122c4771311f82f56f460949370ecd93057ef8a8bb25 SHA512 1e947c09aa4789d414de74bed7b1aa3d5f5d16d22a8a4609f656b47e51b7318fdd21e003f8bf65355728abaf54a016ce2d78b79cc4ab8bd7c3e048b66c0c0f6e
-EBUILD catkin_pkg-0.4.2.ebuild 1146 BLAKE2B e413fe7ab6984bee5bad8208d10442586d8acaa5f81a229ef0f77d670d92aae16a6429d06d6e978efbfb15deecf4b1eda726afdae94db5dfb8c491749cba398d SHA512 2c32267fead6de9e05cf74519fb87d5d846d6ad993e2bc737e48e5131590f840b515d78bfd1dda9971b50607b65b46f5c6f9bf2deead373da3fcd94ab6fa40f9
-EBUILD catkin_pkg-0.4.6.ebuild 1194 BLAKE2B b26f615622719b87a320a21a3157acff920bc9841145783fa28dfa1d4d1290795de651b87e5b618648f277e627a2b19c063b237713e0836b6030ef33ae508371 SHA512 962e46ead9bd6358a97131ad67da3de86dfb562acb29b9cdfa972da708cccb188603b825d2ec048c5bb052a65501556067f76f8354bc615558605360b5ece778
+DIST catkin_pkg-0.4.8-gh.tar.gz 60811 BLAKE2B f7bcdb121844837701e203bfefd3ad9b454362d0d9f5b912a1df542dbb50ea402f1556b4f4031afa13dfdeb852f955d175f80344b773fa959fecf522ceb06fb6 SHA512 b697d177164d681e94f19f7f0ec768cb91ba5bf31cd3dfd41a24bc3347957b30f97bf1cc3e3fadb7c3c4f48a5d0306835a9496a9e4ab7b36784f7bbaf4268b6a
 EBUILD catkin_pkg-0.4.7.ebuild 1237 BLAKE2B 062a0893ed878654c8add72f78814916e33e4e63cc8e78e17b1b30a6869d228f89d55e654294f0668ba4bc4b485c08987108bdeb4ff99b1a86e413512075e771 SHA512 0a4ad10184b23eb326a78fe8b411cda68ed65aade565832f0ec30d0d1fbfe37e2841430bf71eafab99db059903685fa3876998be7cb98172f62572a9abee552e
-EBUILD catkin_pkg-9999.ebuild 1237 BLAKE2B 062a0893ed878654c8add72f78814916e33e4e63cc8e78e17b1b30a6869d228f89d55e654294f0668ba4bc4b485c08987108bdeb4ff99b1a86e413512075e771 SHA512 0a4ad10184b23eb326a78fe8b411cda68ed65aade565832f0ec30d0d1fbfe37e2841430bf71eafab99db059903685fa3876998be7cb98172f62572a9abee552e
+EBUILD catkin_pkg-0.4.8.ebuild 1271 BLAKE2B 0babb723a5bb32a5ef1b5febd3881cd9a25dd5606ecc571453f2ab53a697d8f477b1b56d1ed281169131ade92210b31b51c4cd72ee81e13d0661c9b1fb129aea SHA512 321c96ff1b0d0ff7abb8435fd4b3b98d708ea59f0abeb33513765070a8d16c1c69291833e1452b17c1810a9aa278b237a1cf5d2063394bcd984d8c0f2ad69c45
+EBUILD catkin_pkg-9999.ebuild 1271 BLAKE2B 0babb723a5bb32a5ef1b5febd3881cd9a25dd5606ecc571453f2ab53a697d8f477b1b56d1ed281169131ade92210b31b51c4cd72ee81e13d0661c9b1fb129aea SHA512 321c96ff1b0d0ff7abb8435fd4b3b98d708ea59f0abeb33513765070a8d16c1c69291833e1452b17c1810a9aa278b237a1cf5d2063394bcd984d8c0f2ad69c45
 MISC metadata.xml 343 BLAKE2B 54c183cdd942eaeec77723ae80d09a3cdd6e40270a3974e80a811fb050289e6f86b8d722fcefb1f37f7c2b8ad1ead3e00f04d49c2a029884daa7c2c33869ef87 SHA512 3ca5d78edb7c7dd2283944af93b7a8b6b3bb176ffa9e0df31881c8b5d66a4abc7e080e11f25f285e0b8735b16ed1598cf032a37d62b7fbb0b5adb3296e9b5862
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.2.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.2.ebuild
deleted file mode 100644
index f74d5f891e53..000000000000
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 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}]
-	dev-python/pyparsing[${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-0.4.6.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.8.ebuild
index 263dc13362e4..f4dc76b3fa34 100644
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.6.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.8.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
 
 SCM=""
@@ -32,9 +32,16 @@ RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pyparsing[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
+BDEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
 "
+DEPEND="${RDEPEND} ${BDEPEND}
+	test? (
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
 RDEPEND="${RDEPEND}
 	!<dev-util/catkin-0.7.14"
 PATCHES=(
diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
index 46f2913d41f1..f4dc76b3fa34 100644
--- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
 
 SCM=""
@@ -32,13 +32,16 @@ RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pyparsing[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}
+BDEPEND="
 	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
 	)
 "
+DEPEND="${RDEPEND} ${BDEPEND}
+	test? (
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
 RDEPEND="${RDEPEND}
 	!<dev-util/catkin-0.7.14"
 PATCHES=(
diff --git a/dev-python/catkin_pkg/files/catkin_prefix.patch b/dev-python/catkin_pkg/files/catkin_prefix.patch
deleted file mode 100644
index fe9cc347882b..000000000000
--- a/dev-python/catkin_pkg/files/catkin_prefix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
deleted file mode 100644
index 7c5edba2b50c..000000000000
--- a/dev-python/catkin_pkg/files/infinite_loop2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
- 
-