gentoo resync : 15.12.2019

5 files changed, 65 insertions, 4 deletions

diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
index d325fffaeaf7..d5f048021782 100644
--- a/dev-python/catkin_pkg/Manifest
+++ b/dev-python/catkin_pkg/Manifest
@@ -3,7 +3,9 @@ AUX infinite_loop3.patch 1236 BLAKE2B f236f05623b5ee4414fe3da7efebf61d62ed8617d4
 AUX ros_packages.patch 622 BLAKE2B d155ddb5cf084b660914028b89f061be243ff15ca934a0513afa10f64ae31adbf25acdb294e6fcff441fe598f2210f31f91733038519ce01765cf51b0cf5ba02 SHA512 6675a4a1396b5f8ad0f62b6a2d1c59511950685c85f820f3b2c34f3c701052e2e678aa9d5c6f6e6dca72ed8b94372cd3f442dd1634c53981166efb8ec1f30164
 DIST catkin_pkg-0.4.12-gh.tar.gz 61535 BLAKE2B 9b1a60cfc6bfda6e0f126f062cf62636df162577d693aaa07c4e7433f74383686224c31e0d567a95de20e2643c39f84781be3f82b39d9dfbbd1aed0dd397587e SHA512 227a6f07a46ab62d51f408a8aa08d57199a8f4d7c954421bf9a605fce3a0dc447c9379987bcacbed3bce139f00e95bd565286a530b7177acfc29a172da30f7dd
 DIST catkin_pkg-0.4.13-gh.tar.gz 61790 BLAKE2B b879b6e71c84863fdcbca1023dd5850a226c850e47348a5ce3cfa846bd4dfb7fe0fa2c406003b4d1a0ae7ab97e57a983a499c3a27851d3101c928765c9620cdf SHA512 b971019fe2f8e66639d271ce3a7933368a4af7658d143cb042a315492926a4b0c3593dc9f784ea75150aa048266219fe80f2a104adc6d361a6725d4b24aef330
-EBUILD catkin_pkg-0.4.12.ebuild 1234 BLAKE2B bbe58928171aac97dbfb4d65bd0bef21da1198328ac1a0ef83024bfb54d0da6ccddb4717fa3de9c3420f621603bf5e2e9349e8de03cfb3fc1773dd99f3c3a9fb SHA512 561fe01e7b05df39d2aa0bf818efa6fb7a69543ce264e9f414960f261c23fc7a09286ac6d2f68c26c91c5bfc368e04cd7703752cb054cea1b732e46da497c235
-EBUILD catkin_pkg-0.4.13.ebuild 1234 BLAKE2B bbe58928171aac97dbfb4d65bd0bef21da1198328ac1a0ef83024bfb54d0da6ccddb4717fa3de9c3420f621603bf5e2e9349e8de03cfb3fc1773dd99f3c3a9fb SHA512 561fe01e7b05df39d2aa0bf818efa6fb7a69543ce264e9f414960f261c23fc7a09286ac6d2f68c26c91c5bfc368e04cd7703752cb054cea1b732e46da497c235
-EBUILD catkin_pkg-9999.ebuild 1234 BLAKE2B bbe58928171aac97dbfb4d65bd0bef21da1198328ac1a0ef83024bfb54d0da6ccddb4717fa3de9c3420f621603bf5e2e9349e8de03cfb3fc1773dd99f3c3a9fb SHA512 561fe01e7b05df39d2aa0bf818efa6fb7a69543ce264e9f414960f261c23fc7a09286ac6d2f68c26c91c5bfc368e04cd7703752cb054cea1b732e46da497c235
+DIST catkin_pkg-0.4.15-gh.tar.gz 63376 BLAKE2B 14eaddbc4dd544c26556033699806ee7596a0b262fc8c445696df468d3031ee63ec6c5e74c0a99569fd3faccf79202809b5e85e5ad5655d2f529d25b3d62ce1b SHA512 568f169e8fff5c4e41fdd02cbb4549dac99361a83241acbf15d3a3f2ae72f9230cab147eaa79688ce8e59d91f49096c8c57f73bb5fbfa89a41ac37aac9841f22
+EBUILD catkin_pkg-0.4.12.ebuild 1261 BLAKE2B f87a0620dd3b010ed3ed8a61bd19cb79e83f248ad544d88ae201ff83a19640b2503eccb8661975288668ab59ae025a4430f8f281a881545230e71534481f09c8 SHA512 de46f9758296ae0471f67a2ad4a8127e29c0b518439889a4710a0fe7546065f3ed463396c68e40de6bee061df5d165d12170a7151411ff545f733fba1ceb3a3e
+EBUILD catkin_pkg-0.4.13.ebuild 1261 BLAKE2B f87a0620dd3b010ed3ed8a61bd19cb79e83f248ad544d88ae201ff83a19640b2503eccb8661975288668ab59ae025a4430f8f281a881545230e71534481f09c8 SHA512 de46f9758296ae0471f67a2ad4a8127e29c0b518439889a4710a0fe7546065f3ed463396c68e40de6bee061df5d165d12170a7151411ff545f733fba1ceb3a3e
+EBUILD catkin_pkg-0.4.15.ebuild 1265 BLAKE2B 25f93ab5ca1bc1f56a435b704ec3422f0cefdb972195ec7c5a8b86d85a3aff3a868cffbe89291743abac4d821753000f6290bac8e6a8ad6dc79e78f026124929 SHA512 fb8c95bfb6a0904b0ff79c41cd8dca432460ada2734190270e411c794e87f26292b07686a1977bc24431f7cea94cf798009fc3e0bd9858a6113c89807e2c5322
+EBUILD catkin_pkg-9999.ebuild 1265 BLAKE2B 25f93ab5ca1bc1f56a435b704ec3422f0cefdb972195ec7c5a8b86d85a3aff3a868cffbe89291743abac4d821753000f6290bac8e6a8ad6dc79e78f026124929 SHA512 fb8c95bfb6a0904b0ff79c41cd8dca432460ada2734190270e411c794e87f26292b07686a1977bc24431f7cea94cf798009fc3e0bd9858a6113c89807e2c5322
 MISC metadata.xml 343 BLAKE2B 54c183cdd942eaeec77723ae80d09a3cdd6e40270a3974e80a811fb050289e6f86b8d722fcefb1f37f7c2b8ad1ead3e00f04d49c2a029884daa7c2c33869ef87 SHA512 3ca5d78edb7c7dd2283944af93b7a8b6b3bb176ffa9e0df31881c8b5d66a4abc7e080e11f25f285e0b8735b16ed1598cf032a37d62b7fbb0b5adb3296e9b5862
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.12.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.12.ebuild
index d24c376aa411..ceddd52d1f42 100644
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.12.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.12.ebuild
@@ -25,6 +25,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.13.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.13.ebuild
index d24c376aa411..ceddd52d1f42 100644
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.13.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.13.ebuild
@@ -25,6 +25,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.15.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.15.ebuild
new file mode 100644
index 000000000000..6ddb6178b793
--- /dev/null
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.15.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} 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"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${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=(
+	"${FILESDIR}/catkin_prefix2.patch"
+	"${FILESDIR}/ros_packages.patch"
+	"${FILESDIR}/infinite_loop3.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
index d24c376aa411..6ddb6178b793 100644
--- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -25,6 +25,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]