gentoo resync : 15.01.2020

4 files changed, 6 insertions, 56 deletions

diff --git a/dev-python/logbook/Manifest b/dev-python/logbook/Manifest
index 17b84e964fe4..9176726387e4 100644
--- a/dev-python/logbook/Manifest
+++ b/dev-python/logbook/Manifest
@@ -1,8 +1,6 @@
 AUX logbook-0.4.2-objectsinv.patch 393 BLAKE2B 9575e9f92379fc772755785bd10cc465c9c85085cc9261657a61754d179f8a8f790da8045c13bdabbc0d62ca12c74286bcb35652dc13b8675ef8aa2d6677e57e SHA512 7b62f943b48f52ae46d56a8835f0942d74feb757f2a1ec5165006cfb70a6e2030b422a20f278aa746d1f3c85c9c20d87c954e8c42c31dfd18050fef9dbd3f302
-DIST logbook-0.9.1.tar.gz 106615 BLAKE2B 4100bda341a1c946bbabfb6ff423b4906f0ada754ebcbaefca93d768bd8c5135a9b1e00207fba4b13ce297cb7eca27364000e9f8b9f52935608af6c9586302aa SHA512 d136dd5a7219a23a50db857919d794e7b721cc629443ac2bf92374aef68889d8a7146886fc4484c6d0dea56ec5c1c1ccca3f0b20310c2e12dba9d40dcac9c188
 DIST logbook-1.1.0.tar.gz 367541 BLAKE2B 26e27e94f1238c9188fc66b6eb1f5622d96e1c0db97817dba30c8c70107544ea80ab1f11b71592db6a8e2a9c5d32dd659782a532cb7d263c2f042b41ef88d2ad SHA512 55ec7a026a08baed405e29d7cdcc9d3cc423c9faf13788c2447ac7ccff688de9bd9e332ad78077b1eef8bc8ad9aea572f9c124888f46ecabc2abf22d8ac9086b
 DIST logbook-1.4.0.tar.gz 369335 BLAKE2B 02398be49d2a12aadbcde90561afe6ac08060877922fa04b27f08587115aef8faf47bfc352fc005b8a986ab619289c8544fe53a84e0e863a09c992685f78739c SHA512 3ea969e9e2075e34a915566be906266b408671657e4cecbe47663c28f2212c0522b0f0eb2832fbc4fb906f70c8e53d3cdbe65923dafe53a77545b8126ab539f2
-EBUILD logbook-0.9.1.ebuild 1195 BLAKE2B e55637c53ee01987c444a98e6370647be1a5eb4b7d4068607a045f8032cca12d79f7181c8140287db39137ebdc190286ea278a8b74a1f209999a5a2d76f78c5e SHA512 61df4b2d5927872bf9c26fbd79607d5a433d59cc0fce2c1ebbecda069676f685e41243e209539afa562fc64ffd0f656903d8274992de7a023bdffdbc94842cf7
-EBUILD logbook-1.1.0.ebuild 1199 BLAKE2B 07e812b4d4c0d0802ed6d55ce35f47f2b172ce622d30a27e871239337250bed9fedfbdb4aea66f6f7ab8cabd7df247f62673b36593ae2473db36ec754c11964a SHA512 c62040e75edd78b09362dfdf7ac7ce6f1aa796561a2a6f794d56cf57fc5d5d1559f42c30aabfccb9a9fe93e9f480fab1356661c1527772497c571f6b1584b18e
-EBUILD logbook-1.4.0.ebuild 1201 BLAKE2B e27962c30ebfbf3945d851269e2ff2dc359e9017d9b7da53feb2cdc379dfa28e95bb0bba82f50ff72d71d4ff601443efc36c0c44f772aabd69a1db745cc059b4 SHA512 2d2d8b3480f2a79b81c7e25c05056dd109410c923dc1e19730983c408ac48f2d3ea5fc4817b9e01d1594c5b997bb10e62f24ff0654736c1dd9e4e301986d4293
+EBUILD logbook-1.1.0.ebuild 1190 BLAKE2B 4cadaf73f6cbb58ea2f24f45dcc7606b53e02ea9028680b54f250719d92dc15324f855d731259cc24248d75f4f0b7e9592fbfba73d23e089df8dcd131581ee79 SHA512 423db29cf813ee6c146a43412f82ca9f76c95d076dacf2580d0b02280c355489452750d6317dc944f098d8b24cf6de917c5733e172e9b3a0806d992055062dca
+EBUILD logbook-1.4.0.ebuild 1192 BLAKE2B f97fe5b5090a73f90e04a5a3e61e9f7b4da05216685e727140fc0c0328f0ba38aeb4fd2a3a8e68a1e36526fb68463da0c53f8a3b51ee13fefcc02ada2fc1dd5a SHA512 05b8efab973b0443d2613b898b3526518d2e5ea8ce420bf6ae5b96d9b820d7c175c3404e23f3b46de4c17dec24f4295c4b3ca7208b0f7a5a4ce16308c4e10947
 MISC metadata.xml 379 BLAKE2B 63416a01d45934c94f9f56e2872a35d66a625c6d529315697d4038d64fe0947f77065badeba36cd765d2a4781e04ab651b3b812c5563caf3222065210d62f3f1 SHA512 fcb989995cc9403469ef44339c37b3a849a485b9741b1910e3dbad66d6aeb5a815a25ef9c403c020d75e608f91d78d436dff8a098efe5a508ae73b3dffe01a82
diff --git a/dev-python/logbook/logbook-0.9.1.ebuild b/dev-python/logbook/logbook-0.9.1.ebuild
deleted file mode 100644
index 0322bff77b9f..000000000000
--- a/dev-python/logbook/logbook-0.9.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A logging replacement for Python"
-HOMEPAGE="https://logbook.readthedocs.io/en/stable/
-	https://github.com/getlogbook/logbook
-	https://pypi.org/project/Logbook/"
-SRC_URI="https://github.com/getlogbook/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	doc? ( >=dev-python/sphinx-1.1.3-r3[${PYTHON_USEDEP}] )"
-RDEPEND="dev-python/redis-py[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.4.2-objectsinv.patch )
-
-python_prepare_all() {
-	# Delete test file requiring local connection to redis server
-	rm tests/test_queues.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test tests || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/logbook/logbook-1.1.0.ebuild b/dev-python/logbook/logbook-1.1.0.ebuild
index 5edf475bd22a..3d251417d228 100644
--- a/dev-python/logbook/logbook-1.1.0.ebuild
+++ b/dev-python/logbook/logbook-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/logbook/logbook-1.4.0.ebuild b/dev-python/logbook/logbook-1.4.0.ebuild
index 05fd3081da0b..f06bd6f03f4f 100644
--- a/dev-python/logbook/logbook-1.4.0.ebuild
+++ b/dev-python/logbook/logbook-1.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1