commit: ce6fae58225a1f73846451f687458079d91aed5e Author: William Hubbs <williamh <AT> gentoo <DOT> org> AuthorDate: Sat Mar 11 21:39:05 2023 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Sat Mar 11 21:40:35 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce6fae58
app-containers/docker-cli: fix man pages for 23.0.1 Signed-off-by: William Hubbs <williamh <AT> gentoo.org> app-containers/docker-cli/Manifest | 1 + app-containers/docker-cli/docker-cli-23.0.1.ebuild | 24 +++++++++------------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/app-containers/docker-cli/Manifest b/app-containers/docker-cli/Manifest index 004811e7d36f..57177d40b1f8 100644 --- a/app-containers/docker-cli/Manifest +++ b/app-containers/docker-cli/Manifest @@ -1,2 +1,3 @@ DIST docker-cli-20.10.22.tar.gz 7590020 BLAKE2B ab003a9af2b441a9bad9c27345dea2e82087cfc8a8ac865adeb2e47e91be4bd9b27f499ae95b0ddcddb66d27c3498938682dcd10d5e3bef41fc18ce1f034a476 SHA512 550346904d172725f48c4de0e34fa95123c7022b14980d30cd01df0c9e154ac817f19e24b61538f8cbc23db090de56977c8b885b96f99583e8a5f773691280a6 +DIST docker-cli-23.0.1-man.tar.xz 81956 BLAKE2B 4660d760fc405f9c3fdc38d7324c34d6a5ab1c567f792d400b91b57e2f3c2257b72cd1b02cab2fde8016ac37f6630e6c5c60da0d9064250f341baf3a5e28419a SHA512 88b926f661f3d291dbd71c0ba6f930c13e81760b354f8abccf802abd8175f312a7b3487ed3d767ae02e3c3d4172d02b6bf55b21b3921c9850a05de5efc204b1f DIST docker-cli-23.0.1.tar.gz 6215114 BLAKE2B 4449de9fdc64f45daf6dbbe762bf6e2320aa32bed1aba90a3c1c81df343f3c3a667e62e950896f5d2b12e33d758507b4cec7d6ed3b06c3815ad528be2c47510a SHA512 77d30945160dc4d9c50354c57d2efed49b99c872c8782f6ad121e6dc1489899d8967ba95cca36499c1b59bc5ef71f4a6b516c635b0cf41b50722bb71597aa496 diff --git a/app-containers/docker-cli/docker-cli-23.0.1.ebuild b/app-containers/docker-cli/docker-cli-23.0.1.ebuild index 78a598ba9c32..ef48a886e348 100644 --- a/app-containers/docker-cli/docker-cli-23.0.1.ebuild +++ b/app-containers/docker-cli/docker-cli-23.0.1.ebuild @@ -10,22 +10,28 @@ inherit bash-completion-r1 golang-vcs-snapshot DESCRIPTION="the command line binary for docker" HOMEPAGE="https://www.docker.com/"; SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-man.tar.xz"; LICENSE="Apache-2.0" SLOT="0" -# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" IUSE="hardened selinux" RDEPEND="!<app-containers/docker-20.10.1 selinux? ( sec-policy/selinux-docker )" BDEPEND=" - >=dev-lang/go-1.16.6 - dev-go/go-md2man" + >=dev-lang/go-1.16.6" RESTRICT="installsources strip test" S="${WORKDIR}/${P}/src/${EGO_PN}" +src_unpack() { + golang-vcs-snapshot_src_unpack + set -- ${A} + unpack ${2} +} + src_prepare() { default sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die @@ -43,21 +49,11 @@ src_compile() { VERSION="${PV}" \ GITCOMMIT="${GIT_COMMIT}" \ dynbinary - - # build man pages - # see "cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man) - mkdir -p ./man/man1 || die "mkdir failed" - go build -o "${T}"/gen-manpages ./man || - die 'build gen-manpages failed' - "${T}"/gen-manpages --root "$(pwd)" --target "$(pwd)"/man/man1 || - die 'gen-manpages failed' - ./man/md2man-all.sh -q || - die 'md2man-all.sh failed' } src_install() { dobin build/docker - doman man/man*/* + doman "${WORKDIR}"/man/man?/* dobashcomp contrib/completion/bash/* bashcomp_alias docker dockerd insinto /usr/share/fish/vendor_completions.d/
