Merge updates from master

This commit is contained in:
Repository mirror & CI 2025-12-06 17:30:47 +00:00
commit 8f1061ddc5
No known key found for this signature in database
GPG Key ID: 7C2AC09CD98F2EDF
9 changed files with 14 additions and 220 deletions

View File

@ -1,4 +1,4 @@
DIST aardvark-dns-1.14.0.crate 58825 BLAKE2B 4c87b1986308aea5367042374fe5311f7a219bcd953a417526f0e67cda5b09ab9300ba9bcd9a40668be2267e7506c6c6ebc5f84d5eaf69101541065e40983ffc SHA512 c65258b2d3c2d9f0b507f1bdbddbd3235ac0745b3103631b16b99bd55473bed5eeb54e4d4b76610ec24f983846bfed1007f41b546135c9950bc7047ee588d389
DIST aardvark-dns-1.15.0.crate 59884 BLAKE2B 6be0126b526359b1c402a6f10cfe9b28b9d351621b0f1e9556150fb2477a2c468938dbac1c11bde3eff6deb258ccfa6ed05e6f2a01206d3e08f1e88193016432 SHA512 963d68a662439ea920fbeec08eaa3b9fb486f5e61e46b702b0c9211241c3b1057ce573bac1f75ed558faa0cc99b0f36b7f5299c296e30b6ce6ed046a02cd9782
DIST aardvark-dns-v1.14.0-vendor.tar.gz 7516081 BLAKE2B d11cc8bf1ae6c21b47bb56a92426494b99467f50e5058dce21956dfd399456ddaf235d5308c770fe71a8d17ce727acbc9c6670d01f165eed08a7a4c4865b66c3 SHA512 0d738d0a737bfc9b6b2fe728de343a6a91c6e197d888fd37c0859b831b05f8c92efce13c268fc8f31a09bb78d43f4330230a0454744523df5a4fa96498ca3dac
DIST aardvark-dns-1.17.0.crate 62370 BLAKE2B 7105e4c96e973d6cbda48d7db957423a0743330c53fd694be14951b85ba162624ffa3d96d6737856d7e5d39910a26403a4ab11e912317d6449a85642c8c5d236 SHA512 f8cc4f39b9a16106a7fbe08c94558507e0519018709ceb80474696be24328626f76aedf9bdd12c853be0728f4e9c57e945b442e7f66c22042e25410a690b69e0
DIST aardvark-dns-v1.15.0-vendor.tar.gz 9910590 BLAKE2B 876be4b719cf7d364dbd8ce04a3984d32b24dfba81ece1ce56d1f3e3f80f2607eefd77ff7dece2a678240b1f996cb498ae81f1be06c8f7eaa696eb6001090e4b SHA512 fbe6e77a2d412ed34bcf2c710db3aa8989a5887ab475988c393fb1c49584cac5b09a34b82e880eebe81c59af7817985af87391ffb8421da07abf080704cae5c0
DIST aardvark-dns-v1.17.0-vendor.tar.gz 10267613 BLAKE2B 72b5da08584c5a35188d50646ec98b6463578b09520121224807e3770d6e911b12f61597ca5852be75a8e9de9ade02d507f490ff3a414e681fe31076930dde78 SHA512 b7ec2a2a34d5bb36dbcc55611dc9ec0ff2c1bed4469cc4b12d4eb0bd78bb7d6cae6f80a02ac32ade5c435fdd11e22ddd99646aa4de504c8369ee56cfa470e6a5

View File

@ -3,6 +3,7 @@
EAPI=8
RUST_MIN_VER="1.87.0"
[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}"
inherit cargo
@ -15,7 +16,7 @@ if [[ ${PV} == 9999* ]]; then
else
SRC_URI="${CARGO_CRATE_URIS}"
SRC_URI+="https://github.com/containers/aardvark-dns/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz"
KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv"
KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
fi
# main
@ -23,6 +24,7 @@ LICENSE="Apache-2.0"
# deps
LICENSE+=" 0BSD Apache-2.0-with-LLVM-exceptions MIT Unlicense Unicode-DFS-2016 ZLIB"
SLOT="0"
QA_FLAGS_IGNORED="usr/libexec/podman/${PN}"
QA_PRESTRIPPED="usr/libexec/podman/${PN}"
ECARGO_VENDOR="${WORKDIR}/vendor"
@ -42,6 +44,6 @@ src_prepare() {
}
src_install() {
export PREFIX="${EPREFIX}"/usr
local -x PREFIX="${EPREFIX}"/usr
default
}

