gentoo resync : 27.03.2018

8 files changed, 31 insertions, 381 deletions

diff --git a/app-crypt/acme-tiny/Manifest b/app-crypt/acme-tiny/Manifest
index 03e3883e30d1..0cfb5b9b03f6 100644
--- a/app-crypt/acme-tiny/Manifest
+++ b/app-crypt/acme-tiny/Manifest
@@ -1,10 +1,4 @@
-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-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
+DIST acme-tiny-4.0.3.tar.gz 12662 BLAKE2B 6a17d0597731a5c8c1b260fa47396cb5bf8a223f44c8e498532b6e90a2ded35c5fcae058a8682e59ab060c1eeb27e09c8db8588e1d72cfd75b65f867d3e94f9a SHA512 bd37d4f878f2851c8e88acb78699b855cfd306928e2d70ef1d35dc9883d44dae3c7622e2114b1d5c4e0c5865b61ad3958a776467ab45eaedb0cf612530ca5dc7
+EBUILD acme-tiny-4.0.3.ebuild 1140 BLAKE2B cb18452f2f0c95e4b44e66cc78ffb0ede2f91c08b3a672bb3d58185c655c3e7f4e2e8f51c2e7a0e98baf2c5b4ebaf4872e978877fd54c84ec033d342f14e41b1 SHA512 8c1e7e5596061aea3fdf3a7ee875ba9d6ce9cd87d9f70c8f7b5d38b0bf6d83a58284ae21355d0f956743bad5c3408cc9f4ade13547969ba2067e174482f59f1a
+EBUILD acme-tiny-9999.ebuild 1140 BLAKE2B cb18452f2f0c95e4b44e66cc78ffb0ede2f91c08b3a672bb3d58185c655c3e7f4e2e8f51c2e7a0e98baf2c5b4ebaf4872e978877fd54c84ec033d342f14e41b1 SHA512 8c1e7e5596061aea3fdf3a7ee875ba9d6ce9cd87d9f70c8f7b5d38b0bf6d83a58284ae21355d0f956743bad5c3408cc9f4ade13547969ba2067e174482f59f1a
 MISC metadata.xml 429 BLAKE2B 101ebd6c130b6955951254d1c7e759dbf7d5dc08d899c2bf1793e3e73ad2aec4761782d9bcbd708a42a0217cda22255fb645cc6f88792aa0a5445c6b2df79289 SHA512 7c0ff5126424ad18a75bd73fdab208397aedf79df6c6a3fc776efe1000ac9f41e3cd056e65da68fbba507940328c0308074ce9335c4be38a8197f7545728d9da
diff --git a/app-crypt/acme-tiny/acme-tiny-0_p20170917.ebuild b/app-crypt/acme-tiny/acme-tiny-0_p20170917.ebuild
deleted file mode 100644
index 5dc8c71c35e5..000000000000
--- a/app-crypt/acme-tiny/acme-tiny-0_p20170917.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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=""
-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"
-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"
-
-PATCHES=( "${FILESDIR}/${PN}-PR50-setup.py.patch" )
-
-pkg_setup() {
-	if [[ ${PV} != 9999 ]]; then
-		export SETUPTOOLS_SCM_PRETEND_VERSION="0.1.dev79+n${HASH:0:7}.d$(date +%Y%m%d)"
-	fi
-}
-
-src_prepare() {
-	if ! use minimal; then
-		PATCHES+=(
-			"${FILESDIR}/${PN}-PR87-readmefix.patch"
-			"${FILESDIR}/${PN}-PR101-contactinfo.patch"
-		)
-	fi
-	distutils-r1_src_prepare
-}
diff --git a/app-crypt/acme-tiny/acme-tiny-4.0.0.ebuild b/app-crypt/acme-tiny/acme-tiny-4.0.3.ebuild
index c36ebd5cd3c8..b9815c348094 100644
--- a/app-crypt/acme-tiny/acme-tiny-4.0.0.ebuild
+++ b/app-crypt/acme-tiny/acme-tiny-4.0.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit distutils-r1
+inherit distutils-r1 eapi7-ver
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -20,8 +20,7 @@ HOMEPAGE="https://github.com/diafygi/acme-tiny"
 
 LICENSE="MIT"
 SLOT="0"
-
-IUSE="minimal"
+IUSE=""
 
 DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 RDEPEND="dev-libs/openssl:0"
@@ -33,11 +32,17 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if ! use minimal; then
-		local PATCHES=(
-			"${FILESDIR}/${PN}-PR87-readmefix.patch"
-			"${FILESDIR}/${PN}-4.0.0-PR101-contactinfo.patch"
-		)
-	fi
+	sed -i 's|#!/usr/bin/sh|#!/bin/sh|g' README.md || die
+
 	distutils-r1_src_prepare
 }
