gentoo resync : 24.09.2020

4 files changed, 8 insertions, 55 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 9cf7eca8ff14..9d700e347788 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme-sh/Manifest b/app-crypt/acme-sh/Manifest
index 1c8724e67fe4..e3251feaa522 100644
--- a/app-crypt/acme-sh/Manifest
+++ b/app-crypt/acme-sh/Manifest
@@ -1,8 +1,6 @@
 AUX 99acme-sh 62 BLAKE2B b9542b99b2e720e0930139f7dd56efc63e596156dca1649624f6f4c27a7d57555bb13deb3b5714aa06477e9ca79996b5f891c8a91ea808d853cc7e5d5655b0a0 SHA512 b7fc9402e3bea3ca846bdb82d6f21d1b7023bb2ace8d5ffd146959cd12e3270243fd22e3a7dde9b6cefae8f2cbca369b35d2da4ea9f1e60a2f61ae81612d8bc5
 AUX acme.sh 63 BLAKE2B 50c3284c0172ff0a0dc57fcfbaba57a6518d7c043b5d052f2710b28229b9b13313e7ca7c8b644ea273eb2f4991246631e70e6184fb5489005be12b77b8efa229 SHA512 7ec0764c86db5c68c42189a8af708e769189df201fdf017bd0d8d9e322ab71c2f422be382d170a1f4b876a1e5a6629eb55df0c564abfebab665e27e58660ff6e
-DIST acme.sh-2.8.3.tar.gz 163573 BLAKE2B 7436932d79e732b8c419a588f4677ec0338c63d0dfc227e7410b151731e2fc4c028df81f459f7ad140dab857ebdebddab3173095e3efcfad0a971ff6762c8608 SHA512 15e147d0f07af91eab7274df50e274ae41a411c30ee7f6ebc8bcbcb601b66094fc1d8126bfb816caa27dbeb5222da20a25d1c79227bc70ddb6b5d0ce0dcb389e
-DIST acme.sh-2.8.5.tar.gz 176854 BLAKE2B 74eb9bbf4b99984ba77725c6751b713d6971503d1a8542472e75192afc9139705607f629e673af75b6ec7dab68b1a9ad2fd4676cda26871daf475487e28e0848 SHA512 db355d8c60c61b632c62dda376e71c438035d3eaf5630a6dc3ca241f6d988216f046e1588ccfe3da955aacb7897cefac5a8c7b6868f12af8f422182c52ed7b72
-EBUILD acme-sh-2.8.3.ebuild 1098 BLAKE2B 79aa3b8955df9308a800da0dca7bb97fdf48190a06b205faf85d15ab6284c933187f2bc6ddd0e02fe4cc5c380de910ce15c341e86c7219e6e8ffddf043363331 SHA512 667605c0213706ecd3c8cc95ed98fc322231196ac676ee95f01ec4114e73fa8f226a14de870d8c67569daeb0b6bf78cb9edbe3228bdca36b7e0c10cc65660daf
-EBUILD acme-sh-2.8.5.ebuild 1105 BLAKE2B 18ac41f33a081024a9d7b7f8bf8b87931270f7c5ebb3e415b8ddc5b6c15895c62ce360a71f971f973457f02740862dc7484f9b8794da8f30f48de32176031af5 SHA512 fa1f63b8874a5c834ac3853c8d8d089da516d0ad69610cc51f55051e571e2f42fed4c534a34eb8063a4021c74c6b515bf769f866c1ef254bb25f138fadc9734f
+DIST acme.sh-2.8.7.tar.gz 206475 BLAKE2B ac1d51efac6301210ffd8b6e5ff6ed490cbf80e7dd154ec7a2ad0b6a2dd08ac73a325e332192214c964a873ba7c6f01a43a2157963d7edec9e0ec45b47e5b689 SHA512 45599f50a4a45b6fdea58d7a5759e4eb5f8e33acc53d60b264c15662e6bdc1e353af610845056fc67b127242c4ad15eaaf60a2113f2cb0245d4e4861dac6e1c3
+EBUILD acme-sh-2.8.7.ebuild 1100 BLAKE2B bb49e7ee375145152b585e38a5d64283a886cb9694f0b7167e23ad252f34863de64cc4ac6c4ec2ede86f4182ff90f7591187240d47170dd0482f0583d29ea723 SHA512 7abfd5cf5cafbb7277e8092fca9beac0cefdd20003438de9aabb132040c92192da5fde5aebf0e88d2980c08b82833a61f3906b6be7a38a47c7004a0625529fc9
 EBUILD acme-sh-9999.ebuild 1022 BLAKE2B 0e439fa8bfb6365f24aa4181acdad1af2ae1d0ab55abcb386348180d3ccf03e00bd9f395a96dceb252b56e29bd0a5711d027eedc7e3e23c67e9c491a9d75b66d SHA512 d370fa4197af017c61faf8b89b71e195920ebf6e970e51f86c773027fa95189491e75d94b1fe8901f02562ffc1ec9b736d82a0a21a64e31203bf6e841d2a4021
 MISC metadata.xml 457 BLAKE2B ae99692003d755e2dfcfbd0cd0b6f6094f61fed3e660e742920df93d738f6d6ad53c4e15394585e251cf082c76ae44fc004e53ce8d2df3525c82c57f803bcf1d SHA512 7f2d3a4f0ace2704bfb312ab07e483f1162ddfe6357b14a89010a1f6e45b9dc1600d2d337c6129e53f380988e543c1c5fe3203eb5018907721139882da698c32
