From c3a03fd9f7e0e6ebb436a121cd0a43e3d95c61e9 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:05:22 +0000 Subject: [PATCH] app-containers/docker-cli: Sync with Gentoo It's from Gentoo commit d2a1ed5b6daae1d9258b4f40a0a87c006ebd7142. --- .../app-containers/docker-cli/Manifest | 6 -- .../docker-cli/docker-cli-27.4.1.ebuild | 68 ------------------- .../docker-cli/docker-cli-27.5.0.ebuild | 68 ------------------- .../docker-cli/docker-cli-27.5.1.ebuild | 68 ------------------- .../docker-cli/docker-cli-28.0.1.ebuild | 2 +- 5 files changed, 1 insertion(+), 211 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-27.4.1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-27.5.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-27.5.1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/Manifest b/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/Manifest index 839bedb526..9b854c8d3b 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/Manifest @@ -1,8 +1,2 @@ -DIST docker-cli-27.4.1-man.tar.xz 70252 BLAKE2B 3fbefe359b39cfb7eda125830dc6c8e9e49685a833f7f46b111e9e7c0ed4d0009ab5a6ccdd27a97a1885453a7e43ae4f557c63f9201fc2604d0146f20f14763c SHA512 ddd7017fb0d5193e6f7b39e67f047edf3c98e86f299d0a7ab318efc3fb8b712a71ee5ac933ccf33945f846e2b20d2b1efc7fa9fcbd12f9a56b9d519bec4bcee1 -DIST docker-cli-27.4.1.tar.gz 7273057 BLAKE2B 3ebebe0e0918dd54d45c058c2922107fc2e82170c6e00540fde2c884c8f88945ceb5428fd5917014af5d35a554a0d9e83306d173ceea9c7461508b902f0023f8 SHA512 5880053d44e169b93fe50f3d4b13fa2f8f60de32a96f8ee2923a3291385532c1903027f0654a65a8eab51f29caf7b805857b491c0bfeee2e1983f822e579851e -DIST docker-cli-27.5.0-man.tar.xz 70224 BLAKE2B 4c2a4025721fbfbb63c24e20bdbc68f3a8b2d355d57060a86190ea30ec4dc1e01eae1265a3de6077c3952e1c9d859c1c28c707caccf07260f6dabe8bf3ef5439 SHA512 4450669971503665ca644899a657c587e86edaf4462ef47bd49b09da961111e8bc27a61caf8a8dbf9a617427bb2ebf92ab8d7adb6c4f33001383e590b59cfff3 -DIST docker-cli-27.5.0.tar.gz 7462649 BLAKE2B 89ae65834c606d9ef4f8ebc9fee5052d3e12b8aa6d9f4df7c0415157b24a55e89d0758b4f5cf0e4f3f5b6ea2f9c46bfc010c604995cb5cf1d162c068ba679787 SHA512 3c7c709f38fffd4d4e134d2abd7e6dc606e1cba765d36924a53f9470d6077be2282983eb23995bd56d772da253a69a854fe3112fea1a7ed2c9a1b70d2cc45b57 -DIST docker-cli-27.5.1-man.tar.xz 70236 BLAKE2B 82bf35e1b2ec149aa64ee5c72691a1af790e02e85c02c7078f6d2cff0c52143f64270467b00cf6410b6b80cf5088b15dc0bf87b98df0091bc61fa000b4dcec29 SHA512 6cec8418851dd4226e38319038b621e4697458b18496a0a4bacf1473007d5242a56af66d2a0d90f64bd5a9ccce1777c6c0788bc649c0e6cc38be1ecf63bd64da -DIST docker-cli-27.5.1.tar.gz 7462515 BLAKE2B cd2970ac46092bc040ebb663d1dc3bcd488f1c2e8dfc81b36f937c22cb4becbf79f8d4f537cf482d59fa032e86a183b3c4c781ccda09de68be217347320ad9d6 SHA512 165bd5984786fe6fa6398d6e2b1757ce013a91434317339b360721327d4f74bd52fe0ec3936ae3a0665f0fbbf2cd2c49bd2c503783c25651f8d91a172e1c2d3e DIST docker-cli-28.0.1-man.tar.xz 70360 BLAKE2B 395736a74b314530fbbd6bf4016f7f211a3ee4754179cde0d8edf16f489c3fd92565cf73033defb80fd8280e4ef1e2add15541102944401123cfb251b06492f9 SHA512 b72e4f35a80d72d18f701edcace46eb11fbcf1ba40a1ab8efa913edc74e265dafbdc58c7c0d442293d71ce2cfc952fcbed5afee5d5f3ba52d9d25741d5a12593 DIST docker-cli-28.0.1.tar.gz 7413092 BLAKE2B 69075ba24eb7c46593d7c4ab80499b67994119af8096409f55eec9524173cb8d37263159cd834e3cfaf4e8d169b568232d400633b2d9b08112ced05c78338f92 SHA512 c3d7ca21b88c5f6925f6c99519a67581fd6c264cc96e6c0bc00751f87de6580a2d443cbe59b2e36771e37a78fe05ea054e292675e19bc4d73fcacfda047e0490 diff --git a/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-27.4.1.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-27.4.1.ebuild deleted file mode 100644 index 88442539b2..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-27.4.1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit bash-completion-r1 go-module -MY_PV=${PV/_/-} - -# update this on every bump -GIT_COMMIT=b9d17eaebb55b7652ce37ae5c7c52fcb34194956 - -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" -S="${WORKDIR}/cli-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86" -IUSE="hardened selinux" - -RDEPEND="selinux? ( sec-policy/selinux-docker )" - -RESTRICT="installsources strip test" - -src_unpack() { - default - cd "${S}" - ln -s vendor.mod go.mod - ln -s vendor.sum go.sum -} - -src_prepare() { - default - sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die -} - -src_compile() { - export DISABLE_WARN_OUTSIDE_CONTAINER=1 - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - CGO_CFLAGS+=" -I${ESYSROOT}/usr/include" - CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)" - emake \ - LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \ - VERSION="${PV}" \ - GITCOMMIT="${GIT_COMMIT}" \ - dynbinary -} - -src_install() { - dobin build/docker - doman "${WORKDIR}"/man/man?/* - dobashcomp contrib/completion/bash/docker - bashcomp_alias docker dockerd - insinto /usr/share/fish/vendor_completions.d/ - doins contrib/completion/fish/docker.fish - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/_* -} - -pkg_postinst() { - has_version "app-containers/docker-buildx" && return - ewarn "the 'docker build' command is deprecated and will be removed in a" - ewarn "future release. If you need this functionality, install" - ewarn "app-containers/docker-buildx." -} diff --git a/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-27.5.0.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-27.5.0.ebuild deleted file mode 100644 index 1ea57a7694..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-27.5.0.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit bash-completion-r1 go-module -MY_PV=${PV/_/-} - -# update this on every bump -GIT_COMMIT=a187fa5d2d0d5f12db920734e425afc758e98ead - -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" -S="${WORKDIR}/cli-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="hardened selinux" - -RDEPEND="selinux? ( sec-policy/selinux-docker )" - -RESTRICT="installsources strip test" - -src_unpack() { - default - cd "${S}" - ln -s vendor.mod go.mod - ln -s vendor.sum go.sum -} - -src_prepare() { - default - sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die -} - -src_compile() { - export DISABLE_WARN_OUTSIDE_CONTAINER=1 - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - CGO_CFLAGS+=" -I${ESYSROOT}/usr/include" - CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)" - emake \ - LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \ - VERSION="${PV}" \ - GITCOMMIT="${GIT_COMMIT}" \ - dynbinary -} - -src_install() { - dobin build/docker - doman "${WORKDIR}"/man/man?/* - dobashcomp contrib/completion/bash/docker - bashcomp_alias docker dockerd - insinto /usr/share/fish/vendor_completions.d/ - doins contrib/completion/fish/docker.fish - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/_* -} - -pkg_postinst() { - has_version "app-containers/docker-buildx" && return - ewarn "the 'docker build' command is deprecated and will be removed in a" - ewarn "future release. If you need this functionality, install" - ewarn "app-containers/docker-buildx." -} diff --git a/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-27.5.1.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-27.5.1.ebuild deleted file mode 100644 index dfa0303d06..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-27.5.1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit bash-completion-r1 go-module -MY_PV=${PV/_/-} - -# update this on every bump -GIT_COMMIT=9f9e4058019a37304dc6572ffcbb409d529b59d8 - -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" -S="${WORKDIR}/cli-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="hardened selinux" - -RDEPEND="selinux? ( sec-policy/selinux-docker )" - -RESTRICT="installsources strip test" - -src_unpack() { - default - cd "${S}" - ln -s vendor.mod go.mod - ln -s vendor.sum go.sum -} - -src_prepare() { - default - sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die -} - -src_compile() { - export DISABLE_WARN_OUTSIDE_CONTAINER=1 - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - CGO_CFLAGS+=" -I${ESYSROOT}/usr/include" - CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)" - emake \ - LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \ - VERSION="${PV}" \ - GITCOMMIT="${GIT_COMMIT}" \ - dynbinary -} - -src_install() { - dobin build/docker - doman "${WORKDIR}"/man/man?/* - dobashcomp contrib/completion/bash/docker - bashcomp_alias docker dockerd - insinto /usr/share/fish/vendor_completions.d/ - doins contrib/completion/fish/docker.fish - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/_* -} - -pkg_postinst() { - has_version "app-containers/docker-buildx" && return - ewarn "the 'docker build' command is deprecated and will be removed in a" - ewarn "future release. If you need this functionality, install" - ewarn "app-containers/docker-buildx." -} diff --git a/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-28.0.1.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-28.0.1.ebuild index 540abf0655..98528da006 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-28.0.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-28.0.1.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/cli-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86" IUSE="hardened selinux" RDEPEND="selinux? ( sec-policy/selinux-docker )"