gentoo resync : 25.11.2020

3 files changed, 2 insertions, 61 deletions

diff --git a/dev-python/irc/Manifest b/dev-python/irc/Manifest
index f980b2adeff0..ced3ae96e5c0 100644
--- a/dev-python/irc/Manifest
+++ b/dev-python/irc/Manifest
@@ -1,5 +1,3 @@
-DIST irc-18.0.0.tar.gz 91529 BLAKE2B 91e7f9fe38b46f836eb902c8ce4ca04706e673a8a9372c743e9b6be3b400e4d84a0d841b72e2b8444e055a69d37b22d48fcf33c7bd51375dbf0dd4a06b3ed5dd SHA512 a424f1261a09246dd2cfd0b717d4fd9bbeab9754d1f480c870c2e131354db85268bd010ec6b7cf2c59a0c32057bb290ef3ffdcb30cca8c0d833e1497bc89f58e
 DIST irc-19.0.1.tar.gz 118227 BLAKE2B 7cafeaee39545ea2fb2257ca2ea89ccb90ed6d6607be27dac6d72cd9fc2e308a7980cc89ff4e1a491e52b071f3b91f6a56f56c9956d35f10a3bac95f214fee10 SHA512 f472c47c3fb54fd012fe16774cf19d43e07cfbc314347b02a280b6bf1d08eda9cbc13d4e3adf3af5f22b31d41e7160c44dbde9479abed01e0b5224f23ec9a0d7
-EBUILD irc-18.0.0-r1.ebuild 1629 BLAKE2B 13905c88052e024e8469d5a665822eeb57a7cef175dcd05a955b1e9b79e28abe2614a8a7d6ba3c23d79b0bf025ea9ea2bc320e5450c6a50aaf872c0a9871e7d5 SHA512 d3c99499cdcf4c6a1c0e851081d978005c3b5bcdfc8c9d2484447f0665d9c8d3048dadec8db01e9c1e77d685ee85c0f6dacabc7256aeb0e6f255219a4b1e131d
-EBUILD irc-19.0.1.ebuild 1503 BLAKE2B 001459238969f41aec67d95ab09688f819aa3a084e16bfc4d2ee07951d4d32e0ac9bfe5e58edcffa8f0aeffc29b5018cc506d5e775ee15abeaa25efde7d19c25 SHA512 b187f519830aa00a441b2829b83257ecc5e822ad34f4a05b3352d08264c4dfb7e99603deb079e22ab9d07f95f8404b04b325c243b92637ca2d68e6a8f4b62954
+EBUILD irc-19.0.1.ebuild 1501 BLAKE2B 376206a41c0bc3c3f48c853f98442058ced9d043db4173c43cd2d1c855d0516121839744ea0b43979178b5a9b7d0b5fd75b3f762b0922a432a5b2382c580c7ce SHA512 25bf5baad03ca65051e0ab895a7895f9b4ad93a0f839222bbbf6a01dff2adc1df5019bfaf5d572626e18e6da7207f93c91d30b8862cb1592cfc3004f2b1eb0a1
 MISC metadata.xml 815 BLAKE2B 0431114b3a5e9f0ba4d316502ce7612a7b987d9189789c0e156f6cf970c06fea9353c8b8fbbca828f3b89b2b43e42453ee6073b90097fedf92ce0e6a6061ea8c SHA512 a6b414ff2bac0bb47c4330707b9e09236a7ef2ca13d4e5ed19aa1bc514998ba0139643fd3014ca451c19b446452a829c074b5d2015e761a914373d1b5561c482
diff --git a/dev-python/irc/irc-18.0.0-r1.ebuild b/dev-python/irc/irc-18.0.0-r1.ebuild
deleted file mode 100644
index a96210c789e6..000000000000
--- a/dev-python/irc/irc-18.0.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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="IRC client framework written in Python"
-HOMEPAGE="https://github.com/jaraco/irc"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-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/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}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
-"
-
-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}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/scripts"
-		dodoc -r scripts
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/irc/irc-19.0.1.ebuild b/dev-python/irc/irc-19.0.1.ebuild
index d2b8426c56e7..6cff3f006d59 100644
--- a/dev-python/irc/irc-19.0.1.ebuild
+++ b/dev-python/irc/irc-19.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"