gentoo resync : 15.01.2020

5 files changed, 7 insertions, 100 deletions

diff --git a/dev-util/wstool/Manifest b/dev-util/wstool/Manifest
index 7343064de18e..88f026e13391 100644
--- a/dev-util/wstool/Manifest
+++ b/dev-util/wstool/Manifest
@@ -1,7 +1,4 @@
-AUX prefix2.patch 1031 BLAKE2B 489bc334d6119f1175bf4ea671644ae1878a680b237c424f73ae99ebc20e398d070716bce1df2fa554da382882385693ead202b19af1aaf979b4eff3639dc5b5 SHA512 747b973ec84a31213de84fc15f40d4d9dce854a32602b3dffaac088992578a07f48047358bf7c38b6ca597c251232f48432404836cb2304f5423db4ddf2f9345
-DIST wstool-0.1.13.tar.gz 75188 BLAKE2B 6a34aa04e4a076a75dacf24faf789d5295f6ad9afbbdddae480d8cdd11db63940faeca2c5936a2432aeccae5274e2e9e4e824f303460fe96f95c0d17abeeb9c1 SHA512 4d54f78ca044d31d927de1c3387536d0447ece77672c555845adf54e47f07adb67e6e9c866bc2719aae468aeeb26c900b3784e0ec7cf014c8118e841a92dca14
-DIST wstool-0.1.17.tar.gz 76168 BLAKE2B 4862df0ff16a5102e42d3ed683dbd9e8eb432aaf44f6e641fba6bb6f5d962645685b0fc9ca11f3c8adbe15dbef33086b93e3f9136073f7f181b5da37522e28fa SHA512 13533354a40723137baadc125425a2ec3d6a441da4870f04a9e17c53509ee4d3dc27df1a59edc2c3985a05fbd66a045539e9814f73509ee527fb763f8a804626
-EBUILD wstool-0.1.13.ebuild 1475 BLAKE2B 026905800ac1e0d2a2a4b295222dd83f5f909732fab9694b9507aa2845a4e7de2916569555bd04e57248b117f16ce2dcb112429ae49dd0c271aeda9eeca3e429 SHA512 ccd6c8699e844eb076f2502ff23a71537cc04629aefa4c105fd3e369caf8d5d7051916b92b6a712039e1326a944247150e88a3f9e77aaf7f76fe514d1510671e
-EBUILD wstool-0.1.17.ebuild 1479 BLAKE2B 391f46b2f88aef365efca47975c7715a70a8f841575ded7115cbcbac623ba40d2e09110f799ba1ccb5fbbce4cd4cc318c6c0ed5556051dbf8eb860499bd8b31f SHA512 ac097569ede16c6ee0bb7fd389d29dafc176f3c204c273e8f1cbfb88b2f9edff5474b1e338fbfe435ea58edd1bdf31c299778c52b21595661b7e8692191f044f
-EBUILD wstool-9999.ebuild 1479 BLAKE2B 391f46b2f88aef365efca47975c7715a70a8f841575ded7115cbcbac623ba40d2e09110f799ba1ccb5fbbce4cd4cc318c6c0ed5556051dbf8eb860499bd8b31f SHA512 ac097569ede16c6ee0bb7fd389d29dafc176f3c204c273e8f1cbfb88b2f9edff5474b1e338fbfe435ea58edd1bdf31c299778c52b21595661b7e8692191f044f
+DIST wstool-0.1.18.tar.gz 80595 BLAKE2B ed90fc5c63ab5d775dfb49ddacc6da6e285aeb5078cf471c0d504659a9e322fde27797e4d05fd56dff4b9958558200cf05e46cf7ae71fd1231ab63048e668808 SHA512 fda9c679183c605048ed024a57b07fd2d9b644978a3e4ff89c3716b74d8e4ba0124779bcdf88a75fdbbf47c765b7ab63db7c84a55a6e1744fc6f955649590c48
+EBUILD wstool-0.1.18.ebuild 1439 BLAKE2B 2e5c6f6e82d521725e123726400d5c5c962b73328d0898d37d30ea7f3ee0c4d7a7480978e03e257cb4f00bfd6717eba92ce17abfb457dbc7ead3bad0c61c5c45 SHA512 cef1e8c8dfc9f26526944b7d917ac6e3d2c53e050dc7985379b741ba43ebf90c2456d183971243e2b61d594edab2f9c3031ff61e57046acc4f37224b463d4910
+EBUILD wstool-9999.ebuild 1439 BLAKE2B 2e5c6f6e82d521725e123726400d5c5c962b73328d0898d37d30ea7f3ee0c4d7a7480978e03e257cb4f00bfd6717eba92ce17abfb457dbc7ead3bad0c61c5c45 SHA512 cef1e8c8dfc9f26526944b7d917ac6e3d2c53e050dc7985379b741ba43ebf90c2456d183971243e2b61d594edab2f9c3031ff61e57046acc4f37224b463d4910
 MISC metadata.xml 329 BLAKE2B ffdb449cef2fa449771425241f9a03b49d915bed8abc73329586e9a2873e41ac669e4a347ed6f2cabc92b7132a741d5fcc79f13a9d900f7fced17fba322c460c SHA512 7bedf1430c3a2e5a8c98701ef48ce3a97ac59bebe3d42e19da193480c97ef0b2020916c7582f4083ebbf361b5c66b17ad1bfa7889e8aa62d3c945ba8dcf5b62f