View File

@ -1,8 +1,9 @@
# Copyright 2023-2024 Gentoo Authors
# Copyright 2023-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
RUST_MIN_VER="1.87.0"
[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}"
inherit cargo
@ -23,6 +24,7 @@ LICENSE="Apache-2.0"
# deps
LICENSE+=" 0BSD Apache-2.0-with-LLVM-exceptions MIT Unlicense Unicode-DFS-2016 ZLIB"
SLOT="0"
QA_FLAGS_IGNORED="usr/libexec/podman/${PN}"
QA_PRESTRIPPED="usr/libexec/podman/${PN}"
ECARGO_VENDOR="${WORKDIR}/vendor"
@ -42,6 +44,6 @@ src_prepare() {
}
src_install() {
export PREFIX="${EPREFIX}"/usr
local -x PREFIX="${EPREFIX}"/usr
default
}

View File

@ -1,80 +0,0 @@
# Copyright 2018-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{10..12} )
inherit bash-completion-r1 distutils-r1
MY_PV=${PV/_/-}
DESCRIPTION="Multi-container orchestration for Docker"
HOMEPAGE="https://github.com/docker/compose"
SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
S="${WORKDIR}/compose-${MY_PV}"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 arm64"
RDEPEND="
>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
>=dev-python/docker-7[${PYTHON_USEDEP}]
>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
>=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
dev-python/paramiko[${PYTHON_USEDEP}]
>=dev-python/pysocks-1.6.0[${PYTHON_USEDEP}]
>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
test? (
>=dev-python/pytest-5[${PYTHON_USEDEP}]
>=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
dev-python/py[${PYTHON_USEDEP}]
)"
EPYTEST_DESELECT=(
# These are not ready for >=dev-python/docker-7
tests/unit/cli/docker_client_test.py::TLSConfigTestCase::
)
distutils_enable_tests pytest
PATCHES=(
# Bug #679968 -- https://bugs.gentoo.org/679968
# Bug #681002 -- https://bugs.gentoo.org/681002
"${FILESDIR}"/${PN}-1.29.0-setup-py.patch
"${FILESDIR}"/${P}-tests-unit-cli-test-py.patch
# Bug #920631 -- https://bugs.gentoo.org/920631
"${FILESDIR}"/${P}-docker-7.patch
)
DOCS=( CHANGELOG.md README.md )
src_prepare() {
# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
default
}
python_test() {
epytest tests/unit/
}
python_install_all() {
newbashcomp contrib/completion/bash/docker-compose ${PN}
insinto /usr/share/zsh/site-functions
doins contrib/completion/zsh/*
distutils-r1_python_install_all
}

View File

@ -4,9 +4,9 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{10..13} )
PYTHON_COMPAT=( python3_{11..13} )
inherit bash-completion-r1 distutils-r1
inherit distutils-r1 shell-completion
MY_PV=${PV/_/-}
DESCRIPTION="Multi-container orchestration for Docker"
@ -72,10 +72,8 @@ python_test() {
}
python_install_all() {
newbashcomp contrib/completion/bash/docker-compose ${PN}
insinto /usr/share/zsh/site-functions
doins contrib/completion/zsh/*
dobashcomp contrib/completion/bash/${PN}
dozshcomp contrib/completion/zsh/_${PN}
distutils-r1_python_install_all
}

View File

@ -1,4 +1 @@
DIST k3d-5.6.0.tar.gz 8022281 BLAKE2B 93f32f65e6c42650608b94d58d2149c3fec96251500be0d95d5673f07ae8c366d80954afa4d80eec149b7a9e8af7389323c21498910a3010bb80b975f64064d0 SHA512 c13df93499ffde6567e4bf7dcf260cb65ca01c390bf39361122fa61553591f418213049cf29d8dde63896f026a28d96f4e2ab522a143ac66cfa9f3786f8ba9b9
DIST k3d-5.7.3.tar.gz 9566684 BLAKE2B 9dff7ab447b3fd790a036d61bc3a4bb61238c74eec60aa12a4ff10150ff2f4999a3b1e635aaae6211f4e05ed9c589dc08e08ba511eb7690f857c0dad954b6ce7 SHA512 d6e2f6fb3013429745e1663214c7dd66dd2727b592a32e81f5837bbcc997aee18418366a0e21463ba48a2d72b9a86067f492f1f44c4689a129166dcf018e5642
DIST k3d-5.7.5.tar.gz 9542352 BLAKE2B 7855f4241577ab2558d3eda7eb866fd456ba3c08a60d8ba1d4c7874d846654f39d7bd618bb010d48543536d5e38847cb715fd0ce5af8a519ce0cc7bd3814a1df SHA512 b14f9ddd521aade832ad5493007be55294648a037bcdaeae7e1f424f60975451872ad1bed895892e51ad22ac86ec6fcdc77c08d2b0422d3aad20ab4b40b9f884
DIST k3d-5.8.3.tar.gz 9542510 BLAKE2B d6b2e6701c576ff7cc25b979c18284e6e4dbe4fc8078f3669297b6aa0acddb6ad7e256255d8f8d8a97aef981b20f81529f621237d2f183c58aa37bfd58645b71 SHA512 e942a895b31c7906264380851e5f450e4f4b8bba5552d6693baf3428d2b8c7198f94d62b2791571867f24adda3a3edbac73253d04e13b8f5f3adba56310f6936

View File

@ -1,39 +0,0 @@
# Copyright 2021-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit go-module
DESCRIPTION="k3d creates k3s clusters in docker"
HOMEPAGE="https://github.com/rancher/k3d"
K3D_K3S_TAG=v1.28.3-k3s2
SRC_URI="https://github.com/rancher/k3d/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0 ISC"
SLOT="0"
KEYWORDS="amd64"
IUSE="doc"
src_prepare() {
default
rm Makefile || die
}
src_compile() {
GOWORK=off \
CGO_ENABLED=0 \
go build \
-mod=vendor \
-ldflags "-w -s -X github.com/k3d-io/k3d/v5/version.Version=v${PV} -X github.com/k3d-io/k3d/v5/version.K3sVersion=${K3D_K3S_TAG}" \
-o bin/k3d
}
src_install() {
dobin bin/${PN}
DOCS=(*.md)
if use doc; then
DOCS+=(docs)
fi
default_src_install
}

View File

@ -1,43 +0,0 @@
# Copyright 2021-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit go-module
DESCRIPTION="k3d creates k3s clusters in docker"
HOMEPAGE="https://github.com/rancher/k3d"
K3D_K3S_TAG=v1.30.3-k3s1
SRC_URI="https://github.com/rancher/k3d/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0 ISC"
SLOT="0"
KEYWORDS="~amd64"
IUSE="doc"
src_prepare() {
default
rm Makefile || die
}
src_compile() {
local extra_ldflags=(
-X "github.com/k3d-io/k3d/v5/version.Version=v${PV}"
-X "github.com/k3d-io/k3d/v5/version.K3sVersion=${K3D_K3S_TAG}"
)
env -u GOWORK \
CGO_ENABLED=0 \
go build \
-mod=vendor \
-ldflags "-w -s ${extra_ldflags[*]}" \
-o bin/k3d || die
}
src_install() {
dobin bin/${PN}
DOCS=(*.md)
if use doc; then
DOCS+=(docs)
fi
default_src_install
}

View File

@ -1,43 +0,0 @@
# Copyright 2021-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit go-module
DESCRIPTION="k3d creates k3s clusters in docker"
HOMEPAGE="https://github.com/rancher/k3d"
K3D_K3S_TAG=v1.31.2-k3s1
SRC_URI="https://github.com/rancher/k3d/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0 ISC"
SLOT="0"
KEYWORDS="amd64"
IUSE="doc"
src_prepare() {
default
rm Makefile || die
}
src_compile() {
local extra_ldflags=(
-X "github.com/k3d-io/k3d/v5/version.Version=v${PV}"
-X "github.com/k3d-io/k3d/v5/version.K3sVersion=${K3D_K3S_TAG}"
)
env -u GOWORK \
CGO_ENABLED=0 \
go build \
-mod=vendor \
-ldflags "-w -s ${extra_ldflags[*]}" \
-o bin/k3d || die
}
src_install() {
dobin bin/${PN}
DOCS=(*.md)
if use doc; then
DOCS+=(docs)
fi
default_src_install
}