gentoo resync : 27.03.2018

16 files changed, 106 insertions, 386 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index b9db307b5681..e5449096bd2a 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
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
diff --git a/app-crypt/dehydrated/Manifest b/app-crypt/dehydrated/Manifest
index 2f627c79014d..4d54d4efdf19 100644
--- a/app-crypt/dehydrated/Manifest
+++ b/app-crypt/dehydrated/Manifest
@@ -2,7 +2,9 @@ AUX 00_gentoo.sh 115 BLAKE2B f24fe757e45d9af58adb9417ef6dbd36c5db85bdc50af140304
 AUX cron 71 BLAKE2B 88ec5a0d8618bc9e058d4cb3fedb0f74a530828bf63dd58a267386bd3ed2c3b647a642bfca14f6b05161d13266983bf5672787c7fc5c44e55d953ebebf346259 SHA512 0a8ac29abf2ce84b7b429ec969a3fcbfbab3ba0ed854237efa9bc86eb62859138b027f8879e016d4bedabc788ead0bb5d55ea5b629687c0c980cb63b225852b6
 DIST dehydrated-0.3.1.tar.gz 71375 BLAKE2B 9ab014d0a4cc744081bd8aa134c460408da7f9936f1c41ef890bcebc70282fa61828620be3850cbb02f5b59b4e4fd32bdc41395340aa3673f906f154ca0877b9 SHA512 34b57edc6ab950c2c0163795ef45d6fa104dcf02978bbfa325da63f7d844176ecf20cb8d7604cfedc6b2f47d8c12ce1db5b37f532eda7fffa194b4603e4ee3b9
 DIST dehydrated-0.4.0.tar.gz 74005 BLAKE2B ad55b7c53be0bc0c08ff372171638e9739a6213062b45c36e6ca5bce205b35d097bcffb6d1db6cd9c01f46a6ea31143cd2713bffb5e19f91041969e96a3cc337 SHA512 3c8c0f2fab57a432b69451f8372c02666dd953985679d12a2af9f6b917335b5b10a1196699106e317660039178ce1139a4d5455d4825a152b6911596fba16738
+DIST dehydrated-0.6.1.tar.gz 76693 BLAKE2B 5ecca2942aedc024e87e7b5aac05d836adbbc8bb1dfb38bfcd396a63e9d3e8637d625e279c4e5a47514c0b4f27006226dad7257a620da49c426c256e5267a33d SHA512 c3ef92da4e0e12100d267422eb2667607842f6fb0fe10cbc4d10aee9b5137d292db2348eca34b1f492e21c6c325dcbb595a9ab4de634e4d4a43346be1e2ce0ad
 EBUILD dehydrated-0.3.1.ebuild 527 BLAKE2B 7056d444f51071a33e9cceb697785bcdca60f493594cc7e5e230814a8276cc47b9efa4cdb7f58f7992bae031ae787a9e9f153f2453b6d76e3bdd2c0a0750e65c SHA512 33a13b923a48fdd5e78456f2bc1825dc858a175198af802ab4ff6fee35a3470cce6c2424eedba6970fe4611aba82c0c72983f7b6dc7e22410d58d7a0062b211e
 EBUILD dehydrated-0.4.0-r3.ebuild 1554 BLAKE2B 3fbd4b2d0eda6858f085d2644709897faefbfab26855e37682b7f45a4d262bf80c8a72f8d757df94179f72b7b9a94e7b163cdfcde7d8a72f5e5cf655e05b2e4d SHA512 619e37279c8f7070d2e74f15033d7b6d098479b1837d73cdc9789b6a810160643b2561f268a63acc712abad365ee645150c76bd8c6f5c35e75d734dd3ec280c4
 EBUILD dehydrated-0.4.0.ebuild 523 BLAKE2B 4d32728d01f30828247ae56db687f3da0b768c7c0c67e113af2a95fda3db905a87d8270a3380dc65fba0288d48b2f5bc8abb6b1b521a17748e64705043567344 SHA512 1be1cd3bf9e5f4c78b5506ab33c8189e73ddd9c322334c993a85247770d6c647aef5460a7f2aca55434b90effb0ceb8a3f6b4c19c42cd5a6edcca88793f56d17
