gentoo resync : 02.01.2018

4 files changed, 11 insertions, 8 deletions

diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index d8c0c3012c8c..22cb99178260 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,8 @@
 DIST certbot-0.18.2.tar.gz 1044019 BLAKE2B d198252c1e3e24a80bcadeecde7fd133e454036df6bd782585b31234ddd8d393fc2ab792e60f381eabd9fb453ee2a57d132ba7d41254c8acd9cf64dbfb94fb89 SHA512 30dea063cf8d4bd714a40c1a82a7f4aab51e3a7d4de0d5f9a923f95badb2881562562c4a198da6a4c3cd1db7f9e2d124c2def70f3a245faca0040438586bf6a4
 DIST certbot-0.19.0.tar.gz 1061557 BLAKE2B 4f1c623276cbcc88d414dd9d135b65f472d1e35cfef74901fb8031d40d414266870229b6aaf60a4bfde983c7e930819e5e7326d5cfa3cbffb155e3a9c724883a SHA512 d29c9e2041171f2574bf2ee9ff7442b80b261a03f9e82e4dd40aad0617730aca6bff17fcc728496bda4133f86a4894cf21d083dacb0d0df2dec11d23e4e1541b
 DIST certbot-0.20.0.tar.gz 1108139 BLAKE2B 6af07dd245912741592761bd11160c081e278e5f48b69747669aa6146d81cc7ad6f0d9c7b4bf31ad137d51bd378f670e5e5d7318efe7b3b5463d52515a5df257 SHA512 92c128bc955a576a1eb568d39b3a5568f9bd841acefaa455d716ce5036312d0ad67b3dcfcf960b15abdd39c1f34f82ffe2ebca0722628c5c804fc5472a6c0546
-EBUILD acme-0.18.2.ebuild 1095 BLAKE2B 2b9a678884bd1a89c38e09fdc9dbfd850fd737f138b6ed419138e5e6b539762f45b80882e4cea4b036a7ef210fc4385a605c8fb69dcb9b4ac94dbffcb1694d5e SHA512 f6bd1a44d00471327892e61c4966b300339a2188510258bb22ed046b892587158a6290f09ee9a01bea7f55aba2ed1e2f5168cc7bb41da0574ec0854c2a8a19b4
-EBUILD acme-0.19.0.ebuild 1101 BLAKE2B dd7bc65a98f4b8168f2bc341ac699f68ab65a8a911b4a8fb409fe3ae78e8553c168b55a5a304b3d7cf697d34c58b32d751a87d6d04303a39a11e6eadbebd4be0 SHA512 73db02807520cc53e8695f112e3ee75841bd0aaf9ec9935db7b3e812010f0f9947ed805bd8300d602c0757a5a18b1b4bf1665ac92494791915c09790c10953be
-EBUILD acme-0.20.0.ebuild 1160 BLAKE2B 5cab784cc64156e26fb12b662f0d5d209dffce77011436c9ae1de8a891537b7567c07460334754be5e83fbcd1a17b051ec87affcc115e3b04faad73387de5953 SHA512 05ebf726ac5c68b3be47bb9dd90729b17240c010119c3ae017fb0ca478fcbd8ecfe163eb95d83b195923f2666530f9ff8b2ac09d3b60b04e66f7ada181c3a1a9
+EBUILD acme-0.18.2.ebuild 1133 BLAKE2B 401d18f882e17b5cb3b2554be65faaecd297ff995aa2a27740a02f5ab492e5cc54e93bae8f9d70630718ad428dcccfd99969f34ae53bef082408d21c8b3c436f SHA512 f06d2ed89253047db5a4943d6b4a9e78587af57d352ff5e892f9fa339ab2971684466afa2bffd9c4c7d6d14fde3e59382056b4cf5bab45abc5f914597d61ad13
+EBUILD acme-0.19.0.ebuild 1139 BLAKE2B 38a9513be1f7da99521962ca9a42ed7c5ef519a498ffe36f5fbf6451cd9820f7b2a796dc40ec02cc363c9f3e73e3a158de93bf7bf9677bc79b64c73a563e0e73 SHA512 577fb0baf8b0c0322cd594bbd68635bffaf47ead067563d838d5f787001f9e03ea7e0611f8975bd864b6a749534a4d9d851c519e601b139837310cc11f5b380d
+EBUILD acme-0.20.0.ebuild 1198 BLAKE2B 50eba9ca7a8fffcbe925318761d181b2f78cff34881dedda3bb9e1d4c1a385e23762a3cbdc4482e1407afa5451f2cf236405cf07887682d130a68b4002a49415 SHA512 c14e85f3722e7ae140ff6488faca0f0e00d03df2b01cb32dea1d53c8a090e827f8235b34c40e8ec6be76a14060982dde7a7a958efcad5d38c9463aec93f08658
 EBUILD acme-9999.ebuild 1205 BLAKE2B 8c9ee00ff6505c592a3c1ae4ab57e4abf9c6f49b5dd7737cc4a081645edd808f3bf3422a59fbda1597f31176d003e51aa784886ccd8cb5e5862c2823339f51ee SHA512 164272884c2301b9e2a5252ccff8c87678116bb8007527cd064af9147d536a266c5ed8910b711bd242f384298b903f620ad9cf9431c4e26ec65b7e34a8c20767
 MISC metadata.xml 342 BLAKE2B 770c32b421519cd6bdf7e09a71a1ee679a7fdf18e03587f75097a766c51dc878000184759e3c69f0c19afe060dd5578ff91e481644086e138dbb728619895130 SHA512 bb057838d2a4161b1b5d545d32fb798bf52571fccaf3dfe7e1811ee4090813341222f7c27e21f36ea9353e9f48b401a4cda0f1937640ef052445e6b0eac9defb
diff --git a/app-crypt/acme/acme-0.18.2.ebuild b/app-crypt/acme/acme-0.18.2.ebuild
index 135b289d3d81..88225e3b4f47 100644
--- a/app-crypt/acme/acme-0.18.2.ebuild
+++ b/app-crypt/acme/acme-0.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,7 +29,8 @@ RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
+	dev-python/six[${PYTHON_USEDEP}]
+	!dev-python/josepy[${PYTHON_USEDEP}]"
 DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
 	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
 
diff --git a/app-crypt/acme/acme-0.19.0.ebuild b/app-crypt/acme/acme-0.19.0.ebuild
index 13f5e31382c3..39d761d8800c 100644
--- a/app-crypt/acme/acme-0.19.0.ebuild
+++ b/app-crypt/acme/acme-0.19.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,7 +29,8 @@ RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	!dev-python/josepy[${PYTHON_USEDEP}]"
 DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
 	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
 
diff --git a/app-crypt/acme/acme-0.20.0.ebuild b/app-crypt/acme/acme-0.20.0.ebuild
index b02dbde82a94..81cab6d823e4 100644
--- a/app-crypt/acme/acme-0.20.0.ebuild
+++ b/app-crypt/acme/acme-0.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -31,6 +31,7 @@ RDEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	!dev-python/josepy[${PYTHON_USEDEP}]
 "
 DEPEND="
 	test? (