gentoo resync : 18.03.2018

5 files changed, 97 insertions, 18 deletions

diff --git a/app-crypt/acme-tiny/Manifest b/app-crypt/acme-tiny/Manifest
index 8108624d7365..03e3883e30d1 100644
--- a/app-crypt/acme-tiny/Manifest
+++ b/app-crypt/acme-tiny/Manifest
@@ -1,7 +1,10 @@
+AUX acme-tiny-4.0.0-PR101-contactinfo.patch 2088 BLAKE2B 6d6b6ef76a5461a6b838c9361106fbd3813f643a8cc1d50317ce61f72d48fb596fe27c22e07caacaac700e560f9514b96bdf0de3ad760080a0ded1f8440cfc02 SHA512 a1d3eb984067444c47fbd15b41fd66cbba78494d2e649eaacecac2a8e547d770e5695c28690d78120869764207c61dcac1e9e864030a74775968f0852eb8ff60
 AUX acme-tiny-PR101-contactinfo.patch 4110 BLAKE2B b9ea7e33d59afc9e432a5533894dda690ec770fc2270e951aa47955e8ddb648ba138f1bb1a456f61e31e30ab585533c3a7db9dd813936d9bb0e8eb2c69568e8c SHA512 9ccc9347768de5cbcb9e2c4c9ba175abadb51260ca36eb77ffe01565ee1713b2b6c984ffa392e53217152d696ece02d8fee937602092be678055e20657f94d49
 AUX acme-tiny-PR50-setup.py.patch 4568 BLAKE2B d88c62ab1e30bf67036c104b2d39d300a6e4e89d45115126f31137692c721d995620fb40d6110be5ee02e439d3f8315f8cebe96f52ec4250d1dddf20a6cfe79b SHA512 41daa64e2517950f3863bf0573aa80304fb43a2221f4ea048b52fac64c5cc3b91b52d3dd6b6d791760c29accf26383a559f2956f27467528a1f7eb11ae8449d3
 AUX acme-tiny-PR87-readmefix.patch 821 BLAKE2B f785d2403e368765eee41afc2c6e929ac3c9b0505c6a51d0057b7a14fc6458353519392d8c97c4f123e852589b762a877dc48a040031f156647bf9f11951bda7 SHA512 20dde53915bfc93cd48811cedfdf95405ed7322c277615c0f24969d9071a416db9dff51ce8c0c93af46e9ecfc3ae10bf0ab777576ea2f30a0a5419bd2b406404
-DIST acme-tiny-20170917.tar.gz 10516 BLAKE2B e9d4ae170579cd5379dbb4d900d051bc1789ac994eb491aafb9952cd004b3e3feed20ef505f88587035f3f16163e7965a1b3883caaaa8c2327fca6be0240a17f SHA512 0bfb0d064f21f9d89e3c5863f33c7326c02948a42e2c8dc11c7b5baaf5e0dfcaeba0ad461b2ad12e292cc14f64b44f331f11b56dda6592a4663baf0714048700
-EBUILD acme-tiny-20170917.ebuild 1105 BLAKE2B 20bbc1d5c97de09d06426c323b7d42e290312c9c7d5059fb922ddffdb05da5f10f0ba4471371716f622f93404556cb4916ec301b4436475d5145826e245dd276 SHA512 3939b70cdb1b924fbfc067378f1357ceee0c789dcaba4f3071b7a6550959d01f161617ee00df1a14c66209beb68f4c46f01d6e4e5c61230ed4c4d3800b6aabf4
-EBUILD acme-tiny-99999999.ebuild 1105 BLAKE2B 20bbc1d5c97de09d06426c323b7d42e290312c9c7d5059fb922ddffdb05da5f10f0ba4471371716f622f93404556cb4916ec301b4436475d5145826e245dd276 SHA512 3939b70cdb1b924fbfc067378f1357ceee0c789dcaba4f3071b7a6550959d01f161617ee00df1a14c66209beb68f4c46f01d6e4e5c61230ed4c4d3800b6aabf4
+DIST acme-tiny-0_p20170917.tar.gz 10516 BLAKE2B e9d4ae170579cd5379dbb4d900d051bc1789ac994eb491aafb9952cd004b3e3feed20ef505f88587035f3f16163e7965a1b3883caaaa8c2327fca6be0240a17f SHA512 0bfb0d064f21f9d89e3c5863f33c7326c02948a42e2c8dc11c7b5baaf5e0dfcaeba0ad461b2ad12e292cc14f64b44f331f11b56dda6592a4663baf0714048700
+DIST acme-tiny-4.0.0.tar.gz 11934 BLAKE2B 2303fcd4e14d75cb7b36426f9ffe7e5f989d886be16b322aea2f8b40937e8c1a850704869570911ff7365a9545f5e41006f4e655ba207db9a7105ec3d59c8c32 SHA512 45f3469fbfa8b57c5755595823a6d08fd977c29d948b618ab6bd9c4feba4910bdcc1540757ba78bcdcd7e01c6f7451f4e8aec951a0ae118ab6597a1714f30691
+EBUILD acme-tiny-0_p20170917.ebuild 1232 BLAKE2B 3f8181cc834b6123d77f2d4596c6355f1fa63ece9870052ed57b6aa90e09365e2046953e89a76ef097a818adf9045636234e06ca9cb64c53d3007c5da4ee7d8b SHA512 15e2041fad71a0eeea70dbd825f5c2e876de62a1420f1b513f3cb808bde8333101b18c39e0fdb5a644e6a8b8cafd4485518538ab1f6f75261dffc4c5a4010338
+EBUILD acme-tiny-4.0.0.ebuild 940 BLAKE2B b245cf46a9248d11a009b9e43a9a570316608a28f76a92d7123a7411c153fd808d0b6189bb80b844d83c4d1f0e880e701b0673f487699aae8750f6d842206de7 SHA512 a07469b4ab0f01e14a88eb449f0d67807030743f4d34aec7c6b2e448feb638d8165d60de2f3020bc60f8529a668b0cedd9c4a2edbb41b5cd3546c4432d08d041
+EBUILD acme-tiny-9999.ebuild 940 BLAKE2B b245cf46a9248d11a009b9e43a9a570316608a28f76a92d7123a7411c153fd808d0b6189bb80b844d83c4d1f0e880e701b0673f487699aae8750f6d842206de7 SHA512 a07469b4ab0f01e14a88eb449f0d67807030743f4d34aec7c6b2e448feb638d8165d60de2f3020bc60f8529a668b0cedd9c4a2edbb41b5cd3546c4432d08d041
 MISC metadata.xml 429 BLAKE2B 101ebd6c130b6955951254d1c7e759dbf7d5dc08d899c2bf1793e3e73ad2aec4761782d9bcbd708a42a0217cda22255fb645cc6f88792aa0a5445c6b2df79289 SHA512 7c0ff5126424ad18a75bd73fdab208397aedf79df6c6a3fc776efe1000ac9f41e3cd056e65da68fbba507940328c0308074ce9335c4be38a8197f7545728d9da
