gentoo auto-resync : 28:02:2024 - 05:40:38

12 files changed, 35 insertions, 152 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index dfecabd2ed39..a970ea0f3c9d 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/devcontainer/Manifest b/app-containers/devcontainer/Manifest
index c9cb3126d0db..8462dcfa25b8 100644
--- a/app-containers/devcontainer/Manifest
+++ b/app-containers/devcontainer/Manifest
@@ -4,6 +4,6 @@ DIST devcontainer-0.56.1.tgz 604649 BLAKE2B 887a034a9771843ce84be1b78d00ba7b52d0
 DIST devcontainer-0.56.2.tgz 617293 BLAKE2B 33eb4ae861934e78b9e73e77ed23ec1177e09785cf72dbdeb07e3d80e86ba1ac69f26bc01e150609cd20bc6c7895afc9b6118ae4d5007413b066986c75850a11 SHA512 188fdddad81a7f8cc5409e646c467fdc0722f0d7e45f3b24ea0614a9007c714ac9f8aff13f0e8a65f6c0e06e8769b1a4cba792a5575ce0733379ade45998fd27
 EBUILD devcontainer-0.55.0.ebuild 871 BLAKE2B 1233ec4b1f837432ba4260d0dcf5153a551fe088b6dd2367fc8223819dfe5682a0314d6db0ec590188fa26fe0e6ed3749f54cf9aff6366b39a81e9dc1b35ede9 SHA512 7dc3111668960995c21f17ebfc583035e23b58560a26289390a8da2050270b2d66e6d7e4e8bdf465b2aa712ace6c9fd57943aecaacd27f90a485b2fb45cd5d5e
 EBUILD devcontainer-0.56.0.ebuild 871 BLAKE2B 1233ec4b1f837432ba4260d0dcf5153a551fe088b6dd2367fc8223819dfe5682a0314d6db0ec590188fa26fe0e6ed3749f54cf9aff6366b39a81e9dc1b35ede9 SHA512 7dc3111668960995c21f17ebfc583035e23b58560a26289390a8da2050270b2d66e6d7e4e8bdf465b2aa712ace6c9fd57943aecaacd27f90a485b2fb45cd5d5e
-EBUILD devcontainer-0.56.1.ebuild 872 BLAKE2B a49d606609bab843fc1f6f8edecdaa2b837a385f6583d99e97c07168795f8b41057d912fc0b82c5afbb2861efeef9e7fb0fa5b3752fd66f7211f51c31aa10519 SHA512 1d2925d3544b438ef352bf3b386ba65686c888c9cdc5841e4ba280b457ead591c1f91d9ad06e6e4db41d5d9fe0094c1b8b7ab2112730eab88ff7921fefed937b
+EBUILD devcontainer-0.56.1.ebuild 871 BLAKE2B 1233ec4b1f837432ba4260d0dcf5153a551fe088b6dd2367fc8223819dfe5682a0314d6db0ec590188fa26fe0e6ed3749f54cf9aff6366b39a81e9dc1b35ede9 SHA512 7dc3111668960995c21f17ebfc583035e23b58560a26289390a8da2050270b2d66e6d7e4e8bdf465b2aa712ace6c9fd57943aecaacd27f90a485b2fb45cd5d5e
 EBUILD devcontainer-0.56.2.ebuild 872 BLAKE2B a49d606609bab843fc1f6f8edecdaa2b837a385f6583d99e97c07168795f8b41057d912fc0b82c5afbb2861efeef9e7fb0fa5b3752fd66f7211f51c31aa10519 SHA512 1d2925d3544b438ef352bf3b386ba65686c888c9cdc5841e4ba280b457ead591c1f91d9ad06e6e4db41d5d9fe0094c1b8b7ab2112730eab88ff7921fefed937b
 MISC metadata.xml 886 BLAKE2B 6255ba2337a21bd814e0472648cf4eb78b7c3e6ca6ead9f154cc70b662b7721ddc62137f1ebf542123c7d716e0ff94527f7a1aa99786446c7ffd36bbbf9c9efe SHA512 6dd2c48ee1dc5b722768780f20c32dd424af327fe7a580eb4f8ce31712dff211ecc9ebe1eae4ca22ec3a90ef5b3a6690407b24fc11c45000a7d986871956d407
