gentoo resync : 02.11.2017

7 files changed, 4 insertions, 168 deletions

diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 3f41f197c61e..ab06e434cf68 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,15 +1,7 @@
-DIST certbot-0.15.0.tar.gz 942788 SHA256 87d306b1c013b472b8f548b38ccc476c125816435bb3b99e932fed09ac777296 SHA512 e884b34985a1128ce94d6b2be77af6ee86ded8b870e066f3f4bc22f78501f3f0a51060edcf75a11cd31dd525388adb8ccc4e2da0068b5b75be131d0fb0ca6844 WHIRLPOOL 01b172e8c7ac5d3678ee608b36d93f23943bf17f1e9c593cc1af3febcf0549b03961e69e537f099643dd9ee268497f76c2c18d8fa7a1d45753bc50e670375317
-DIST certbot-0.16.0.tar.gz 992700 SHA256 9abac759d7d72b520693ff806479e87609059a1546bb6ea26416267ebeedd25b SHA512 4cb6ec06c6ec71cd6886a716100f269de3922f17a582c8c20ec40327b65e1c16347a5b33d44131e56a7667233ebba88ff36a4e854beedd13e848897ba09a7e64 WHIRLPOOL 34dae0b20d472b4020986d0768ea6757c977fa4626666a9f81711007c051e76f9ad60f5a3bc77c768975e71a791f20e5ca2bb6f2fc41d809ebe2541129c975ef
-DIST certbot-0.17.0.tar.gz 1036099 SHA256 ed4334dce166bf38ecc7218449efda3798d62c7e2934a71702c0dc3d78eccdd1 SHA512 57fa830d19173eacdbb17242a3c446d9414f02e09fab6ccd41c82b15156bc103ec358ff3d515e94881fcf6438f6acfe449eee9bb3108df41f7b8f2395500b549 WHIRLPOOL cbfffc3866ffed3e0c702ac686768e879c7f1306a62dc050aab05e5a207b4f77a4acae9ca8f3ce973a6691d98838a488ab6335aa0692dd2b28a99c8aecff232d
 DIST certbot-0.18.2.tar.gz 1044019 SHA256 c8a94e3e2dfa8efa379912a8dc67f561cf6daf7d8e13dbb76b40a38cfb40c08d SHA512 30dea063cf8d4bd714a40c1a82a7f4aab51e3a7d4de0d5f9a923f95badb2881562562c4a198da6a4c3cd1db7f9e2d124c2def70f3a245faca0040438586bf6a4 WHIRLPOOL 79105ea9d54fdd42dbb4327dd3afa7beb80e5a13eef0a1d3236f5150b42281b299a06391a93372c80a04f0bd962565522e3ddd239cd4d2186e32262fedf97481
 DIST certbot-0.19.0.tar.gz 1061557 SHA256 164b496cc111f19619da1eac9e3fe03baac5ad5a97c2fa19eeffe07273c4b723 SHA512 d29c9e2041171f2574bf2ee9ff7442b80b261a03f9e82e4dd40aad0617730aca6bff17fcc728496bda4133f86a4894cf21d083dacb0d0df2dec11d23e4e1541b WHIRLPOOL 203f00121dfc95136821dcbe224419b02f4f03aa1bfaf1d5516baa7f3e43aa898f30488026a18ffb27d238c5603892df8fca059d0670993f6b72b27af7ac82a1
