gentoo resync : 12.05.2022

9 files changed, 3 insertions, 381 deletions

diff --git a/app-containers/skopeo/Manifest b/app-containers/skopeo/Manifest
index 25632ba2b8e5..377b5abfdce0 100644
--- a/app-containers/skopeo/Manifest
+++ b/app-containers/skopeo/Manifest
@@ -1,21 +1,7 @@
-DIST skopeo-0.1.41.tar.gz 4692408 BLAKE2B d5e99be0cb478065f1478beda355abc11c8f13ad8446251048502da1b1af38d407ec46d284e59d2018af5d1ca6a953ad6156a306e9bc1acbdb22b447fe17a59f SHA512 924af178eb9621395cfffcf51aa072886dc8c20746bce1599a503df8c54794e34184a1fc6fd9582b889c7c8efecf8cf192797bc8e208b90c71cca31bb970d8e9
-DIST skopeo-0.2.0.tar.gz 4295805 BLAKE2B 4ad13ff49bec56f3766e8d94f80fe8e22edb011b8862fb1249882e5695fa9260a6e2ce3d8345411ee7717cb92d4c1516268678f0884a62b02bfc8c9a554367ee SHA512 89d416110561dbe967860f752db607634a37b12adc376736de48264ec064abfed6b3db9ae195ffb3e9616dd6d65528660a23f2a5145d4674ed47cf443f17295a
-DIST skopeo-1.1.0.tar.gz 4516471 BLAKE2B 665acc925cd4f0a97919bbc03db37ca9b5636d110e4780b5053c4a2773b4e524dd879870262f1760aee7413f52c7614cc4adcd56f20881cfe20b2c9a3af09dc3 SHA512 84ce9d786a471cf7d2551ae884801255b0fe501a21d3d2bbbfe0bb9e9c771105b00cdcfc1bef2cee5bd5ce55d0fd30be49c87c09361be47854dbb5e8e20e13a5
-DIST skopeo-1.1.1.tar.gz 4622784 BLAKE2B 3f72a812409a48d960fe36028355cf7128dabbb466bbb20aae9d8dda81a35e018e5a3cf4d430beaf8834f5355d6293a01b7702e88713557afb58216bffd9f3e5 SHA512 7d38179d550a1461f58d2d590d69ea8445d2c1d399a7cf39fcbcf6aab64da056c6de0f772f28eb60aec04c379d2cf27cbc5678546005ea6c1e8c20b7fe5b8676
-DIST skopeo-1.3.0.tar.gz 5593261 BLAKE2B b26e39d821e63b31a1cbd23bf7b836fbe3185f45ad086c8d0f427309590dbaf196fe09af9aca4aae10c30423c3828375ffe6c95c9c9fb1dea739404e98d8554e SHA512 5b6e96fff4670d8dcbc787cd5a568112337a111e7c44111226fa5684edffa880a1d632660238c55b6193ba26496697dd7e38d7d015cdfd61ce5efb119f0e12eb
-DIST skopeo-1.3.1.tar.gz 5595931 BLAKE2B eda2767a1b1b899b99fc70ef361541c388cab77d4521cc2792baf78ca2474e73ff2d7d64d26f713410a40600866fd6c20855d4acdbdb0a31b11d7efaa8101b83 SHA512 65b8ba735bd409b25b56a5538de4e09edfd11d684752a6e9d28037d0f2b80aef80796c2e9588fcf192d24bd885cc7b2d65b0ee7f7c34d18b2eacc25816da5d36
 DIST skopeo-1.5.1.tar.gz 5636533 BLAKE2B 7f0e86cdee5c3250ec1280d7e71554ac2f8ad96ababe0e81dfabc00e8c128a13fc0c9c561b7a9be389d7386e9f664b95118bd2122612b9c2e8844db49769c03c SHA512 3f8c730eaa739bf2a29b82d3b04aa4eee1c09f957b61964fc8c48e59d1537bcb87b5bdf9c18fa48f9d36cf2b7ede3a1448918a20b5a3167f6ce09881a6cd3dde
