gentoo auto-resync : 09:03:2024 - 12:44:17

5 files changed, 12 insertions, 16 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index bfe7f8311b79..5f8f68703cf9 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/eza/Manifest b/sys-apps/eza/Manifest
index bfae5ac9119b..ac77193809e7 100644
--- a/sys-apps/eza/Manifest
+++ b/sys-apps/eza/Manifest
@@ -215,5 +215,5 @@ DIST winnow-0.6.2.crate 157140 BLAKE2B 2cb9e63875403fe525739e2e20d4351f51b6f52dc
 DIST zoneinfo_compiled-0.5.1.crate 8837 BLAKE2B 1d513b145a391ccb22d2110cce06dc1fc91e109d93cc7f2a056ceb5056a5a480b98ed3471cf8ff8fb8011f2d9c037b3bbd4f47dcedc0a56499e324ea5d7849da SHA512 4ad46983742ed37246f3ba5538fdf3a4dfc444ec635ffaa51d5daffa70c14e1876e703cd0a1f077e6b324e0d44d4b5e1e710b3543636fa9f33d509fa8bce333c
 EBUILD eza-0.15.3.ebuild 5063 BLAKE2B bec6b234b4e36d4e83ea4c5662b7461d0f6fff0cbdfc84af92d36fcee72a4c727f2c9059ce2e2859380b0b0df1c80cfd94b933482cb2a73379064767abd069e0 SHA512 7ab9e10b45948c2b98b5cb29db539c9a01a4858dd3b592af997a45d1f7c046aa213683471be63704e45041c5edc7bf385b7cefc52dc5d5fe017c62d9209307ef
 EBUILD eza-0.17.2-r1.ebuild 5360 BLAKE2B 72b31d9a9ac32f8a7e32b2cec8e6b45b6f713164e25a3b235e83844f80d064231bf76099e3e8f1aeea9a8db860f16b4ef1ffce237c6ee3a08c738d25664eee4f SHA512 aed0955e96117ea853a1db9e83062ec56be06fe551f53a79636ef8b40470784d633432956fe8f3ce70dae087ab92d34684dd4828a13abafc5a2de4c60193d338
-EBUILD eza-0.18.6.ebuild 5371 BLAKE2B 0b15f62aa5ee940f2ae199189fad86b676fd58f5102338784ad27aa49f050bbee107168043def12f832fdf0c7f8e112c96fcf4c235f4b428e854dc31685a9f6b SHA512 69c60af997fb28c8efe1c58292026cd257ceaf0035f8d34b8f4903074fe41978ba56a206b67e1df17a24e15e46ee40df1562779c36fb9f664443033cee75bfba
+EBUILD eza-0.18.6.ebuild 5370 BLAKE2B 993d0d9bd06e9e701d97677410d178dcd5ab9c5380ccabf57bebe25b4487abe06bf6cefd1c314855480119e26dd5e525226c5da13b7967c62856f589a39cb1c7 SHA512 4c2e906be9da0f34afb0fce0f444593e368174c38b591d2d34f99b50dde9ea025c0d7867406ca6f721f10bcd8a4d8aedb025f98bb8cdc1e7c3e8a9c0ac1828e3
 MISC metadata.xml 495 BLAKE2B 306ca308e3132da0688cee3f358d239c0b5ab3014c01d8624344d3a68643741a3d4303c1199454589f7fbc3a22d80fcc8ac66377b02895a39c1b54e078aee787 SHA512 09872a6228f3f3884044a8d08970ca5933a2de28049b900f85a99c749b7710268f7981f7115b796dbff159c471af3a60a4326da4412e660206b9ecbb6d24d11e