diff --git a/app-containers/devcontainer/devcontainer-0.56.1.ebuild b/app-containers/devcontainer/devcontainer-0.56.1.ebuild
index 991cd956e37b..10d7f50fc167 100644
--- a/app-containers/devcontainer/devcontainer-0.56.1.ebuild
+++ b/app-containers/devcontainer/devcontainer-0.56.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/package"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	net-libs/nodejs
diff --git a/app-containers/earthly/Manifest b/app-containers/earthly/Manifest
index fe36a8e64529..38a397d6b3ef 100644
--- a/app-containers/earthly/Manifest
+++ b/app-containers/earthly/Manifest
@@ -7,7 +7,7 @@ DIST earthly-0.8.3.tar.gz 8034636 BLAKE2B f61133eda18d81588d35a1b4916bdc72e3a037
 DIST earthly-0.8.4-deps.tar.xz 158470344 BLAKE2B c3ec6369f8b397abd9b76dc77461c628e14ecc5866c8b66d094c3fe3194b18330be78454b57f211a717785210da40dc3c83e7d9769c62d621ca42a9d70f7be7f SHA512 d9b0960e02cf288b933a8da954e597957b2e8dc0920e2dca208a17d41c84bc1bcff789ee1c02fa930d5d0a816cb03437b091375168e0f46f3d3cf330a643b308
 DIST earthly-0.8.4.tar.gz 8041021 BLAKE2B 66057e29d4b287a220d8799efb4a1c5c43ea7641029e3af59bf8556125df28f9eafddc20d515fd20fab8c09bbb6278af4ea525f4bbe38d0e24ee031fc65c7336 SHA512 b663a10feb255329dfca30d5d70cb5c36ad5f96ed2b0cd30c46dd1b4ad087ab15b941fe6d3be3e32b1eee8199b5ee8ae50d61739c290b8967b6fcfd4126327db
 EBUILD earthly-0.7.23.ebuild 1813 BLAKE2B f467ed655eb54b39dc41f50f95f293898779a5efd30892ffa243e48e5524e6e90ef76825906745541d5ca1e6f43dec46cf30c734deee64f2f2eb79e81641a098 SHA512 35c1754664cd08dd6c582909aec2a23e73d404d0d9bc003eba5c63b6e1ed230c1674cc71c64809182236a558481c7e05b224fe541a8b6eb4e9d81532037349b2
