gentoo resync : 09.06.2018

4 files changed, 18 insertions, 67 deletions

diff --git a/dev-python/cached-property/Manifest b/dev-python/cached-property/Manifest
index 6bf98c5f9db5..35eb3efa230f 100644
--- a/dev-python/cached-property/Manifest
+++ b/dev-python/cached-property/Manifest
@@ -1,9 +1,5 @@
-DIST cached-property-0.1.5.tar.gz 7434 BLAKE2B 2bd21004e896335044a3d1c08840a781cca62736b45bd3e51152e4a28a546ef7e64cffd070e55b13e8b8cef5b31895840d737bd1d00ad0c991ffa9e324d0940d SHA512 f5a01e64eed78cc3377bd053b0662dc4f904db7c1ea47b155e1613e6ed413fb6693e4893916518f9e53589373ebe099724d296306a9854d8d8df66b62ed9ce1b
-DIST cached-property-1.0.0.tar.gz 8210 BLAKE2B 56dd60787b0ba0b5398142d755dd62e49935d06a6523bfa221a8d022c60838604035862e454182e093289fcc366e2f30e321a585fb07bea7a4c55b619d1d7bd9 SHA512 771615418853d3a2a24567fa3f6dc931a02d0013abd38c26a2822cc0ab3228972e7f03e51a69478defc617491f81b76040d34a0e6683719b09b485c85196d948
-DIST cached-property-1.2.0.tar.gz 9162 BLAKE2B f064573001745872b9d0a7e6bfadfc203c36328dfd1a85ba310c1da517cb45fd166c49cb809a726d663659318a3c7120bca017a6f674aef5f98ec7630429bfe0 SHA512 0d05bad187d30b4354d8fa93d181d753c6e27e43a84891bd3bcc1c1449fe6d57d7fc1eecdbdc097f8c25e4cfa331811db5a6e23f77891848edc2817162259cd6
 DIST cached-property-1.3.1.tar.gz 9648 BLAKE2B 154208108cfbec914519f2a08ecc6ad025c284726d65a001eae84701b1eb8479e127473c124b08d3b0d969f59798f9dcef473cd8209c248b1d5b016a0bc8dac6 SHA512 3349751d442ca6e7d4e792c8b076735d5308d68244af9c03044f3d72d619a5c3d7d5dbef434caa954db4b983245bfe646d4a25c99aec39f32d99751edd9e233f
-EBUILD cached-property-0.1.5.ebuild 591 BLAKE2B b122a31a43bae62ca9eb7fce6abdb40cd916ecb295c421a1b53cb1017cf35e9f19b9394142ebd83dcd074b46498e474a77f6ce30c983c5c6670dd7e671843bdb SHA512 eaf5d64c5842b120f8b5442ac4efbc0d089edadc591983e4d28029c45f50149f75615b450e01129ef896ad2e377e2facb010e93a162a01e6e0ba675444637b98
-EBUILD cached-property-1.0.0.ebuild 591 BLAKE2B b122a31a43bae62ca9eb7fce6abdb40cd916ecb295c421a1b53cb1017cf35e9f19b9394142ebd83dcd074b46498e474a77f6ce30c983c5c6670dd7e671843bdb SHA512 eaf5d64c5842b120f8b5442ac4efbc0d089edadc591983e4d28029c45f50149f75615b450e01129ef896ad2e377e2facb010e93a162a01e6e0ba675444637b98
-EBUILD cached-property-1.2.0.ebuild 591 BLAKE2B b122a31a43bae62ca9eb7fce6abdb40cd916ecb295c421a1b53cb1017cf35e9f19b9394142ebd83dcd074b46498e474a77f6ce30c983c5c6670dd7e671843bdb SHA512 eaf5d64c5842b120f8b5442ac4efbc0d089edadc591983e4d28029c45f50149f75615b450e01129ef896ad2e377e2facb010e93a162a01e6e0ba675444637b98
+DIST cached-property-1.4.2.tar.gz 11201 BLAKE2B 1fba572e8e4e06744b230994e19a93f9004c0e2584549af2b001cf780222cbd2196b09432301f1ef8b4c4ccc93f8dedf53113c541b1189bc005c79fa9d7dadc0 SHA512 27ce49c8b71f0337e34c36ef5a45cae273a62b42c8f1b690c2c4d32d9bdf7f532a12787c99257c956ac7ff15d2e7f16868e4cebdf1417ebca493e1037c1a612f
 EBUILD cached-property-1.3.1.ebuild 625 BLAKE2B d05f358db313bb62e8e6af7733fbeb9bb378db4ebe34be8d2c44da08147aed09567c8dea352c93ee3a94ca6ac52733b19c5ddfaa119795d9f515c1b9a0972093 SHA512 8b408e180af71d702e053ee0e56327eeae8843ca3b75e15b71d41997a428ce63c59f04e74e59edd93f4898e99280f39dd5f37ef1c64ae8e30d33404a22802547
