gentoo resync : 24.12.2018

3 files changed, 69 insertions, 4 deletions

diff --git a/dev-util/rosdep/Manifest b/dev-util/rosdep/Manifest
index 6d24d1d6d670..f4f9db790d4d 100644
--- a/dev-util/rosdep/Manifest
+++ b/dev-util/rosdep/Manifest
@@ -1,6 +1,8 @@
 DIST rosdep-0.12.1.tar.gz 117102 BLAKE2B 42b0f6e7b6b0c2a4219bce24ff74ec01efb61ac0799a89baa5dc7f6b698e8f69a1578f744179252e7123c87c9fb0368b43a9a293609b28f6bfbc32c87b5f4627 SHA512 031bdfb4877865cacfab63a4494807ecf157d8514e89c7ab15e38fcbd4664df1247874975d7b1af42a8a1fc24cb62a558bd6b43732946f3122ffa6448a7631da
 DIST rosdep-0.12.2.tar.gz 118343 BLAKE2B 98163feef406707772a54bf6d1825900ac593113d635de92adcac0ae7ce201c2e312116104c76c13b9c1e3b1847ef4dcc0cfb4fd1edcb2795c6b323fa9cc7167 SHA512 0932a5ff9874bbdffa1160fe0a391d27eef9a2f2435d7a89fa3b5e4eab0fc08205d4417aaea1254ab7bfe679cfeb61a6f1b199f06d65154b30505e2a280c0b61
+DIST rosdep-0.13.0.tar.gz 301327 BLAKE2B 39c39903bb2e6c07dfd4e3aa9546acf434498db518c3bda04ef79c46ed5d13b7cd55978c78bea8294d8e5b84ddddef22814436566f3f958d91d3964650399a08 SHA512 c42aa17ee9b31f7013415e99a484a66a7a7fb52abef4cc9045658150ce0c36b475f2885ebfff537f9ce9f8fd5eeaef5482226c5bff5b4a3df03cc72b149db07a
 EBUILD rosdep-0.12.1.ebuild 1493 BLAKE2B 14848d0cc919de003bdf86d87fcb942ca22aaa66b5c19eee08c288529682f152b0d25c542573261df6a18929dd54e7282df704c193e2f1bb8e9e3432d10ac418 SHA512 ec31c55b9e7c4de2b5eb7ebeec2b877fc10492324cbc46bb17961efde0fca52ad7be3f61559d845ea101afd9700fb01640b11b9ee30e32e07828b5bf4a1eab67
 EBUILD rosdep-0.12.2.ebuild 1493 BLAKE2B 14848d0cc919de003bdf86d87fcb942ca22aaa66b5c19eee08c288529682f152b0d25c542573261df6a18929dd54e7282df704c193e2f1bb8e9e3432d10ac418 SHA512 ec31c55b9e7c4de2b5eb7ebeec2b877fc10492324cbc46bb17961efde0fca52ad7be3f61559d845ea101afd9700fb01640b11b9ee30e32e07828b5bf4a1eab67
-EBUILD rosdep-9999.ebuild 1493 BLAKE2B 14848d0cc919de003bdf86d87fcb942ca22aaa66b5c19eee08c288529682f152b0d25c542573261df6a18929dd54e7282df704c193e2f1bb8e9e3432d10ac418 SHA512 ec31c55b9e7c4de2b5eb7ebeec2b877fc10492324cbc46bb17961efde0fca52ad7be3f61559d845ea101afd9700fb01640b11b9ee30e32e07828b5bf4a1eab67
+EBUILD rosdep-0.13.0.ebuild 1501 BLAKE2B 0930c792aa1630d26ceea2c8cd884001f80b3883516abe2680704fa3df6fd6b0939915fe6caaca5dab1d1cbb45babf3c43163870451a763f3f1fd749b0b32035 SHA512 7ac5cddf69c5ccb31404d4c2b98030a7b63708e9602fae8fba086553a7afd0cd8013de7f82982830161a20e210186152d0450cd1b345778afa7d1a9b1ace4d66
+EBUILD rosdep-9999.ebuild 1501 BLAKE2B 0930c792aa1630d26ceea2c8cd884001f80b3883516abe2680704fa3df6fd6b0939915fe6caaca5dab1d1cbb45babf3c43163870451a763f3f1fd749b0b32035 SHA512 7ac5cddf69c5ccb31404d4c2b98030a7b63708e9602fae8fba086553a7afd0cd8013de7f82982830161a20e210186152d0450cd1b345778afa7d1a9b1ace4d66
 MISC metadata.xml 339 BLAKE2B 98c570641ca07f96e5fcfaece9d49977136f720d77c9cf6dcecbb06bc4016410e082201d69d3c36af5de03cc70ea5a1b726289124324e2f11266e5db69a6ea97 SHA512 62ab4dc2638e4af95290eba19e1755d3bade56e5d1e7251d3cc9da410fcf7ead48562193b2cb6b6f8800daf7df31786e70ce153780b9e278891c31d2b9c257bf
diff --git a/dev-util/rosdep/rosdep-0.13.0.ebuild b/dev-util/rosdep/rosdep-0.13.0.ebuild
new file mode 100644
index 000000000000..d406809d630f
--- /dev/null
+++ b/dev-util/rosdep/rosdep-0.13.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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/rosdep"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Command-line tool for installing ROS system dependencies"
+HOMEPAGE="http://wiki.ros.org/rosdep"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		https://github.com/ros-infrastructure/rosdep/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-python/rosdistro[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/nose[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests --with-coverage --cover-package=rosdep2 --with-xunit test || die
+}
+
+pkg_postrm() {
+	if [ "${ROOT:-/}" = "/" ] ; then
+		einfo "Removing rosdep default sources list."
+		rm -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list"
+	fi
+}
+
+pkg_postinst() {
+	if [ "${ROOT:-/}" = "/" -a ! -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list" ] ; then
+		einfo "Initializing rosdep"
+		rosdep init
+	fi
+}
diff --git a/dev-util/rosdep/rosdep-9999.ebuild b/dev-util/rosdep/rosdep-9999.ebuild
index 842ec4941e9e..d406809d630f 100644
--- a/dev-util/rosdep/rosdep-9999.ebuild
+++ b/dev-util/rosdep/rosdep-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # 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=""
@@ -33,7 +33,8 @@ RDEPEND="
 	dev-python/rospkg[${PYTHON_USEDEP}]
 	dev-python/rosdistro[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-python/nose[${PYTHON_USEDEP}]
 	test? (
 		dev-python/coverage[${PYTHON_USEDEP}]