diff --git a/app-crypt/acme-tiny/acme-tiny-20170917.ebuild b/app-crypt/acme-tiny/acme-tiny-0_p20170917.ebuild
index b85a76447997..5dc8c71c35e5 100644
--- a/app-crypt/acme-tiny/acme-tiny-20170917.ebuild
+++ b/app-crypt/acme-tiny/acme-tiny-0_p20170917.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
@@ -6,15 +6,18 @@ EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
-if [[ ${PV} == 99999999 ]]; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/diafygi/${PN}.git"
 	KEYWORDS=""
-else
+elif [[ ${PV} =~ 0_p* ]]; then
 	HASH="4ed13950c0a9cf61f1ca81ff1874cde1cf48ab32"
 	SRC_URI="https://github.com/diafygi/${PN}/archive/${HASH}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${PN}-${HASH}"
+else
+	SRC_URI="https://github.com/diafygi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="A tiny, auditable script for Let's Encrypt's ACME Protocol"
@@ -31,7 +34,7 @@ RDEPEND="dev-libs/openssl:0"
 PATCHES=( "${FILESDIR}/${PN}-PR50-setup.py.patch" )
 
 pkg_setup() {
-	if [[ ${PV} != 99999999 ]]; then
+	if [[ ${PV} != 9999 ]]; then
 		export SETUPTOOLS_SCM_PRETEND_VERSION="0.1.dev79+n${HASH:0:7}.d$(date +%Y%m%d)"
 	fi
 }
diff --git a/app-crypt/acme-tiny/acme-tiny-99999999.ebuild b/app-crypt/acme-tiny/acme-tiny-4.0.0.ebuild
index b85a76447997..c36ebd5cd3c8 100644
--- a/app-crypt/acme-tiny/acme-tiny-99999999.ebuild
+++ b/app-crypt/acme-tiny/acme-tiny-4.0.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
@@ -6,15 +6,13 @@ EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
-if [[ ${PV} == 99999999 ]]; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/diafygi/${PN}.git"
 	KEYWORDS=""
 else
-	HASH="4ed13950c0a9cf61f1ca81ff1874cde1cf48ab32"
-	SRC_URI="https://github.com/diafygi/${PN}/archive/${HASH}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/diafygi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${HASH}"
 fi
 
 DESCRIPTION="A tiny, auditable script for Let's Encrypt's ACME Protocol"
@@ -28,19 +26,17 @@ IUSE="minimal"
 DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 RDEPEND="dev-libs/openssl:0"
 