+
+pkg_postinst() {
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "$v" "-lt" "4.0.3" || ver_test "$v" "-ge" "9999"; then
+			einfo "The --account-email flag has been changed to --contact and"
+			einfo "has different syntax."
+			einfo "Please update your scripts accordingly"
+		fi
+	done
+}
diff --git a/app-crypt/acme-tiny/acme-tiny-9999.ebuild b/app-crypt/acme-tiny/acme-tiny-9999.ebuild
index c36ebd5cd3c8..b9815c348094 100644
--- a/app-crypt/acme-tiny/acme-tiny-9999.ebuild
+++ b/app-crypt/acme-tiny/acme-tiny-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit distutils-r1
+inherit distutils-r1 eapi7-ver
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -20,8 +20,7 @@ HOMEPAGE="https://github.com/diafygi/acme-tiny"
 
 LICENSE="MIT"
 SLOT="0"
-
-IUSE="minimal"
+IUSE=""
 
 DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 RDEPEND="dev-libs/openssl:0"
@@ -33,11 +32,17 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if ! use minimal; then
-		local PATCHES=(
-			"${FILESDIR}/${PN}-PR87-readmefix.patch"
-			"${FILESDIR}/${PN}-4.0.0-PR101-contactinfo.patch"
-		)
-	fi
+	sed -i 's|#!/usr/bin/sh|#!/bin/sh|g' README.md || die
+
 	distutils-r1_src_prepare
 }