-MISC metadata.xml 303 BLAKE2B d33909a744823d6dcbd0b796a1bac7e604577f248d58883b77b23f0c95657d2e78c4e64bf7e654973e26b50beb85451238fd0e43449ccc60000a058f3a0f0cfd SHA512 d0612583d0803dd4cffbc723df0d2e4f0897729cd607a5a7ea278e602e667d02f58a7794debcf2ca81fee877a2f9f2e3d8ca978b85d2ae4995040ca5ca5ce1e1
+EBUILD dehydrated-0.6.1.ebuild 1569 BLAKE2B 543ed28a4ff57bc5306f939e4ce0131af9434a437b867fee4e28ca4b0fec39478a370d97d0e3eec02b169c72e405170ad9d89a8f733a7a6f7936d9a49ae7b4a9 SHA512 9d5f30868d67e3e8bc8968142e5f27cb39aa5ff71897c993c15af598d5caf33329ae85947befda40a956ad7c10f78853d3269cc54f908885466cea47680eabec
+MISC metadata.xml 415 BLAKE2B 8d9bb04264444c4647ec70e1b95fa7acdad4fa8fd2fa05ebe2c34133b58c0b11f8c534e5649ce8a3a311008f6adc00d68e1229a7ee0fd4d7028d0fad969f26de SHA512 06c66b6a1e1b2378876bf3c1ed29dfd5915c189128e3723f46c07df6366888c6d5eb0a9c84c0387482fdec06d5c687b7f88ec0aec658859bb9c23ee82846e61b
diff --git a/app-crypt/dehydrated/dehydrated-0.6.1.ebuild b/app-crypt/dehydrated/dehydrated-0.6.1.ebuild
new file mode 100644
index 000000000000..a04c83040fd4
--- /dev/null
+++ b/app-crypt/dehydrated/dehydrated-0.6.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="a client for signing certificates with an ACME-server"
+HOMEPAGE="https://github.com/lukas2511/dehydrated"
+SRC_URI="https://github.com/lukas2511/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="virtual/cron"
+RDEPEND="
+	${DEPEND}
+	app-shells/bash
+	net-misc/curl
+"
+
+src_configure() {
+	default
+	sed -i  's,^#CONFIG_D=.*,CONFIG_D="/etc/dehydrated/config.d",' docs/examples/config || die "could not set config (CONFIG_D)"
+}
+
+src_install() {
+	dobin "${PN}"
+	insinto "/etc/${PN}"
+	doins docs/examples/{config,domains.txt,hook.sh}
+	dodoc docs/*.md
+
+	insinto /etc/"${PN}"/config.d
+	doins "${FILESDIR}"/00_gentoo.sh
+
+	insinto "/etc/cron.d"
+	newins "${FILESDIR}"/cron "${PN}"
+
+	dodir /etc/"${PN}"/config.d
+	keepdir /etc/"${PN}"/config.d
+
+	default
+}
+
+pkg_preinst() {
+	enewgroup "${PN}"
+	enewuser "${PN}" -1 -1 /var/lib/"${PN}" "${PN}"
+}
+
+pkg_postinst() {
+	if [[ "${REPLACING_VERSIONS}" =~ (0\.3\.1|0\.4\.0) ]]; then
+		ewarn ""
+		ewarn "The new default BASEDIR is now '/var/lib/dehydrated'"
+		ewarn "Please consider migrating your data with a command like"
+		ewarn ""
+		ewarn "  'mv -v /etc/dehydrated/{accounts,archive,certs,lock} /var/lib/dehydrated'"
+		ewarn ""
+		ewarn "and make sure BASEDIR is set to '/var/lib/dehydrated'"
+		ewarn ""
+	fi
+	einfo "See /etc/dehydrated/config for configuration."
+	einfo "After finishing setup you should enable the cronjob in /etc/cron.d/dehydrated."
+}
diff --git a/app-crypt/dehydrated/metadata.xml b/app-crypt/dehydrated/metadata.xml
index 87c8df609c97..146b3f01d685 100644
--- a/app-crypt/dehydrated/metadata.xml
+++ b/app-crypt/dehydrated/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="person">
 		<email>mschiff@gentoo.org</email>
 	</maintainer>
+	<maintainer type="person">
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">lukas2511/dehydrated</remote-id>
 	</upstream>
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 907d2afb091b..987951de5b88 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -19,5 +19,5 @@ DIST krb5-1.15.2.tar.gz 9380755 BLAKE2B 3f5d00a70bf44ef077872bde282e4753e82acb70
 DIST krb5-1.16.tar.gz 9474479 BLAKE2B 0c5caa0a0d2308a447d47ab94d7b8dc92a67ad78b3bac1678c3f3ece3905f27feda5a23d28b3c13ebd64d1760726888c759fb19da82ad960c6f84a433b753873 SHA512 7e162467b95dad2b6aaa11686d08a00f1cc4eb08247fca8f0e5a8bcaa5f9f7b42cdf00db69c5c6111bdf9eb8063d53cef3bb207ce5d6a287615ca10b710153f9
 EBUILD mit-krb5-1.15.2-r1.ebuild 3913 BLAKE2B f4559c0b17ef398ac7168763d2e2225d8b1b061a61384313c93d69db9f680461008b48f4e66ed64f672fe1e6e32825a874084954e03b1dfa228ead6bb6d1e89c SHA512 b4da2e82b91b1fec83d94dcad8b2787f07f9b0bc1421519ce6a3b1545ecf30e14817debe67a9dd98ddb88b666b337be18b286b3d866e51664599b1e07f13eeae
 EBUILD mit-krb5-1.15.2.ebuild 3856 BLAKE2B 7b3d059b5bd6e68ba99bc896ae8435543a6128e4e7f9dc29e73a02cb145228a54c1f7eeca92bc3aec49582e1e0c24f9620089a8abe917b59a152b2608d0b5a25 SHA512 dc2d6fb486e95100a02a4b2f32fb93279b022195d82810e2a794f6d813f5c31f95b68b3449e2b885bc9a3658cb1d18acd76d76fa13907baa817215534531148b
-EBUILD mit-krb5-1.16.ebuild 4197 BLAKE2B b85556b9f1d2ea8cfdeaebb4101033ef3d59d93d60b035a6d997b16fb9d2fa511b658cdb1d1b72231f77ca4dce7a61d18417eec6f8cfdeb4f97e0c45ee6ebe08 SHA512 9814cd2b17793d67aa48b113fdacfd00d0a1786c99f1906f4293a2367065bb7b3e94afe51ea38bd31cc3e6684056358bf5c9b385599099a7d22f623895aab3ec
+EBUILD mit-krb5-1.16.ebuild 4194 BLAKE2B 0f85705362c7b26128abbf63f5253c2b889ce0f6e6bfca818f5c00a5e7c86eb4a83219308a2dabec961948d1c439ae33644335dd9eaa749d4deccc6cd5cf0bb5 SHA512 00af8483dfc8879ee15af4dbf31fb6be591bd55ad35644dbb25493a390be2a9a12b0932b09ec4877dab798d18a4e5bf87a591c3dc92d389a588485cb38da3769
 MISC metadata.xml 828 BLAKE2B f317440eac9d164e0640cb059dee0c3bdcfeaeb2d0e346d962f09b7152224efc10084611768663b84c67fdf73c9d89481370fe0b70ffe14aa10a360f60bd00f6 SHA512 c0f45699280d49b91eab24de6cbb28900170c3c4526b8c6ef0f6a996d3e53abd49911ce4f6ce7b28c69d37e86cc9e5b830977b9640809734e7fccf078886685c
diff --git a/app-crypt/mit-krb5/mit-krb5-1.16.ebuild b/app-crypt/mit-krb5/mit-krb5-1.16.ebuild
index 4e4edda7cfaa..5a57093bc496 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.16.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.16.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
 
 LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"
 
 # Test suite require network access
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index 786863301aca..07263168ea86 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -3,5 +3,5 @@ AUX unquote-cc.patch 791 BLAKE2B a872b7a8e8d2e04f5cf3dda0b4f4aa5e0177878942f9836
 DIST rhash-1.3.5-src.tar.gz 316867 BLAKE2B 3ffbf2ec5aef24ef63455e21c3efcae043a321a78be522a26bd25086111430071a496ab3775ff9b4956da7304df8d8e552a061f3306a7a683be5fc65ea3fd1c4 SHA512 e8450aab0c16bfb975bf4aeee218740fb4d86d5514e426b70c3edb84e4d63865cd4051939aa95c24a87a78baaedc49e40bb509b2610e89ca3745930808b3ef6c
 DIST rhash-1.3.6-src.tar.gz 328097 BLAKE2B c74993d183f0f2e479f0bd5831a9f653b9bd17bbed4d1ba896f6e33db98b7141175cd3c688dc41dfd8ec4b98acb51255ae5b795435cbc9dfb5ab77573cb25543 SHA512 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6
 EBUILD rhash-1.3.5.ebuild 2622 BLAKE2B 28d39e4b2212149ba41fcda4070141b1ddb0f350520c3ebbb1e77c751179dc87b9455f3870b822b100d297c49db26e597498d937d0d3317abde71f46257c2068 SHA512 0d57acaa7876e74d2914b4ccade7a94e248f49f4ad32e21b87171a2d4a795028d88210cc1977f45d917d006e73b7dc8f5f5ad9321ac890a50a893bcd9cfb3120
-EBUILD rhash-1.3.6-r1.ebuild 1765 BLAKE2B 4999a6f9a3d0adad7c900c8e900b9f96f3fbb73212d3c5b08c5b843dcd620d30a3c9687529bf72691367fad1f3a30063afbd57946c1dfdac4dd7c3e6fe837d75 SHA512 df720ce2e57ab3076e544872ddcccc30e05aa844cd9dde5530c4b27f16d90bc0373d970e1e1e72f8ba4780b2072eee8fb7710991b0a5ce43396907ed37e09e5c
+EBUILD rhash-1.3.6-r1.ebuild 1732 BLAKE2B 407f7e0693017530a5ed607d382518b1014ac8b5e0deb4fc29bcc443209e2d59bf88b5813b1417efed6d88eae62a16977cbbda8c531d0bd2a6f7148260afde1f SHA512 21699e9008cce86c8091b5b03fc5c5af7f226de93ecb76cc3e7916e2e6a055831abfb111db5762600fb047d17c028980c5a5d83872ff5f1b000d4ae5dcdc7692
 MISC metadata.xml 843 BLAKE2B 9380d16da7ed26bc2cb455ad4e01806d54233df9ec229e67a8ed1a3944e91569cc4a478c375e75a87ea758eab6a886b89fae27dea32434e8c7f4a068d0371369 SHA512 360de1b8627471599f06a5bbd34a4359be7bd5bc39fe97d7db3da57794e2ace132539e56a2cc971b53911887b314a8ff1c689063c86d70473ac771062f1f3b4f
diff --git a/app-crypt/rhash/rhash-1.3.6-r1.ebuild b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
index b51d7d7fab81..f5d9f3796faa 100644
--- a/app-crypt/rhash/rhash-1.3.6-r1.ebuild
+++ b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x64-solaris ~x86-solaris"
 IUSE="debug nls openssl static-libs"
 
 RDEPEND="openssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )"