commit:     0549759e97978de023ca4eea47c27119713c96e0
Author:     Rahil Bhimjiani <me <AT> rahil <DOT> rocks>
AuthorDate: Mon Mar 11 06:24:05 2024 +0000
Commit:     Rahil Bhimjiani <rahil3108 <AT> gmail <DOT> com>
CommitDate: Mon Mar 11 07:30:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0549759e

app-crypt/lego: add 4.16.1

* Only install html files when +doc

Hot fix from upstream:
19bbefb fix: don't generate ARI cert ID if ARI is not enable (#2138)

Signed-off-by: Rahil Bhimjiani <me <AT> rahil.rocks>

 app-crypt/lego/Manifest                              |  2 ++
 .../lego/{lego-9999.ebuild => lego-4.16.1.ebuild}    | 20 ++++++++++++--------
 app-crypt/lego/lego-9999.ebuild                      | 18 +++++++++++-------
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/app-crypt/lego/Manifest b/app-crypt/lego/Manifest
index 3d4c7d79e5..0cc3a5acfe 100644
--- a/app-crypt/lego/Manifest
+++ b/app-crypt/lego/Manifest
@@ -7,3 +7,5 @@ DIST lego-4.15.0.tar.gz 683931 BLAKE2B 
b4bcdca4ea72e7826b690b15c297b37c186567d01
 DIST lego-4.16.0-deps.tar.xz 211637812 BLAKE2B 
ce3089dd2f355a72e6cf81309ae389a01eb65ce832e38065174997636b9b62e742ef7cddb3aa5ab9a8657b2d643b0e190b8f75fc9b767d74fcebb71e0d860146
 SHA512 
62fd86bef1163c5b0f8a3a3540e7fe94ccee1b097449c42f0d5267894a4e0931a89c0f8e2e2af0f37757c7a4f25fe0d27a305aa51490b7f522ec23b9267b7eb9
 DIST lego-4.16.0-docs.tar.gz 3681408 BLAKE2B 
3be8f0a8d9aaa13e4ff3bf0bd8b928bc7be0e1bec0dd31cc5e91cd1ae7d19a6952fe81a3db5c89d296642325b897e436acacf1e18975fdf5cbe34d0b1e1e7371
 SHA512 
80819d4496cd2cabf1d9eb8f254b240edf43e01a01c2de28274799986bee7f9a8698fc8dbba000d8e4e37b2d68e4a9f772214a237321077dedbe3a0657666244
 DIST lego-4.16.0.tar.gz 698821 BLAKE2B 
9058f856a477c70c12352df4786e18dadf444df60ed462411367a8aa18ce1e98ede4358e6aad8032d5d3230341fd7e544343bda27fd92c46c494e0a5eb683f35
 SHA512 
ba40fdcd94cb1f12d609104d1af5c8e398f3a3d70e4d2a0b65365b401b6928149749778de9acb138e9548d634ea210641c07d2218135f2e4c903a39947f206e5
+DIST lego-4.16.1-docs.tar.gz 3681606 BLAKE2B 
9f80ba3f132eb08b06a960c8a9bdcf372a7925bdc931a078385ff1b6b9f01981d76758c15cc3f8c35f48e461bdc84f5a4d6a7b9a6b1aadbda249ca4d27459bc3
 SHA512 
1c953edd93b6d56b0b1bd48519b745d7ebfce9df76d6c92cccde88e4aff814de19d9a68e3d949f517530acaf738def97550d1a866e156a8d03e9ff644766df35
+DIST lego-4.16.1.tar.gz 698801 BLAKE2B 
005be7bf3462d941de99c46b659776f2b69b9298819a23009060fbf0f7532c62eae3512c10619f034916eaa3c20b9607d78786cf5ec023df139cc6c186b0df20
 SHA512 
a65c661fc003cc26c13ed6b38719a0ab49a8fe8e2a18c59c84e5c974b918aaf0c55c92015d2794a17b4fe5ac31c3557a4d5e1971527441b8bdf80907fe4b90e9

diff --git a/app-crypt/lego/lego-9999.ebuild b/app-crypt/lego/lego-4.16.1.ebuild
similarity index 82%
copy from app-crypt/lego/lego-9999.ebuild
copy to app-crypt/lego/lego-4.16.1.ebuild
index 3c984d15fc..c012524d54 100644
--- a/app-crypt/lego/lego-9999.ebuild
+++ b/app-crypt/lego/lego-4.16.1.ebuild
@@ -8,7 +8,7 @@ inherit go-module
 DESCRIPTION="Let's Encrypt/ACME client (like certbot or acme.sh) and library 
