From 7d87239eefdb68fbcff37b8da4c8cea23c559b06 Mon Sep 17 00:00:00 2001 From: Georgy Yakovlev Date: Sat, 18 Dec 2021 23:32:34 -0800 Subject: Move {app-emulation -> app-containers}/docker-proxy Signed-off-by: Georgy Yakovlev --- app-containers/docker-proxy/Manifest | 1 + .../docker-proxy-0.8.0_p20210525.ebuild | 35 ++++++++++++++++++++++ app-containers/docker-proxy/metadata.xml | 15 ++++++++++ app-emulation/docker-proxy/Manifest | 1 - .../docker-proxy-0.8.0_p20210525.ebuild | 35 ---------------------- app-emulation/docker-proxy/metadata.xml | 15 ---------- app-emulation/docker/docker-20.10.12-r1.ebuild | 2 +- app-emulation/docker/docker-20.10.9.ebuild | 2 +- profiles/updates/4Q-2021 | 1 + 9 files changed, 54 insertions(+), 53 deletions(-) create mode 100644 app-containers/docker-proxy/Manifest create mode 100644 app-containers/docker-proxy/docker-proxy-0.8.0_p20210525.ebuild create mode 100644 app-containers/docker-proxy/metadata.xml delete mode 100644 app-emulation/docker-proxy/Manifest delete mode 100644 app-emulation/docker-proxy/docker-proxy-0.8.0_p20210525.ebuild delete mode 100644 app-emulation/docker-proxy/metadata.xml diff --git a/app-containers/docker-proxy/Manifest b/app-containers/docker-proxy/Manifest new file mode 100644 index 000000000000..234680e4f155 --- /dev/null +++ b/app-containers/docker-proxy/Manifest @@ -0,0 +1 @@ +DIST docker-proxy-0.8.0_p20210525.tar.gz 3154432 BLAKE2B 3f273cd4c2dd3c797117bebfe06eb3ae8ce3b3f70d495cb0c77a372d64e23f1d9ad31e8efef64df494cc462e9f4fda9311c99ae7e7218f0fc41b6bf44cf8c08d SHA512 6a94fe23ce1bab0a428ee4bbe20089f5a4470e72c5da156b2b1a89de01cca803374fd9cdcd4c5b25b86af1c4e956c75a1a5ad7fb6639def7bcec69859a77c047 diff --git a/app-containers/docker-proxy/docker-proxy-0.8.0_p20210525.ebuild b/app-containers/docker-proxy/docker-proxy-0.8.0_p20210525.ebuild new file mode 100644 index 000000000000..aff3fde4d8a1 --- /dev/null +++ b/app-containers/docker-proxy/docker-proxy-0.8.0_p20210525.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +EGO_PN="github.com/docker/libnetwork" + +if [[ ${PV} == *9999 ]]; then + inherit golang-vcs +else + EGIT_COMMIT=64b7a4574d1426139437d20e81c0b6d391130ec8 + SRC_URI="https://github.com/docker/libnetwork/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86" + inherit golang-vcs-snapshot +fi + +DESCRIPTION="Docker container networking" +HOMEPAGE="https://github.com/docker/libnetwork" + +LICENSE="Apache-2.0" +SLOT="0" + +S=${WORKDIR}/${P}/src/${EGO_PN} + +# needs dockerd +RESTRICT="strip test" + +src_compile() { + GO111MODULE=auto GOPATH="${WORKDIR}/${P}" \ + go build -o "bin/docker-proxy" ./cmd/proxy || die +} + +src_install() { + dodoc README.md CHANGELOG.md + dobin bin/docker-proxy +} diff --git a/app-containers/docker-proxy/metadata.xml b/app-containers/docker-proxy/metadata.xml new file mode 100644 index 000000000000..c7055f4173cd --- /dev/null +++ b/app-containers/docker-proxy/metadata.xml @@ -0,0 +1,15 @@ + + + + + williamh@gentoo.org + William Hubbs + + + gyakovlev@gentoo.org + Georgy Yakovlev + + + docker/libnetwork + + diff --git a/app-emulation/docker-proxy/Manifest b/app-emulation/docker-proxy/Manifest deleted file mode 100644 index 234680e4f155..000000000000 --- a/app-emulation/docker-proxy/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST docker-proxy-0.8.0_p20210525.tar.gz 3154432 BLAKE2B 3f273cd4c2dd3c797117bebfe06eb3ae8ce3b3f70d495cb0c77a372d64e23f1d9ad31e8efef64df494cc462e9f4fda9311c99ae7e7218f0fc41b6bf44cf8c08d SHA512 6a94fe23ce1bab0a428ee4bbe20089f5a4470e72c5da156b2b1a89de01cca803374fd9cdcd4c5b25b86af1c4e956c75a1a5ad7fb6639def7bcec69859a77c047 diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20210525.ebuild b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20210525.ebuild deleted file mode 100644 index aff3fde4d8a1..000000000000 --- a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20210525.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -EGO_PN="github.com/docker/libnetwork" - -if [[ ${PV} == *9999 ]]; then - inherit golang-vcs -else - EGIT_COMMIT=64b7a4574d1426139437d20e81c0b6d391130ec8 - SRC_URI="https://github.com/docker/libnetwork/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86" - inherit golang-vcs-snapshot -fi - -DESCRIPTION="Docker container networking" -HOMEPAGE="https://github.com/docker/libnetwork" - -LICENSE="Apache-2.0" -SLOT="0" - -S=${WORKDIR}/${P}/src/${EGO_PN} - -# needs dockerd -RESTRICT="strip test" - -src_compile() { - GO111MODULE=auto GOPATH="${WORKDIR}/${P}" \ - go build -o "bin/docker-proxy" ./cmd/proxy || die -} - -src_install() { - dodoc README.md CHANGELOG.md - dobin bin/docker-proxy -} diff --git a/app-emulation/docker-proxy/metadata.xml b/app-emulation/docker-proxy/metadata.xml deleted file mode 100644 index c7055f4173cd..000000000000 --- a/app-emulation/docker-proxy/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - williamh@gentoo.org - William Hubbs - - - gyakovlev@gentoo.org - Georgy Yakovlev - - - docker/libnetwork - - diff --git a/app-emulation/docker/docker-20.10.12-r1.ebuild b/app-emulation/docker/docker-20.10.12-r1.ebuild index d466e2248823..e1e0014766cf 100644 --- a/app-emulation/docker/docker-20.10.12-r1.ebuild +++ b/app-emulation/docker/docker-20.10.12-r1.ebuild @@ -38,7 +38,7 @@ RDEPEND=" >=app-arch/xz-utils-4.9 dev-libs/libltdl >=app-emulation/containerd-1.4.12[apparmor?,btrfs?,device-mapper?,seccomp?] - ~app-emulation/docker-proxy-0.8.0_p20210525 + ~app-containers/docker-proxy-0.8.0_p20210525 cli? ( ~app-emulation/docker-cli-${PV} ) container-init? ( >=sys-process/tini-0.19.0[static] ) " diff --git a/app-emulation/docker/docker-20.10.9.ebuild b/app-emulation/docker/docker-20.10.9.ebuild index 4da3a4b2f29c..558024e41f42 100644 --- a/app-emulation/docker/docker-20.10.9.ebuild +++ b/app-emulation/docker/docker-20.10.9.ebuild @@ -38,7 +38,7 @@ RDEPEND=" >=app-arch/xz-utils-4.9 dev-libs/libltdl >=app-emulation/containerd-1.4.9[apparmor?,btrfs?,device-mapper?,seccomp?] - ~app-emulation/docker-proxy-0.8.0_p20210525 + ~app-containers/docker-proxy-0.8.0_p20210525 cli? ( app-emulation/docker-cli ) container-init? ( >=sys-process/tini-0.19.0[static] ) " diff --git a/profiles/updates/4Q-2021 b/profiles/updates/4Q-2021 index 995780cd5301..29ba62f80d1a 100644 --- a/profiles/updates/4Q-2021 +++ b/profiles/updates/4Q-2021 @@ -30,3 +30,4 @@ move app-crypt/openpgp-keys-teemutoivola sec-keys/openpgp-keys-teemutoivola move app-crypt/openpgp-keys-terminator sec-keys/openpgp-keys-terminator move app-crypt/openpgp-keys-tor sec-keys/openpgp-keys-tor move app-crypt/openpgp-keys-voikko sec-keys/openpgp-keys-voikko +move app-emulation/docker-proxy app-containers/docker-proxy -- cgit v1.2.3-18-g5258