diff --git a/dev-util/wstool/files/prefix2.patch b/dev-util/wstool/files/prefix2.patch
deleted file mode 100644
index 934443f98707..000000000000
--- a/dev-util/wstool/files/prefix2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: wstool-0.1.13/setup.py
-===================================================================
---- wstool-0.1.13.orig/setup.py
-+++ wstool-0.1.13/setup.py
-@@ -26,18 +26,11 @@ def _resolve_prefix(prefix, type):
-     # issue: https://github.com/vcstools/wstool/issues/81
-     osx_system_prefix = '/System/Library/Frameworks/Python.framework/Versions'
-     if type == 'man':
--        if prefix == '/usr':
--            return '/usr/share'
--        if sys.prefix.startswith(osx_system_prefix):
--            return '/usr/local/share'
-+        return os.path.join(prefix, 'share')
-     elif type == 'bash_comp':
--        if prefix == '/usr':
--            return '/'
--        if sys.prefix.startswith(osx_system_prefix):
--            return '/usr/local'
-+        return os.path.join(prefix, '../')
-     elif type == 'zsh_comp':
--        if sys.prefix.startswith(osx_system_prefix):
--            return '/usr/local'
-+        return os.path.join(prefix, '../')
-     else:
-         raise ValueError('not supported type')
-     return prefix
diff --git a/dev-util/wstool/wstool-0.1.17.ebuild b/dev-util/wstool/wstool-0.1.17.ebuild
deleted file mode 100644
index 44cd350a809f..000000000000
--- a/dev-util/wstool/wstool-0.1.17.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/vcstools/wstool"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Commands to manage several local SCM repositories for ROS"
-HOMEPAGE="http://wiki.ros.org/wstool"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		https://github.com/vcstools/wstool/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/vcstools-0.1.38[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/sphinx
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-vcs/git
-		dev-vcs/bzr
-		dev-vcs/mercurial
-		dev-vcs/subversion
-	)
-"
-
-PATCHES=( "${FILESDIR}/prefix2.patch" )
-DISTUTILS_IN_SOURCE_BUILD="yes"
-
-python_test() {
-	# From travis.yml
-	# Set git config to silence some stuff in the tests
-	git config --global user.email "foo@example.com"
-	git config --global user.name "Foo Bar"
-	# Set the hg user
-	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
-	# Set the bzr user
-	bzr whoami "Your Name <name@example.com>"
-	# command to run tests
-	nosetests --with-coverage --cover-package=wstool || die
-}
diff --git a/dev-util/wstool/wstool-0.1.13.ebuild b/dev-util/wstool/wstool-0.1.18.ebuild
index 30a7bd56fa00..6dbe2958bdb9 100644
--- a/dev-util/wstool/wstool-0.1.13.ebuild
+++ b/dev-util/wstool/wstool-0.1.18.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -45,7 +45,6 @@ DEPEND="${RDEPEND}
 	)
 "
 
-PATCHES=( "${FILESDIR}/prefix2.patch" )
 DISTUTILS_IN_SOURCE_BUILD="yes"
 
 python_test() {
diff --git a/dev-util/wstool/wstool-9999.ebuild b/dev-util/wstool/wstool-9999.ebuild
index 44cd350a809f..6dbe2958bdb9 100644
--- a/dev-util/wstool/wstool-9999.ebuild
+++ b/dev-util/wstool/wstool-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -45,7 +45,6 @@ DEPEND="${RDEPEND}
 	)
 "
 
-PATCHES=( "${FILESDIR}/prefix2.patch" )
 DISTUTILS_IN_SOURCE_BUILD="yes"
 
 python_test() {