gentoo resync : 25.08.2020

5 files changed, 3 insertions, 112 deletions

diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index 8004b0baeff5..9b1f1dc8389c 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -1,8 +1,3 @@
-AUX pynacl-1.3.0-hypothesis-4.patch 879 BLAKE2B ad16a87df5bdcad6e07afc4474a0cae6284e8cdc547405af05b1b4bae32e3c01c9ca523f3045326335536f509cb72c7014d31ccee8a3ad8b2fffd3c9cd837935 SHA512 de3bffffd0a16934ec5653c850a2d9b2075468dd0ea59c646af0c2ddfc9c4dd2994413a917e58fc67d436d2add6d111749d4979b02e4bdb6b8ff4e946e283109
-DIST pynacl-1.2.1.tar.gz 3302051 BLAKE2B 96278368427c2b5f1d9508a5d9a36853a9c50390ee3ada20d6344e4f7f67fb3f1285c45794b863f129b48feff8a5a3d4a20796f69e832cec2aef26f27961d925 SHA512 15a3a84fed4d002072c185ca346c708ed0fb397ca3a8d0144caced635cc2e00e19603767cf9fcedc571cb4bf32c546141094ce44536dd117c3775efb2fc589b9
-DIST pynacl-1.3.0.tar.gz 3405949 BLAKE2B e6a6444eed2cbf134ee6060ef382981f6bfb8396fbae30dc1e16f7702a559b7ea56889d9889adfea09ac6644732fafb98e07da99e3a41392303b6a45f0b494b1 SHA512 815c31a2069cbee1091d7e0ebf0b5572875c4a537311af561b5bce0b9d8051028e367a516b46481453d9780e60e9e7e2a4640d320164059c3974b0319d1cf96d
 DIST pynacl-1.4.0.tar.gz 46396758 BLAKE2B 9575bca05ecaf33e798f2abfee7a1af26bbb10b5dbd4e7ca70af8032866e26b88736c2a2ff52e4496e4862f92042fb125df7cd1f1427b16a2313926162466343 SHA512 2a11a623452cea60199cdff83db6f5922698237267c11f055f2fd7768e0875a819dcc08c477113ad89461797ab36d66e0b9c7700eee335eb6b16af6b378b9e88
-EBUILD pynacl-1.2.1.ebuild 1022 BLAKE2B 00a0f5cb11a1e542bebb1cb0a0257902afaa91108c061aaf06b49482c838e94688ccc1dc9f477acfb6490208a562c9740e90fb6bd8ca351665e3bba6750cd797 SHA512 43ce2fbd3fcaba0e8607d454d1196e840528899670b90fdb8ffe6405a1abc508648bbeaa6ddfc5b92ea9b9e8fc4c88ebb9d52359cf90742dd6f3f88c30314af5
-EBUILD pynacl-1.3.0.ebuild 975 BLAKE2B f1466ee9c913c90b85b02055fb4d8d36e12529cf1399fb774161be152be82890736c920ba54ba3cb14d10f3bc192d1e5c28b396cd8c1be20454b6134105b26b2 SHA512 5b8a64705801c43e89100e04922f8cc1aa554428f1f17cd71ab7567c837fc9a04494d091069d26785e440a58684ba87ca3cf8aa86fa6442c89bb886b7a3850fd
-EBUILD pynacl-1.4.0.ebuild 973 BLAKE2B 21cc174bc442b444c91fe035635040379edf1d715a8f3d702d9129d0e2bbe420a9c2af0554a4ada10d1ae41fcf63c541eb2b50a1568ba8c2b5a96964be40eea6 SHA512 d6f7f2880f6654e9cfac6c7c6f098e8ca37256e06d9b0bfae32178cd655f13e1c790495ebbc11747c464bbd716e0b6e1d534fdf2ec36cea4f162cfbe7cbe9576
+EBUILD pynacl-1.4.0.ebuild 955 BLAKE2B e20e1d8a026cfb118e890715de6cf2f6c3dfa77b2a236f7928172110c9ee179563d12d0dbd8ab2165a4051b46588ed45fe704818d7f255bde3eed7735443c47e SHA512 428a21a64ffafc3d402c38705c97efef46f160eef8d091ee9805cb04253bc4e19d7193917b2f48753ce7e7e016244e64df61feeec6ae7e8e9b7b34e73da0f18f
 MISC metadata.xml 753 BLAKE2B a735a91bb099911df938224e8f89baa564a86855655a5fbd2d9027bc108001052c7793a6675dd2d301c083bde38d4eb03015628d733055d1938e2dee12f8e784 SHA512 f9c8f52b3c9069f3500c5e7023636f9866c90b5c904e7d66443b620f523474e3f695f66e666de679b3b8b4c362cfbc5c9268727c68d3d1ca462b1ef93b0ec6e4