-DIST skopeo-1.6.0.tar.gz 6542541 BLAKE2B d2898d8f80a04340e3174179e2397f7b5e66ed50ec8c11919adf1b0620c74a3a69f8be548c5c3bf081735e1a86dc5ae3390d058ef64fc4b73d8f01074ef4a210 SHA512 13a3660780ce43e31a9840811aaa7626f9d0de9999e52c469a2a58b4bf96bd5e4d67e0f0556ac2baef14c5a662afae1f2d407b260c8833d573326791a2193e48
-DIST skopeo-1.6.1.tar.gz 6543397 BLAKE2B 25ca8bc99b03516cb2312c5ce36c13ec87ad34f3831a04e37d5c0f5d4afe2a60ae5d8e6039d8d3651b978459cbdec65f6f43259116368a11b8c6d3478b8ca733 SHA512 92ebe121ae41b2f192e52e24ae05a2f12fedf3483f8d342f6bdde9cb902a291e0297b187c614a64a5c1a62098c7dc59d8a5e5fd1f61b48e4030b163822b47a2b
 DIST skopeo-1.7.0.tar.gz 6542347 BLAKE2B 990ad594df9483ad114debeb2882ed3976306d69983ae3d91d807e2654583e7a6599ddf50152df9a937c1c64c1e5a8abb6ed83433036e7efd4ef7e911f99c191 SHA512 7d17f98e86677150fb2ddba9edae18d8b1ac8f06fba575268e6ba54c60f7b371b5e5a9eab1a4fe19da6c7e85eb79c1eef169ad2a39eff979130ee8d141bd8d6b
-EBUILD skopeo-0.1.41.ebuild 1330 BLAKE2B d17e46533d449b957b0829d2bd7790610fa3f1f314500b9a830d2710eeef33c6b0c8125bd803125245b361aae351e241bd8754683d0d28a6f63746d2cabd58a6 SHA512 c907e07d0587e652f425ac91be2dd5648820622864fea7845558db2f6df1f3c21ccd029f24b9be8edccf3e51679290fde22526590dcd55558227909ae520878f
-EBUILD skopeo-0.2.0.ebuild 1396 BLAKE2B b36f33f7ab6c5fc8f963a16a505aa2e72cb5c74b2639eba02096e12a6d7b569ce64bac8c5f1072926ec8823532eeecd6c72567a910d4390c1639b07db358f78d SHA512 e77213f9d79443d813d434b2483ef5c685db5791eb1f5e56418754ffbe53ce76a6390964bfd1fe4fcf411a1fb037045ec86157d434adde6d593d2dcdbfde3cd6
-EBUILD skopeo-1.1.0.ebuild 1403 BLAKE2B b6f3b24584bf50ccb2c73504b92f316badc9bf21740e161923160aa6bbcf69bf1e881c080a50b61a59e107605cfa742b6f59ecd63bdb793a4b3e87979a238323 SHA512 13bd64e17ac13bf1a2778f76ac04675870c3e47b66c4d5acb0fbc8f5bd941f336425a7da5a2548ff8c91e49995fc6ecea658672f2c1ffa6c57b0449fb6700b5a
-EBUILD skopeo-1.1.1.ebuild 1403 BLAKE2B 4f2e45e5a3acdb8e0ca02dc0c8f7ac788010fc54aeae9369441d31c96c5e475414ba62d69c8f2cbaab01b9f196c26e88a23472718051986284608703b1ca81db SHA512 2c1333335a8530ab37fa791974f5f3a1c08aacb1baa992b4eda4e1e3599a2136130553d916811bfd40e16381e7c64f87dc9bb50c8310c3a47ca209f54f462d6b
-EBUILD skopeo-1.3.0.ebuild 1403 BLAKE2B 34a3d2a275af0547b7cefdb3c79602c60cb71651650cbbb0b7e410a6fde21b08306242eea76b120a65c9074251499776529d166cbfd46aee50254652ae585a90 SHA512 6d9139dd8873dfa98d7488e9f81df5ec2ff8d6d3914824f173918638c0c76b7b9531fa4f83e62f1c0d7b1b96d8e745945d0623dce1de1090c59ad6fea9997741
-EBUILD skopeo-1.3.1.ebuild 1403 BLAKE2B 34a3d2a275af0547b7cefdb3c79602c60cb71651650cbbb0b7e410a6fde21b08306242eea76b120a65c9074251499776529d166cbfd46aee50254652ae585a90 SHA512 6d9139dd8873dfa98d7488e9f81df5ec2ff8d6d3914824f173918638c0c76b7b9531fa4f83e62f1c0d7b1b96d8e745945d0623dce1de1090c59ad6fea9997741
+DIST skopeo-1.8.0.tar.gz 6577667 BLAKE2B 21565736a13d2fcce2576fcc1ff522e81b74aff6c18058f4c994e4f0fc12efa38706ba4c07bbe35abd7e339d9080783f766b68325b01cba90c3cd82f19470aec SHA512 697242244e533b597f481005754301efed8581018cdc297e071fa24347301ddf6111d1f1d3ccc6e87e3e5a9ea606e9c6b40c47bf69d2df6b44336fb260f546de
 EBUILD skopeo-1.5.1.ebuild 1403 BLAKE2B a4c236cb6248a1551c90683a45247d19d5634ca7e9ca801761953131f73a7bd0058ab5bcea1d7b2593229eb20c6482e2dae833443227467daccef020b23b5f88 SHA512 b163486639a8831eb20db3a5906378485f0aaf3299e815217b1c8a2f4e27ca35af0bda40e6265a7c58107588cab429c0044717666cd22c43e8e21c73a75277dd
