gentoo auto-resync : 15:11:2022 - 06:52:13

5 files changed, 3 insertions, 110 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 79747da1c996..1e4f1050ef4c 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index 13bc6425e2e1..d109225f7164 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -1,13 +1,7 @@
 AUX docker-compose-1.29.0-setup-py.patch 1858 BLAKE2B 9a53ffec0449fe1fa110b21617bc3e804829625abc6205f10962f568acbdfa7c38ffeec7e7feb0fe585b95555ff786223b3a7c24e960738cea0dfa7803be3f59 SHA512 66a25230e8d7f294c7baa3053cee508623d85e8453eb758f7f80aed9416aef9018c8878e9c0db6b96e657bb450508d442d6b055e11e80996ef3aba276d98fe63
 DIST docker-compose-1.29.2.tar.gz 320320 BLAKE2B 2d1a6375127fa09661822f7148665161b45bbd234c93444ae31c1d926513fcbc9fb845f8af01d8f11788f24b7517bff5f6cea2a5da9ade897891f2dd728f26bd SHA512 09f2ae2ae7a17ab5fb3e22580f7a80f1a8253f7ad9fc8f29aca432911bcde46ed22030ff3073cdd7eff3d55aaba17f56e628a178ec05c3a9b4f28495d6045111
-DIST docker-compose-2.11.2-deps.tar.xz 122617800 BLAKE2B 47fe7f6e1f0321498a4b0a060ea88758355be6ecd9b7798e3f614a62c93c5508dea744ab0437626c94d33ecee91f4d9e9ede0a4f26754ae96cc070b9e3377af5 SHA512 3f36191b35bb17d02d0c85ba64a2d79f6128f2d3ac1d1921ff348f165bbc92a91e92c20374159b6e7ed140a0a08f698473f0da35dd2e140ad3675c8eddc9fda3
-DIST docker-compose-2.11.2.tar.gz 303314 BLAKE2B e395a820f0ef414021427ae01d390e30c8d6287c12b2b72c7e08f88219580370185bc48dbf31a30548c7b6f0ce0f070faa488d29689fbcd0d14af2b4fa2e4a67 SHA512 174ef8e38dce65f6ce117f8efdd24049dd9e56aa7c619242b4514ba258461ec1d65b2d226601a6efb3caf7b8516ba5c65af48854f70a2eff25adcdd3f9b9f697
-DIST docker-compose-2.5.0-deps.tar.xz 110626568 BLAKE2B 657d4d421172a6ba3516475045af50ef2351cc847933a799b7232ad6a46485d7961ad5875c9f19bf96d39adf275ca943d02fba2b939a210c080c6d38211e56f5 SHA512 231416474c6b3f73911bc7cf344ea5bfdb719cecf6ad7b159c755814df08ffcb60d05ccbdd294211cb7f64a52a5a81e2dfd357bdc10738918d47a75909d20bf9
-DIST docker-compose-2.5.0.tar.gz 274812 BLAKE2B cf3b49cc13a8ab37d6426e78f4d9fca9a7b629346d292458e32ca2b66d20ba49929cc354d570b05deec3a0e0ac7778a02045ea87070059fc20c352f2d2ddb589 SHA512 7b556394e58dcdd49229c608d0672fe1aa5bd0b715f49b4b3e2ecbea16cc4962deb7e816ea057a8a565c598c21207316b8f7b5e41f0af0c3f330054ae81c2703
-DIST docker-compose-2.6.0-deps.tar.xz 110634424 BLAKE2B a63f67babac39bb3cc01cdf1a6db24d6612f0d1e9d41eb4d60e83153f3acc5f096cc323a28cba8ae7ff0e43c18b10427cf80a235e8d3463827487d479ef0db3e SHA512 d3001fda9da5523594d684db4f12c85c41a4b6e64d7f97b774d0d3ce68c7c301d466f7a4e2a1c9e17b23fca124b6fc253746255919b5212f7bb6d72d3bed85e5
-DIST docker-compose-2.6.0.tar.gz 277387 BLAKE2B e4ca8d614a8ae860dcda77e3b655ff6a8f4af8b4c77e679cdfe256053ac6b0bbbf77a92f2ca871a6d95120c2bbb54093979f816be3c367ff59e355e57fe063d8 SHA512 df8402f0f827b7c1defbb7d0b5037ea38db98337d8ebc4756f0316cf55e368e6c61401fb0d000e1942e0878d5ce1870b0f2a3217ac4b34d1e5f4c3aab68832fe
+DIST docker-compose-2.12.2-deps.tar.xz 139592724 BLAKE2B fd0e375e9cefe802d6d557763838959712f31391c2ac4e5e41d37ce2b6df209c35e86f255197ccb39ca04dc9ea9b04de29347570d0d1b0ed5a0b2d094c5e24a7 SHA512 af4e431dbb4735fa1a2aff2271e052479b4e4dac83f2d7a733aac9aab0ac33e00499d81b6c8a6a36aa330618a89c44993c5b27349752678ce1ac41921f12dfbe
+DIST docker-compose-2.12.2.tar.gz 305198 BLAKE2B a39a0c2266abc442f1c65ac00da9dd380df85d2aaa9429898461f12138fe64a7a6c74a45b3bb734419b7093ec69a44b49dfc57ff264a2d3cb576a78a0720db03 SHA512 dfb82ecc5a984d7193da164924c1e430d07b6378028dac7264b8084da2e315e5c5091803a5db79fe27ed06b002c62b295d873b9371bd19d4550a37a28f8ec952
 EBUILD docker-compose-1.29.2-r1.ebuild 1915 BLAKE2B 45e984d2f7c8cf249187355bc2503a1b17642f1e87b0a308779ec027187ed9b700413f2c814880c6618607a3531c766086807b4a9a3021f6695453cc6074cb1b SHA512 37375b33f10219740a7f26b2af9f246635ac9196e17b1bd82337341afcdc21eebedceae1c32139f7c54eaf96b3cfa7a2f25c632a4d96b2a10708e80f5ec1cca1
