gentoo resync : 08.01.2021

5 files changed, 88 insertions, 75 deletions

diff --git a/app-crypt/acme-sh/Manifest b/app-crypt/acme-sh/Manifest
index c02d961192c2..6884cc86a591 100644
--- a/app-crypt/acme-sh/Manifest
+++ b/app-crypt/acme-sh/Manifest
@@ -1,6 +1,6 @@
 AUX 99acme-sh 62 BLAKE2B b9542b99b2e720e0930139f7dd56efc63e596156dca1649624f6f4c27a7d57555bb13deb3b5714aa06477e9ca79996b5f891c8a91ea808d853cc7e5d5655b0a0 SHA512 b7fc9402e3bea3ca846bdb82d6f21d1b7023bb2ace8d5ffd146959cd12e3270243fd22e3a7dde9b6cefae8f2cbca369b35d2da4ea9f1e60a2f61ae81612d8bc5
 AUX acme.sh 63 BLAKE2B 50c3284c0172ff0a0dc57fcfbaba57a6518d7c043b5d052f2710b28229b9b13313e7ca7c8b644ea273eb2f4991246631e70e6184fb5489005be12b77b8efa229 SHA512 7ec0764c86db5c68c42189a8af708e769189df201fdf017bd0d8d9e322ab71c2f422be382d170a1f4b876a1e5a6629eb55df0c564abfebab665e27e58660ff6e
 DIST acme.sh-2.8.8.tar.gz 218582 BLAKE2B bcd2fbc0ff984d7bbcf4e0ee4c1f08f868ebc4b31a5d217587cdeb5810b8991698de52dd082219194c762ef245324e981eb2a044b213e2713c0d12370be1c19b SHA512 cf601965cd5542dbd11668330d0a4e428e89ccc3af92d4d04ea3936c8a31979a5c00aa8e18a31fde07812242dddcebbfdbc06f1c29260b917dfa19f88d12fd72
