From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 534D513835A for ; Tue, 5 Jan 2021 18:09:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 732C1E084E; Tue, 5 Jan 2021 18:09:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4A03AE084E for ; Tue, 5 Jan 2021 18:09:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EBAE3340FC4 for ; Tue, 5 Jan 2021 18:09:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A1181487 for ; Tue, 5 Jan 2021 18:09:16 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1609870149.ac62475f7e6cb0b2cbc46f981e71de1d4cc17e42.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/acme-sh/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/acme-sh/acme-sh-2.8.8-r1.ebuild app-crypt/acme-sh/acme-sh-9999.ebuild X-VCS-Directories: app-crypt/acme-sh/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: ac62475f7e6cb0b2cbc46f981e71de1d4cc17e42 X-VCS-Branch: master Date: Tue, 5 Jan 2021 18:09:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7853c7a3-8665-47f4-8859-6bd842223b4c X-Archives-Hash: 9310ac59245d42f417b490602dc6d399 commit: ac62475f7e6cb0b2cbc46f981e71de1d4cc17e42 Author: Conrad Kostecki gentoo org> AuthorDate: Tue Jan 5 18:07:44 2021 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Tue Jan 5 18:09:09 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac62475f app-crypt/acme-sh: update RDEPEND Update deps in RDEPEND, as some are not supported anymore and some where put into 'optfeature' as the should't be installed unconditionally. Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Conrad Kostecki gentoo.org> ...acme-sh-9999.ebuild => acme-sh-2.8.8-r1.ebuild} | 46 +++++++++++----------- app-crypt/acme-sh/acme-sh-9999.ebuild | 42 ++++++++++---------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/app-crypt/acme-sh/acme-sh-9999.ebuild b/app-crypt/acme-sh/acme-sh-2.8.8-r1.ebuild similarity index 51% copy from app-crypt/acme-sh/acme-sh-9999.ebuild copy to app-crypt/acme-sh/acme-sh-2.8.8-r1.ebuild index 3bd355e8982..5d51ca8d03b 100644 --- a/app-crypt/acme-sh/acme-sh-9999.ebuild +++ b/app-crypt/acme-sh/acme-sh-2.8.8-r1.ebuild @@ -3,48 +3,50 @@ EAPI=7 -EGIT_REPO_URI="https://github.com/Neilpang/${PN/-/.}.git" +MY_PN="${PN/-/.}" +MY_P="${MY_PN}-${PV}" -inherit git-r3 +inherit optfeature DESCRIPTION="A pure Unix shell script implementing ACME client protocol" HOMEPAGE="https://github.com/acmesh-official/acme.sh" -SRC_URI="" +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="" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" RDEPEND=" + dev-libs/openssl:0 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 + net-misc/socat " 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 + 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/dnsapi - doins -r dnsapi/*.sh + insinto /usr/share/acme.sh + doins -r deploy dnsapi notify - insinto /usr/share/acme.sh/deploy - doins -r deploy/*.sh + keepdir /etc/acme-sh + doenvd "${FILESDIR}"/99acme-sh - insinto /usr/share/acme.sh/notify - doins -r notify/*.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-9999.ebuild b/app-crypt/acme-sh/acme-sh-9999.ebuild index 3bd355e8982..1e6ca015589 100644 --- a/app-crypt/acme-sh/acme-sh-9999.ebuild +++ b/app-crypt/acme-sh/acme-sh-9999.ebuild @@ -3,48 +3,46 @@ EAPI=7 -EGIT_REPO_URI="https://github.com/Neilpang/${PN/-/.}.git" - -inherit git-r3 +inherit git-r3 optfeature DESCRIPTION="A pure Unix shell script implementing ACME client protocol" HOMEPAGE="https://github.com/acmesh-official/acme.sh" -SRC_URI="" +EGIT_REPO_URI="https://github.com/acmesh-official/${PN/-/.}.git" LICENSE="GPL-3" SLOT="0" KEYWORDS="" RDEPEND=" + dev-libs/openssl:0 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 + net-misc/socat " 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 + 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/dnsapi - doins -r dnsapi/*.sh + insinto /usr/share/acme.sh + doins -r deploy dnsapi notify - insinto /usr/share/acme.sh/deploy - doins -r deploy/*.sh + keepdir /etc/acme-sh + doenvd "${FILESDIR}"/99acme-sh - insinto /usr/share/acme.sh/notify - doins -r notify/*.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 +}