-DIST letsencrypt-0.1.0.tar.gz 524821 SHA256 1c1ac7b41e5e0fc0e41a7ef159ac9147a4aafff54453d57b519eb05bf52ade14 SHA512 6a786290362741ac97dcb4b59bc4cba56f3e8b5193bbc10be19086d462f76e6124259c42bac36afe9eb818f4bb9edec34f8e2a02bd8c855e3b35404f4ee81f96 WHIRLPOOL cdc41a3466de54ab8ddfeedea9935205d78383028769dcfbc876be0c2ef80c2d14f5d0e4a9c56a751163718f5ababb07848822989a060de7031ea8ebdf6424a0
-EBUILD acme-0.1.0.ebuild 1234 SHA256 8720192872d7fa7f7d40bbfd8bcb47da11c9ee53ef5491436844f907f087b2ed SHA512 a86535b4848749ad221269f2cc8494bd61cf7ae3e0352ab1d4d60c2d0b56b34dc2d0fad77786d49dfed08eb22c48cce936cddca97b9fccb946b7f9265695f5e8 WHIRLPOOL 5d8e66b8eccaf0cdc5cef94ecb0206b9e70f16d375775603a2d0322c09983c5218264468ec09f5e7265c367f8ea06debe1b138f1c4d50f43ac1221d16dc785ed
-EBUILD acme-0.15.0.ebuild 1088 SHA256 3901459c800d46b169a5c26ef8ccd97c8f7b0f08583f1181e4cf675d965561ec SHA512 4368b0a3b7442122bdeb5295988f3151000048c708cb86f8faa552670fee8d54a314c27a900bc14adf46545799ddc6560df2807263eacce9ae5c20e6361ebc9b WHIRLPOOL 9da58a0a770583d3f3c7b36682bf47a6a842927c5fa89eb75df2fa674bc4532f6524057e96f6d4ab5fbd7056f53501e6f9058377e3491b0fe8dc65b50d10da63
-EBUILD acme-0.16.0.ebuild 1088 SHA256 3901459c800d46b169a5c26ef8ccd97c8f7b0f08583f1181e4cf675d965561ec SHA512 4368b0a3b7442122bdeb5295988f3151000048c708cb86f8faa552670fee8d54a314c27a900bc14adf46545799ddc6560df2807263eacce9ae5c20e6361ebc9b WHIRLPOOL 9da58a0a770583d3f3c7b36682bf47a6a842927c5fa89eb75df2fa674bc4532f6524057e96f6d4ab5fbd7056f53501e6f9058377e3491b0fe8dc65b50d10da63
-EBUILD acme-0.17.0.ebuild 1088 SHA256 3901459c800d46b169a5c26ef8ccd97c8f7b0f08583f1181e4cf675d965561ec SHA512 4368b0a3b7442122bdeb5295988f3151000048c708cb86f8faa552670fee8d54a314c27a900bc14adf46545799ddc6560df2807263eacce9ae5c20e6361ebc9b WHIRLPOOL 9da58a0a770583d3f3c7b36682bf47a6a842927c5fa89eb75df2fa674bc4532f6524057e96f6d4ab5fbd7056f53501e6f9058377e3491b0fe8dc65b50d10da63
 EBUILD acme-0.18.2.ebuild 1095 SHA256 64e48f47a416b6fff4fc89f734fd798d81cfefc818cf0a6e8f7e5ab20a9b8971 SHA512 f6bd1a44d00471327892e61c4966b300339a2188510258bb22ed046b892587158a6290f09ee9a01bea7f55aba2ed1e2f5168cc7bb41da0574ec0854c2a8a19b4 WHIRLPOOL 4d1ece95d63fe48939ef8ea93ea0f15626ed2d39b72ac14fcc31c1904bc12d399239177f511e8c3d992206081aab1ae2871af38e905ead350be61a82c7eb2585
