gentoo resync : 16.01.2018

4 files changed, 9 insertions, 57 deletions

diff --git a/dev-python/rosdistro/Manifest b/dev-python/rosdistro/Manifest
index 02af4c58b514..d992b59a8ef4 100644
--- a/dev-python/rosdistro/Manifest
+++ b/dev-python/rosdistro/Manifest
@@ -1,8 +1,6 @@
-DIST rosdistro-0.6.1.tar.gz 48699 BLAKE2B 87bc8d7d90d3731c5994be94bde9932e16cac8e4c257a97c80c1cc70b2af68bbeaa6c36c1eeba9dc32a75b33cf69196f1520c3475f1dfd56d4ab17804ca6802a SHA512 9f7c9eea737da443b1daaacde6bcea163ac2ffc707efb23016fe77c68423ee192e0610b9aa1c8a4b07735d1784e30a509dc78cf256061fcc4de75ed4c4244f75
-DIST rosdistro-0.6.2.tar.gz 42658 BLAKE2B 5f4c574438ff6e791adf1ee8076ab898b656c00bfa8b48b6cd2d871c71c48f3c5b609108ed8005ae47e2554ac92a9512382c1dcdd5bc74614aaf4573b13322b1 SHA512 df7da98a2b46d45d978bbb371ea98cf24aafa0704c1cd991db0f1b785eb3330227d42a505b765653bf11d267f676844e1043e5fcff52b7295afa1b21ffc99301
 DIST rosdistro-0.6.3.tar.gz 48789 BLAKE2B f26da2b2624501321033390d554559a0b807b224c35e96ff1643d6060e0225b9de6e2f9df354c5f6f13d277ba5b46453fe5db10d31cd5b05f50a78360d2b03dd SHA512 9fe50a9ed67d5772912ad7d15c60179894f3d775b593e4f42fff6c5221a77ea89176c9239ac0e962d2997eb6b1b365ad47da1080f69e62a4c75e1ea3f26294f0
-EBUILD rosdistro-0.6.1.ebuild 999 BLAKE2B e5e705c96b78cdf2672c3560597aa580bb420f4617211e6685736bae962487c503356ff7e901492174629e89ff03eeacb32c40105adc14dfb859471995239a75 SHA512 c48867ae999fb3d5ba998d7136de9044cf370e9de08b0f69ebe8f5224db276bc9182f9fc4fe19a2207e92bbc5bf0889c4e4f790b072aa0fb50f9da856ec5c448
-EBUILD rosdistro-0.6.2.ebuild 999 BLAKE2B e5e705c96b78cdf2672c3560597aa580bb420f4617211e6685736bae962487c503356ff7e901492174629e89ff03eeacb32c40105adc14dfb859471995239a75 SHA512 c48867ae999fb3d5ba998d7136de9044cf370e9de08b0f69ebe8f5224db276bc9182f9fc4fe19a2207e92bbc5bf0889c4e4f790b072aa0fb50f9da856ec5c448
+DIST rosdistro-0.6.4.tar.gz 58603 BLAKE2B 9eed482987826b69eba51f1776df0d2285c496130d500f082f82fe7fbbb8e8d5767dcaec93582328a33c164a862ac2a46ac6d0ed0f770ebb16b25e680dc1e9af SHA512 92365b556cc6615245bd69cce35efb2fe879fe42fb4aafef08b2472c67b43e14e3088c1186e8b1d4f5f3781bfebbe826b3c361a9435ce27745a3506d20d40f85
 EBUILD rosdistro-0.6.3.ebuild 999 BLAKE2B e5e705c96b78cdf2672c3560597aa580bb420f4617211e6685736bae962487c503356ff7e901492174629e89ff03eeacb32c40105adc14dfb859471995239a75 SHA512 c48867ae999fb3d5ba998d7136de9044cf370e9de08b0f69ebe8f5224db276bc9182f9fc4fe19a2207e92bbc5bf0889c4e4f790b072aa0fb50f9da856ec5c448
-EBUILD rosdistro-9999.ebuild 999 BLAKE2B e5e705c96b78cdf2672c3560597aa580bb420f4617211e6685736bae962487c503356ff7e901492174629e89ff03eeacb32c40105adc14dfb859471995239a75 SHA512 c48867ae999fb3d5ba998d7136de9044cf370e9de08b0f69ebe8f5224db276bc9182f9fc4fe19a2207e92bbc5bf0889c4e4f790b072aa0fb50f9da856ec5c448
+EBUILD rosdistro-0.6.4.ebuild 979 BLAKE2B fa07155748189f0377c4ee69288f0d876d77bd8b8ed4f942abd309fcce01db3e890da5012c5c85110fc3e00724bfafc1bf32f53d5581557887102bd1407990c6 SHA512 ead56ec46c5e25727911212be51bffd567e5b84507984ab74221b5fb4107b95e17c2f1a8f51110fc70c361cd41f3e2d881dc7d9c9f42b4f911011e4443ba5bac
+EBUILD rosdistro-9999.ebuild 979 BLAKE2B fa07155748189f0377c4ee69288f0d876d77bd8b8ed4f942abd309fcce01db3e890da5012c5c85110fc3e00724bfafc1bf32f53d5581557887102bd1407990c6 SHA512 ead56ec46c5e25727911212be51bffd567e5b84507984ab74221b5fb4107b95e17c2f1a8f51110fc70c361cd41f3e2d881dc7d9c9f42b4f911011e4443ba5bac
 MISC metadata.xml 342 BLAKE2B 1975e171b6e686c5fa1cf51909101b1785f2610f619de6465329c935023adcbe5d0373512bf7e7fb5a2451e31664faeb2aed67eb9af58d40005f10ee1582e4f9 SHA512 5f55e6edbfd3be1214791b1897ce625f6cc52989ac007d7de9c9eb0bff57c1ca805ee18b911fcc2c29a86a5fb9f68e1b9647f69a38dc6b1d1d74334b35ac106d
diff --git a/dev-python/rosdistro/rosdistro-0.6.2.ebuild b/dev-python/rosdistro/rosdistro-0.6.2.ebuild
deleted file mode 100644
index e9ccf8b2beb3..000000000000
--- a/dev-python/rosdistro/rosdistro-0.6.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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/rosdistro"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Tools to work with catkinized rosdistro files"
-HOMEPAGE="http://wiki.ros.org/rosdistro"
-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/rosdistro/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/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests --with-xunit test || die
-}
diff --git a/dev-python/rosdistro/rosdistro-0.6.1.ebuild b/dev-python/rosdistro/rosdistro-0.6.4.ebuild
index e9ccf8b2beb3..8780e241c60c 100644
--- a/dev-python/rosdistro/rosdistro-0.6.1.ebuild
+++ b/dev-python/rosdistro/rosdistro-0.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,9 +18,7 @@ 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/rosdistro/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
+	SRC_URI="https://github.com/ros-infrastructure/rosdistro/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
 fi
 
@@ -36,6 +34,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/rosdistro/rosdistro-9999.ebuild b/dev-python/rosdistro/rosdistro-9999.ebuild
index e9ccf8b2beb3..8780e241c60c 100644
--- a/dev-python/rosdistro/rosdistro-9999.ebuild
+++ b/dev-python/rosdistro/rosdistro-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,9 +18,7 @@ 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/rosdistro/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
+	SRC_URI="https://github.com/ros-infrastructure/rosdistro/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
 fi
 
@@ -36,6 +34,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "