From 03931c6d6487b6a00c9bf5944c3aa23bf02717ec Mon Sep 17 00:00:00 2001 From: Sam Therapy Date: Thu, 9 Nov 2023 00:36:30 +0100 Subject: [PATCH] nfpm: Add manpage goreleaser: Correct commit --- dev-go/goreleaser/Manifest | 4 ++-- dev-go/goreleaser/goreleaser-9999.ebuild | 2 +- dev-util/nfpm/Manifest | 5 +++-- dev-util/nfpm/files/nfpm-manpage-no-compress.patch | 8 ++++++++ dev-util/nfpm/nfpm-9999.ebuild | 6 ++++++ 5 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 dev-util/nfpm/files/nfpm-manpage-no-compress.patch diff --git a/dev-go/goreleaser/Manifest b/dev-go/goreleaser/Manifest index 30c45b7..445bf42 100644 --- a/dev-go/goreleaser/Manifest +++ b/dev-go/goreleaser/Manifest @@ -1,5 +1,5 @@ AUX goreleaser-manpage-no-compress.patch 199 BLAKE2B 42e3f76c79ba60bc35bcceb81aa6eca63eca05a39b69ccb1de0e237f8c8ba4050107ad1e71f9537a39e5658c5f1e52cb92e433747a7a561c6051cc1781e02583 SHA512 f168becefc1b8477730a3c49ca812213fbf91d02aa3e6b7977bcf98d4270f56e76bec1d2f6a4304fe43a12c879ef71c79d4b9059ef1472778e0eefc73b23881f DIST goreleaser-1.22.0-vendor.tar.xz 7802072 BLAKE2B cd7618dc82c1a54b5a77012072c03e303e7a9c8ca00d3a8e862b4ac0463e5c75f9eaa4162894f72f38b00395c1a7e1e248f71643b6b2d2827bf7aa50b4ca7e42 SHA512 6895bc254741a07ccfc5dc8f07b4baa1fc0ca55e33422e04814c22144c36bae38cecdfda9a001c8adc7a756ccea24b1755f5ea56c2759a204c422cba9e69bd32 DIST goreleaser-1.22.0.tar.gz 934753 BLAKE2B 50ff56d1f6517848949ea8ade7d10f2717b73defb9407dc7f2a7d4b435832426452887d324d15f69221f14449e66e98351b413fc7da1e65744c609c69b3f4e6e SHA512 6334a9b6cb3a9d90672bc3161f3f5f7e2a4edf8efab5b2d6edeef185dc5c7d46d70053432fe37c7a44c2a0aa7afcdad2dd4478f6cedf6bca73f6ed37bdcf7ef1 -EBUILD goreleaser-1.22.0.ebuild 1191 BLAKE2B 535c868ef4e5836cb0666f9f7e34f5b0fc2bfc77fd83c0e96d1daeb0931d76d89cacf43a0bf48f000a0fb0456ab0df2f4effd366b5bc02195abcb76475d828a6 SHA512 0943fddec3e87a3a18dc932396dff9d00728dafa55ddebaa1f90b83d91e8054aa390cdd500d346bcf7b174b218edf0de23248a3b27697ab21747c64994c532af -EBUILD goreleaser-9999.ebuild 1191 BLAKE2B 535c868ef4e5836cb0666f9f7e34f5b0fc2bfc77fd83c0e96d1daeb0931d76d89cacf43a0bf48f000a0fb0456ab0df2f4effd366b5bc02195abcb76475d828a6 SHA512 0943fddec3e87a3a18dc932396dff9d00728dafa55ddebaa1f90b83d91e8054aa390cdd500d346bcf7b174b218edf0de23248a3b27697ab21747c64994c532af +EBUILD goreleaser-1.22.0.ebuild 1191 BLAKE2B 3108225c3f8b13da414dc89e31defb29c3c75e9b3c788d4a1fd873381566f9f67156b51e897c8998c67ff2e57e5da9c3aed27eee7b4ead0ccdd16ac3f0c20f37 SHA512 24429c860b5f3a0f0797f4c42db76cf9a468e4fa67a190e38d36633c4297600fcd093ff82de8aa9bba04f8ee39fea46a638df675118874f9f51ff7a01c3ac929 +EBUILD goreleaser-9999.ebuild 1191 BLAKE2B 3108225c3f8b13da414dc89e31defb29c3c75e9b3c788d4a1fd873381566f9f67156b51e897c8998c67ff2e57e5da9c3aed27eee7b4ead0ccdd16ac3f0c20f37 SHA512 24429c860b5f3a0f0797f4c42db76cf9a468e4fa67a190e38d36633c4297600fcd093ff82de8aa9bba04f8ee39fea46a638df675118874f9f51ff7a01c3ac929 diff --git a/dev-go/goreleaser/goreleaser-9999.ebuild b/dev-go/goreleaser/goreleaser-9999.ebuild index 31dae7f..e3a648b 100644 --- a/dev-go/goreleaser/goreleaser-9999.ebuild +++ b/dev-go/goreleaser/goreleaser-9999.ebuild @@ -26,7 +26,7 @@ if [[ ${PV} == 9999 ]]; then } else # TODO: UPDATE EVERY BUMP - COMMIT="6a16fcd38aa41ec2a5fea50728d22258ab9e2580" + COMMIT="6b65ea5ca18f9ee2de48f2ecc914a617741d6b14" SRC_URI="https://github.com/goreleaser/goreleaser/archive/v${PV}.tar.gz -> ${P}.tar.gz" SRC_URI+=" https://git.froth.zone/api/packages/packaging/generic/portage/deps/${P}-vendor.tar.xz" KEYWORDS="~amd64 ~arm64 ~x86" diff --git a/dev-util/nfpm/Manifest b/dev-util/nfpm/Manifest index e87d868..ba1a068 100644 --- a/dev-util/nfpm/Manifest +++ b/dev-util/nfpm/Manifest @@ -1,4 +1,5 @@ +AUX nfpm-manpage-no-compress.patch 207 BLAKE2B 176ea144039f23054f5d222de91d7c19d9aba134893c2d91c4d9ab1db781ac0dbe890f4a55d1390f13f9b0034d959de9e622a10e6a275eea84178e5a617343d1 SHA512 f07e440e09f2c58c0b5046aa0c64342880d2fe02e7a65a6e5f08be134505573f5526988e378a4a0b7eeaf57ddffebd0cf840a89f90fae39b95326b9cec6e3e2a DIST nfpm-2.34.0-vendor.tar.xz 2443248 BLAKE2B 6ddf909150a23270d242424476d8f8a183b2058bf91df4ff78e666c3acc162a8df9b83f2176c262829ec7cf93ef5e668f566dd065145e410acb3948a9854b96f SHA512 18c84351cde81dca4ca57d0def2d208fd7cf193d62783bf41b0596d5d726cf63011fbb4696d0b1919134b8e697bf63efc31e1204a33bd4e7144d337d44ce0c4c DIST nfpm-2.34.0.tar.gz 452713 BLAKE2B 890e78857641807a5a60469439679466c5e8f63fea91f23ee1ab5dae5ed0cff35f9388589cbee4c3e351c79d18b8a03866df2f05864b213fe3eec249d0c34702 SHA512 fd6dc65a421685072c1723c5e59e6ec04b72a4761e84d9c0d87a6dd72a07e79fabdcd104ccc73ea1880fe2be146cd2e7779be0adae7a4573b1652804468f18a7 -EBUILD nfpm-2.34.0.ebuild 1071 BLAKE2B eeef8bd1c3562ebcefb7b8267f96e4c8d3bc1978b0424fca51f446f3f1d96a2428ab058d0377a93049e7a72f1d04b2a959c26f299890fb1adaeec3b17b94254f SHA512 a375545c64e47ae1702e49ee4be31744efb0cfabc89768537af3fe35d3857cd1b450850d509c9d4ecd40c90822333569418d68cdf380438367f03c21cec18719 -EBUILD nfpm-9999.ebuild 1071 BLAKE2B eeef8bd1c3562ebcefb7b8267f96e4c8d3bc1978b0424fca51f446f3f1d96a2428ab058d0377a93049e7a72f1d04b2a959c26f299890fb1adaeec3b17b94254f SHA512 a375545c64e47ae1702e49ee4be31744efb0cfabc89768537af3fe35d3857cd1b450850d509c9d4ecd40c90822333569418d68cdf380438367f03c21cec18719 +EBUILD nfpm-2.34.0.ebuild 1190 BLAKE2B d1d4ce278e20eff28ed7ea7bc1153d09008ecbff76ee0cb578ca4f873896d17e1800c1f1cd4725e23a5d10ea56a68c88e31d0a87c78f4a00b964b2bc3fd56321 SHA512 6802cc79a97245d132f9e6e33e900ff329eaa259d009d63a8c9a46643e46200ffdbf86eceb8ef1c3c77f651564599fad1ab02c7e970ec053b0ce279faf8a0687 +EBUILD nfpm-9999.ebuild 1190 BLAKE2B d1d4ce278e20eff28ed7ea7bc1153d09008ecbff76ee0cb578ca4f873896d17e1800c1f1cd4725e23a5d10ea56a68c88e31d0a87c78f4a00b964b2bc3fd56321 SHA512 6802cc79a97245d132f9e6e33e900ff329eaa259d009d63a8c9a46643e46200ffdbf86eceb8ef1c3c77f651564599fad1ab02c7e970ec053b0ce279faf8a0687 diff --git a/dev-util/nfpm/files/nfpm-manpage-no-compress.patch b/dev-util/nfpm/files/nfpm-manpage-no-compress.patch new file mode 100644 index 0000000..b59373c --- /dev/null +++ b/dev-util/nfpm/files/nfpm-manpage-no-compress.patch @@ -0,0 +1,8 @@ +--- a/scripts/manpages.sh ++++ b/scripts/manpages.sh +@@ -2,4 +2,4 @@ + set -e + rm -rf manpages + mkdir manpages +-go run ./cmd/nfpm/ man | gzip -c -9 >manpages/nfpm.1.gz ++go run ./cmd/nfpm/ man >manpages/nfpm.1 diff --git a/dev-util/nfpm/nfpm-9999.ebuild b/dev-util/nfpm/nfpm-9999.ebuild index e41b7c8..4bc0c7e 100644 --- a/dev-util/nfpm/nfpm-9999.ebuild +++ b/dev-util/nfpm/nfpm-9999.ebuild @@ -10,6 +10,10 @@ HOMEPAGE="https://github.com/goreleaser/nfpm https://nfpm.goreleaser.com/" LICENSE="MIT BSD BSD-2 Apache-2.0 MPL-2.0" SLOT="0" +PATCHES=( + "${FILESDIR}/${PN}-manpage-no-compress.patch" +) + if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/goreleaser/nfpm.git" @@ -30,9 +34,11 @@ fi src_compile() { ego build -ldflags "-s -w -X main.version=${PV} -X main.date=$(date -I) -X main.commit=${COMMIT} -X main.builtBy=portage" ./cmd/nfpm + ./scripts/manpages.sh } src_install() { dobin ./${PN} + doman manpages/nfpm.1 einstalldocs }