-EBUILD docker-compose-2.11.2.ebuild 1200 BLAKE2B bb0535a5b444bd519b16b0d041b0a4cd0ac84ebea4b6b901e760f593afbae217689c8b58c18d6de1ddb520132c20c0b75765865d7e9b8d0a288052199429804b SHA512 5cb3bbc8957c2e7455c9b2ab00742680d3d430133536490628532e869e684d06334737d73b46533364256a1441273df503474efd165742839b9b2cfc1aca3ec0
-EBUILD docker-compose-2.5.0.ebuild 1242 BLAKE2B 48e1062372861a1707356495b38ebdf3818a946538f1798016dd187969cac14c88a4c2e268f13f4178be10a65ef4d3cb1d2fbfb58e6d39ea6c4ed8bb03cf1727 SHA512 ba6439a3d2e6f62ae36a780a7c421d0316e2d70e0bf5327bbef4aa27ed9cdc0da0537b05416480fcce01dabf871245ef4f70176ef1503ccb20a4d4f791bb3cb9
-EBUILD docker-compose-2.6.0.ebuild 1242 BLAKE2B 48e1062372861a1707356495b38ebdf3818a946538f1798016dd187969cac14c88a4c2e268f13f4178be10a65ef4d3cb1d2fbfb58e6d39ea6c4ed8bb03cf1727 SHA512 ba6439a3d2e6f62ae36a780a7c421d0316e2d70e0bf5327bbef4aa27ed9cdc0da0537b05416480fcce01dabf871245ef4f70176ef1503ccb20a4d4f791bb3cb9
+EBUILD docker-compose-2.12.2.ebuild 1143 BLAKE2B 65406f19f5454c903ac34ce63653083ec4533707c5e507e56c767f8529b1fdf397573cac69efef2981c77314feced2b5a7723cd6ded71ecd422787b5ad0347ed SHA512 5ba4e727da997ecc072a8ee09b60d5986f7313c8b6c097680c07b67c156cc59f912256b99075de1c0b91f66e81ded4a0411099f89585a7f3c4f26bd0a2a6aa4f
 MISC metadata.xml 544 BLAKE2B d515d07ee7d2045db1d4a2a0e8f0e797e23b01dea7ab164d9bffc85bc00ddc18a050f296db0a80df8a65c9c554d6e189218a1939b07b29ea823e5eea65d803e6 SHA512 17c3b4e7be1318a36aa744e185d7f7d5571107cecc98eed8fce07b4d905273409b95a202129440082f29be57d6a44eabda43730e8f47cc7c63c04d6d0ed05645
