gentoo auto-resync : 29:09:2022 - 21:23:22

6 files changed, 57 insertions, 36 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 08085c1656f8..da46df94177a 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/cosign/Manifest b/app-containers/cosign/Manifest
index e5070d86141a..2b1e92adde8b 100644
--- a/app-containers/cosign/Manifest
+++ b/app-containers/cosign/Manifest
@@ -1,11 +1,8 @@
 AUX cosign-1.10.0-fix-makefile.patch 1272 BLAKE2B 3a243bcd768b782da852389489fbd208f5c106f93973e855db765d6e92df02548f687aa758d754cd289b7a330f361f7e79e6f7f7f7afce66b8aba00dfb98370a SHA512 b4defd13c441b294a4ef1f8c518a2c55e9d9ae17f9b1fa00eb0d7b948ce6d201da081d4ff17cafd7939204e78cc39b0c9a0bb4020aec5b91249f45b6a4070f30
 DIST cosign-1.10.0-deps.tar.xz 393342088 BLAKE2B 527a143a1a81b86c8d2d2186c6e18111aa46a7cd908c77bf8f6cc7ebd53a4a8461168dacf46d97dc7e2a14d9e7fe1d7cc59cd81a4fd695177863ec5893577ba3 SHA512 9b764f7d642fd2b7ad3210d7b0fe16b1d5d24ea581266e4f43b0039cb63b1dfbac8fa6826d0359ac3a85575fb03562938ced72e6673fe9a5a4fe85601001adba
 DIST cosign-1.10.0.tar.gz 7140596 BLAKE2B 796ada75ce24ba8d2c7ad8702b9abeb82fd3ae75decac58c8e95f41bda7420056659cf76b4d79a1eaf3e3752c91ebb5da7bbb8bfbcfc0e99bea335ee7566183d SHA512 8ce41349737835945b0a5fe66d9b87b8747301c4e067db305ad7fc573bb8e86b2c6ae787944e01f8490a6db7aba72c33e285f098d0b7c710f1e54814a9cb2cdd
-DIST cosign-1.8.0-deps.tar.xz 541301856 BLAKE2B fb1fd9c2570f327876a5d151261f906951c57fdbaa6eefe1dcb84166f71ae381053f44a3d8a5707660cba066435aa6747aa5c47896b19b461954f6c824c33cd2 SHA512 b2773c1f07d32edc6a4ba02c487a3620eea141f29b425159eb2973ef32867afa7f334fdde2a23d00c84314a236b3bd513f1ea8faf231204a7fd9358ba0ba5234
-DIST cosign-1.8.0.tar.gz 7217748 BLAKE2B 2d9625609f86cad05770085617cd80335d62554e608f64abf96a3dcf5f0d4449b850d493ce2faff2593d0f996d2ace3f304d89ef99c7bfa2a2027a419ae6da1d SHA512 7d45e80ae5fa15fa7fe14bc5cd13a159356b58afc3baebac5d2c64fa38c74e73a3d17f75bed0730fe842da63de5487c54dfb9f77bbffa1f943281b74d3b30c94
-DIST cosign-1.9.0-deps.tar.xz 543778128 BLAKE2B 56f1e75c4199ae8bb33e71546709ebf621bab8123036f80e61624929e46d679353a211eb2da30197181f285033293c35f055977d762684bfc88d843deb06edc6 SHA512 07942be16e53e4325b3026b51557f352d45eee0d0b4cf84d823ebdd53573630c9e461f8dd6e93068dc20e6f25d589241a4e809839c7aa2aab65e3b7aebc2f3a3
-DIST cosign-1.9.0.tar.gz 7240352 BLAKE2B c6b9c617e288b6104d683a1b1ce8c22897e122a70429dd3db2a4643b91d4cf492c1fcd016ac4bcae32de51464aea538babbb04a8fe7d3b3275310adba528d945 SHA512 1a2a7b32aa0d4f2ad90113a3b5923390d29564d3ddc5e9c8539c8ad646541734164942e93d56321b9ff78910532911272a0e3ee007c2066e40656caac17d6c16
+DIST cosign-1.12.1-deps.tar.xz 383293220 BLAKE2B d409b64f47c780afcb5e500520c798cdc3035ea773b5f121d1269755edefe43f8a7445072b565accc20507e7e536cc7dab8ea250076a0652127e123b3d1809d2 SHA512 ed0e040f392178ddc954f1e38f4d5562c9840fcfa22a24024c8f20857b4b7f281ba525bbb28286cb883fbd82e11ce74c642d6261c79375f35dcd98da4332ef51
+DIST cosign-1.12.1.tar.gz 6638172 BLAKE2B f748e993cc2c37a67c42255b8c08ca6471c31fb02251ca7d42b8c7e85003aa879907421fc2df2bd8e0e4080865b33ceeafd47fd7b538969bd80f3b566e6aecf8 SHA512 ed53561a37a308481f158acf91e8cdb0dea8d348eb3cc30b3f882717fd18defc6cac330131c5b93609b587c2b8cefa000b1e1a9de5d0a070534f05aa09c55bd9
 EBUILD cosign-1.10.0.ebuild 660 BLAKE2B 02f37073a0ba0880057985eccb0815b261d6c2508d8473cb29e9782d228c976bfd8b6711d81b2ef31267e10c68848b37d562087623861c7fcc2de9cf2ed41f9e SHA512 74c2c90c9ed9801bb212cfe3e6a910e66b068540a7346481bf31f011d6a3c89bc0a16d4846b1eb6236ebb2cbfba4dd575cc5c8618edb8beacd2829ba95b9376a