diff --git a/sys-apps/eza/eza-0.18.6.ebuild b/sys-apps/eza/eza-0.18.6.ebuild
index b97b0ca31f61..f230aac1ffb5 100644
--- a/sys-apps/eza/eza-0.18.6.ebuild
+++ b/sys-apps/eza/eza-0.18.6.ebuild
@@ -204,7 +204,7 @@ LICENSE="MIT"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0 LGPL-3+ MIT Unicode-DFS-2016"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="+git"
 
 DEPEND="git? ( >=dev-libs/libgit2-1.7.0:= )"
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index d6d577271be6..5786c6337a3d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -7,5 +7,5 @@ DIST portage-3.0.63.tar.bz2 1187961 BLAKE2B 10523150b0eabac97309004c57356c40fa94
 EBUILD portage-3.0.59-r1.ebuild 6919 BLAKE2B 42d9b40cd255004ae6e3e598940717296163e500434a8c2bdf08b280915aecf8dc9d5f3b6d9eb5dc09c8718f689b459ec6a1f5df03187935d17d447f8b2e0f25 SHA512 59cfb6566b72a82cf81503b40b3ad73bb1616c39a6957d14681c55b53a60b662eb5330b7021d6c860212c4e583c4ed67e64ff5a55738f2f8f1a22d5cf4442e03
 EBUILD portage-3.0.61-r1.ebuild 6919 BLAKE2B 42d9b40cd255004ae6e3e598940717296163e500434a8c2bdf08b280915aecf8dc9d5f3b6d9eb5dc09c8718f689b459ec6a1f5df03187935d17d447f8b2e0f25 SHA512 59cfb6566b72a82cf81503b40b3ad73bb1616c39a6957d14681c55b53a60b662eb5330b7021d6c860212c4e583c4ed67e64ff5a55738f2f8f1a22d5cf4442e03
 EBUILD portage-3.0.63.ebuild 6927 BLAKE2B e6ea3a331b29c53e5dbc2240db2923a75f27ac77533c3dcf12eec266d2418deb5939887c112460fdb5e8c67681e6a134109065fdf32b2ec66573edf5bac74515 SHA512 5443ee6ba6d1c1b340f87908811becdc1821ec1410aa2e9eb860268400f66fa26d7d7cc8216c93afcb04a4d7b41360506a8e3c54412b95154576a988933cb89e
-EBUILD portage-9999.ebuild 6927 BLAKE2B e6ea3a331b29c53e5dbc2240db2923a75f27ac77533c3dcf12eec266d2418deb5939887c112460fdb5e8c67681e6a134109065fdf32b2ec66573edf5bac74515 SHA512 5443ee6ba6d1c1b340f87908811becdc1821ec1410aa2e9eb860268400f66fa26d7d7cc8216c93afcb04a4d7b41360506a8e3c54412b95154576a988933cb89e
+EBUILD portage-9999.ebuild 6790 BLAKE2B c0c4b0323ecf461cdd38831f8644944803b3c3cc653e11b7ed88ac4495f99ccf6fffc170d1bf41daffa60e5d8d262766a3e9641eac3f106f2dd866b6354722fd SHA512 73def9620f9e55157d298d89064cf7c7011ed0320fe1a2fb597b5ad74cf2ff2696a60ef1a89780883aecd98964bc559ed4d91d2d73f37082795885dc8181f169
 MISC metadata.xml 1539 BLAKE2B 0efa1ae365449d6593909046c32158a9f6755aa9252c34ae00eb866dd29a0b6a5c2e7a4af9293d0f87c4dd9231132fc5361acb0818fb6beff6dd6fbbdc6f409b SHA512 675f5baa1b3079592e3930b11ca18f324e27c42b5515f9ae815a26e53a465640fa6e9c4069df0e2121932b9f1cc73f2c9469c1529728f3c5ed5c3e687743ac0d
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 834b9af7a549..ea323e5a917c 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( pypy3 python3_{10..12} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 TMPFILES_OPTIONAL=1
 
-inherit meson linux-info multiprocessing python-r1 tmpfiles
+inherit meson linux-info python-r1 tmpfiles
 
 DESCRIPTION="The package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
@@ -35,6 +35,7 @@ RESTRICT="!test? ( test )"
 # >=meson-1.2.1-r1 for bug #912051
 BDEPEND="
 	${PYTHON_DEPS}
+	>=app-arch/tar-1.27
 	>=dev-build/meson-1.2.1-r1
 	|| (
 		>=dev-build/meson-1.3.0-r1
@@ -43,15 +44,6 @@ BDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/setuptools[${PYTHON_USEDEP}]
 	' python3_12)
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-DEPEND="
-	${PYTHON_DEPS}
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
 	>=sys-apps/sed-4.0.5
 	sys-devel/patch
 	!build? ( $(python_gen_impl_dep 'ssl(+)') )
@@ -63,6 +55,10 @@ DEPEND="
 		~app-text/docbook-xml-dtd-4.4
 		app-text/xmlto
 	)
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
 "
 # Require sandbox-2.2 for bug #288863.
 # For whirlpool hash, require python[ssl] (bug #425046).
@@ -164,9 +160,9 @@ src_compile() {
 }
 
 src_test() {
-	local -x PYTEST_ADDOPTS="-vv -ra -l -o console_output_style=count -n $(makeopts_jobs) --dist=worksteal"
-
-	python_foreach_impl meson_src_test --no-rebuild --verbose
+	local EPYTEST_XDIST=1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	python_foreach_impl epytest
 }
 
 src_install() {