gentoo resync : 04.08.2018

3 files changed, 31 insertions, 28 deletions

diff --git a/dev-python/irc/Manifest b/dev-python/irc/Manifest
index c5bb9b9a1d50..605e7cb2df21 100644
--- a/dev-python/irc/Manifest
+++ b/dev-python/irc/Manifest
@@ -1,5 +1,5 @@
-DIST irc-15.0.6.tar.gz 81996 BLAKE2B b5d329b70404a92d4f69cc3fef2be374b0a1e98e04588b7f2f7f7c241dc3d72122f813b67e48522b7779dfdf90478db6ff10cda3c66b621f7c4a099142d533f0 SHA512 48240eb496a3c88310f02cf092b8e19e4aa8d8dc165a9a8a39c313490a69ecc29ac67db297436df5e86e7253e2481bd19bc0429ea9cc359089a5cd6179125c0f
 DIST irc-16.3.tar.gz 87067 BLAKE2B 61d8b9cc20390a3eb918e5593a167b28f37154ee05cb4d7a72f8901509d3345e8d6bee9c17b66aa6c71fad4608a9f98eb3848190f82eac7db6f2013227979c25 SHA512 84b5a56a441cdf22396c10b81c115cb2e297ac082785e9baf0bc73d655034be1ff3f553d44412f066ab4b74530faddb66a9cc2f511a332e87fe49af0b6e68e5b
-EBUILD irc-15.0.6.ebuild 1597 BLAKE2B 67909f9c9f586c6ed63850ceb6df56aeae9404ab65ad5702a561667c6e624c5157ee46a90a8975e27ef28bdf39ce24f78d8e15d96fb0cb3d2dd13626ea0a5a7b SHA512 df65de77ef9fdb42bfd560212e5c9e86fb1d6febb58e4691a1a8ac3392b424709e81614b22c301f775b40e7682cb938012f4d98298ffad6e1dd62c1600af9ecb
-EBUILD irc-16.3.ebuild 1673 BLAKE2B 0014550f5a8b72e1cf7782fe6b70b2e4db0af21088d58c92ce19543f1ee794f6bd9f70f9232fa52e63c38cdbfa8fb57615dc79d60b0d4d4dd8dacf3e47347da4 SHA512 7ee09f6a0300504c0c074180465101eeca8902281e23a59168062ba2b8debe85f7ff717b9458d60c532cceee4c41d05e3a0e1f2be5adf9ea38a6eff3d87a692c
+DIST irc-16.4.tar.gz 86909 BLAKE2B c1544a36cb4173fdd22514ab5c6a61d691634224f93c9a04aa08b9fc91203aa18ed2bf429221089fd2bbea45de6138e8eb480b1ac706e36c6ed2c01405397dda SHA512 9080d3dd484751ffa80b117184cd63c4728b1bc50f2493b046a1fd3779e65016f874d0e629d2ac8a3b36db39a91985b890f3a1fb35bd9638d96f2654bf6da943
+EBUILD irc-16.3.ebuild 1680 BLAKE2B 93507172331fcb0e1cc18553ba3b97212320c2e71fa74d223f03e8ea7daa8df5d72da85a8e2152a240aa2a07493f14e8c8acd4cf1e95da4cef26194ead5368f2 SHA512 1bdc0ac3df0942435588f233d5edcbb58758e8b6e7346220da2c982500b63c3cf61f73ededbcf6175b1a79962224d1b7390c9444aa14c8f0b0348120c16f3265
+EBUILD irc-16.4.ebuild 1683 BLAKE2B 03a597644b910da9aa5a8be18c8cfa1082c04df2fda32dafb3677a80570d93f51163080622ab5d5f6f04d30b6199d327f42ae1ebf196c7fbc307862f9e8b4f7c SHA512 f779a74a3a336f53f06bf02eb08d5037c00f75a992795f8b62ccb47977747a52d48f6ae008df926d262416323beae250872ddb6359461544bb03607369fb969d
 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 98fedd35523f..a8ee6feca92d 100644
--- a/dev-python/irc/irc-16.3.ebuild
+++ b/dev-python/irc/irc-16.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
@@ -27,18 +27,19 @@ RDEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${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}]
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
 "
 
 python_compile_all() {
@@ -51,7 +52,7 @@ python_compile_all() {
 
 python_test() {
 	# Override pytest options to skip flake8
-	py.test --override-ini="addopts=--doctest-modules" \
+	pytest -vv --override-ini="addopts=--doctest-modules" \
 		|| die "Tests failed with ${EPYTHON}"
 }
 
diff --git a/dev-python/irc/irc-15.0.6.ebuild b/dev-python/irc/irc-16.4.ebuild
index b84a0821d677..f96d4b897827 100644
--- a/dev-python/irc/irc-15.0.6.ebuild
+++ b/dev-python/irc/irc-16.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
@@ -12,32 +12,33 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc examples test"
 
 RDEPEND="
-	dev-python/jaraco-collections[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-functools-1.5[${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/six[${PYTHON_USEDEP}]
-	>=dev-python/tempora-1.6[${PYTHON_USEDEP}]
 "
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=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}]
 		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/rst-linker[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
 	)
 "
 
@@ -50,14 +51,15 @@ python_compile_all() {
 }
 
 python_test() {
-	py.test || die "Tests failed with ${EPYTHON}"
+	# Override pytest options to skip flake8
+	pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "Tests failed with ${EPYTHON}"
 }
 
 python_install_all() {
 	if use examples; then
-		insinto "/usr/share/doc/${PF}"
 		docompress -x "/usr/share/doc/${PF}/scripts"
-		doins -r scripts
+		dodoc -r scripts
 	fi
 	distutils-r1_python_install_all
 }