-EBUILD acme-0.19.0.ebuild 1103 SHA256 da323dba2cfc558a07d29a372e95ab0ef7c96764ec719c17739f44b8d49a6c46 SHA512 37c78b40124c666e76d6579c14b03e47ac54d0fd2157a42cf62405e2f485e05ab9d0416cc9ddb2db66786f5524b392cdf7d38a59ceba1dff577d795abd8e9aed WHIRLPOOL dc6a244eee32361d1d6bd9374a89341722417f6515655aec5b2846f82bc405c9cde05613839f22754f5e2d032419d7fcb83f151ec31b63571dc1322b9fcbb22a
-EBUILD acme-9999.ebuild 1095 SHA256 64e48f47a416b6fff4fc89f734fd798d81cfefc818cf0a6e8f7e5ab20a9b8971 SHA512 f6bd1a44d00471327892e61c4966b300339a2188510258bb22ed046b892587158a6290f09ee9a01bea7f55aba2ed1e2f5168cc7bb41da0574ec0854c2a8a19b4 WHIRLPOOL 4d1ece95d63fe48939ef8ea93ea0f15626ed2d39b72ac14fcc31c1904bc12d399239177f511e8c3d992206081aab1ae2871af38e905ead350be61a82c7eb2585
+EBUILD acme-0.19.0.ebuild 1101 SHA256 a0675a8f953972ff8a133aea62ae14cdf00f3ebb7eeb3178f72778ec5739020d SHA512 73db02807520cc53e8695f112e3ee75841bd0aaf9ec9935db7b3e812010f0f9947ed805bd8300d602c0757a5a18b1b4bf1665ac92494791915c09790c10953be WHIRLPOOL e3cb6c03fa30428e071e41c3b463cdb1c61ee88c76de469adaccf90347eafa352d30eca011620f540c222065640b02a73ea09aa263ef94df4a8a5348b04ac74f
+EBUILD acme-9999.ebuild 1103 SHA256 da323dba2cfc558a07d29a372e95ab0ef7c96764ec719c17739f44b8d49a6c46 SHA512 37c78b40124c666e76d6579c14b03e47ac54d0fd2157a42cf62405e2f485e05ab9d0416cc9ddb2db66786f5524b392cdf7d38a59ceba1dff577d795abd8e9aed WHIRLPOOL dc6a244eee32361d1d6bd9374a89341722417f6515655aec5b2846f82bc405c9cde05613839f22754f5e2d032419d7fcb83f151ec31b63571dc1322b9fcbb22a
 MISC ChangeLog 5917 SHA256 bdbadcd2933561b28889bf9b42c7d8863ecdf550db5b65662f3fb9096031b160 SHA512 63e3bf1a22642138436d2c123c9e25c33cd9b17ba6be7953a95babe7541ba0fafe82a1f504b3b1647eb08e19714075c79bb1fac3f7334b94ee6d7a740347b540 WHIRLPOOL 9eaaedda59338c0c9bc3e0188d2dcc08ed17b83adfc49a7afa21c7883d97ea07a4d457be8546c92354ce7eb85bc59dbea905fe09e5a9ea6809e879f2ba915eeb
 MISC metadata.xml 342 SHA256 cb538c63739de15c65069f536cf05b70d203ff46e6782d7671fa465eec4ce641 SHA512 bb057838d2a4161b1b5d545d32fb798bf52571fccaf3dfe7e1811ee4090813341222f7c27e21f36ea9353e9f48b401a4cda0f1937640ef052445e6b0eac9defb WHIRLPOOL c74a8e573a993be6355b81149e5b4fea5cd67d9cd3d6bbb27df1cc2093e87d78dea1ab0994d1b7e35e17f14cbb2d2b655f86870366dc86e0bd58ad92654960f5
diff --git a/app-crypt/acme/acme-0.1.0.ebuild b/app-crypt/acme/acme-0.1.0.ebuild
deleted file mode 100644
index efb7cc2d870d..000000000000
--- a/app-crypt/acme/acme-0.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=(python{2_7,3_4,3_5})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/letsencrypt/letsencrypt.git"
-	inherit git-r3
-	KEYWORDS=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/letsencrypt/letsencrypt/archive/v${PV}.tar.gz -> letsencrypt-${PV}.tar.gz"
-	KEYWORDS="~amd64"
-	S=${WORKDIR}/letsencrypt-${PV}/acme
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/letsencrypt/letsencrypt https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/ndg-httpsclient-0.4[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.15[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests -w ${PN} || die
-}
diff --git a/app-crypt/acme/acme-0.15.0.ebuild b/app-crypt/acme/acme-0.15.0.ebuild
deleted file mode 100644
index bf3eed8aaa75..000000000000
--- a/app-crypt/acme/acme-0.15.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S=${WORKDIR}/certbot-${PV}/acme
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests -w ${PN} || die
-}
diff --git a/app-crypt/acme/acme-0.16.0.ebuild b/app-crypt/acme/acme-0.16.0.ebuild
deleted file mode 100644
index bf3eed8aaa75..000000000000
--- a/app-crypt/acme/acme-0.16.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S=${WORKDIR}/certbot-${PV}/acme
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests -w ${PN} || die
-}
diff --git a/app-crypt/acme/acme-0.17.0.ebuild b/app-crypt/acme/acme-0.17.0.ebuild
deleted file mode 100644
index bf3eed8aaa75..000000000000
--- a/app-crypt/acme/acme-0.17.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S=${WORKDIR}/certbot-${PV}/acme
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests -w ${PN} || die
-}
diff --git a/app-crypt/acme/acme-0.19.0.ebuild b/app-crypt/acme/acme-0.19.0.ebuild
index a8fc5d0ba458..13f5e31382c3 100644
--- a/app-crypt/acme/acme-0.19.0.ebuild
+++ b/app-crypt/acme/acme-0.19.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~ppc64 x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index 135b289d3d81..a8fc5d0ba458 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -29,7 +29,7 @@ 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-1.9.0[${PYTHON_USEDEP}]"
 DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
 	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"