-EBUILD skopeo-1.6.0.ebuild 1405 BLAKE2B 136d1359c55535bddd968a42d6b4792aad910b3ffb24dbb86d152ea4db5905452fd9fc30f2aa2e5ae62321f5120457dc976f852d4fc75e58b26a4208a9503f45 SHA512 d6bb772ca42e2716c8feae529d9fbe298b83911e2852004f0db8571023ca1fb227ede68082861ada291001831a0e4d1c546860452a588d29e8cdc6e9b226536b
-EBUILD skopeo-1.6.1.ebuild 1405 BLAKE2B 1ce30ee0d951dbd3c26ca1d94b80c1335bb674b98d54a0a9b1fc6a01fede332958c9f9edc9a169501126bb13a62f1edef521e7893ac5025e7eeb86fcbf7ee276 SHA512 9e041aa3284a1157e458f8343a6d777921872482b7991ff86e437edfc9663f23df3aa9e173deb2d85f35ece897cb5ce0608536a9cf26def8fe6e3f63172ab856
 EBUILD skopeo-1.7.0.ebuild 1405 BLAKE2B dce3e36f77136de837bc5111de50f4db5ecf97b536b141e36c011258890efe1d8523557d917793c83b3a85cdbe8ce84e9c129087c1a1d09d2f5be21775dd354c SHA512 5618521e281c41e9e9770c830ace7686a757295c7b1c04fca7ce65ecf816ca2e5c49e8309d9dd89114f8539e334c1a1d2aeec83ea233e918247abd6422c62c91
+EBUILD skopeo-1.8.0.ebuild 1405 BLAKE2B 8ad2416a913af4c39d58101131826e3bf0783824378452c2a4c282f74ff89688a770c1afb169db1326ce3cf1683ca31d1d2943fa20e096fb2ee2c9b2135ea9f2 SHA512 6cc2d62ba405d74ab4a120994e12735257b5439c6cecd9c88bd324eab9e20a35a7c30bdc262d4b2940e5640c4f5c583ba1907b563e86773a42959993bcc3520a
 MISC metadata.xml 343 BLAKE2B 505fa7017cdd1977cb51f19af40301d260e35439a04773312da34b8a265e105fc82628ef8497437d766cf5337e1020f459bbe3fb12ab1a0f659dfe3aab927807 SHA512 14e010518d452a426fbd49bcc35ca8d980ac3f49da449f7af5ad097e4ebad908ec931e67c50dfccf0cb7b7dae2ba1fb1d2b33d41c85263efd22f263fbea7e221
