gentoo resync : 25.08.2020

4 files changed, 40 insertions, 6 deletions

diff --git a/dev-python/voluptuous/Manifest b/dev-python/voluptuous/Manifest
index a228da2e1c5c..05acd9aa8347 100644
--- a/dev-python/voluptuous/Manifest
+++ b/dev-python/voluptuous/Manifest
@@ -1,3 +1,6 @@
+AUX voluptuous-0.11.5-fix-doctest.patch 193 BLAKE2B 7880210f220cc65a4ac3692da728fe607e2accea6722232dd0bbef2fcc29187e661afb326741caa0d47f9dc96b6b5bb1cfcd064019dae66636054e1b2704f01f SHA512 d261e24685e551de96cdd68e1e0090aa639198f2647ad5d68f7d0d45b834ede99c52e5439ed0b41f3271aaf934519105c8e0820ead288b1748b18b0ee734e977
 DIST voluptuous-0.11.5.tar.gz 44216 BLAKE2B 921e0f35bd5348f412f0bf20939b3364b0014d3b1d1a7248cd73f2514eef0fb4e5b4b742876dc4606b5619529f1aa96e3577508ed0bf8d1e98b4d8bb88e2b8a2 SHA512 8893434e8e73ebf3682da1970d1d720444de452937ac9123fab53413c88a21d04ad3eb490902d829aa60be6804ff68b8bcf57a1c45807751c3d50be63e9b2551
-EBUILD voluptuous-0.11.5.ebuild 526 BLAKE2B 0524f99dd3c90f446064b27a2a0d8abd6aa73bd3b2713a827cce059701e06797283dd701879b11cdfc3658cfc036465533666551e5a8bb9dd6f067623da4926e SHA512 1a059795c8e77e1d7f19fcc9cabd0bb84d265fcaa00d81b39b29387e88cf8e80139220b929a13541ec5182ba8a48bcfe0b1fbbe83340e2ab355ac41f5d0cf92d
+DIST voluptuous-0.11.7.tar.gz 45262 BLAKE2B 2c4c171ed281bdf799491b0e14f64ff2f4ff73143b1b5498eed0d2d4a148ff0e40392393923f25bbb066a872a81ac753d861640abc8b3d340c4c01ff5e139140 SHA512 bf0ad4684a4da59b3eccb54f6edfa643eb894076fc50d1bfd4c953de15cfd711a70e8aee685497197eaef24897ae55fb5fb2aec5e2fc9dcf344a6f7c6f569b88
+EBUILD voluptuous-0.11.5.ebuild 535 BLAKE2B 7a44f9d16a2b5ea9e8210e6819b642d40fb736fa1a5049d6afa8a13d58faee85fcd4db70bfa5b3640aa2c973f069ca7a1ad9ae9db6f8458d4b9a6fe14fab4b51 SHA512 464e35ec91ad0d87ea802153c291c07d6a61bc8a64af059bbb512c1adbcbc36efa96a82dbb88d1e0afccf55ebde3209b5344616e53417478715acdf8d8e1d1ef
+EBUILD voluptuous-0.11.7.ebuild 541 BLAKE2B 3991e82383c6aaa9df0e8f49a1a5aa8cf1022a1201d99e8bd33039955d3f292a37e971d13391efd85c023f5ad6ed20529078707494b3816fcb519442a34bcb9f SHA512 a926c4c872edc46771b37f74b0bd793299f8f7bbb311b7262fc11419bf33c9224408673e77825c4428dde61a40524b6446e0d8a673da1c18feeb3252ffc3179c
 MISC metadata.xml 691 BLAKE2B 833a0f6176b6e2b3db23053e8be9054b28434061afa2e09aae9ceec1a3c1b841b3f0e0b9939341b66614cb12d8a002111aa554ee4c094123439de935e7e60b73 SHA512 0162ad8edf206d260e648a6a2441fdf054bc591b9368e3c78525bde5ab7e6a23f65c3f0ed1c04827847759182a8b81c0fa55ebc833a753f90a9e7df14aa04f06
diff --git a/dev-python/voluptuous/files/voluptuous-0.11.5-fix-doctest.patch b/dev-python/voluptuous/files/voluptuous-0.11.5-fix-doctest.patch
new file mode 100644
index 000000000000..bdc8228ff40e
--- /dev/null
+++ b/dev-python/voluptuous/files/voluptuous-0.11.5-fix-doctest.patch
@@ -0,0 +1,11 @@
+--- a/voluptuous/util.py
++++ b/voluptuous/util.py
+@@ -87,7 +87,7 @@
+     >>> s = Schema(validators.Any(int, SetTo(42)))
+     >>> s(2)
+     2
+-    >>> s("foo")
++    >>> s(42)
+     42
+     """
+ 
diff --git a/dev-python/voluptuous/voluptuous-0.11.5.ebuild b/dev-python/voluptuous/voluptuous-0.11.5.ebuild
index 40ef58995c16..bef18fbef06f 100644
--- a/dev-python/voluptuous/voluptuous-0.11.5.ebuild
+++ b/dev-python/voluptuous/voluptuous-0.11.5.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6..9}} )
+
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -14,7 +15,6 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
-python_test() {
-	unset PYTHONPATH
-	nosetests -v || die "Tests failed"
-}
+PATCHES=( "${FILESDIR}"/${PN}-0.11.5-fix-doctest.patch )
+
+distutils_enable_tests nose
diff --git a/dev-python/voluptuous/voluptuous-0.11.7.ebuild b/dev-python/voluptuous/voluptuous-0.11.7.ebuild
new file mode 100644
index 000000000000..d0c398fb00b3
--- /dev/null
+++ b/dev-python/voluptuous/voluptuous-0.11.7.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python data validation library."
+HOMEPAGE="https://github.com/alecthomas/voluptuous"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.11.5-fix-doctest.patch )
+
+distutils_enable_tests nose