written in Go"
 HOMEPAGE="https://github.com/go-acme/lego/";
 
-DOCUMENTATION_COMMIT=1f91ea806ff8f3184b7f4e00fc6e69b1e23a08a2
+DOCUMENTATION_COMMIT=14be9e1e1c33a1e370b7fc76ebe3e6fba938c87d
 
 if [[ ${PV} == 9999* ]]; then
        inherit git-r3
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]]; then
 else
        SRC_URI="
        https://github.com/go-acme/lego/archive/v${PV}.tar.gz -> ${P}.tar.gz
-       
https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz
 -> ${P}-deps.tar.xz
+       
https://github.com/rahilarious/gentoo-distfiles/releases/download/${PN}-4.16.0/deps.tar.xz
 -> ${PN}-4.16.0-deps.tar.xz
        doc? ( 
https://github.com/go-acme/lego/archive/${DOCUMENTATION_COMMIT}.tar.gz -> 
${P}-docs.tar.gz )
 "
        KEYWORDS="~amd64 ~arm64"
@@ -41,7 +41,7 @@ src_unpack() {
                go-module_live_vendor
                if use doc; then
                        EGIT_BRANCH="gh-pages"
-                       EGIT_CHECKOUT_DIR="${WORKDIR}/${P}-doc"
+                       
EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${DOCUMENTATION_COMMIT}"
                        git-r3_src_unpack
                fi
        else
@@ -49,6 +49,14 @@ src_unpack() {
        fi
 }
 
+src_prepare() {
+       default
+       if use doc; then
+               find ../"${PN}"-"${DOCUMENTATION_COMMIT}"/ -type f -not -name 
'*.html' -delete || die
+       fi
+
+}
+
 src_compile() {
        export CGO_ENABLED=0
 
@@ -73,10 +81,6 @@ src_install() {
        # docs
        einstalldocs
        if use doc; then
-               if [[ ${PV} == 9999* ]]; then
-                       dodoc -r ../"${P}"-doc/*
-               else
-                       dodoc -r ../"${PN}"-"${DOCUMENTATION_COMMIT}"/*
-               fi
+               dodoc -r ../"${PN}"-"${DOCUMENTATION_COMMIT}"/*
        fi
 }

diff --git a/app-crypt/lego/lego-9999.ebuild b/app-crypt/lego/lego-9999.ebuild
index 3c984d15fc..c4ae98059e 100644
--- a/app-crypt/lego/lego-9999.ebuild
+++ b/app-crypt/lego/lego-9999.ebuild
@@ -8,7 +8,7 @@ inherit go-module
 DESCRIPTION="Let's Encrypt/ACME client (like certbot or acme.sh) and library 
written in Go"
 HOMEPAGE="https://github.com/go-acme/lego/";
 
-DOCUMENTATION_COMMIT=1f91ea806ff8f3184b7f4e00fc6e69b1e23a08a2
+DOCUMENTATION_COMMIT=14be9e1e1c33a1e370b7fc76ebe3e6fba938c87d
 
 if [[ ${PV} == 9999* ]]; then
        inherit git-r3
@@ -41,7 +41,7 @@ src_unpack() {
                go-module_live_vendor
                if use doc; then
                        EGIT_BRANCH="gh-pages"
-                       EGIT_CHECKOUT_DIR="${WORKDIR}/${P}-doc"
+                       
EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${DOCUMENTATION_COMMIT}"
                        git-r3_src_unpack
                fi
        else
@@ -49,6 +49,14 @@ src_unpack() {
        fi
 }
 
+src_prepare() {
+       default
+       if use doc; then
+               find ../"${PN}"-"${DOCUMENTATION_COMMIT}"/ -type f -not -name 
'*.html' -delete || die
+       fi
+
+}
+
 src_compile() {
        export CGO_ENABLED=0
 
@@ -73,10 +81,6 @@ src_install() {
        # docs
        einstalldocs
        if use doc; then
-               if [[ ${PV} == 9999* ]]; then
-                       dodoc -r ../"${P}"-doc/*
-               else
-                       dodoc -r ../"${PN}"-"${DOCUMENTATION_COMMIT}"/*
-               fi
+               dodoc -r ../"${PN}"-"${DOCUMENTATION_COMMIT}"/*
        fi
 }

Reply via email to