+EBUILD cached-property-1.4.2.ebuild 911 BLAKE2B 252e6b963254b1e48cd328adc04bf344f2916145ff9138f15d780e8196215feabbd3ed524a2d26922fdeae5d20c1011633c11087f0096ad81c0afc45e7946361 SHA512 442dcfa206d8f8b06bdef561723ec280692f7e6cfd35dca8d36335687a7b9668b84acaa9a034d5c24cd2d2c4f7836fb64197d6ab8faad80c04fbdec8daca2416
 MISC metadata.xml 489 BLAKE2B 36f59b8764462acd2920868cc5b5c84e27cf2e86b1356a76a816ec60a5f69bda780a62a811aefe06639827bdc3257128cded2d6c2e53e8c4516af9d1b9769879 SHA512 cecc6d43fcd54d1a949a60380d91a313d0464e0858be0fd544a76232f04961eca2530ebddaf6daabc5f050bdfe12092c99028c4a9cd33a14f23c0b43befe7def
diff --git a/dev-python/cached-property/cached-property-1.0.0.ebuild b/dev-python/cached-property/cached-property-1.0.0.ebuild
deleted file mode 100644
index b8d189a859a6..000000000000
--- a/dev-python/cached-property/cached-property-1.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="A cached-property for decorating methods in classes"
-HOMEPAGE="https://github.com/pydanny/cached-property"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="test? ( dev-python/pytest )"
-RDEPEND=""
-
-src_install() {
-	distutils-r1_src_install
-	dodoc README.rst HISTORY.rst CONTRIBUTING.rst AUTHORS.rst
-}
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/cached-property/cached-property-1.2.0.ebuild b/dev-python/cached-property/cached-property-1.2.0.ebuild
deleted file mode 100644
index b8d189a859a6..000000000000
--- a/dev-python/cached-property/cached-property-1.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="A cached-property for decorating methods in classes"
-HOMEPAGE="https://github.com/pydanny/cached-property"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="test? ( dev-python/pytest )"
-RDEPEND=""
-
-src_install() {
-	distutils-r1_src_install
-	dodoc README.rst HISTORY.rst CONTRIBUTING.rst AUTHORS.rst
-}
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/cached-property/cached-property-0.1.5.ebuild b/dev-python/cached-property/cached-property-1.4.2.ebuild
index b8d189a859a6..3b54319a6d39 100644
--- a/dev-python/cached-property/cached-property-0.1.5.ebuild
+++ b/dev-python/cached-property/cached-property-1.4.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
 
@@ -15,7 +15,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-DEPEND="test? ( dev-python/pytest )"
+DEPEND="test? (
+		dev-python/pytest
+		dev-python/freezegun
+		)"
 RDEPEND=""
 
 src_install() {
@@ -24,5 +27,13 @@ src_install() {
 }
 
 python_test() {
-	py.test || die
+	local ignore=""
+	if [[ ${EPYTHON} == python2.7 ]]; then
+		ignore="--ignore=tests/test_coroutine_cached_property.py \
+			--ignore=tests/test_async_cached_property.py"
+	fi
+	if [[ ${EPYTHON} == python3.4 ]]; then
+		ignore="--ignore=test_async_cached_property.py"
+	fi
+	py.test -v ${ignore} tests/ || die
 }