diff --git a/app-crypt/acme-sh/acme-sh-2.8.3.ebuild b/app-crypt/acme-sh/acme-sh-2.8.3.ebuild
deleted file mode 100644
index 6aa2342cb37c..000000000000
--- a/app-crypt/acme-sh/acme-sh-2.8.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/-/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="An ACME Shell script"
-HOMEPAGE="https://github.com/Neilpang/acme.sh"
-SRC_URI="https://github.com/Neilpang/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="net-misc/curl
-	|| ( dev-libs/libressl dev-libs/openssl:0 )
-	|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
-	|| ( net-misc/socat www-servers/apache:2 www-servers/nginx )
-	virtual/cron"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	einstalldocs
-	newdoc dnsapi/README.md README-dnsapi.md
-	newdoc deploy/README.md README-deploy.md
-
-	keepdir /etc/acme-sh
-	doenvd "${FILESDIR}"/99acme-sh
-	insinto /etc/bash/bashrc.d
-	doins "${FILESDIR}"/acme.sh
-
-	exeinto /usr/share/acme.sh
-	doexe acme.sh
-	insinto /usr/share/acme.sh/dnsapi
-	doins -r dnsapi/*.sh
-	insinto /usr/share/acme.sh/deploy
-	doins -r deploy/*.sh
-	insinto /usr/share/acme.sh/notify
-	doins -r notify/*.sh
-
-	dosym ../share/acme.sh/acme.sh usr/bin/acme.sh
-}
diff --git a/app-crypt/acme-sh/acme-sh-2.8.5.ebuild b/app-crypt/acme-sh/acme-sh-2.8.7.ebuild
index 59253f841d69..af53d7dec342 100644
--- a/app-crypt/acme-sh/acme-sh-2.8.5.ebuild
+++ b/app-crypt/acme-sh/acme-sh-2.8.7.ebuild
@@ -10,18 +10,19 @@ DESCRIPTION="An ACME Shell script"
 HOMEPAGE="https://github.com/Neilpang/acme.sh"
 SRC_URI="https://github.com/Neilpang/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
 
-RDEPEND="net-misc/curl
+RDEPEND="
+	net-misc/curl
 	|| ( dev-libs/libressl dev-libs/openssl:0 )
 	|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
 	|| ( net-misc/socat www-servers/apache:2 www-servers/nginx )
-	virtual/cron"
-
-S="${WORKDIR}/${MY_P}"
+	virtual/cron
+"
 
 src_install() {
 	einstalldocs