gentoo resync : 15.01.2020

4 files changed, 19 insertions, 26 deletions

diff --git a/dev-python/irc/Manifest b/dev-python/irc/Manifest
index e55fd18af2b9..f60f0d65953f 100644
--- a/dev-python/irc/Manifest
+++ b/dev-python/irc/Manifest
@@ -1,7 +1,7 @@
 DIST irc-16.3.tar.gz 87067 BLAKE2B 61d8b9cc20390a3eb918e5593a167b28f37154ee05cb4d7a72f8901509d3345e8d6bee9c17b66aa6c71fad4608a9f98eb3848190f82eac7db6f2013227979c25 SHA512 84b5a56a441cdf22396c10b81c115cb2e297ac082785e9baf0bc73d655034be1ff3f553d44412f066ab4b74530faddb66a9cc2f511a332e87fe49af0b6e68e5b
-DIST irc-17.0.tar.gz 86522 BLAKE2B 1fc1d2faa4e13bfdabffbccae0c40ea7dd477894a5b6f24370950d4bce5e833103fcd2c20d39e2fd0490975b1f36fb234bc354d08f1524062f4dfe7195158750 SHA512 7afef790048b6905d1ae1fa559fa100f57a508586a9d3641890c578730677c965b5c1dc9e00927c8178955632ff919c00484c535eaaaa5c411ce15f68a7d3f93
 DIST irc-17.1.tar.gz 90266 BLAKE2B bcee4710527d718c43fd836f36c48af4bd3b92aee202b0197be710ffc249b3b24d6bfb4f092a102ba0789325e0322b23d65af3fd5d7aa45cf0174d278b5d5282 SHA512 8c6a7d1e302ddfdb86808fe422f922a4bf088dd2890e5ca7a924ca960e603c78e9aedab202c895c555e3ad569e6be133aff652e0a374a16e3ab165100e6fecb6
-EBUILD irc-16.3.ebuild 1702 BLAKE2B c4ea0cb372c819a9c9652fa7bd123a10a8e2666223d20a78fb1a0db5c1123e5946f1d34c77a2abd85e433aae5db84406fa7ba649fa273d9db07eca5882c1e076 SHA512 efbc9afab10a162fe1e9e82f03b46ff3f1c5fe17e2ccd63d3093e0399bff2b3a2da12e1f8ecdf70eb7c9807efb8240e47f27faccd82ec1ce81c4654571555eea
-EBUILD irc-17.0.ebuild 1665 BLAKE2B b578bfb57a990a8a2778805594cd746912da36a5ab0e603b4939814ab9b3289258dfbf477d487d0db835abef47460bdd412a1b403fb2ec646c23848f1ac18b78 SHA512 8bcfcb11a10b7305907112b3e4207fc1b63dd298bf4c3faf97117b5ec36b824f1ac03d783fa8abdd05a28524131e0c34dbd78f4f5f5ca8763c76a8cc074cb205
-EBUILD irc-17.1.ebuild 1715 BLAKE2B 1b73627d777934995a838b69b14d3c95714dfbd056da446f083df3fc52306ce39d31b93428eabaa000210ad1b77b6e2f957e9b3376a10d2ef534a5c407b9dae8 SHA512 1b06a82e7e8f1c31afd55008ee351958c975cc7d3500510ce42337d782584b9da00d00cafa964fc14bb1e772791c0561779107d08da0a9055f12ab97f2166cd2
+DIST irc-18.0.0.tar.gz 91529 BLAKE2B 91e7f9fe38b46f836eb902c8ce4ca04706e673a8a9372c743e9b6be3b400e4d84a0d841b72e2b8444e055a69d37b22d48fcf33c7bd51375dbf0dd4a06b3ed5dd SHA512 a424f1261a09246dd2cfd0b717d4fd9bbeab9754d1f480c870c2e131354db85268bd010ec6b7cf2c59a0c32057bb290ef3ffdcb30cca8c0d833e1497bc89f58e
+EBUILD irc-16.3.ebuild 1700 BLAKE2B a8975570c31d232e5e9bd40f68a887ca5f69bbdc03a03e05b805f053507b1c47ab19fd4f90ae78762f3104b457500986fb736766285789e06b7d09a7ac6bd12b SHA512 d377ff996ce35f5b8f7fd77e1e08bfb84e5f1b25d6f66b0fb5e0f28b74e4d17fc1e542d6209b1daf3ba6c0f89db8ea3715c4eb235d8982743baeb6ca79be7ef9
+EBUILD irc-17.1.ebuild 1713 BLAKE2B e4a88b51c44a7f1ffa5400c415af52d10a9eab3563a817439f11031a8d7f2fbcd2431bdaa4b22e5116fc2d99386e7e5678ae1d7eb09d395bea2adbfc8532cafb SHA512 bd890c2e3cfb6e4d91e615cd9a556fcc574713838bac08994a32b950327a4dcc179dbba064393c171d1535734f71f89a116f32577e518f6112dd7ef0d20e3f35
+EBUILD irc-18.0.0-r1.ebuild 1686 BLAKE2B ba7de13db747de4ac4c6b590831859eb2b51240895cdcf03ea3a6028ea8a38ab64562cf401816b372cfd338b935c497191292af26b303b96d589308b5cf37057 SHA512 3768540afb7e2f5b72376d93bb3511e72d48f8bb6813508f4bbd8d302e3691a12ab318990dd41ed2666ab47116a1277c6bffee2f34e306b8a56da90851c3b327
 MISC metadata.xml 690 BLAKE2B 5bee1fd162cf7a46ee59a40c945991887fe187d09b647907a2e05b80dbd9327d039d40986b5b5549e27f8729153880a234ea50c9601e171b5cfa13de295d6ba8 SHA512 1aadd270ebeedd1ffaea3f62bb804e48f94f822ac6f4d8502753259c098c7b18a5a94d0643f35eab2df47ef3537d513e37bbb9d04b619cf88580a4d5a463095d