-EBUILD earthly-0.8.0.ebuild 1801 BLAKE2B 476e1e789d9656e9eba53469236b84a6da504e065e8b0c820db739ade650c82c2e4aff48bc1f0e0b899cc870a5fcc220a9c40de73d2cf005bb6ab0f520f13f78 SHA512 cfc25d37cb0ae1ae068ff0b8eadf1fd7c50e28215ffc2bcacd7cbc9c49bed2b2f72428282405a704cbd2f8a38f8d769764c3abc9c9c48cb315dced781bd86634
+EBUILD earthly-0.8.0.ebuild 1800 BLAKE2B c06dcd832279d384bce9223b065f5edf89c0344464a6e903a41613849f8ec00f8fc88989fd780f63b89a75b821836dcb21551b498959da0a62f18071248ad4b7 SHA512 da7534851b3d8e7eef39ba09ebc90dc4f785661879e7fa2cbfd7e65ab3ba9cb35ad753088e4e390bb3d93ab3003740c92403177e5f7dd9e40b83d2c47c3d9b26
 EBUILD earthly-0.8.3.ebuild 1806 BLAKE2B eb6140758b673eeedaba24ad4c342eae44f86c5fa2052e155cf91ba027eb17d070ea2a258afc3d9e0c5a6b101abf0a4751c93f00a656b0433613fc53e38f5d52 SHA512 64e7cba6912563a223a1be0463cacdfd76815cd5c7d31d7e05a2dd2c2b9a8e8a75e032516b7d2dd039d42335ff1b397b8f210063629b03b859d8ccace126c692
 EBUILD earthly-0.8.4.ebuild 1806 BLAKE2B 76b450d95330496cc88850d080993a09fdfec4b3c9ddea23cfb0e11e376058d782e67adf713e6a042f939951cb40fcf9c5b6b97e47f3042ac90730079005b207 SHA512 08f376f6f2b2aca415881f4e34fd4b058020de98168bbf1341a245d36b9a5100487ca51fc1d1e2a297547817c6435196e2656b83f5ef2b8910502b19adaa977d
 MISC metadata.xml 927 BLAKE2B b7d5184df16f39603bf6df8b503e701d737fec188d1d97673e4ca59babd990c1b872784c91db04c74d9a08dbffa76f4e7530d8b021cbbe9ae51fd9966f709522 SHA512 f7f49eb583b2b5a9939c26e9eaff3917392525c3a94e5f8274c89b69e172547ad02fa4ed1b078e7d778f765659e1b9a7cf99d88042034cfbfbef54e685c8b6dd
