gentoo resync 31.01.2019

3 files changed, 60 insertions, 72 deletions

diff --git a/dev-python/hacking/Manifest b/dev-python/hacking/Manifest
index 9c3bc5516de0..7101d5148fca 100644
--- a/dev-python/hacking/Manifest
+++ b/dev-python/hacking/Manifest
@@ -1,9 +1,9 @@
 DIST hacking-0.10.3.tar.gz 41119 BLAKE2B fe43b31f356c9469925bf43ff381c1e24d6976961140e2e3f0988d2c693db87de98b27b38ce456b4fc681bfbaff428882e7fc072cd4511935585d789850b85a4 SHA512 020f58220d6c3d09dcc1b0ab886796087c9fe4e9eccae1e331f6f2056b5b106ffa4ba2545af086cf4ee53e21bcc124fef203c7bac36456ac86f09b4c6ff07417
-DIST hacking-0.13.0.tar.gz 49171 BLAKE2B 2784f7303dc985ba8d0cc0c9d91dc76ff9b6bc02c1bbf1381e0803e753c2a4aa0560acead7e653616a2316bbd3ac073142cfc078dddea36b39b2c5e5bbef0f8e SHA512 ca3fe0bef1c6348ee9497c136d002b04c9f67a766192d88456b749ff860528a887636b1f3db23fec336749dbf3e5bb413a1effd2261e42929d5826e54336e314
 DIST hacking-0.9.2.tar.gz 43956 BLAKE2B f4bad9ca0ffaaaf05d9f0b8536ccc72c51de4547de8d38ea31f9bae1ebbb52362d75fc286075b13631362fa00e3a7081db6a128584067896bf4daf7b32f4bfeb SHA512 76aa59b4cdfb8036d6471e35cba43d502de3a72edc3883a05822063cbb92eaa072cef3144d21ee82ac763c3385c65bc9dec4b66fda5a5a2090191ba5b6388d41
 DIST hacking-0.9.6.tar.gz 43287 BLAKE2B e67090fe103849fd9cb4cd4ea36065d49500448cc291ffa2c36273095a2de4a704af2f3a926aef0ffe4aa4689ef7f810f317f0ed46e9c7143039ab776b04bfe5 SHA512 e4225754a85ff474b724130a0c3d6a6b9c480a953ea35a18833378cf2a5df4687819f510b50a95f42890cc69836033a8af933bc0a5a4e330ae94532bcee189b4
+DIST hacking-1.1.0.tar.gz 55620 BLAKE2B 6a6f30ef8a1eef3aa1b1b630dd43e1d2e9adff1623d8db19a545f186f60ce367e4b820582893e6444b7d58573b4a70a47a30cdc8d2ce1202666cf6e1b0e7456f SHA512 d326995976c04469c9d164ff31d02471346af715730d97fee23261988100156c4598ea8968cb483e8f386ee3f94a6bdffb5f67d8a7dfc238f4607fb7fe09e128
 EBUILD hacking-0.10.3.ebuild 2115 BLAKE2B 58a5bdc96cde6a5d5fc63847dec869a6056103047d0b7d3d4b7cd2e78d2278e086afa945d1ffcd95302d387c2b35e3de54b7908916a925319bbac9202338df49 SHA512 42602898d7935c5127c28529a241f4a319b74c6c3b59d51e904ea5738dad573d16a027958a9cb290f3f7901cb4bcfad3e479d4d581552b54e227b0a688d848aa
