gentoo resync : 09.03.2018

4 files changed, 22 insertions, 49 deletions

diff --git a/dev-util/rosinstall_generator/Manifest b/dev-util/rosinstall_generator/Manifest
index ef87c316cce1..3d211b7ff7a9 100644
--- a/dev-util/rosinstall_generator/Manifest
+++ b/dev-util/rosinstall_generator/Manifest
@@ -1,8 +1,6 @@
-DIST rosinstall_generator-0.1.11.tar.gz 10230 BLAKE2B 15387a30b93de1ab954a188c0c870f0e50c96ea428eb3dea364b5f41634e34383f7d55cd7a76d47bdca3a081ce1d142db6d1e7af665eb2f0af907b4fa10d7815 SHA512 ec94feaf05f105cc19715824937c96a505bcff1236a445f8eb85cd68dfa70fd8e146d6e8c67a5f1d54b1579a8f432ecbf042acd7c0a78a104c27281433afb2f6
-DIST rosinstall_generator-0.1.12.tar.gz 10269 BLAKE2B 5f4524d7eda68a02c67bd5427066231a1c04def3564cf7d68f555e473589d9b3ba1bafecae524d9d6f89336321fb68d6a38f7430ed0b45dba09533ed26574446 SHA512 29c22920c5780deb9562ca26cff442161518d86f0b0355c2303b831f27c3c6b6cd0825321254a1dc97ccbe91806741b3b16bbd21309fa81b2aa4412b45b5c8e0
 DIST rosinstall_generator-0.1.13.tar.gz 11186 BLAKE2B bb6f95eba12ee6b9adfa22d46475d555aa9b3bed225e3be52a52f380bbd1ab3f86871a9a816c56c874f8545d2ef648e226ad5d8d3346444a92202865265260f1 SHA512 c8b5736066f8a42a324b2bed578e03282b6d8ae8df48fb30545617c2995ce53f35d7fea6fab3989383b958e7cb763b24deb67c5ec3496cc77f1ba51f110ab78c
-EBUILD rosinstall_generator-0.1.11.ebuild 928 BLAKE2B a333ed86f466bfe7b02cf30916de863fa820cbc28b051042421ad64af0f050ef48af1e3897ef0327382ed789088c0fc58f2650577c48f3a8b0b97789aeb6607f SHA512 8cfadea67e123ea53e1a039dfc813428b4239c58e9b7fc91befe2e2cc2191e19c5093d89165375b868f9f00b1d632c1960d0e706b8601460b47f39b02a9e66ad
-EBUILD rosinstall_generator-0.1.12.ebuild 928 BLAKE2B 8682b7f23689d9c346a861a5675041f0dcc506c8e776c6cf57c20b4ab451fd0c370519baff7031e790dc05c89eb4a145b59ffd5caba227bdfe8521f57f7c7e1a SHA512 98e9b6ac62816719b91f070cc3b731ba9db1a7b801901072ddc10bb84f3a080c3d395905527ee19c2a38a5c30acbfb60b2358487ee3fab008739677b2159173f
+DIST rosinstall_generator-0.1.14.tar.gz 11419 BLAKE2B af9754f46589aac1e9bb265345319c4037d2b1e10ea8119859e2715b2828974bc4422cac25f84216c401f35b7cddde207e7562afb07e753328940db347b69a20 SHA512 45461917afaf93f38b118951c272ba71a408d2c276b4019739c9c8dc9407812bf166bb762910ce45cedc9b31e2796922a69681ad461c468c7ed2372a1d189904
 EBUILD rosinstall_generator-0.1.13.ebuild 944 BLAKE2B 65e10af020b5e282ad7df1cf0bcf430a70a810b24aa163046917f2a27bd84c26b57928e3a60f3fcf295c1b2a423d11d3423e8b9a09cfce4d8cb15f8d2ebb2c09 SHA512 be7033bc84379134d8e0d04759be6df781a8565147f75eb6213c182b0e16812cfc1f31fb0f9be186f81d3eb51dc9d4313796a003ce740630c00fb0963f7e828e
-EBUILD rosinstall_generator-9999.ebuild 944 BLAKE2B 65e10af020b5e282ad7df1cf0bcf430a70a810b24aa163046917f2a27bd84c26b57928e3a60f3fcf295c1b2a423d11d3423e8b9a09cfce4d8cb15f8d2ebb2c09 SHA512 be7033bc84379134d8e0d04759be6df781a8565147f75eb6213c182b0e16812cfc1f31fb0f9be186f81d3eb51dc9d4313796a003ce740630c00fb0963f7e828e
+EBUILD rosinstall_generator-0.1.14.ebuild 1055 BLAKE2B 208150c09756838a5a97f4cfee646b0cc8402183fbd948eb6ef4073f74a4be7ef1f8fb649cfedf08131b50bd33f5dab102cd60db737f632ad34d170a05804d38 SHA512 4df734f550041942284475d1ba8b02d4214c0de9b3fb4f8ef019c962b12b48d45d4b519f3bcbb6a78a0e0f991b8d028c78bd9c3b2fcc8483739a9e2eb7055a21
+EBUILD rosinstall_generator-9999.ebuild 1055 BLAKE2B 208150c09756838a5a97f4cfee646b0cc8402183fbd948eb6ef4073f74a4be7ef1f8fb649cfedf08131b50bd33f5dab102cd60db737f632ad34d170a05804d38 SHA512 4df734f550041942284475d1ba8b02d4214c0de9b3fb4f8ef019c962b12b48d45d4b519f3bcbb6a78a0e0f991b8d028c78bd9c3b2fcc8483739a9e2eb7055a21
 MISC metadata.xml 353 BLAKE2B 26692ca3eb76500607275909a9c86bc88f7c80114e7840763136902a59dddc8f23dcd766f821aa5beffff9419d39a48e18682f86c8148df7d640977c9b30ebcd SHA512 a681a9f31c4cf06a775ef57f7a942c76d0e8873c4c854fddaf44df0301f3e14bd836727e6816bc74f0ced9e54dfd9335c376c47b8af2a19455c42a3f6ed38a18
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.12.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.12.ebuild
deleted file mode 100644
index 37c80b8e751a..000000000000
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.12.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosinstall_generator"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Generates rosinstall metadata about repositories with ROS packages/stacks"
-HOMEPAGE="http://wiki.ros.org/rosinstall_generator"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ros-infrastructure/rosinstall_generator/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/catkin_pkg-0.1.28[${PYTHON_USEDEP}]
-	dev-python/rosdistro[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.11.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.14.ebuild
index 3a7f46fa7048..725ccaf60ba1 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.11.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-0.1.14.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -24,12 +24,17 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
+IUSE="test"
 
 RDEPEND="
 	>=dev-python/catkin_pkg-0.1.28[${PYTHON_USEDEP}]
-	dev-python/rosdistro[${PYTHON_USEDEP}]
+	>=dev-python/rosdistro-0.5.0[${PYTHON_USEDEP}]
 	dev-python/rospkg[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests --with-coverage || die
+}
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
index 484e133e8ea0..725ccaf60ba1 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -24,7 +24,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
+IUSE="test"
 
 RDEPEND="
 	>=dev-python/catkin_pkg-0.1.28[${PYTHON_USEDEP}]
@@ -32,4 +32,9 @@ RDEPEND="
 	dev-python/rospkg[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests --with-coverage || die
+}