diff --git a/dev-python/irc/irc-16.3.ebuild b/dev-python/irc/irc-16.3.ebuild
index 449848bcb3de..9e1351a244bc 100644
--- a/dev-python/irc/irc-16.3.ebuild
+++ b/dev-python/irc/irc-16.3.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=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/irc/irc-17.1.ebuild b/dev-python/irc/irc-17.1.ebuild
index b534d09c2a25..9a603ad04654 100644
--- a/dev-python/irc/irc-17.1.ebuild
+++ b/dev-python/irc/irc-17.1.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=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/irc/irc-17.0.ebuild b/dev-python/irc/irc-18.0.0-r1.ebuild
index 253606a72f7e..bc2ceafe82d0 100644
--- a/dev-python/irc/irc-17.0.ebuild
+++ b/dev-python/irc/irc-18.0.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -13,28 +13,23 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
+IUSE="examples test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/jaraco-collections[${PYTHON_USEDEP}]
 	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
 	>=dev-python/jaraco-itertools-1.8[${PYTHON_USEDEP}]
-	>=dev-python/tempora-1.6[${PYTHON_USEDEP}]
-	dev-python/jaraco-collections[${PYTHON_USEDEP}]
 	dev-python/jaraco-logging[${PYTHON_USEDEP}]
 	dev-python/jaraco-stream[${PYTHON_USEDEP}]
 	dev-python/jaraco-text[${PYTHON_USEDEP}]
 	dev-python/more-itertools[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/tempora-1.6[${PYTHON_USEDEP}]
 "
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
 	test? (
 		${RDEPEND}
 		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
@@ -42,17 +37,15 @@ DEPEND="
 	)
 "
 
-python_compile_all() {
-	if use doc; then
-		cd docs || die
-		sphinx-build . _build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
+distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
+	'>=dev-python/rst-linker-1.9'
 
 python_test() {
 	# Override pytest options to skip flake8
+	# Skip a test that fails with 3.8 until it is fixed
+	# https://github.com/jaraco/irc/issues/165
 	pytest -vv --override-ini="addopts=--doctest-modules" \
+		--deselect irc/tests/test_client_aio.py::test_privmsg_sends_msg \
 		|| die "Tests failed with ${EPYTHON}"
 }