gentoo resync : 05.04.2019

6 files changed, 14 insertions, 14 deletions

diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index cdb367c52642..1b35c04e96c9 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -6,9 +6,9 @@ DIST cryptography-2.3.1.tar.gz 449577 BLAKE2B 66a94f68a6f5c14ff1e3316ea740bda8c3
 DIST cryptography-2.3.tar.gz 449464 BLAKE2B 7485c745f9c6512a5efce42181970deff19bd4420e91230d84b070cd77450a6805c56a2e37cda73b45c90ed969c8fdbb866a7cc9e53a6828a1ca6e45befd9de8 SHA512 75e14020da500fdbbd578f004b22ef3237844185329adf59288b29f1b3ee9dd2005a2c4a933fe8609a59d168012a9f687bab0f31ab39ed6ca325198aa9295e52
 DIST cryptography-2.4.2.tar.gz 468645 BLAKE2B 80ecde87cf1568239977fbe4f835db98f689a7dc3646d44229b5b33932885c288d4274427f5d04eb74e9e064b01b11b7eac40fc6221ea2241371bca618cc66df SHA512 800735fa86e9ad0f8517328d47e55dc79a2b86d8c7539ee2921c526085782d8dad5559bbee84f7effb42275503fa9a984b099a688c530c92f5672c423c0f1a28
 DIST cryptography-2.5.tar.gz 487694 BLAKE2B 9502e7b7987ee0101ad8e5fcd09208034222a7f20b6b3bc3126c8b59081c9d8ecf872985d5fca191fc132dd6759afd4d11c0e0d39268627f35990c005a2095d3 SHA512 5e8f8818fcaa8143526006b027107b8afbdc925d40c846701e65b2c7ee02235b7e0918246515520ef2030b1c87bb157d0d403c28ad68c31459d677af7e2d0b3f
-EBUILD cryptography-2.2.2-r1.ebuild 2212 BLAKE2B aa1f0f4adf0d87aef5cff265df415696247a185a82a4827afc4014b1c3b1a9e62da6169179096f724adaf21aae824a9cce3d31a8ea225bdd2eb815020fe37d61 SHA512 bf1241583761b05298449e603e1755d65944c156bac7ac76f955f90e709ddde24538216995d9272e5cd5b5dc43568fb795d026798cf663f3ef126c0a3310125a
-EBUILD cryptography-2.3.1.ebuild 2204 BLAKE2B 4cf0c0fb964cf00b57b078c568780e2fd41460c22b878158e9195ffb113f72783e9fa5a88c06c0f2b7f6f185990acc004ba331abaff481bac375cd90a10bfa91 SHA512 9b53819c9827a046b710bd520c45b922913633587db29436bf40eedc5a7c9408dc3ab8f39de34de632503d6955eaa0a2673de67f63ae6fb6a9efa42b211a0b59
-EBUILD cryptography-2.3.ebuild 2162 BLAKE2B b7b99f45e7cae87e2f286e1edc07fd96d79bed983642e2f08500b89ca8f6102596b79a000d1de33316b3ae56e4fab1ebc632db974ba3f4c0a23637e8a53552f5 SHA512 5999a1de82114e5da46ab9bcea4de62e6552c1323e410fe1d829c1ab962153b3b14befc6a60fb6f748c03a4926a332e5e084bea67597503914f0e28283546cc2
-EBUILD cryptography-2.4.2.ebuild 2159 BLAKE2B 576b8dd817d7a90ffa61fb16d3f647d688e1c3f3f1b60bc27f730c9a3cae762d1b60e4a0ff2e764578fc752d7b1495f9a498bd151227b676f91607500bcee05a SHA512 799c0ac2cc0d17354aca91b2cc92201b8ac4ac64adbbbcec45126a42eca97a750c0678bcecbd24fe77164a5a548d5337c812166238a53459593d1954c7d9f2e6
-EBUILD cryptography-2.5.ebuild 2174 BLAKE2B 166efea0f2d4447a73b0f9528eb1dc2e238c2cbc7cf9f19b180f05e02d218397cef8dc9c0c19499fa231c3921fe360089b7963389b94798d39652baee2c60127 SHA512 d5d17d90bac76c028e30fe550d5ac7782efd89b23bed560eb86cafc2715f85ad74bc89250133af27d785189bd67f3ff86973b605566f9ee942a9016b80f1cde2
+EBUILD cryptography-2.2.2-r1.ebuild 2169 BLAKE2B 70ed687d01e2a93f63c7b81ac73f9bf633ec63d5ddb4bd6626fa51f0926eb0c7f6c734654cfed65ff56f307c976c02345f51e49356a11dc9a081b4e770b8d8f5 SHA512 2b1dfcd666431e86770dd26352fdad20ca036c51cad9c079c82978622436feebb930f300d9c187c839bafb08b8bfeef55967fab61b03c34bd0e5c1a5474d5f97
+EBUILD cryptography-2.3.1.ebuild 2164 BLAKE2B 50e3d608b512c6c82125588fe4910c1bde86774de6097d0387df311503a7f7d7122d2f2c5315377a24699ddab7755da3b6706d801bb755e929d5174ad38d4ab7 SHA512 3c28c6cd526f2411d3ee2e67e3313b08d675cc9a624a5951b535afd7b88acec17d747f136b327bbf2339084cead0dd5f90e1ff64995a579e0e78b39fd6fc87ec
+EBUILD cryptography-2.3.ebuild 2119 BLAKE2B 9d2e51f0835eb4e5555d954d0f4e923b5b8e26197429364492f860122b694a016b0fc3d6931d5d3f01354efabeab28ca9cb714101efc28d5e49d3423f3f768cf SHA512 53a1390bfe6b83f67d272839cf3cb554824d55367b0445efacf359fa2690b7ce0a6ba16333b79b0a73d8667da5265faf6fc9361d0cf4b4ee9af00819f4500715
+EBUILD cryptography-2.4.2.ebuild 2119 BLAKE2B 9d2e51f0835eb4e5555d954d0f4e923b5b8e26197429364492f860122b694a016b0fc3d6931d5d3f01354efabeab28ca9cb714101efc28d5e49d3423f3f768cf SHA512 53a1390bfe6b83f67d272839cf3cb554824d55367b0445efacf359fa2690b7ce0a6ba16333b79b0a73d8667da5265faf6fc9361d0cf4b4ee9af00819f4500715
+EBUILD cryptography-2.5.ebuild 2134 BLAKE2B 4425d762042f363a25095d039c453914df8e300dd8aa04004db613c5f1dc8415368d209a34f2b508c17b51a531672b036f0fb4438dd4e4fc2f478837bd28c77b SHA512 00290c7ad79950f2fac145cf325da68723d029fc1944ce061dd77c19587f3671cee4b7ae624001c30f228d7ba1cab5ba5cbcc6e9be930aa4f3da2d236a38b98d
 MISC metadata.xml 499 BLAKE2B 2e4c37917ebb1604f399b0db4abe27b02b133a2cc8fb69fbbf52b6fdc0aee079dde61be188bfa5bca043a1804a670ffb53f6ab1e79147230166f696741fadad8 SHA512 26eda8b0a2ac91dce2946e18e941e2e75df15e4583e4ddb1f1329403eaae30db9976017f92981c462bfb8c8a559de2a2ea9531f4ac5ccb2d57cadb00e68e05ec
