gentoo resync : 14.05.2020

3 files changed, 73 insertions, 2 deletions

diff --git a/dev-python/txtorcon/Manifest b/dev-python/txtorcon/Manifest
index 930b78b6c615..49921e5e193b 100644
--- a/dev-python/txtorcon/Manifest
+++ b/dev-python/txtorcon/Manifest
@@ -3,5 +3,7 @@ AUX txtorcon-0.19.3-Removeinstalldocs.patch 1755 BLAKE2B db819619ede7aec946226cb
 AUX txtorcon-0.19.3-Removeunconditionalexamples.patch 964 BLAKE2B cde8fdc85b3809917fefc21603a4de86119ab54dabad0e1258c8a387c632bd034decf1ea0d6a0a829246cacefd8651b84d1aaf10b55d2e5423d6ded58b92bfbd SHA512 3131dce9b4f3bf15d09ebc87b323c06bdc30a833ab7c6a964f31599d0b21fd5baa0c696af1356db58677c58d803033e786a80db1d46444d92b91a9fee2736cf6
 AUX txtorcon-0.19.3-setup.py-Dontinstallthetests.patch 680 BLAKE2B b26bd4e41d8f3b8b9e795e77475c93bb8f8a1ce138c1fbf83af9d3ece46f031e94e90db35e0aa057594004e80d4413c4853d7b3cd7c41b784ac5a40f6a843d8f SHA512 95894caa6c9e6f3f3a2744a1388397b0ff7298bd508579411ce2cb93ea6f990e6068806ef8d4a9fe959b235ed68402925c731beb9ff9b638a8d6ef2c10709eb8
 DIST txtorcon-0.19.3.tar.gz 265716 BLAKE2B c0778c918689906c1066f714f4c6621f176cc413b0ebbe628201727cb7ae24c8f1b5a8a5a030b5cb48b2cea96e29f2f7bb5a54744e36324a938841b11f44474b SHA512 748e23c25c0b287467e0fa7db6ad69a8af7010957a846141b9360b71af0d279153ff401b85d135e7e66171e81117ebc56406e64e660aeda7dde8cd430d0a7254
+DIST txtorcon-20.0.0.tar.gz 306139 BLAKE2B 54474ef6facf5c54ccc9feed0e8c5b58b3f5356b73290f7d0d488910637e541c2e4d7b8c90470aa561f6bcc202532e153761e9409375d102d9c68473cf34a456 SHA512 4856c86b3eac432b8e2dddec4d4ef3172452d084a5685f90335d366e918e2e80a223a7a31ff78ddb6dff1ddbbfc1e26f6d0ae9fb99bd47d6894cc6dd29365da8
 EBUILD txtorcon-0.19.3-r1.ebuild 1778 BLAKE2B fb05d3e43b0b5deefd796004485e658bd3ac755a847e618f4dbdde94c084c349ff2c37ae87f48e2f7463cc79dd36db026edfe75a974881c875fc26dca4f9dfd3 SHA512 081b9383013286c9c2b9cae3041bcc235b81c91ce8e9b1f250e03331a8d8341446dce66ccf3b9b34e90d073667d3c9d58e74a27949d3ad62509de335f2c7008f
-MISC metadata.xml 532 BLAKE2B 757c7b063ce80fd9a6c8534be25740c4dcb59a89b217491cb83bcee0be8ed9fe03543e2cd74da076f366a01174d0b93839642bd37808b41e2c9a9b72fe494b2f SHA512 34e60662826b41e73c51a35105adeb3a80a634ce620cd42c3354b3faf7651a1e979f66f140cf7b8f45b130170735242d4c4d7a34d018ec9cd9d717b3b6cc06e7
+EBUILD txtorcon-20.0.0.ebuild 1906 BLAKE2B 642dabbf6f0bcce124e42b5ba7afd71e8b07615c207c07f039979eb8dd607e112d1d22b21008a8efa66dfa40eacc6f6fd97ce98243772076c7f785d6305726ed SHA512 1c4a841f0a53cf2875c42c7bf5ee523e37b2871eee6718417b8d106ca20a010adf2d3dd1dc122626e5a3ee6b17cef808fbc8a1aefc5839ee5d3a10e6b95e7dc4
+MISC metadata.xml 610 BLAKE2B fb46ec20d770d43ca8b92b0275068fabe8e71536cd792c9757517a128e1f602552ea518f9673a65750f246c5d16eac5e6ae508e2150522a746fc91016cd4aac9 SHA512 84f568e3bb39515ae42b119ba40aa7549e8bf8387ba3150675cd0625d14925de042a9b6057d7818611e45284175bc92bd2f73979d132b83adf4b7ebef0a9fef8
diff --git a/dev-python/txtorcon/metadata.xml b/dev-python/txtorcon/metadata.xml
index cab355145219..43897ef848d6 100644
--- a/dev-python/txtorcon/metadata.xml
+++ b/dev-python/txtorcon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<name>Brian Dolbec</name>
+	</maintainer>
 	<upstream>
 		<maintainer>
 			<email>meejah@meejah.ca</email>
diff --git a/dev-python/txtorcon/txtorcon-20.0.0.ebuild b/dev-python/txtorcon/txtorcon-20.0.0.ebuild
new file mode 100644
index 000000000000..d06852d8f77d
--- /dev/null
+++ b/dev-python/txtorcon/txtorcon-20.0.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Twisted-based Tor controller client, with state-tracking and config abstractions"
+HOMEPAGE="https://github.com/meejah/txtorcon https://pypi.org/project/txtorcon/ https://txtorcon.readthedocs.org"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/automat[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/incremental[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP},crypt]
+	>=dev-python/zope-interface-3.6.1[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/automat[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/repoze-sphinx-autointerface[${PYTHON_USEDEP}]
+		>=dev-python/zope-interface-3.6.1[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}/txtorcon-0.19.3-setup.py-Dontinstallthetests.patch"
+	"${FILESDIR}/txtorcon-0.19.3-Movetestsunderthetxtorconnamespace.patch"
+	"${FILESDIR}/txtorcon-0.19.3-Removeunconditionalexamples.patch"
+)
+
+python_prepare_all() {
+	sed -e "s/^ipaddress.*//" -i requirements.txt || die
+
+	distutils-r1_python_prepare_all
+}
+python_test() {
+	pushd "${TEST_DIR}" > /dev/null || die
+	/usr/bin/trial txtorcon || die "Tests failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+python_compile_all() {
+	use doc && emake -C "${S}/docs" html
+}
+
+python_install_all() {
+	use doc && dodoc -r "${S}/docs/_build/html/"*
+	use examples && dodoc -r "${S}/examples/"
+	distutils-r1_python_install_all
+
+	# delete the dropin.cache so we don't have collisions
+	rm "${D}"/usr/lib*/python*/site-packages/twisted/plugins//dropin.cache || die
+}