diff --git a/dev-python/pynacl/files/pynacl-1.3.0-hypothesis-4.patch b/dev-python/pynacl/files/pynacl-1.3.0-hypothesis-4.patch
deleted file mode 100644
index 9b7a5a905d41..000000000000
--- a/dev-python/pynacl/files/pynacl-1.3.0-hypothesis-4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From af2d8c241872318baba42d7f5fbfb1869de91baa Mon Sep 17 00:00:00 2001
-From: Valentin Heidelberger <github@valentinsblog.com>
-Date: Thu, 27 Sep 2018 22:36:34 +0200
-Subject: [PATCH] Remove average_size hypothesis setting from test_bindings.py
-
----
- tests/test_bindings.py | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/tests/test_bindings.py b/tests/test_bindings.py
-index 22930cc7..d7951a21 100644
---- a/tests/test_bindings.py
-+++ b/tests/test_bindings.py
-@@ -306,7 +306,6 @@ def test_unpad_not_padded():
- 
- 
- @given(binary(min_size=0,
--              average_size=128,
-               max_size=2049),
-        integers(min_value=16,
-                 max_value=256)
-@@ -320,7 +319,6 @@ def test_pad_sizes(msg, bl_sz):
- 
- 
- @given(binary(min_size=0,
--              average_size=128,
-               max_size=2049),
-        integers(min_value=16,
-                 max_value=256)
diff --git a/dev-python/pynacl/pynacl-1.2.1.ebuild b/dev-python/pynacl/pynacl-1.2.1.ebuild
deleted file mode 100644
index 9c06b3ad7e23..000000000000
--- a/dev-python/pynacl/pynacl-1.2.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7})
-
-inherit distutils-r1
-
-DESCRIPTION="Python binding to the Networking and Cryptography (NaCl) library"
-HOMEPAGE="https://github.com/pyca/pynacl/ https://pypi.org/project/PyNaCl/"
-SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/cffi-1.4.1[${PYTHON_USEDEP}]
-	dev-libs/libsodium:0/23
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/hypothesis-3.27.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.2.1[${PYTHON_USEDEP}] )
-"
-
-src_prepare() {
-	# For not using the bundled libsodium
-	export SODIUM_INSTALL=system
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pynacl/pynacl-1.3.0.ebuild b/dev-python/pynacl/pynacl-1.3.0.ebuild
deleted file mode 100644
index dfc8f7da7cdf..000000000000
--- a/dev-python/pynacl/pynacl-1.3.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6..9})
-
-inherit distutils-r1
-
-DESCRIPTION="Python binding to the Networking and Cryptography (NaCl) library"
-HOMEPAGE="https://github.com/pyca/pynacl/ https://pypi.org/project/PyNaCl/"
-SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/cffi-1.4.1[${PYTHON_USEDEP}]
-	dev-libs/libsodium:0/23
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/hypothesis-3.27.0[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}/${P}-hypothesis-4.patch" )
-
-src_prepare() {
-	# For not using the bundled libsodium
-	export SODIUM_INSTALL=system
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pynacl/pynacl-1.4.0.ebuild b/dev-python/pynacl/pynacl-1.4.0.ebuild
index 6f73a99639f2..7a7a44ef1cf0 100644
--- a/dev-python/pynacl/pynacl-1.4.0.ebuild
+++ b/dev-python/pynacl/pynacl-1.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9})
+PYTHON_COMPAT=( python3_{6..9})
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]