-EBUILD hacking-0.13.0.ebuild 2116 BLAKE2B 375185270877f4fc41ade17877e3eba86d653ce50a647c0e4cbe5636d99974f182de1c7ea5efa8681836d9177a70c453af30eb234c028eee1bbf551595f38d37 SHA512 51a10240b218de9eaa832adf5a5de34df75ec0b741a688b094676bbfcb7d3726728f1409f950ccbd70216276c75a42c6f28823ca82f26b22eea5499ac17dc0c7
 EBUILD hacking-0.9.2.ebuild 1942 BLAKE2B 453052e1370d760467797a57e0bdc11c72039a41c6f0f59153405a548f20b7e128ac563a5ae2a9d327a3cb2182a60d4e97b02111d105e5a58c83d84e1f2856a3 SHA512 f9d49566d6b2ac6489b9d0e163960733222e929feaa12d6701c54cac354299214deb979db2a6c1b466cc0df3d6146bbacc4b4a2534e24648c9162ff59834a49a
 EBUILD hacking-0.9.6.ebuild 1927 BLAKE2B 7ed3b24c466e37c7526e14ea7376317e7582da8c7eb40f027dc59d97641bea859974bda082e9d1edd9f68718c0523d438bb8f44de22d6fec73e1240641208818 SHA512 05e14f7072171567a0bc9cfdf430846b34404bcd1e5dd3d8ae0070203fe4b29d88b9360dd59222162bdb4411651d210bb443c0f386433284bec1b31cea918513
+EBUILD hacking-1.1.0.ebuild 1729 BLAKE2B fc96859c2c40835cb749f0a76965fa83e82ad408553e257128bcf05c3758de7a42762537f8409f254911a09028c9ebe97a9530fd38022688159f1d98de5111a4 SHA512 39dafe85e40143c615f337fa78144418bb0f68b62d897ab0ef9abbccc80d63c3089554f325cd438d58179e8cf69c2b59f8f2501edb0fde4084c04804de673852
 MISC metadata.xml 749 BLAKE2B 29b4d37179a1c8f36f3c66ec80d0c2044f3457542114dd8753b1c50303e3dc5fe499ff52d4554f434a89026c4aee544ccb5049d0b2a8e2ea98042228234de01a SHA512 723ea94c939f789ba8112fc54d2de3abea87795407ce15ea8982140ce3bd446cdca885c2680471fbb70551e275b426fdab219f1f0394b581bd495fd643f5e0c2
diff --git a/dev-python/hacking/hacking-0.13.0.ebuild b/dev-python/hacking/hacking-0.13.0.ebuild
deleted file mode 100644
index 9e30c64b836a..000000000000
--- a/dev-python/hacking/hacking-0.13.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack-dev/hacking"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)
-	doc? (
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/oslo-sphinx[${PYTHON_USEDEP}]' python2_7 )
-	)"
-RDEPEND="
-	~dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
-	~dev-python/pyflakes-0.8.1[${PYTHON_USEDEP}]
-	<dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
-	~dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Prevent d'loading and correct ?typo to oslosphinx in conf.py
-	sed -e 's:intersphinx_mapping:#&:' \
-		-e 's:oslosphinx:oslo.sphinx:' \
-		-i doc/source/conf.py || die
-	# relax deps
-	rm *requirements.txt hacking.egg-info/requires.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && sphinx-build -b html -c doc/source/ doc/source/ doc/source/html
-}
-
-python_test() {
-	testr init || die "testr init died"
-	testr run || die "testsuite failed under ${EPYTHON}"
-	flake8 "${PN}"/tests || die "flake8 drew error on a run over ${PN}/tests folder"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/source/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hacking/hacking-1.1.0.ebuild b/dev-python/hacking/hacking-1.1.0.ebuild
new file mode 100644
index 000000000000..6b5bc774fe4d
--- /dev/null
+++ b/dev-python/hacking/hacking-1.1.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/openstack-dev/hacking"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/flake8-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)
+	doc? (
+		>=dev-python/sphinx-1.7.0[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+	)"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	use doc && sphinx-build -b html -c doc/source/ doc/source/ doc/source/html
+}
+
+python_test() {
+	testr init || die "testr init died"
+	testr run || die "testsuite failed under ${EPYTHON}"
+	flake8 "${PN}"/tests || die "flake8 drew error on a run over ${PN}/tests folder"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/source/html/. )
+	distutils-r1_python_install_all
+}