diff --git a/app-containers/skopeo/skopeo-0.1.41.ebuild b/app-containers/skopeo/skopeo-0.1.41.ebuild
deleted file mode 100644
index cc09b12134e3..000000000000
--- a/app-containers/skopeo/skopeo-0.1.41.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-COMMIT=7d080ca
-inherit go-module bash-completion-r1
-
-DESCRIPTION="Command line utility foroperations on container images and image repositories"
-HOMEPAGE="https://github.com/containers/skopeo"
-SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:=
-	>=dev-libs/libassuan-2.4.3:=
-	dev-libs/libgpg-error:=
-	>=sys-fs/btrfs-progs-4.0.1
-	>=sys-fs/lvm2-2.02.145:="
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT="test"
-
-src_compile() {
-	local BUILDTAGS="containers_image_ostree_stub"
-	set -- env -u GOCACHE -u XDG_CACHE_HOME \
-		go build -mod=vendor -ldflags "-X main.gitCommit=${COMMIT}" \
-		-gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \
-		-o skopeo ./cmd/skopeo
-	echo "$@"
-	"$@" || die
-	cd docs || die
-	for f in *.1.md; do
-		go-md2man -in ${f} -out ${f%%.md} || die
-	done
-}
-
-src_install() {
-	dobin skopeo
-	doman docs/*.1
-	dobashcomp completions/bash/skopeo
-	insinto /etc/containers
-	newins default-policy.json policy.json
-	insinto /etc/containers/registries.d
-	doins default.yaml
-	keepdir /var/lib/atomic/sigstore
-	einstalldocs
-}
diff --git a/app-containers/skopeo/skopeo-0.2.0.ebuild b/app-containers/skopeo/skopeo-0.2.0.ebuild
deleted file mode 100644
index c6caefe701f8..000000000000
--- a/app-containers/skopeo/skopeo-0.2.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-COMMIT=1119299c4b27e16680744e8bcf3b5362344a40d7
-inherit go-module bash-completion-r1
-
-DESCRIPTION="Command line utility foroperations on container images and image repositories"
-HOMEPAGE="https://github.com/containers/skopeo"
-SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="btrfs"
-
-COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:=
-	>=dev-libs/libassuan-2.4.3:=
-	dev-libs/libgpg-error:=
-	btrfs? ( >=sys-fs/btrfs-progs-4.0.1 )
-	>=sys-fs/lvm2-2.02.145:="
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT="test"
-
-src_compile() {
-	local BUILDTAGS
-	BUILDTAGS="containers_image_ostree_stub $(usex btrfs "" exclude_graphdriver_btrfs)"
-	set -- go build -mod=vendor -ldflags "-X main.gitCommit=${COMMIT}" \
-		-gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \
-		-o skopeo ./cmd/skopeo
-	echo "$@"
-	"$@" || die
-	cd docs || die
-	for f in *.1.md; do
-		go-md2man -in ${f} -out ${f%%.md} || die
-	done
-}
-
-src_install() {
-	dobin skopeo
-	doman docs/*.1
-	dobashcomp completions/bash/skopeo
-	insinto /etc/containers
-	newins default-policy.json policy.json
-	insinto /etc/containers/registries.d
-	doins default.yaml
-	keepdir /var/lib/atomic/sigstore
-	einstalldocs
-}
diff --git a/app-containers/skopeo/skopeo-1.1.0.ebuild b/app-containers/skopeo/skopeo-1.1.0.ebuild
deleted file mode 100644
index 7a625ebb1c56..000000000000
--- a/app-containers/skopeo/skopeo-1.1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-COMMIT=63085f5bef1131aa9ec0907a5c8d66b67de7c4b2
-inherit go-module bash-completion-r1
-
-DESCRIPTION="Command line utility foroperations on container images and image repositories"
-HOMEPAGE="https://github.com/containers/skopeo"
-SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="btrfs"
-
-COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:=
-	>=dev-libs/libassuan-2.4.3:=
-	dev-libs/libgpg-error:=
-	btrfs? ( >=sys-fs/btrfs-progs-4.0.1 )
-	>=sys-fs/lvm2-2.02.145:="
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT="test"
-
-src_compile() {
-	local BUILDTAGS
-	BUILDTAGS="containers_image_ostree_stub $(usex btrfs "" exclude_graphdriver_btrfs)"
-	set -- go build -mod=vendor -ldflags "-X main.gitCommit=${COMMIT}" \
-		-gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \
-		-o skopeo ./cmd/skopeo
-	echo "$@"
-	"$@" || die
-	cd docs || die
-	for f in *.1.md; do
-		go-md2man -in ${f} -out ${f%%.md} || die
-	done
-}
-
-src_install() {
-	dobin skopeo
-	doman docs/*.1
-	dobashcomp completions/bash/skopeo
-	insinto /etc/containers
-	newins default-policy.json policy.json
-	insinto /etc/containers/registries.d
-	doins default.yaml
-	keepdir /var/lib/atomic/sigstore
-	einstalldocs
-}
diff --git a/app-containers/skopeo/skopeo-1.1.1.ebuild b/app-containers/skopeo/skopeo-1.1.1.ebuild
deleted file mode 100644
index e0c555f2bb9c..000000000000
--- a/app-containers/skopeo/skopeo-1.1.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-COMMIT=67abbb3cefbdc876447583d5ea45e76bf441eba7
-inherit go-module bash-completion-r1
-
-DESCRIPTION="Command line utility foroperations on container images and image repositories"
-HOMEPAGE="https://github.com/containers/skopeo"
-SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="btrfs"
-
-COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:=
-	>=dev-libs/libassuan-2.4.3:=
-	dev-libs/libgpg-error:=
-	btrfs? ( >=sys-fs/btrfs-progs-4.0.1 )
-	>=sys-fs/lvm2-2.02.145:="
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT="test"
-
-src_compile() {
-	local BUILDTAGS
-	BUILDTAGS="containers_image_ostree_stub $(usex btrfs "" exclude_graphdriver_btrfs)"
-	set -- go build -mod=vendor -ldflags "-X main.gitCommit=${COMMIT}" \
-		-gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \
-		-o skopeo ./cmd/skopeo
-	echo "$@"
-	"$@" || die
-	cd docs || die
-	for f in *.1.md; do
-		go-md2man -in ${f} -out ${f%%.md} || die
-	done
-}
-
-src_install() {
-	dobin skopeo
-	doman docs/*.1
-	dobashcomp completions/bash/skopeo
-	insinto /etc/containers
-	newins default-policy.json policy.json
-	insinto /etc/containers/registries.d
-	doins default.yaml
-	keepdir /var/lib/atomic/sigstore
-	einstalldocs
-}
diff --git a/app-containers/skopeo/skopeo-1.3.0.ebuild b/app-containers/skopeo/skopeo-1.3.0.ebuild
deleted file mode 100644
index b18397b2e83c..000000000000
--- a/app-containers/skopeo/skopeo-1.3.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-COMMIT=c35944bec010fe9b534881aca153ef5964f5a010
-inherit go-module bash-completion-r1
-
-DESCRIPTION="Command line utility foroperations on container images and image repositories"
-HOMEPAGE="https://github.com/containers/skopeo"
-SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="btrfs"
-
-COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:=
-	>=dev-libs/libassuan-2.4.3:=
-	dev-libs/libgpg-error:=
-	btrfs? ( >=sys-fs/btrfs-progs-4.0.1 )
-	>=sys-fs/lvm2-2.02.145:="
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT="test"
-
-src_compile() {
-	local BUILDTAGS
-	BUILDTAGS="containers_image_ostree_stub $(usex btrfs "" exclude_graphdriver_btrfs)"
-	set -- go build -mod=vendor -ldflags "-X main.gitCommit=${COMMIT}" \
-		-gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \
-		-o skopeo ./cmd/skopeo
-	echo "$@"
-	"$@" || die
-	cd docs || die
-	for f in *.1.md; do
-		go-md2man -in ${f} -out ${f%%.md} || die
-	done
-}
-
-src_install() {
-	dobin skopeo
-	doman docs/*.1
-	dobashcomp completions/bash/skopeo
-	insinto /etc/containers
-	newins default-policy.json policy.json
-	insinto /etc/containers/registries.d
-	doins default.yaml
-	keepdir /var/lib/atomic/sigstore
-	einstalldocs
-}
diff --git a/app-containers/skopeo/skopeo-1.3.1.ebuild b/app-containers/skopeo/skopeo-1.3.1.ebuild
deleted file mode 100644
index b18397b2e83c..000000000000
--- a/app-containers/skopeo/skopeo-1.3.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-COMMIT=c35944bec010fe9b534881aca153ef5964f5a010
-inherit go-module bash-completion-r1
-
-DESCRIPTION="Command line utility foroperations on container images and image repositories"
-HOMEPAGE="https://github.com/containers/skopeo"
-SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="btrfs"
-
-COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:=
-	>=dev-libs/libassuan-2.4.3:=
-	dev-libs/libgpg-error:=
-	btrfs? ( >=sys-fs/btrfs-progs-4.0.1 )
-	>=sys-fs/lvm2-2.02.145:="
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT="test"
-
-src_compile() {
-	local BUILDTAGS
-	BUILDTAGS="containers_image_ostree_stub $(usex btrfs "" exclude_graphdriver_btrfs)"
-	set -- go build -mod=vendor -ldflags "-X main.gitCommit=${COMMIT}" \
-		-gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \
-		-o skopeo ./cmd/skopeo
-	echo "$@"
-	"$@" || die
-	cd docs || die
-	for f in *.1.md; do
-		go-md2man -in ${f} -out ${f%%.md} || die
-	done
-}
-
-src_install() {
-	dobin skopeo
-	doman docs/*.1
-	dobashcomp completions/bash/skopeo
-	insinto /etc/containers
-	newins default-policy.json policy.json
-	insinto /etc/containers/registries.d
-	doins default.yaml
-	keepdir /var/lib/atomic/sigstore
-	einstalldocs
-}
diff --git a/app-containers/skopeo/skopeo-1.6.1.ebuild b/app-containers/skopeo/skopeo-1.6.1.ebuild
deleted file mode 100644
index 39920f95e67a..000000000000
--- a/app-containers/skopeo/skopeo-1.6.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-COMMIT=49084d2cd8c9f8e7b38ba8405d61e701d5381bc0
-inherit go-module bash-completion-r1
-
-DESCRIPTION="Command line utility foroperations on container images and image repositories"
-HOMEPAGE="https://github.com/containers/skopeo"
-SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="btrfs"
-
-COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:=
-	>=dev-libs/libassuan-2.4.3:=
-	dev-libs/libgpg-error:=
-	btrfs? ( >=sys-fs/btrfs-progs-4.0.1 )
-	>=sys-fs/lvm2-2.02.145:="
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT+=" test"
-
-src_compile() {
-	local BUILDTAGS
-	BUILDTAGS="containers_image_ostree_stub $(usex btrfs "" exclude_graphdriver_btrfs)"
-	set -- go build -mod=vendor -ldflags "-X main.gitCommit=${COMMIT}" \
-		-gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \
-		-o skopeo ./cmd/skopeo
-	echo "$@"
-	"$@" || die
-	cd docs || die
-	for f in *.1.md; do
-		go-md2man -in ${f} -out ${f%%.md} || die
-	done
-}
-
-src_install() {
-	dobin skopeo
-	doman docs/*.1
-	dobashcomp completions/bash/skopeo
-	insinto /etc/containers
-	newins default-policy.json policy.json
-	insinto /etc/containers/registries.d
-	doins default.yaml
-	keepdir /var/lib/atomic/sigstore
-	einstalldocs
-}
diff --git a/app-containers/skopeo/skopeo-1.6.0.ebuild b/app-containers/skopeo/skopeo-1.8.0.ebuild
index ab507a164049..c3dcc4973b2a 100644
--- a/app-containers/skopeo/skopeo-1.6.0.ebuild
+++ b/app-containers/skopeo/skopeo-1.8.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-COMMIT=e4b79d7741c40434838ece2790be537083fc2a04
+COMMIT=37727a45f96ac208785b606f7772d609bf50dbc4
 inherit go-module bash-completion-r1
 
 DESCRIPTION="Command line utility foroperations on container images and image repositories"