gentoo resync : 11.08.2021

3 files changed, 20 insertions, 36 deletions

diff --git a/dev-python/treq/Manifest b/dev-python/treq/Manifest
index 50797040b1e2..d2e1bba790b4 100644
--- a/dev-python/treq/Manifest
+++ b/dev-python/treq/Manifest
@@ -3,5 +3,5 @@ DIST treq-21.1.0.tar.gz 71018 BLAKE2B 44223c0ad618f4a57283db60063ee2fd263f958ff1
 DIST treq-21.5.0.tar.gz 71323 BLAKE2B 1e1f0f4c885c1d197fdf9c1a88c9ee486c3fcc4d126498f4ce10e59d62e2445e4935e3f4cabed5de2f2663c3049ab6b49e47a0bad29380a4bb901e30d6723f49 SHA512 81ccfaa90513f0ef53c60f69ff7c60e066c6f0669ab82cf361e0720e5fd3098eb88e9b205f5bb590f1e0cde6083e5e2dfbacb6086986f0dd91fc2b3038da3093
 EBUILD treq-20.9.0.ebuild 1552 BLAKE2B e96643e5db58330b4ae89681821d17d2907662d09f86d291157b36f7072172e162c0bf8387ed0be11e8edbd83ea43ee7ace004050f7179fbc7ebee731759d323 SHA512 2f08bdea0941edaa8359a7ba9e549c796461195179c9eef3c3e6f3df6890f46671f72fe6423416e480315660789b8437559faab798b7a0c3b2adfcbe2eed98c2
 EBUILD treq-21.1.0.ebuild 1563 BLAKE2B f8c7f22fd8231617ffd1e00c84a9b84a60d834180a034674cc19d044667ec20f4329dada4f1bd5344137c7bf1286fd530b18064426739f4826b8e7ee9df529bd SHA512 3c32cea95537342362e8cbe56c810c373173bc83f96629bbebef31f409ec2a3f2c08afd0689c864072d4435ad8af52bd509dbe8b28b65147f0f3aef9f908f250
-EBUILD treq-21.5.0.ebuild 1563 BLAKE2B f8c7f22fd8231617ffd1e00c84a9b84a60d834180a034674cc19d044667ec20f4329dada4f1bd5344137c7bf1286fd530b18064426739f4826b8e7ee9df529bd SHA512 3c32cea95537342362e8cbe56c810c373173bc83f96629bbebef31f409ec2a3f2c08afd0689c864072d4435ad8af52bd509dbe8b28b65147f0f3aef9f908f250
-MISC metadata.xml 679 BLAKE2B 1218e13a10ef3e4b63b892d3ba444116d8ae3bdc625c9b95ef73f9c4d59dc7bad527e919568306e7744b79a9bb00dea90ee0b83146bc4314d224e2dc7657cb7d SHA512 b3d2aadc2c43d03d80d50fd67830e62ba7543dc7ea7e0f834b32a7738031a49a8ab57069b8d5c7a9b0f88405bae8d59333e50ecab87286f8be5504141081914e
+EBUILD treq-21.5.0.ebuild 1059 BLAKE2B b27a7f9e6f5f8f07e60673b9604d21462b8e7121fd24787dde811e05e46d7dea0406a41d9ba8f1ef74666487fe696af263077d3521203d8ce0d23c4ac3e95bb6 SHA512 1ec6b023e1709f350a5b61a036a7ab60f7d09b65f58fe4ab2c76c9941e636da83c497f82ee93eb12f6520c8976bb33adef126222b4f53d55a342f21a9c1656fa
+MISC metadata.xml 780 BLAKE2B 624c0453f7ddecf22792eaa2cc87e4c997f5896cefcbd2fff2e7cc991ebb094dd178340b7ced63a8e274e4d56fea24a17c07930303dee72049b2b1981d4295af SHA512 d3fb3a72c69ca17e14b767b91084048791fa6ef5b52ee6a4979dcb53f013549ed2b2d651e9668b7cdf7770379d06e4a78efa2d4eaca94a8a6e3bd244252c233b
diff --git a/dev-python/treq/metadata.xml b/dev-python/treq/metadata.xml
index d90ac85b2d47..298a46ddb241 100644
--- a/dev-python/treq/metadata.xml
+++ b/dev-python/treq/metadata.xml
@@ -5,6 +5,10 @@
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<maintainer>
 			<email>hawkowl@twistedmatrix.com</email>
diff --git a/dev-python/treq/treq-21.5.0.ebuild b/dev-python/treq/treq-21.5.0.ebuild
index b5f62bffd38c..4a466dd998f2 100644
--- a/dev-python/treq/treq-21.5.0.ebuild
+++ b/dev-python/treq/treq-21.5.0.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS="bdepend"
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -17,47 +17,27 @@ KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
-COMMON_DEPEND="
-	dev-python/incremental[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
 	>=dev-python/hyperlink-21.0.0[${PYTHON_USEDEP}]
-"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/twisted-18.7.0[crypt,${PYTHON_USEDEP}]
+	dev-python/incremental[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/twisted-18.7.0[crypt,${PYTHON_USEDEP}]
 "
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx
-		${RDEPEND} )
+BDEPEND="
 	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/httpbin[${PYTHON_USEDEP}]
 	)"
 
-python_compile_all() {
-	use doc && emake -C "${S}/docs" html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/ )
-
-	distutils-r1_python_install_all
-}
+distutils_enable_sphinx docs
 
-test_instructions() {
-	ewarn "The 'test' USE flag and FEATURE only ensures that the correct"
-	ewarn "dependenciess are installed for this package."
-	ewarn "Please run eg:"
-	ewarn "$ python3.7 /usr/bin/trial treq"
-	ewarn "as a user for each of the python versions it is installed to"
-	ewarn "to correctly test this package."
+src_prepare() {
+	# fix relative path for docs generation
+	sed -e "s@('..')@('../src')@" -i docs/conf.py || die
+	distutils-r1_src_prepare
 }
 
 python_test() {
-	# Tests fail when run via emerge
-	# they need proper network access
-	test_instructions
+	distutils_install_for_testing
+	"${EPYTHON}" -m twisted.trial treq || die "Tests failed with ${EPYTHON}"
 }