Updating liguros repo

13 files changed, 172 insertions, 36 deletions

diff --git a/dev-python/cheroot/cheroot-8.3.0-r1.ebuild b/dev-python/cheroot/cheroot-8.3.0-r1.ebuild
index 22b404d5215a..f7c37a0adaf9 100644
--- a/dev-python/cheroot/cheroot-8.3.0-r1.ebuild
+++ b/dev-python/cheroot/cheroot-8.3.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 6f446f94a2e2..85e36860fe58 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1 +1 @@
-DIST pipenv-2020.4.1_beta1.tar.gz 11331009 BLAKE2B 55ac81238b885bdf0293199ca1caf44a78f3cdbec75c9df259411b949dec8b385161e7ef46160ca099ef51041410d8c5d1274ad200eba5c2a9d06c8a5f61c5f1 SHA512 a5de90ae9910a30666ac7323ccf83b78ee11d8993aef1a2108a44f4256d365d0c1abfff72c83748ef82215914931090c670a10eeb511cb48483762b54c80e5c7
+DIST pipenv-2020.6.2.tar.gz 11571734 BLAKE2B bc50535f215b11d284eeec546722a144cfdfeeab6abab8eae51c727c054865f274ac970dc61c23cce7db19ac28a77e44a84453743ba2dc75068feb3a47a19190 SHA512 671765b9e77a18039668eb500989de45c8bd4f15948ee914eb241985098562ebd382168a535a449ac5d216f07327b6787eb8f828b5a6499ef6e77fe5a036441e
diff --git a/dev-python/pipenv/metadata.xml b/dev-python/pipenv/metadata.xml
index f1fa3c532cf9..d84d0564dd4a 100644
--- a/dev-python/pipenv/metadata.xml
+++ b/dev-python/pipenv/metadata.xml
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!--maintainer-needed-->
+  <maintainer type="person">
+    <email>oz.tiram@gmail.com</email>
+    <name>Oz Tiram</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pipenv</remote-id>
-    <maintainer status="unknown">
-      <email>me@kennethreitz.org</email>
-      <name>Kenneth Reitz</name>
+    <maintainer status="active">
+      <email>distutils-sig@python.org</email>
+      <name>Python Packaging Authority</name>
     </maintainer>
   </upstream>
 	<origin>gentoo-staging</origin>