diff --git a/dev-python/cryptography/cryptography-2.2.2-r1.ebuild b/dev-python/cryptography/cryptography-2.2.2-r1.ebuild
index 449719f769ca..a9ee41ff6db9 100644
--- a/dev-python/cryptography/cryptography-2.2.2-r1.ebuild
+++ b/dev-python/cryptography/cryptography-2.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,11 +33,11 @@ RDEPEND="
 	)
 	libressl? ( dev-libs/libressl:0= )
 	$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
 	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
 	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
 	virtual/python-ipaddress[${PYTHON_USEDEP}]
 	"
 DEPEND="${RDEPEND}
diff --git a/dev-python/cryptography/cryptography-2.3.1.ebuild b/dev-python/cryptography/cryptography-2.3.1.ebuild
index 1a58e5692ef8..0a3fea875041 100644
--- a/dev-python/cryptography/cryptography-2.3.1.ebuild
+++ b/dev-python/cryptography/cryptography-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,11 +32,11 @@ RDEPEND="
 		)
 	)
 	libressl? ( dev-libs/libressl:0= )
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
 	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
 	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
 	virtual/python-ipaddress[${PYTHON_USEDEP}]
 	"
 DEPEND="${RDEPEND}
diff --git a/dev-python/cryptography/cryptography-2.3.ebuild b/dev-python/cryptography/cryptography-2.3.ebuild
index ec123a175ee9..d7f68b52d822 100644
--- a/dev-python/cryptography/cryptography-2.3.ebuild
+++ b/dev-python/cryptography/cryptography-2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,11 +32,11 @@ RDEPEND="
 		)
 	)
 	libressl? ( dev-libs/libressl:0= )
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
 	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
 	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
 	virtual/python-ipaddress[${PYTHON_USEDEP}]
 	"
 DEPEND="${RDEPEND}
diff --git a/dev-python/cryptography/cryptography-2.4.2.ebuild b/dev-python/cryptography/cryptography-2.4.2.ebuild
index 4af6a76f62db..d7f68b52d822 100644
--- a/dev-python/cryptography/cryptography-2.4.2.ebuild
+++ b/dev-python/cryptography/cryptography-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,11 +32,11 @@ RDEPEND="
 		)
 	)
 	libressl? ( dev-libs/libressl:0= )
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
 	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
 	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
 	virtual/python-ipaddress[${PYTHON_USEDEP}]
 	"
 DEPEND="${RDEPEND}
diff --git a/dev-python/cryptography/cryptography-2.5.ebuild b/dev-python/cryptography/cryptography-2.5.ebuild
index c6cccef62a59..d75305f32e0e 100644
--- a/dev-python/cryptography/cryptography-2.5.ebuild
+++ b/dev-python/cryptography/cryptography-2.5.ebuild
@@ -32,11 +32,11 @@ RDEPEND="
 		)
 	)
 	libressl? ( dev-libs/libressl:0= )
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
 	idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] )
 	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
 	virtual/python-ipaddress[${PYTHON_USEDEP}]
 	"
 DEPEND="${RDEPEND}