-PATCHES=( "${FILESDIR}/${PN}-PR50-setup.py.patch" )
-
 pkg_setup() {
-	if [[ ${PV} != 99999999 ]]; then
-		export SETUPTOOLS_SCM_PRETEND_VERSION="0.1.dev79+n${HASH:0:7}.d$(date +%Y%m%d)"
+	if [[ ${PV} != 9999 ]]; then
+		export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
 	fi
 }
 
 src_prepare() {
 	if ! use minimal; then
-		PATCHES+=(
+		local PATCHES=(
 			"${FILESDIR}/${PN}-PR87-readmefix.patch"
-			"${FILESDIR}/${PN}-PR101-contactinfo.patch"
+			"${FILESDIR}/${PN}-4.0.0-PR101-contactinfo.patch"
 		)
 	fi
 	distutils-r1_src_prepare
diff --git a/app-crypt/acme-tiny/acme-tiny-9999.ebuild b/app-crypt/acme-tiny/acme-tiny-9999.ebuild
new file mode 100644
index 000000000000..c36ebd5cd3c8
--- /dev/null
+++ b/app-crypt/acme-tiny/acme-tiny-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 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} )
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/diafygi/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/diafygi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A tiny, auditable script for Let's Encrypt's ACME Protocol"
+HOMEPAGE="https://github.com/diafygi/acme-tiny"
+
+LICENSE="MIT"
+SLOT="0"
+
+IUSE="minimal"
+
+DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+RDEPEND="dev-libs/openssl:0"
+
+pkg_setup() {
+	if [[ ${PV} != 9999 ]]; then
+		export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+	fi
+}
+
+src_prepare() {
+	if ! use minimal; then
+		local PATCHES=(
+			"${FILESDIR}/${PN}-PR87-readmefix.patch"
+			"${FILESDIR}/${PN}-4.0.0-PR101-contactinfo.patch"
+		)
+	fi
+	distutils-r1_src_prepare
+}
diff --git a/app-crypt/acme-tiny/files/acme-tiny-4.0.0-PR101-contactinfo.patch b/app-crypt/acme-tiny/files/acme-tiny-4.0.0-PR101-contactinfo.patch
new file mode 100644
index 000000000000..447ed5f5f9b5
--- /dev/null
+++ b/app-crypt/acme-tiny/files/acme-tiny-4.0.0-PR101-contactinfo.patch
@@ -0,0 +1,34 @@
+--- a/acme_tiny.py	2018-03-16 02:37:41.989372265 -0400
++++ b/acme_tiny.py	2018-03-16 02:53:28.365319918 -0400
+@@ -12,7 +12,7 @@
+ LOGGER.addHandler(logging.StreamHandler())
+ LOGGER.setLevel(logging.INFO)
+ 
+-def get_crt(account_key, csr, acme_dir, log=LOGGER, CA=DEFAULT_CA, disable_check=False, directory_url=DEFAULT_DIRECTORY_URL):
++def get_crt(account_key, csr, acme_dir, account_email, log=LOGGER, CA=DEFAULT_CA, disable_check=False, directory_url=DEFAULT_DIRECTORY_URL):
+     directory, acct_headers, alg, jwk = None, None, None, None # global variables
+ 
+     # helper functions - base64 encode for jose spec
+@@ -107,6 +107,8 @@
+     # create account and set the global key identifier
+     log.info("Registering account...")
+     reg_payload = {"termsOfServiceAgreed": True}
++    if account_email:
++        reg_payload["contact"] = ["mailto:"+account_email]
+     account, code, acct_headers = _send_signed_request(directory['newAccount'], reg_payload, "Error registering")
+     log.info("Registered!" if code == 201 else "Already registered!")
+ 
+@@ -185,10 +187,12 @@
+     parser.add_argument("--disable-check", default=False, action="store_true", help="disable checking if the challenge file is hosted correctly before telling the CA")
+     parser.add_argument("--directory-url", default=DEFAULT_DIRECTORY_URL, help="certificate authority directory url, default is Let's Encrypt")
+     parser.add_argument("--ca", default=DEFAULT_CA, help="DEPRECATED! USE --directory-url INSTEAD!")
++    parser.add_argument("--account-email", help="contact e-mail address")
+ 
+     args = parser.parse_args(argv)
+     LOGGER.setLevel(args.quiet or LOGGER.level)
+-    signed_crt = get_crt(args.account_key, args.csr, args.acme_dir, log=LOGGER, CA=args.ca, disable_check=args.disable_check, directory_url=args.directory_url)
++    signed_crt = get_crt(args.account_key, args.csr, args.acme_dir,
++            args.account_email, log=LOGGER, CA=args.ca, disable_check=args.disable_check, directory_url=args.directory_url)
+     sys.stdout.write(signed_crt)
+ 
+ if __name__ == "__main__": # pragma: no cover