+
+pkg_postinst() {
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "$v" "-lt" "4.0.3" || ver_test "$v" "-ge" "9999"; then
+			einfo "The --account-email flag has been changed to --contact and"
+			einfo "has different syntax."
+			einfo "Please update your scripts accordingly"
+		fi
+	done
+}
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
deleted file mode 100644
index 447ed5f5f9b5..000000000000
--- a/app-crypt/acme-tiny/files/acme-tiny-4.0.0-PR101-contactinfo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- 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
diff --git a/app-crypt/acme-tiny/files/acme-tiny-PR101-contactinfo.patch b/app-crypt/acme-tiny/files/acme-tiny-PR101-contactinfo.patch
deleted file mode 100644
index 63727840d8e3..000000000000
--- a/app-crypt/acme-tiny/files/acme-tiny-PR101-contactinfo.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 86083e6f79c6af99a59d8ee27c61f5d9b407f436 Mon Sep 17 00:00:00 2001
-From: Phiber2000 <phiber2000@gmx.de>
-Date: Thu, 10 Mar 2016 16:43:54 +0100
-Subject: [PATCH 1/3] added contact key in payload and email parameter
-
----
- acme_tiny.py | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/acme_tiny.py b/acme_tiny.py
-index 34a1863..bd79321 100644
---- a/acme_tiny.py
-+++ b/acme_tiny.py
-@@ -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):
-+def get_crt(account_key, csr, acme_dir, account_email, log=LOGGER, CA=DEFAULT_CA):
-     # helper function base64 encode for jose spec
-     def _b64(b):
-         return base64.urlsafe_b64encode(b).decode('utf8').replace("=", "")
-@@ -80,10 +80,13 @@ def _send_signed_request(url, payload):
- 
-     # get the certificate domains and expiration
-     log.info("Registering account...")
--    code, result = _send_signed_request(CA + "/acme/new-reg", {
-+    payload = {
-         "resource": "new-reg",
-         "agreement": json.loads(urlopen(CA + "/directory").read().decode('utf8'))['meta']['terms-of-service'],
--    })
-+    }
-+    if account_email:
-+        payload["contact"] = ["mailto:"+account_email]
-+    code, result = _send_signed_request(CA + "/acme/new-reg", payload)
-     if code == 201:
-         log.info("Registered!")
-     elif code == 409:
-@@ -188,10 +191,11 @@ def main(argv):
-     parser.add_argument("--acme-dir", required=True, help="path to the .well-known/acme-challenge/ directory")
-     parser.add_argument("--quiet", action="store_const", const=logging.ERROR, help="suppress output except for errors")
-     parser.add_argument("--ca", default=DEFAULT_CA, help="certificate authority, default is Let's Encrypt")
-+    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)
-+    signed_crt = get_crt(args.account_key, args.csr, args.acme_dir, args.account_email, log=LOGGER, CA=args.ca)
-     sys.stdout.write(signed_crt)
- 
- if __name__ == "__main__": # pragma: no cover
-
-From b128ae1289b106e1ddf20d3787a431d8ea949cf3 Mon Sep 17 00:00:00 2001
-From: Phiber2000 <phiber2000@gmx.de>
-Date: Thu, 10 Mar 2016 19:27:17 +0100
-Subject: [PATCH 2/3] code style correction
-
----
- acme_tiny.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/acme_tiny.py b/acme_tiny.py
-index bd79321..cea57ee 100644
---- a/acme_tiny.py
-+++ b/acme_tiny.py
-@@ -85,7 +85,7 @@ def _send_signed_request(url, payload):
-         "agreement": json.loads(urlopen(CA + "/directory").read().decode('utf8'))['meta']['terms-of-service'],
-     }
-     if account_email:
--        payload["contact"] = ["mailto:"+account_email]
-+        payload["contact"] = ["mailto:{0}".format(account_email)]
-     code, result = _send_signed_request(CA + "/acme/new-reg", payload)
-     if code == 201:
-         log.info("Registered!")
-
-From 90eac8d6f22e858168ead32f00f13e7c997b64fc Mon Sep 17 00:00:00 2001
-From: Phiber2000 <phiber2000@gmx.de>
-Date: Thu, 10 Mar 2016 19:33:21 +0100
-Subject: [PATCH 3/3] updated email argument helptext
-
----
- acme_tiny.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/acme_tiny.py b/acme_tiny.py
-index cea57ee..930cd43 100644
---- a/acme_tiny.py
-+++ b/acme_tiny.py
-@@ -191,7 +191,7 @@ def main(argv):
-     parser.add_argument("--acme-dir", required=True, help="path to the .well-known/acme-challenge/ directory")
-     parser.add_argument("--quiet", action="store_const", const=logging.ERROR, help="suppress output except for errors")
-     parser.add_argument("--ca", default=DEFAULT_CA, help="certificate authority, default is Let's Encrypt")
--    parser.add_argument("--account-email", help="contact e-mail address")
-+    parser.add_argument("--account-email", help="set contact e-mail address, leave empty to keep current")
- 
-     args = parser.parse_args(argv)
-     LOGGER.setLevel(args.quiet or LOGGER.level)
diff --git a/app-crypt/acme-tiny/files/acme-tiny-PR50-setup.py.patch b/app-crypt/acme-tiny/files/acme-tiny-PR50-setup.py.patch
deleted file mode 100644
index c7e2c08a7c6e..000000000000
--- a/app-crypt/acme-tiny/files/acme-tiny-PR50-setup.py.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From 9bc3865d8c86392ca115ffb64a9389e92e00e861 Mon Sep 17 00:00:00 2001
-From: Jonas Haag <jonas@lophus.org>
-Date: Tue, 29 Dec 2015 14:14:49 +0100
-Subject: [PATCH 1/3] Add setup.py
-
----
- acme_tiny.py          |  2 +-
- setup.py              | 28 ++++++++++++++++++++++++++++
- tests/__init__.py     |  1 +
- tests/test_install.py | 24 ++++++++++++++++++++++++
- 4 files changed, 54 insertions(+), 1 deletion(-)
- create mode 100644 setup.py
- create mode 100644 tests/test_install.py
-
-diff --git a/acme_tiny.py b/acme_tiny.py
-index f54db0c..ca9ad3d 100644
---- a/acme_tiny.py
-+++ b/acme_tiny.py
-@@ -165,7 +165,7 @@ def _send_signed_request(url, payload):
-     return """-----BEGIN CERTIFICATE-----\n{0}\n-----END CERTIFICATE-----\n""".format(
-         "\n".join(textwrap.wrap(base64.b64encode(result).decode('utf8'), 64)))
- 
--def main(argv):
-+def main(argv=None):
-     parser = argparse.ArgumentParser(
-         formatter_class=argparse.RawDescriptionHelpFormatter,
-         description=textwrap.dedent("""\
-diff --git a/setup.py b/setup.py
-new file mode 100644
-index 0000000..9ed597e
---- /dev/null
-+++ b/setup.py
-@@ -0,0 +1,28 @@
-+from setuptools import setup
-+
-+setup(
-+    name="acme-tiny",
-+    version="1.0.0",
-+    url="https://github.com/diafygi/acme-tiny",
-+    author="Daniel Roesler",
-+    author_email="diafygi@gmail.com",
-+    description="A tiny script to issue and renew TLS certs from Let's Encrypt",
-+    license="MIT",
-+    py_modules=['acme_tiny'],
-+    entry_points={'console_scripts': [
-+        'acme-tiny = acme_tiny:main',
-+    ]},
-+    classifiers = [
-+        'Development Status :: 5 - Production/Stable',
-+        'Intended Audience :: System Administrators'
-+        'License :: OSI Approved :: MIT License',
-+        'Operating System :: OS Independent',
-+        'Programming Language :: Python',
-+        'Programming Language :: Python :: 2',
-+        'Programming Language :: Python :: 2.7',
-+        'Programming Language :: Python :: 3',
-+        'Programming Language :: Python :: 3.3',
-+        'Programming Language :: Python :: 3.4',
-+        'Programming Language :: Python :: 3.5',
-+    ]
-+)
-diff --git a/tests/__init__.py b/tests/__init__.py
-index ce89619..5ade34c 100644
---- a/tests/__init__.py
-+++ b/tests/__init__.py
-@@ -1 +1,2 @@
- from .test_module import TestModule
-+from .test_install import TestInstall
-diff --git a/tests/test_install.py b/tests/test_install.py
-new file mode 100644
-index 0000000..005f36c
---- /dev/null
-+++ b/tests/test_install.py
-@@ -0,0 +1,24 @@
-+import unittest
-+import os
-+import tempfile
-+import shutil
-+import subprocess
-+
-+
-+class TestInstall(unittest.TestCase):
-+    def setUp(self):
-+        self.tempdir = tempfile.mkdtemp()
-+        subprocess.check_call(["virtualenv", self.tempdir])
-+
-+    def tearDown(self):
-+        shutil.rmtree(self.tempdir)
-+
-+    def virtualenv_bin(self, cmd):
-+        return os.path.join(self.tempdir, "bin", cmd)
-+
-+    def test_install(self):
-+        subprocess.check_call([self.virtualenv_bin("python"), "setup.py", "install"])
-+
-+    def test_cli(self):
-+        self.test_install()
-+        subprocess.check_call([self.virtualenv_bin("acme-tiny"), "-h"])
-
-From cdf1bde83d6b640a8896722557386b6d9b6a9fbb Mon Sep 17 00:00:00 2001
-From: Rob Speed <speed.rob@gmail.com>
-Date: Wed, 10 Feb 2016 21:53:24 -0500
-Subject: [PATCH 2/3] Added setuptools_scm for automatic versioning based on
- tags.
-
----
- setup.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 9ed597e..7ec7ef1 100644
---- a/setup.py
-+++ b/setup.py
-@@ -2,7 +2,7 @@
- 
- setup(
-     name="acme-tiny",
--    version="1.0.0",
-+    use_scm_version=True,
-     url="https://github.com/diafygi/acme-tiny",
-     author="Daniel Roesler",
-     author_email="diafygi@gmail.com",
-@@ -12,6 +12,7 @@
-     entry_points={'console_scripts': [
-         'acme-tiny = acme_tiny:main',
-     ]},
-+    setup_requires=['setuptools_scm'],
-     classifiers = [
-         'Development Status :: 5 - Production/Stable',
-         'Intended Audience :: System Administrators'
-
-From edcaee1fa841d49a3fa488288faa8e6573269413 Mon Sep 17 00:00:00 2001
-From: Matthias Bach <marix@marix.org>
-Date: Mon, 22 Feb 2016 22:53:06 +0100
-Subject: [PATCH 3/3] Mark wheels of acme-tiny as universal
-
-Ensure that wheels created from the acme-tiny source are marked as universal.
----
- setup.cfg | 2 ++
- 1 file changed, 2 insertions(+)
- create mode 100644 setup.cfg
-
-diff --git a/setup.cfg b/setup.cfg
-new file mode 100644
-index 0000000..434559d
---- /dev/null
-+++ b/setup.cfg
-@@ -0,0 +1,2 @@
-+[wheel]
-+universal=True
diff --git a/app-crypt/acme-tiny/files/acme-tiny-PR87-readmefix.patch b/app-crypt/acme-tiny/files/acme-tiny-PR87-readmefix.patch
deleted file mode 100644
index 1f576d50c755..000000000000
--- a/app-crypt/acme-tiny/files/acme-tiny-PR87-readmefix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 85df9d1217341893ab6dbbe58fb7c878e15d832b Mon Sep 17 00:00:00 2001
-From: Jakub Wilk <jwilk@jwilk.net>
-Date: Wed, 24 Feb 2016 22:10:01 +0100
-Subject: [PATCH] renew_cert.sh: fix unusual shebang
-
-sh is normally lives in /bin, not in /usr/bin.
----
- README.md | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/README.md b/README.md
-index dfa562c..5c83a67 100644
---- a/README.md
-+++ b/README.md
-@@ -171,7 +171,7 @@ for example script).
- 
- Example of a `renew_cert.sh`:
- ```sh
--#!/usr/bin/sh
-+#!/bin/sh
- python /path/to/acme_tiny.py --account-key /path/to/account.key --csr /path/to/domain.csr --acme-dir /var/www/challenges/ > /tmp/signed.crt || exit
- wget -O - https://letsencrypt.org/certs/lets-encrypt-x1-cross-signed.pem > intermediate.pem
- cat /tmp/signed.crt intermediate.pem > /path/to/chained.pem