-EBUILD cosign-1.8.0.ebuild 608 BLAKE2B 464b5611d6dc9bc0027d14ed821c90527cdb6c7b739b1658d2c1eb4ffd515fa75471685f5b708772e39cbc20ecf77f77b66fc54ea02e735066a6fd34ece51247 SHA512 7d2404c8bd7d1d74e246592ed9bbe69af4c337c8dac09882eafaec32589ba9639f430b2b31381506e32f2775edce4a383ee78b40b28cbcc47712c14946436ed2
-EBUILD cosign-1.9.0.ebuild 608 BLAKE2B 9f4853c72225e3e4a87e6db4baf5324a08bff02e3ca3e3e8164a90d5f8b228d5b14eda18875b545295b2b8b347409a05b2017658e5303ab42fcedad886178a6f SHA512 1673577c5978614568be95eb6f7f002d1ee93229942731272482659b9af1cb0fef459e7d2356ee66bcd41d07240aeadcf31fe93e916476ff42f684c744760b80
+EBUILD cosign-1.12.1.ebuild 608 BLAKE2B dbadd4c902ce6b380293d607789b707442d6a513f33ac9fa6a698c708964faf582112e40eee0ec3eb173236ede1b7679297cbd1bf88cb36736178dc85e2e7549 SHA512 83d249e0c5adadd161d2cba81e40cf122abc5d5eb2f428a79cf20b5161848df3832d4a1f497a328a8dbd969278a4ba963ee6110fced94e9a5ce35b90a3a37ced
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/app-containers/cosign/cosign-1.8.0.ebuild b/app-containers/cosign/cosign-1.12.1.ebuild
index d70505278ce2..694db96d6a32 100644
--- a/app-containers/cosign/cosign-1.8.0.ebuild
+++ b/app-containers/cosign/cosign-1.12.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-GIT_HASH=9ef6b207218572b3257a5b4251418d75569baaae
+GIT_HASH=0baa044bea61e7c16d56023be20ead3d9204b24a
 inherit go-module
 
 DESCRIPTION="container signing utility"
diff --git a/app-containers/cosign/cosign-1.9.0.ebuild b/app-containers/cosign/cosign-1.9.0.ebuild
deleted file mode 100644
index 6ee89bf12fd6..000000000000
--- a/app-containers/cosign/cosign-1.9.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GIT_HASH=a4cb262dc3d45a283a6a7513bb767a38a2d3f448
-inherit go-module
-
-DESCRIPTION="container signing utility"
-HOMEPAGE="https://sigstore.dev"
-SRC_URI="https://github.com/sigstore/cosign/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="test"
-
-src_compile() {
-	emake \
-		GIT_HASH=${GIT_HASH} \
-		GIT_VERSION=v${PV} \
-		GIT_TREESTATE=clean
-}
-
-src_install() {
-	dobin cosign
-	einstalldocs
-}
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index 696e34e8fcef..79e880f21129 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -1,10 +1,13 @@
 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
 EBUILD docker-compose-1.29.2-r1.ebuild 1915 BLAKE2B 45e984d2f7c8cf249187355bc2503a1b17642f1e87b0a308779ec027187ed9b700413f2c814880c6618607a3531c766086807b4a9a3021f6695453cc6074cb1b SHA512 37375b33f10219740a7f26b2af9f246635ac9196e17b1bd82337341afcdc21eebedceae1c32139f7c54eaf96b3cfa7a2f25c632a4d96b2a10708e80f5ec1cca1
+EBUILD docker-compose-2.11.2.ebuild 1194 BLAKE2B c1191a4dda3d95bea0a55042a3732e1d46a4479e255d8adfa585de7b107a62a8580267edb11f742e9a4e9c15b954647797b08bba4090f5f6d53395fa4e18e140 SHA512 6560b5c9fb957b800843ce8c77c55227dba2d67a58063223fd5a0535b9ad2f930c3a3e450ff61847ac10004299701ea65d5c1fcbb790285e351342092b49e172
 EBUILD docker-compose-2.5.0.ebuild 1242 BLAKE2B 48e1062372861a1707356495b38ebdf3818a946538f1798016dd187969cac14c88a4c2e268f13f4178be10a65ef4d3cb1d2fbfb58e6d39ea6c4ed8bb03cf1727 SHA512 ba6439a3d2e6f62ae36a780a7c421d0316e2d70e0bf5327bbef4aa27ed9cdc0da0537b05416480fcce01dabf871245ef4f70176ef1503ccb20a4d4f791bb3cb9
 EBUILD docker-compose-2.6.0.ebuild 1242 BLAKE2B 48e1062372861a1707356495b38ebdf3818a946538f1798016dd187969cac14c88a4c2e268f13f4178be10a65ef4d3cb1d2fbfb58e6d39ea6c4ed8bb03cf1727 SHA512 ba6439a3d2e6f62ae36a780a7c421d0316e2d70e0bf5327bbef4aa27ed9cdc0da0537b05416480fcce01dabf871245ef4f70176ef1503ccb20a4d4f791bb3cb9
 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.11.2.ebuild
new file mode 100644
index 000000000000..26e531c4ce68
--- /dev/null
+++ b/app-containers/docker-compose/docker-compose-2.11.2.ebuild
@@ -0,0 +1,50 @@
+# 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//' Makefile || die
+}
+
+src_compile() {
+	emake VERSION=v${PV}
+}
+
+src_test() {
+	emake 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"
+}