gentoo resync : 09.12.2017

4 files changed, 5 insertions, 48 deletions

diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
index b47e23234fb3..a3fce916c796 100644
--- a/dev-python/rospkg/Manifest
+++ b/dev-python/rospkg/Manifest
@@ -1,7 +1,5 @@
 AUX gentoo.patch 662 BLAKE2B 06e1c4af66a5d1ca1e51f8d99a1cf4e62042da3d41f38b34143f7af2ec7ae4bd4516f2b57e863ec6b80d921e2ab6a920ba581dccc6615da480c237e410f4cea2 SHA512 7525f4e8809b6002000b22d6f5def37054a1bceb3d581fe01bcedd7e21dc757dd04d229e9550bfe1d2248c5804856cd9869149bea9a9ec5423e1a596c0f56153
-DIST rospkg-1.1.3.tar.gz 89534 SHA256 ba0948fbb3be14082f9e83763cbe3a12857127eb78e142748c9d16d41ab4479c SHA512 2bb0521fbb87492dbc83d2582a8de3034f2e5548c1a464cfc558915157f3ef9d34d6166a4378d5e5cb226f2c8f714df86879220f7041d37b58a9ad33be2ce3cd WHIRLPOOL 77082d0927626a5350300c556fd15eceb3527ee3a64239ade75aa2758288c1835e3f7797425ea6921674cab187593ec494406717a8daa88093dea874efad95d0
-DIST rospkg-1.1.4.tar.gz 89554 SHA256 9d93bbf646c3db7e5ffd9814a879fe76cf45d2aa0a0bb210f44e807ea41a4c70 SHA512 1758dcbe28c18c834a60bbda2e5e6be34629b3dd4f6519f24dfa1324ff9fc59fb7d0ae9d324c002eee06ff672309627e48f97119b36601390b24a24ae196d5c5 WHIRLPOOL ab3eedf4df5bac5cfb19c50e8452928c8a879fc506a13e1ff2f92cb37afdd610ade43efd367d5c5cf09fbbc331177e42d79f8825da23ed05fae2f9f3953b4ab2
-EBUILD rospkg-1.1.3.ebuild 1006 BLAKE2B 0282355098a4aa7d64fd54063c52a9a65d85f5d748cc780fc4baf682469209876c4145d97cd777de4ec718e433ce05c38c23c2bacd78196c5d8fb79d4cd6012a SHA512 d81c650b250b40c58a2eb8e8fb6de4822d392121409346dba318b7c2a3844833cdfa6f661c6a57139b8b86a33de0d1e9066bb40e973a43858fb2335a540b56f4
-EBUILD rospkg-1.1.4.ebuild 1006 BLAKE2B 0282355098a4aa7d64fd54063c52a9a65d85f5d748cc780fc4baf682469209876c4145d97cd777de4ec718e433ce05c38c23c2bacd78196c5d8fb79d4cd6012a SHA512 d81c650b250b40c58a2eb8e8fb6de4822d392121409346dba318b7c2a3844833cdfa6f661c6a57139b8b86a33de0d1e9066bb40e973a43858fb2335a540b56f4
-EBUILD rospkg-9999.ebuild 1006 BLAKE2B 0282355098a4aa7d64fd54063c52a9a65d85f5d748cc780fc4baf682469209876c4145d97cd777de4ec718e433ce05c38c23c2bacd78196c5d8fb79d4cd6012a SHA512 d81c650b250b40c58a2eb8e8fb6de4822d392121409346dba318b7c2a3844833cdfa6f661c6a57139b8b86a33de0d1e9066bb40e973a43858fb2335a540b56f4
+DIST rospkg-1.1.4.tar.gz 89554 BLAKE2B b307482cc3df0f2a178dd427a37160cfdc3c407b2135a28854f3df0ff964ed57c17a8ee358a1aa90b3d735e0913bc6c3c8ea1084efdef5fd01933166e21ebac8 SHA512 1758dcbe28c18c834a60bbda2e5e6be34629b3dd4f6519f24dfa1324ff9fc59fb7d0ae9d324c002eee06ff672309627e48f97119b36601390b24a24ae196d5c5
+EBUILD rospkg-1.1.4.ebuild 1047 BLAKE2B 5b922d621b25f784306647865bbf7eac12b03c4684c656a69a884efec91bc72f127d8faf23eb3f3c87b86aff5c61759a30a3766ad847f290a955d12cb2ddbca5 SHA512 d01620d22f53394000cffd74a8df24338b51c1c8356efc02dae3ac26e595e76a23614b2fd50f9b918e6730f1ba03072a421de47e15cb9c44c04f4c4dd5c5686e
+EBUILD rospkg-9999.ebuild 1047 BLAKE2B 5b922d621b25f784306647865bbf7eac12b03c4684c656a69a884efec91bc72f127d8faf23eb3f3c87b86aff5c61759a30a3766ad847f290a955d12cb2ddbca5 SHA512 d01620d22f53394000cffd74a8df24338b51c1c8356efc02dae3ac26e595e76a23614b2fd50f9b918e6730f1ba03072a421de47e15cb9c44c04f4c4dd5c5686e
 MISC metadata.xml 339 BLAKE2B b73b43910983a77b06481850b398f006e6e535382c5fde12e8b86d43151b840e309bb2c6b0cd83899c3a9b8fcfd1c44fe6f1e5c53008e62b5653fda7cbfb12db SHA512 c9e10c6eecb919a284258e818a9830f6ba2afe095a9f4c565bf086855d5bbb26bf6973455c62a38ab4e20eb88da1f3d44b97597b197ca30227a7e7438a84d8a7
diff --git a/dev-python/rospkg/rospkg-1.1.3.ebuild b/dev-python/rospkg/rospkg-1.1.3.ebuild
deleted file mode 100644
index dff594067afb..000000000000
--- a/dev-python/rospkg/rospkg-1.1.3.ebuild
+++ /dev/null
@@ -1,43 +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/rospkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the ROS package system"
-HOMEPAGE="http://wiki.ros.org/rospkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-	# Needed for tests
-	S="${WORKDIR}/${PN}"
-	EGIT_CHECKOUT_DIR="${S}"
-else
-	SRC_URI="https://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
-
-python_test() {
-	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
-}
diff --git a/dev-python/rospkg/rospkg-1.1.4.ebuild b/dev-python/rospkg/rospkg-1.1.4.ebuild
index dff594067afb..a7dae07958a5 100644
--- a/dev-python/rospkg/rospkg-1.1.4.ebuild
+++ b/dev-python/rospkg/rospkg-1.1.4.ebuild
@@ -31,6 +31,7 @@ IUSE="test"
 
 RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-9999.ebuild
index dff594067afb..a7dae07958a5 100644
--- a/dev-python/rospkg/rospkg-9999.ebuild
+++ b/dev-python/rospkg/rospkg-9999.ebuild
@@ -31,6 +31,7 @@ IUSE="test"
 
 RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]