diff --git a/app-containers/earthly/earthly-0.8.0.ebuild b/app-containers/earthly/earthly-0.8.0.ebuild
index ebf995573dfa..f36efb1e95ed 100644
--- a/app-containers/earthly/earthly-0.8.0.ebuild
+++ b/app-containers/earthly/earthly-0.8.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	|| (
diff --git a/app-containers/nerdctl/Manifest b/app-containers/nerdctl/Manifest
index 6848db37c959..14f538fb5311 100644
--- a/app-containers/nerdctl/Manifest
+++ b/app-containers/nerdctl/Manifest
@@ -1,15 +1,7 @@
-DIST nerdctl-0.22.2-vendor.tar.gz 8374960 BLAKE2B 84b8cb1bef03d05f9277c6931f1f4596609b35ba4e555b02885a5ad99aa692ac8c7b32c778f18993bba518945816dc9ca2ebdb4818b733fc999c4b717c0c7313 SHA512 fa6c166c5376395e129b2b79653382c7e5bc6fcc4a744063afd92fc4b5e84afc41489543c58c0f65c893d7b3d906d502b520d5cb4401ca4ca49c9526606c9291
-DIST nerdctl-0.23.0-vendor.tar.gz 8420534 BLAKE2B 824ea8761a81ed063b853f5a78bd7506f7eecfe6f7b6e3e7d9fbb7113477c32236b59e669821851117b07eb7b5be82cab6b8750ddef59a053535dfa48a65dc77 SHA512 e8431d292a0e8f6db828b3475bb2e918612961b46212e6dcad6b1edadf6fca828c7ff0aeeadbc6e847b8a2d2b0c362f789b6a19ebb6c20922e0f77e46d3df84a
-DIST nerdctl-1.0.0-vendor.tar.gz 8189234 BLAKE2B 610cf1cc3b68f110023e4d2c7aea99b33c702e4f11afa39db92e1c1ae3873500a12bb71cbbf547d03eaaa9a2b1c277addebef48759abdcafa85500d0cd382cc6 SHA512 9367dd9339b62c3ef0bea7f9f85040dacd9cffc527f22175ed4337c76a16f8dad554fed4086eeee0c58286a751c061fddd21f119504dbd26ccc46ad3b44d0799
-DIST nerdctl-1.1.0-vendor.tar.gz 8022993 BLAKE2B 7fe1f1337255aaac39137a7081141ace4fa762e1dda683370843320dfc6549129aaf998737684c60067f7d0765bcd143b6598c7e43b247aeb9da5bf4ba027fd9 SHA512 382382abae0cd07afcf525bce3d424461dcd3c19086bf8f2847ca43ca17db218bc99afdbe36953fd9eb63689f68484c82973dffe087dc8bf9f963d6a6122bfff
-DIST nerdctl-1.3.1-go-mod-vendor.tar.gz 6756835 BLAKE2B 55ba1d184bd57cadc30e1f539687461065efff9402f063ff2660e03f61b771ee110d79eeceb451fc4e5eb5e1ac0e8fc4281e17ee43663996a9de0175d20a80c2 SHA512 5d15fa5e723a14d992c1834d4c3327c4d137a240d9edfffa3ca51e8ba502006de1d75ea4c5252a78622eccae333b039193546d5f037ba7d95cfc9ef9bea2268f
-DIST nerdctl-1.3.1.tar.gz 509270 BLAKE2B bd51203db7fc45098328ba3c6dc6864be48e3f6fcb21bea4b79ac14979e79a1e16f3f556c6fc00c26b46b9ddeb200f3d1e7f8f9c8c4d2eee4067b300ea3ddbf1 SHA512 478a9ae8162233a12c569ca9a2216dda652d450944a9fa70ba7b4b41405b5f569b870a8a9d6fcaa14afc2991ea9e97a20ebfa9b1b5154e052c65fd78d6f32e3c
 DIST nerdctl-1.4.0-go-mod-vendor.tar.gz 6711566 BLAKE2B 242648545d82bfcdde6dd5056e4225d9b37021a6b210632ad112e18659d3f6f89bb53e31aee55106b5654080fab8dfd33268138b5f0a0b36d425395e1be89728 SHA512 fd2b3d30c35dee73eb2325188477659fc08a974737b8f555275524368aa59583987b04f19057cbd4c03c0bf7df89f38e3d115c36da2f089ac9d908bf77e774b8
 DIST nerdctl-1.4.0.tar.gz 515068 BLAKE2B 68daacc251322b5efe0591fe6cd615cd7a11df803a66a3a151b3ae46e1a3b22bfbde7726bf4418b0df988965578cecd3dc2fac67b45b1d765d059c92aab1ec12 SHA512 b14cd92b76d9699b4042fcd7a6906b1c714221b30cff1074a1d59ea038cf74ea6437d4a4d9a265e7b0f4c96397c82d53856f9e43d08aa8abcb98af5e9fb6e8dc
-EBUILD nerdctl-0.22.2.ebuild 989 BLAKE2B 37554b2f0f2a4454315f8e8874efdb1fa2b559e21f32982d3195a43b8deef1e9e6c8e5e98fa955d1b8b740582c3a069c7141693a498b5df7b8830d141b6c8713 SHA512 a759af6318826e41dcc439da16e1a36f86af9d053bc904ef80676bcb4f4aba152c3f02201e4fd16d5e7406c271164d4dbb77d59778331acad5fe00865b8723e8
-EBUILD nerdctl-0.23.0.ebuild 989 BLAKE2B 47a7ac4ccc3be14eced47b04f508aeebe66b251b48007c5262b4ba6bc843e12b79abffec6241460488340b5cd55426d45835f174c1cb8b5c2a2ba8a6a7433100 SHA512 42b9bb0acf1fdf996bed5a26e4ad20067c221c7ffb066061f8cada2d04aa03c0c72f229a8b95b62b43c49fb756fe3086031a32dc84d00266f035fbc6fc22c1d3
-EBUILD nerdctl-1.0.0.ebuild 991 BLAKE2B e7c63a9eb8adbd93d0795d2a5fc3c7eb0c19ee8e80bb616025d0419adc8004eac342760361493f10162fae0f30ea98e497c2fee5138b6ea8f137b534fc85f0d1 SHA512 cbeec4d6601632adb4be4570d1014c3c4e660220eecc8e6ddd6b0e4d7318ad5c3da24398418130952e49b1eeca2f2ba922e407aa3785edf8fe7b42ab08f94833
-EBUILD nerdctl-1.1.0.ebuild 991 BLAKE2B efbad50e4aea343bf75682a3e8fab5e71c6f5d608a8875bb8b05486fa5544b1905ca61ad1f531401493592a8bbd1b99c92f8417ba783b4aa495a44645a22e484 SHA512 0678083fada30f4a6d8e980e5fcac18534becc2c865cad492cfba895e8c475f69c0e8966b012680324b36500c99d39b41034a137a6f0a84d3f2215c89620c7af
-EBUILD nerdctl-1.3.1.ebuild 877 BLAKE2B 0c553462a6da40cb99b4280e5d56678d6eb0d811752fe881dc6234d7f52d42b05bb6f3f4dda3b9686310a9b56064511056396a3aecd34f80067fb2cc914a0445 SHA512 870171d4f134f2e1ecb5781aaf87f5fc8d636f7b09bda37975252ebdaaad26234cf47056b4303360b3515c9f4e09dca4532ffa69be275a48492b6a0812f4d505
+DIST nerdctl-1.7.4-go-mod-vendor.tar.gz 7197938 BLAKE2B 14a95cd634acc652d5532d1c6aa28abf24c1cf26393d63fd627e864ba73e5f3355832afd8c3c31eb0dcef9ae1d82c35a7df49c017c5719b45145496ec9243e79 SHA512 aefc9d23114bb2ca0a640287ed27e2afeeb9075a4fdfa33817310300ac8a1ca492defd4a5436f71f4f06a2b8916a75793ce846eac0878a8e51e1accadd21d13f
+DIST nerdctl-1.7.4.tar.gz 516231 BLAKE2B 3f1726945c5b816b4ca922187ae0bde0af82ca38227fe3ad2509b8b1654a2ee22d3929296d9633275cc7c3495202c66d90a956ac92c790f17eb2d1254bdb2c17 SHA512 a2cf60e2d704bef6a9c2abc697ef44a6a833b5fcc276bbffec503437281c830e2cd73fc541ef85be2444bad8f2b827c832b7685a3c74ebba503019ed39a19d75
 EBUILD nerdctl-1.4.0.ebuild 877 BLAKE2B 31e5421ce3eb68ce07f942d43d075ed78c6b0b2f7cafec4b0da86a9745cf9196364887b36e313b616f9af056562f2cc491c048d01119c6829e2533a1ba53d3ac SHA512 85b960d4aebea5f9a8e7fc68a7bcb29e6356800b3f0349bcd0070ccacae195b5db44b10aa64a47be0a50cdd03b23980409c3da0d5e74b78572ea8b61126f5720
-MISC metadata.xml 328 BLAKE2B e1284388fe40d8aa709a783d583fc6116eafc276e6d3e65741a03dea3cfb007549c1dadfdc2eea8ee92e430c22b734ad76944efb9c00082b4dc84e003c684763 SHA512 27f4323cda23315264bc5ea386e19b3faea4fc4808835c7105b2827cb98ed62bbbc49fa9676bd8e897d66e1b2d1cc338eebfff4c7ed01b769c13f1b72e3d5252
+EBUILD nerdctl-1.7.4.ebuild 1105 BLAKE2B 687902768057732a6fd0969e0325cea5ff5474a05b2991af21f9031ba7708eb7ceb4851e990e1edd3424522fd75ce099474c5066bae772be2ff05a2345830aaf SHA512 d3d2d87222de3f9ed9be490f1f1d9df8d79f49642e5dcd0c1c84446ec4d9ca851273efc6131d16f5a58be7746fb5761e3208c4b8c0e6b5bd61d2dd1e7125c230
+MISC metadata.xml 432 BLAKE2B 7f848d9bba87057eaa87973dcea0651a8190fbbf096d0e28d074825daa4c5617d113dc274595e6a985dc9140c14b09cd9b24ed872332d2a74ca4a0a757a6b00d SHA512 9118209800003747dcf6dbde6703e7c5b0cbe68c79c6eaae9d7b5ad6c53112e07f5372128d88ab5a484dc68cc7780230111d6fd1b13c04cf255db803fd196a7d
diff --git a/app-containers/nerdctl/metadata.xml b/app-containers/nerdctl/metadata.xml
index aaf3fccc76e1..364fdaa26268 100644
--- a/app-containers/nerdctl/metadata.xml
+++ b/app-containers/nerdctl/metadata.xml
@@ -5,6 +5,11 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<use>
+		<flag name="rootless">
+			Enables dependencies for running in rootless mode.
+		</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">containerd/nerdctl</remote-id>
 	</upstream>
diff --git a/app-containers/nerdctl/nerdctl-0.22.2.ebuild b/app-containers/nerdctl/nerdctl-0.22.2.ebuild
deleted file mode 100644
index b9663fd39468..000000000000
--- a/app-containers/nerdctl/nerdctl-0.22.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Docker-compatible CLI for containerd, with support for Compose"
-HOMEPAGE="https://github.com/containerd/nerdctl"
-
-EGIT_COMMIT="2899222cb0715f1e5ffe356d10c3439ee8ee3ba4"
-# There are too many vendor dependencies to distribute via EGO_SUM (see https://bugs.gentoo.org/721088),
-# so they are instead distributed via a combined tarball.
-SRC_URI="https://github.com/zmedico/nerdctl/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
-BDEPEND=">=dev-lang/go-1.16"
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE=""
-S=${WORKDIR}/${P}-vendor
-
-src_prepare() {
-	sed -e 's:/usr/local/bin:/usr/bin:' \
-		-e "s|^VERSION[[:space:]]*=.*|VERSION := v${PV}|" \
-		-e "s|^REVISION[[:space:]]*=.*|REVISION := ${EGIT_COMMIT}|" \
-		-i Makefile || die
-	default
-}
-
-src_install() {
-	DOCS=(README.md docs examples)
-	default_src_install
-}
diff --git a/app-containers/nerdctl/nerdctl-0.23.0.ebuild b/app-containers/nerdctl/nerdctl-0.23.0.ebuild
deleted file mode 100644
index 93e8df5fdcff..000000000000
--- a/app-containers/nerdctl/nerdctl-0.23.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Docker-compatible CLI for containerd, with support for Compose"
-HOMEPAGE="https://github.com/containerd/nerdctl"
-
-EGIT_COMMIT="660680b7ddfde1d38a66ec1c7f08f8d89ab92c68"
-# There are too many vendor dependencies to distribute via EGO_SUM (see https://bugs.gentoo.org/721088),
-# so they are instead distributed via a combined tarball.
-SRC_URI="https://github.com/zmedico/nerdctl/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
-BDEPEND=">=dev-lang/go-1.16"
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE=""
-S=${WORKDIR}/${P}-vendor
-
-src_prepare() {
-	sed -e 's:/usr/local/bin:/usr/bin:' \
-		-e "s|^VERSION[[:space:]]*=.*|VERSION := v${PV}|" \
-		-e "s|^REVISION[[:space:]]*=.*|REVISION := ${EGIT_COMMIT}|" \
-		-i Makefile || die
-	default
-}
-
-src_install() {
-	DOCS=(README.md docs examples)
-	default_src_install
-}
diff --git a/app-containers/nerdctl/nerdctl-1.0.0.ebuild b/app-containers/nerdctl/nerdctl-1.0.0.ebuild
deleted file mode 100644
index bb0db49328aa..000000000000
--- a/app-containers/nerdctl/nerdctl-1.0.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Docker-compatible CLI for containerd, with support for Compose"
-HOMEPAGE="https://github.com/containerd/nerdctl"
-
-EGIT_COMMIT="c00780a1f5b905b09812722459c54936c9e070e6"
-# There are too many vendor dependencies to distribute via EGO_SUM (see https://bugs.gentoo.org/721088),
-# so they are instead distributed via a combined tarball.
-SRC_URI="https://github.com/zmedico/nerdctl/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
-BDEPEND=">=dev-lang/go-1.16"
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE=""
-S=${WORKDIR}/${P}-vendor
-
-src_prepare() {
-	sed -e 's:/usr/local/bin:/usr/bin:' \
-		-e "s|^VERSION[[:space:]]*?=.*|VERSION := v${PV}|" \
-		-e "s|^REVISION[[:space:]]*?=.*|REVISION := ${EGIT_COMMIT}|" \
-		-i Makefile || die
-	default
-}
-
-src_install() {
-	DOCS=(README.md docs examples)
-	default_src_install
-}
diff --git a/app-containers/nerdctl/nerdctl-1.1.0.ebuild b/app-containers/nerdctl/nerdctl-1.1.0.ebuild
deleted file mode 100644
index e80c5adc1190..000000000000
--- a/app-containers/nerdctl/nerdctl-1.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Docker-compatible CLI for containerd, with support for Compose"
-HOMEPAGE="https://github.com/containerd/nerdctl"
-
-EGIT_COMMIT="18944bc70784dfa83010d37054d75487a58ab581"
-# There are too many vendor dependencies to distribute via EGO_SUM (see https://bugs.gentoo.org/721088),
-# so they are instead distributed via a combined tarball.
-SRC_URI="https://github.com/zmedico/nerdctl/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
-BDEPEND=">=dev-lang/go-1.16"
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE=""
-S=${WORKDIR}/${P}-vendor
-
-src_prepare() {
-	sed -e 's:/usr/local/bin:/usr/bin:' \
-		-e "s|^VERSION[[:space:]]*?=.*|VERSION := v${PV}|" \
-		-e "s|^REVISION[[:space:]]*?=.*|REVISION := ${EGIT_COMMIT}|" \
-		-i Makefile || die
-	default
-}
-
-src_install() {
-	DOCS=(README.md docs examples)
-	default_src_install
-}
diff --git a/app-containers/nerdctl/nerdctl-1.3.1.ebuild b/app-containers/nerdctl/nerdctl-1.7.4.ebuild
index 368d3359748d..43a574817df7 100644
--- a/app-containers/nerdctl/nerdctl-1.3.1.ebuild
+++ b/app-containers/nerdctl/nerdctl-1.7.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit go-module
 
-EGIT_COMMIT="b224b280ff3086516763c7335fc0e0997aca617a"
+EGIT_COMMIT="7b5f7e0d8f705ed4e54f7040512327e231433366"
 
 DESCRIPTION="Docker-compatible CLI for containerd, with support for Compose"
 HOMEPAGE="https://github.com/containerd/nerdctl"
@@ -14,9 +14,19 @@ SRC_URI="
 	https://github.com/containerd/${PN}/releases/download/v${PV}/${P}-go-mod-vendor.tar.gz
 "
 
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
+LICENSE="Apache-2.0"
+LICENSE+=" BSD BSD-2 ISC MIT"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="rootless"
+
+DEPEND="
+	rootless? (
+		app-containers/slirp4netns
+		sys-apps/rootlesskit
+	)
+"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack "${P}.tar.gz"
@@ -29,7 +39,15 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" VERSION=v${PV} REVISION="${EGIT_COMMIT}" BINDIR="/usr/bin" install
+	local emake_args=(
+		DESTDIR="${D}"
+		VERSION=v${PV}
+		REVISION="${EGIT_COMMIT}"
+		DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		PREFIX="${EPREFIX}/usr"
+		install
+	)
+	emake "${emake_args[@]}"
 	DOCS=( README.md docs/* examples )
 	einstalldocs
 }