gentoo resync : 13.06.2020

3 files changed, 42 insertions, 10 deletions

diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index 210fe74d23de..8004b0baeff5 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -1,6 +1,8 @@
 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 1100 BLAKE2B 1700b7c8d22e281d7cdaceba00fab934794e5efa0e0e5cdb6a363069bd11d76fabaaa3c95ef412d109cdfe60ac3803c8454d9014761b7fdca2e6407877ae52cb SHA512 0d7be99261588e6085c2ac68973bad98d529ce9e8242a6cc5e1267cd23bf46d656048046eb40ce34d544306cff989152269d20fe1c91e6972f34fc2a4a12c8eb
+EBUILD pynacl-1.3.0.ebuild 975 BLAKE2B f1466ee9c913c90b85b02055fb4d8d36e12529cf1399fb774161be152be82890736c920ba54ba3cb14d10f3bc192d1e5c28b396cd8c1be20454b6134105b26b2 SHA512 5b8a64705801c43e89100e04922f8cc1aa554428f1f17cd71ab7567c837fc9a04494d091069d26785e440a58684ba87ca3cf8aa86fa6442c89bb886b7a3850fd
+EBUILD pynacl-1.4.0.ebuild 973 BLAKE2B 21cc174bc442b444c91fe035635040379edf1d715a8f3d702d9129d0e2bbe420a9c2af0554a4ada10d1ae41fcf63c541eb2b50a1568ba8c2b5a96964be40eea6 SHA512 d6f7f2880f6654e9cfac6c7c6f098e8ca37256e06d9b0bfae32178cd655f13e1c790495ebbc11747c464bbd716e0b6e1d534fdf2ec36cea4f162cfbe7cbe9576
 MISC metadata.xml 753 BLAKE2B a735a91bb099911df938224e8f89baa564a86855655a5fbd2d9027bc108001052c7793a6675dd2d301c083bde38d4eb03015628d733055d1938e2dee12f8e784 SHA512 f9c8f52b3c9069f3500c5e7023636f9866c90b5c904e7d66443b620f523474e3f695f66e666de679b3b8b4c362cfbc5c9268727c68d3d1ca462b1ef93b0ec6e4
diff --git a/dev-python/pynacl/pynacl-1.3.0.ebuild b/dev-python/pynacl/pynacl-1.3.0.ebuild
index 97a32891a3b1..dfc8f7da7cdf 100644
--- a/dev-python/pynacl/pynacl-1.3.0.ebuild
+++ b/dev-python/pynacl/pynacl-1.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8})
+PYTHON_COMPAT=( python2_7 python3_{6..9})
 
 inherit distutils-r1
 
@@ -14,8 +14,6 @@ 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"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
@@ -24,10 +22,11 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/hypothesis-3.27.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.2.1[${PYTHON_USEDEP}] )
+	test? ( >=dev-python/hypothesis-3.27.0[${PYTHON_USEDEP}] )
 "
 
+distutils_enable_tests pytest
+
 PATCHES=( "${FILESDIR}/${P}-hypothesis-4.patch" )
 
 src_prepare() {
@@ -35,7 +34,3 @@ src_prepare() {
 	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.4.0.ebuild b/dev-python/pynacl/pynacl-1.4.0.ebuild
new file mode 100644
index 000000000000..6f73a99639f2
--- /dev/null
+++ b/dev-python/pynacl/pynacl-1.4.0.ebuild
@@ -0,0 +1,35 @@
+# 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
+
+src_prepare() {
+	# For not using the bundled libsodium
+	export SODIUM_INSTALL=system
+	sed -i -e 's:"wheel"::' setup.py || die
+	distutils-r1_python_prepare_all
+}