-EBUILD acme-sh-2.8.8.ebuild 1100 BLAKE2B bb49e7ee375145152b585e38a5d64283a886cb9694f0b7167e23ad252f34863de64cc4ac6c4ec2ede86f4182ff90f7591187240d47170dd0482f0583d29ea723 SHA512 7abfd5cf5cafbb7277e8092fca9beac0cefdd20003438de9aabb132040c92192da5fde5aebf0e88d2980c08b82833a61f3906b6be7a38a47c7004a0625529fc9
-EBUILD acme-sh-9999.ebuild 1022 BLAKE2B 0e439fa8bfb6365f24aa4181acdad1af2ae1d0ab55abcb386348180d3ccf03e00bd9f395a96dceb252b56e29bd0a5711d027eedc7e3e23c67e9c491a9d75b66d SHA512 d370fa4197af017c61faf8b89b71e195920ebf6e970e51f86c773027fa95189491e75d94b1fe8901f02562ffc1ec9b736d82a0a21a64e31203bf6e841d2a4021
-MISC metadata.xml 457 BLAKE2B ae99692003d755e2dfcfbd0cd0b6f6094f61fed3e660e742920df93d738f6d6ad53c4e15394585e251cf082c76ae44fc004e53ce8d2df3525c82c57f803bcf1d SHA512 7f2d3a4f0ace2704bfb312ab07e483f1162ddfe6357b14a89010a1f6e45b9dc1600d2d337c6129e53f380988e543c1c5fe3203eb5018907721139882da698c32
+EBUILD acme-sh-2.8.8-r1.ebuild 1206 BLAKE2B 99e8c88d8a6f2cf8a189ec22d85cfb93397d50767873575a5e517de688820e2e52a0c50b31265e99b413ca8cf98490260dfaf59129d22cd6c16d005f1a45af42 SHA512 c9974da53271607ab45e1101f12ee7f8c0f731cc167fadff65c4fd14e2bb5d3075a20b688c6aecaf6aed7b462cfffc1f8b8d8ebeb8098f887a1eef3818483d61
+EBUILD acme-sh-9999.ebuild 1098 BLAKE2B 25a97db2f6e8cd0fafc2c07de5312ac8dd3bbfbd4e17cdfbd7c3cb11504137cc705d8ad8f286620e9d72e88bd6cdc2a10e50a53333ea6b43840ed137ac5d6c7d SHA512 2f29bda15f989b61b66bd311e0a34772db242881480e6f34dfb2056aaa5bbe92f1c26cc0eb2c7d7ac218e47088c11c5a8e2eb80f52bb6b5e2a34da3e7a0b0f3f
+MISC metadata.xml 646 BLAKE2B a06db1267cdb5269401e4493ecd5e7432eac110f5554d7627dd718b35c90320be8b9f1310c0bd6ee985023efbc3b99c8314c4ebc81cb3f39db2d5b7f4b9a1ebe SHA512 9959d771b4bd98c6fe3172150d905766b2b4d30c182b2d3cac3cbc5f3a95ef71ca7fc8930c3f42cd9907cacbb28511a40331257f68f7383f806aaf07ac4ee38c
diff --git a/app-crypt/acme-sh/acme-sh-2.8.8-r1.ebuild b/app-crypt/acme-sh/acme-sh-2.8.8-r1.ebuild
new file mode 100644
index 000000000000..5d51ca8d03b0
--- /dev/null
+++ b/app-crypt/acme-sh/acme-sh-2.8.8-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/-/.}"
+MY_P="${MY_PN}-${PV}"
+
+inherit optfeature
+
+DESCRIPTION="A pure Unix shell script implementing ACME client protocol"
+HOMEPAGE="https://github.com/acmesh-official/acme.sh"
+SRC_URI="https://github.com/acmesh-official/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-libs/openssl:0
+	net-misc/curl
+	net-misc/socat
+"
+
+src_install() {
+	newdoc deploy/README.md README-deploy.md
+	newdoc dnsapi/README.md README-dnsapi.md
+	rm {deploy,dnsapi}/README.md || die
+	einstalldocs
+
+	exeinto /usr/share/acme.sh
+	doexe acme.sh
+
+	insinto /usr/share/acme.sh
+	doins -r deploy dnsapi notify
+
+	keepdir /etc/acme-sh
+	doenvd "${FILESDIR}"/99acme-sh
+
+	insinto /etc/bash/bashrc.d
+	doins "${FILESDIR}"/acme.sh
+
+	dosym ../share/acme.sh/acme.sh usr/bin/acme.sh
+}
+
+pkg_postinst() {
+	einfo "If you wish to use the webserver mode,"
+	einfo "you need to install a supported web server."
+	optfeature "using apache2 webserver mode." www-servers/apache
+	optfeature "using nginx webserver mode." www-servers/nginx
+}
diff --git a/app-crypt/acme-sh/acme-sh-2.8.8.ebuild b/app-crypt/acme-sh/acme-sh-2.8.8.ebuild
deleted file mode 100644
index af53d7dec342..000000000000
--- a/app-crypt/acme-sh/acme-sh-2.8.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 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"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-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
-"
-
-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-9999.ebuild b/app-crypt/acme-sh/acme-sh-9999.ebuild
index 7ff01d8cd7e6..1e6ca0155893 100644
--- a/app-crypt/acme-sh/acme-sh-9999.ebuild
+++ b/app-crypt/acme-sh/acme-sh-9999.ebuild
@@ -1,45 +1,48 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-EGIT_REPO_URI="https://github.com/Neilpang/${PN/-/.}.git"
+inherit git-r3 optfeature
 
-inherit git-r3
-
-DESCRIPTION="An ACME Shell script"
-HOMEPAGE="https://github.com/Neilpang/acme.sh"
-SRC_URI=""
+DESCRIPTION="A pure Unix shell script implementing ACME client protocol"
+HOMEPAGE="https://github.com/acmesh-official/acme.sh"
+EGIT_REPO_URI="https://github.com/acmesh-official/${PN/-/.}.git"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-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"
+RDEPEND="
+	dev-libs/openssl:0
+	net-misc/curl
+	net-misc/socat
+"
 
 src_install() {
-	einstalldocs
-	newdoc dnsapi/README.md README-dnsapi.md
 	newdoc deploy/README.md README-deploy.md
+	newdoc dnsapi/README.md README-dnsapi.md
+	rm {deploy,dnsapi}/README.md || die
+	einstalldocs
+
+	exeinto /usr/share/acme.sh
+	doexe acme.sh
+
+	insinto /usr/share/acme.sh
+	doins -r deploy dnsapi notify
 
 	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
 }
+
+pkg_postinst() {
+	einfo "If you wish to use the webserver mode,"
+	einfo "you need to install a supported web server."
+	optfeature "using apache2 webserver mode." www-servers/apache
+	optfeature "using nginx webserver mode." www-servers/nginx
+}
diff --git a/app-crypt/acme-sh/metadata.xml b/app-crypt/acme-sh/metadata.xml
index e60bd24cf641..a02acbd86b57 100644
--- a/app-crypt/acme-sh/metadata.xml
+++ b/app-crypt/acme-sh/metadata.xml
@@ -9,7 +9,12 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="github">Neilpang/acme.sh</remote-id>
+		<bugs-to>https://github.com/acmesh-official/acme.sh/issues</bugs-to>
+		<remote-id type="github">acmesh-official/acme.sh</remote-id>
 	</upstream>
 </pkgmetadata>