diff --git a/app-containers/docker-compose/docker-compose-2.11.2.ebuild b/app-containers/docker-compose/docker-compose-2.12.2.ebuild
index b29f582cff9c..67d20deb634b 100644
--- a/app-containers/docker-compose/docker-compose-2.11.2.ebuild
+++ b/app-containers/docker-compose/docker-compose-2.12.2.ebuild
@@ -39,7 +39,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	has_version =app-containers/docker-compose-1* || return
 	ewarn
 	ewarn "docker-compose 2.x is a sub command of docker"
 	ewarn "Use 'docker compose' from the command line instead of"
diff --git a/app-containers/docker-compose/docker-compose-2.5.0.ebuild b/app-containers/docker-compose/docker-compose-2.5.0.ebuild
deleted file mode 100644
index 3946a436a4be..000000000000
--- a/app-containers/docker-compose/docker-compose-2.5.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2018-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND=">=app-containers/docker-cli-20.10.3"
-
-S="${WORKDIR}/compose-${MY_PV}"
-
-src_prepare() {
-	default
-	# do not strip
-	sed -i -e 's/-s -w//' builder.Makefile || die
-}
-
-src_compile() {
-	emake -f builder.Makefile GIT_TAG=v${PV}
-}
-
-src_test() {
-	emake -f builder.Makefile test
-}
-
-src_install() {
-	exeinto /usr/libexec/docker/cli-plugins
-	doexe bin/docker-compose
-	dodoc README.md
-}
-
-pkg_postinst() {
-	has_version =app-containers/docker-compose-1* || return
-	ewarn
-	ewarn "docker-compose 2.x is a sub command of docker"
-	ewarn "Use 'docker compose' from the command line instead of"
-	ewarn "'docker-compose'"
-	ewarn "If you need to keep 1.x around, please run the following"
-	ewarn "command before your next --depclean"
-	ewarn "# emerge --noreplace docker-compose:0"
-}
diff --git a/app-containers/docker-compose/docker-compose-2.6.0.ebuild b/app-containers/docker-compose/docker-compose-2.6.0.ebuild
deleted file mode 100644
index 3946a436a4be..000000000000
--- a/app-containers/docker-compose/docker-compose-2.6.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2018-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND=">=app-containers/docker-cli-20.10.3"
-
-S="${WORKDIR}/compose-${MY_PV}"
-
-src_prepare() {
-	default
-	# do not strip
-	sed -i -e 's/-s -w//' builder.Makefile || die
-}
-
-src_compile() {
-	emake -f builder.Makefile GIT_TAG=v${PV}
-}
-
-src_test() {
-	emake -f builder.Makefile test
-}
-
-src_install() {
-	exeinto /usr/libexec/docker/cli-plugins
-	doexe bin/docker-compose
-	dodoc README.md
-}
-
-pkg_postinst() {
-	has_version =app-containers/docker-compose-1* || return
-	ewarn
-	ewarn "docker-compose 2.x is a sub command of docker"
-	ewarn "Use 'docker compose' from the command line instead of"
-	ewarn "'docker-compose'"
-	ewarn "If you need to keep 1.x around, please run the following"
-	ewarn "command before your next --depclean"
-	ewarn "# emerge --noreplace docker-compose:0"
-}