diff --git a/dev-python/pipenv/pipenv-2020.4.1_beta1.ebuild b/dev-python/pipenv/pipenv-2020.6.2.ebuild
index 9a6edb8635af..2ff4139d4e2f 100644
--- a/dev-python/pipenv/pipenv-2020.4.1_beta1.ebuild
+++ b/dev-python/pipenv/pipenv-2020.6.2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1
@@ -11,19 +12,23 @@ MY_PV=${PV/_beta/b}
 DESCRIPTION="Python Development Workflow for Humans"
 HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
 SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_PV}
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/certifi[${PYTHON_USEDEP}]
 	>=dev-python/pip-18.0[${PYTHON_USEDEP}]
 	dev-python/virtualenv[${PYTHON_USEDEP}]
 	>=dev-python/virtualenv-clone-0.2.5[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-36.2.1[${PYTHON_USEDEP}]"
-DEPEND="test? (
+	"
+
+BDEPEND="
+	test? (
 		${RDEPEND}
 		dev-python/flaky[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
@@ -33,14 +38,13 @@ DEPEND="test? (
 		dev-python/pytz[${PYTHON_USEDEP}]
 	)"
 
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2020.4.1_beta1-disable-networked-tests.patch"
-)
+src_prepare() {
+	# remove vendored version of PyYAML that is backported to Python2
+	# this should be removed when upstream removes support for Python2
+	rm -vR "${S}/${PN}/patched/yaml2/" || die
+	distutils-r1_src_prepare
+}
 
 python_test() {
-	pytest -m "not cli" -vv tests/unit || die
+	pytest -m "not cli and not needs_internet" -vv tests/unit || die
 }
diff --git a/dev-python/rosdistro/Manifest b/dev-python/rosdistro/Manifest
index cc49f4a4757e..220e99d325d6 100644
--- a/dev-python/rosdistro/Manifest
+++ b/dev-python/rosdistro/Manifest
@@ -1,2 +1,3 @@
 DIST rosdistro-0.8.0.tar.gz 60527 BLAKE2B 9404452dc62c9f7d1482de3c13df0093ac26a60554c97fa097cb14548cdb814fbdc96a26db2d24aa1f2eb99de86f27807ecdc50e0e00a8fa727af8803ab5d644 SHA512 1f4620454f78bd03f75a8b1b8535588a8d6e50aeef17dbf346e8d0443a6fbc5ec83646767bf86521fb65508e205fc3edb8f0c97a81aec8d6b72088d9d78a14f0
 DIST rosdistro-0.8.1.tar.gz 61268 BLAKE2B 16de2f747eab59f0d2eb880cfa5cde8b62f8f6b71773f1c72665c5b58bf9f63f8e593b2dd0924b104488ce5e7e5bdf930a52db677180542806a899970ede5b37 SHA512 3d49aaf460904e2cce635443cb95ca54bdd429549016a614da7038703752187a00b98916e2826193897048753a2b2727eb153296d30abe66c56bd54d68648b08
+DIST rosdistro-0.8.2.tar.gz 61328 BLAKE2B 2eb9c4ffc7eedaa040c48d3eb914ea08540adc4ff76ef83eb0fcf8d3d83989b499408953d76c7e9e7951488b269eb9bb3cd6b9db15650924e9c814c7aac60a6b SHA512 b96565dc8fbc000ed6b18285b04b435c7e3455b1e0938c7959cdd7f78749e1a0cf02b2eecba47077bec512d4f8b22923012a6496fb06a5d58ae97a859f8bc6c3
diff --git a/dev-python/rosdistro/rosdistro-0.8.2.ebuild b/dev-python/rosdistro/rosdistro-0.8.2.ebuild
new file mode 100644
index 000000000000..177a0088eafb
--- /dev/null
+++ b/dev-python/rosdistro/rosdistro-0.8.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+
+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="https://wiki.ros.org/rosdistro"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ros-infrastructure/rosdistro/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+PATCHES=( "${FILESDIR}/yaml.patch" )
+
+src_prepare() {
+	# Requires network access
+	rm -f test/test_manifest_providers.py
+	default
+}
+
+python_test() {
+	nosetests --with-xunit test || die
+}
diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
index 2ad08e490359..0306a6208ac6 100644
--- a/dev-python/rospkg/Manifest
+++ b/dev-python/rospkg/Manifest
@@ -1,2 +1,3 @@
 DIST rospkg-1.2.0.tar.gz 90516 BLAKE2B 0c1d993c70f0ad383ab457c846416a22b9adf9611704a918c3765659231846749228073ea04950ddfdbe13f7e51f87ce5d17c1488f995e846a6590a0f9549efd SHA512 f059259a38b8b2281496a69f8a55fdd31a11e91583babb82e574363c40c90221a4abb7c1d7a5ed6be3b2389ee6aaf08b4e016260c73dd779f8c7993e6eba78db
 DIST rospkg-1.2.6.tar.gz 90944 BLAKE2B 26bd4a9deb3c6876b870ec6ccb11dfdb7820d0cf23fef2fcea8391543c58cf8e916253316df443cc9cc7e364ab790a8915e77986aef3f400785f50604fbd2a45 SHA512 6c88c8789927d72f8f882930aeef776dbec3c4d1343a2d4143d920684c8d2007021397a42008521c87dfc637302b9266615e13623ef5dc5c076e6e8cfd9e957d
+DIST rospkg-1.2.8.tar.gz 91042 BLAKE2B 4c4640d45a06214240a80d2ea15a09799eb892755c7c4410761e2a3505115ee1914a542886385bcd6996ead46e46a3e4d22bf79ffc38a0d2d8f2c7ac295eb0bb SHA512 c4f0c1992597aadf395effd4e6db65c20bf19501a19c569de57a2b9977d9ba794c3c68ba16b2b274ec865caffe6ec98b8fc0e88ad13ea3a9bc744e9ab6adb3a6
diff --git a/dev-python/rospkg/rospkg-1.2.8.ebuild b/dev-python/rospkg/rospkg-1.2.8.ebuild
new file mode 100644
index 000000000000..b00391a9a3ad
--- /dev/null
+++ b/dev-python/rospkg/rospkg-1.2.8.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+
+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="https://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"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND} ${BDEPEND}
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+PATCHES=( "${FILESDIR}/gentoo.patch" "${FILESDIR}/yaml_load.patch" )
+
+python_test() {
+	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
+}
diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-9999.ebuild
index 5bf8837b0b2d..b00391a9a3ad 100644
--- a/dev-python/rospkg/rospkg-9999.ebuild
+++ b/dev-python/rospkg/rospkg-9999.ebuild
@@ -31,7 +31,9 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+"
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/tubes/files/remove-unnecessary-dep.patch b/dev-python/tubes/files/remove-unnecessary-dep.patch
new file mode 100644
index 000000000000..678f3c27abd8
--- /dev/null
+++ b/dev-python/tubes/files/remove-unnecessary-dep.patch
@@ -0,0 +1,24 @@
+From 2c05dd8f27c97ebbfea18706ff54d2406448b09a Mon Sep 17 00:00:00 2001
+From: Glyph <glyph@twistedmatrix.com>
+Date: Tue, 3 Mar 2020 01:24:13 -0800
+Subject: [PATCH] remove unnecessary dependency
+
+---
+ setup.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index c647927..e9e3134 100644
+--- a/setup.py
++++ b/setup.py
+@@ -16,7 +16,6 @@ setup(
+     packages=find_packages(exclude=[]),
+     package_dir={'tubes': 'tubes'},
+     install_requires=[
+-        "characteristic",
+         "six",
+         "Twisted",
+     ],
+--
+libgit2 1.0.1
+
diff --git a/dev-python/tubes/metadata.xml b/dev-python/tubes/metadata.xml
index dff0b749e6b0..16277ad306a2 100644
--- a/dev-python/tubes/metadata.xml
+++ b/dev-python/tubes/metadata.xml
@@ -7,18 +7,15 @@
 	</maintainer>
 	<upstream>
 		<maintainer>
-			<email>bolson@bolson.org</email>
-			<name>Brian Olson</name>
+			<email>glyph@twistedmatrix.com</email>
+			<name>glyph</name>
 		</maintainer>
-		<remote-id type="pypi">cbor</remote-id>
-		<remote-id type="bitbucket">bodhisnarkva/cbor</remote-id>
+		<remote-id type="pypi">Tubes</remote-id>
+		<remote-id type="github">twisted/tubes</remote-id>
 	</upstream>
-	<longdescription>This library provides encoding and decoding for the
-Concise Binary Object Representation (CBOR) (RFC 7049) serialization format.
-It is implemented in pure python with an optional C backend and is compatible
-with versions 2.7 through to 3.8.  On cPython>=3.3 cbor2 can use a built in C
-module for performance similar to how pickle wraps the _pickle C module in the
-Python Standard Library.
+	<longdescription>Presently based primarily on Twisted, its core data
+	structures are fairly framework-agnostic and could be repurposed to work
+	with any event-driven container.
 	</longdescription>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/tubes/tubes-0.2.0.ebuild b/dev-python/tubes/tubes-0.2.0-r1.ebuild
index c22f5e2a5b83..90fba2d38031 100644
--- a/dev-python/tubes/tubes-0.2.0.ebuild
+++ b/dev-python/tubes/tubes-0.2.0-r1.ebuild
@@ -11,9 +11,6 @@ DESCRIPTION="Flow control and backpressure for event-driven applications"
 HOMEPAGE="https://github.com/twisted/tubes https://pypi.org/project/Tubes/"
 SRC_URI="https://github.com/twisted/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-IUSE="test"
-RESTRICT="!test? ( test )"
-
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 "
@@ -22,12 +19,9 @@ DEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/twisted[${PYTHON_USEDEP}]
 "
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
 
 RDEPEND="${DEPEND}"
 
+PATCHES=( "$FILESDIR/remove-unnecessary-dep.patch")
+
 distutils_enable_tests pytest
diff --git a/dev-python/wcwidth/wcwidth-0.2.2-r1.ebuild b/dev-python/wcwidth/wcwidth-0.2.2-r1.ebuild
index d130d1884268..bfd90ccf1878 100644
--- a/dev-python/wcwidth/wcwidth-0.2.2-r1.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.2.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	$(python_gen_cond_dep '