gentoo auto-resync : 07:11:2022 - 21:22:53

8 files changed, 43 insertions, 19 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 29227fd7714a..f96ff624755d 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index d4b8787dec14..840a13aa78e2 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,4 +1,4 @@
 DIST pkgcore-0.12.16.tar.gz 623795 BLAKE2B b591aeaa5d780f0b273d446d1bdbdf33a44d085aa4975d3c5f394820a6f479c15da7850a699c92a56cb280ee028d922551c7226801dea6f4c34620bde3859c31 SHA512 acd7c478b342349e66dfda5ed1284663037b221e39b557215d1441e8a908c845fe26e274bcfd97b1879f5792fc017437cd0fbde1cdffc5ebc595a34fa56d2589
 EBUILD pkgcore-0.12.16-r1.ebuild 1449 BLAKE2B a4620deadd0c3e5c59a72b0eea28d15dab8d73449051d59f347a4d37b4a83c69ff8c84cae743b7d8f3344dbac5055c08e6a85282d3680900b9e873131ba9f842 SHA512 cd9676de9f17249a2c0aeb1b266b357c6a700f829a6fe8ba0b9cab5423312ef8874e2f407c29156f894a2c9b64e3a7e98d733f6abff082ec2a199870e629c1e2
-EBUILD pkgcore-9999.ebuild 1519 BLAKE2B 1af05cb85b235e8906a49ea45cba5ab099b52ff2b4dc1ce2bf294e61ef9ec35f0c112a3e662afd5b5d4a3c9f3606a81049d27a9fda5a19c738ccf5887ff4e7d5 SHA512 b2c996ffe1ce426394ae4c3d3b80effb63ea166027c9bd6525fd61a6d68fd4b86ee9301f355955cbd779f7af78de0101272563461d102167e291df99ca3757c4
+EBUILD pkgcore-9999.ebuild 1449 BLAKE2B 24ba7a7835e8d2268c3dd1c05d73700e55de940ecabe1cface8878a1ef9b78c824da197787b065ccbef1d28f91a82418f9ee0d78efe2c09831c749bcbf66454a SHA512 777b0ef3b758ea7da829e0288e16164643d37268f973628c1415a71cf9e9fdf7f569606a16bb130544671277fc33726267e072bee62655021917fa7c05a175fa
 MISC metadata.xml 392 BLAKE2B 98797b18321d3133dceaf79389bd35b26344a342c55c477b178359d731c46fa209adbdcf1d14eb009d57c8c20db8b898651dd45d5bcfc6bb3009ceffa1436650 SHA512 097710cc6c1df7455328a1d3feb223e324162ff20ef03964de4682eec7acf4e2d08fa64d3ac4946783f4c2587455d90ee5aa628f637f3a48386d9c9e6b7362e1
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index 86ca28dcedd6..ad37b266d812 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_USE_PEP517=standalone
 PYTHON_COMPAT=( python3_{9..11} )
 inherit distutils-r1
 
@@ -32,31 +32,27 @@ else
 	RDEPEND+=" >=dev-python/snakeoil-0.10.1[${PYTHON_USEDEP}]"
 fi
 BDEPEND="
+	>=dev-python/flit_core-3.8[${PYTHON_USEDEP}]
 	test? (
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
 		dev-vcs/git
 	)
 "
 
-distutils_enable_tests setup.py
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# fail because of forcing Gentoo's prefix
+	tests/ebuild/test_eapi.py::TestEAPI::test_register
+	tests/ebuild/test_eapi.py::TestEAPI::test_is_supported
+)
 
 src_prepare() {
 	# force Gentoo's prefix
-	sed -e "/INSTALL_PREFIX =/s@= .*\$@= '${EPREFIX}/usr'@" -i setup.py || die
+	sed -e "/INSTALL_PREFIX =/s@= .*\$@= '${EPREFIX}/usr'@" -i py_build.py || die
 
 	distutils-r1_src_prepare
 }
 
-src_test() {
-	# With PYTHONDONTWRITEBYTECODE=, python will try rebuild all sorts of modules.
-	# https://bugs.gentoo.org/840266
-	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
-	addpredict /
-
-	local -x PYTHONDONTWRITEBYTECODE=
-	distutils-r1_src_test
-}
-
 python_install_all() {
 	local DOCS=( NEWS.rst )
 	[[ ${PV} == *9999 ]] || doman man/*
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 56529b1ce08d..85725b1227be 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -12,5 +12,5 @@ DIST systemd-stable-251.7.tar.gz 11448429 BLAKE2B 959ac7944d778c8e6d7a3c67ea6adc
 EBUILD systemd-utils-251.4-r2.ebuild 12095 BLAKE2B 21014fadfa7a5ea04e2cabde58ff7a5c404c28feb224680309c49f3f056b2b0af92688d245f17f42896e71bd1e59879ed070c691dfadaaa29e90580a3a216038 SHA512 f3bb8010c6162fc601b95eebc297ae8f3f5256bd6a20c70423aec1c90854744c773f63affe3f610c3b28ab795f5579cfb45ec57f70cb5eb6121c4347a7f45e95
 EBUILD systemd-utils-251.5.ebuild 12004 BLAKE2B 813622adb081673984af0142e4fcec51259441bcc31d2cd2985cd93c31ab6790a82081469525b6e3a05e9fe17f9cc581f717903aefa267aeb5167edebf714521 SHA512 3cfc14f2d5d0570dc6be9d4ad1ad9ebcc17c59970e5840a02a84bda6d80f35b33facddd46554a1857ecc38fc6e69875681e292d57a2dc32205e4e2f88a377c54
 EBUILD systemd-utils-251.6.ebuild 12053 BLAKE2B 885efc6eacdee2839c1098a7a450eee58b7cd28eb4c1c09c58cf090c9ba6c6c9a887ffee96cde1131a8f5d3ac701bb02c0ed47581d7a4da75189237774a1c729 SHA512 c25c6088674b560130e7b113e376077c44e5eb622ab62e5c8211dd7c9d84efd97df82fd94d169bbbbf46f180203d042dad8d39b34773b33fb5294ad92ef934f9
-EBUILD systemd-utils-251.7.ebuild 12114 BLAKE2B 4059cb8c4af812daee221c7f4022be89b7edeae664a046eca1f1183f530c90b855e4a90ea27f911cb235b0217c25d8c61389dd3d9c419b0455cf9ca2d5611075 SHA512 0aa44c5b3fa1a5f03bb7552fe2ebf3fb02658ad799619289e8f7918bb50f7a281fd7e2f69467c88de985e19758bddd6de966ec415515d3d324f1fceff8099640
+EBUILD systemd-utils-251.7.ebuild 12113 BLAKE2B 0446053130c2f4c875c47e653c704f2ad2b9f618bf1b0387b7e1ea36db1145affb97c4dce680f4253cf9d4a69ac07879dddcaeb1f46673d4a73d2c70594fee3c SHA512 ab963883b30c0bfa75d98333059b2502820111faa46e9fb461087bf7ad620e4e004aeaacee965c77d48ea77432a9512c87bca24857d9c3fb08e9ec28d88d3a33
 MISC metadata.xml 713 BLAKE2B 1dcb5d9949600c9a8c8ac0c005ffa03b2ca91293a932fa96092a24c094e9fb29f2cf063af041432c12daec4aa4e60d11ea77ed0a423e188095f995c68e75b91a SHA512 46d167a6d898abfc56130e373d232c18fb3ef8865755379fa7678c049515458e7354b7a8cab3bf3faa7326932cccceb0b0745b4695ab9bea492bc2344abf9da4
diff --git a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
index 3f1741e3035d..88cf55f5eb82 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
 REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
 RESTRICT="!test? ( test )"
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index b1e9ff7bc177..6a5657be8b84 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,4 +1,5 @@
 AUX 251-gpt-auto-no-cryptsetup.patch 958 BLAKE2B 7067224e613433fcb139c38597552e080e07d33b207965a9c9a2b3d4e353c43dae38e6800d6ce28cadcba5f914b1b49e80fa48929df2c4bb96248bfeb6bf6aa5 SHA512 6a78bbdde3aae9a2ad4c4f824eb5281ca9ab24770516ad7c9a9e3daf7f39475bf9b4dd868c857a9833dd408db801393f949b8fae1700b2ad04ea822dc84e3429
+AUX 251-meson-0.64.patch 919 BLAKE2B e9eb5f82235f60f18658e4a6a3bc262525cb3152f8b6953b38683c51d439ebebe215dc4b71935e4059e17d82a07bc9e0ffd1354453d5c6977c927d0ba8f52646 SHA512 2d331194071c6cd0c1e8cf3c50de71b3a06b65ec7cf03f0ced15f2d060dd1b0b252efd59604bc871a8b3bb60794cdafecd9ab01ca17f73d854fce77528cf3f4a
 AUX 251-revert-fortify-source-3-fix.patch 2059 BLAKE2B 5b34062821f2097fc622ffc66d83029267173b2b4131b29d9339644577b7e80c513c83f62d07ba3e030c2a861efe7d399bd871cc35803b39940f7ec0e7bacfec SHA512 14c5ac8d0343a4cb50de6c56124e515b159cf5f9bf358404ba41ec7a9c439206673e0d44888164ff3872236c7b8c74f5ea9544ea7a981a3b5930585dabcd4782
 AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada
 AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed68272fcfa9cc34a309ff5d4cc2230f71a6f7fed42c79afb1c96605df141e8e40b2d8290d12ad3c18038269814f2df8 SHA512 d77d4dae9f8a7819c6d4855476f3163ee19f52b20f66a93e25818f0747404462c47e3cafbd82ba85ce1b3d2fdbabdd96a0398b71149b318c540d82403f8ad0ad
@@ -13,7 +14,7 @@ DIST systemd-stable-251.7.tar.gz 11448429 BLAKE2B 959ac7944d778c8e6d7a3c67ea6adc
 EBUILD systemd-251.4.ebuild 15500 BLAKE2B c8ea106e1dbbf830fba008ed6f70486e36a62947cf390f436b2c45856a8f3fc74d819f67983dde5fa49b854cf91e3c76e4ccb7d99af9c9753cc7a0183d8bb0d3 SHA512 f97e89cbc1fad054b265878f0f55b7bbfccdecc1f907743d4373cb7a9783805ea1e5536ad5fe759da4e3b6954146c9b456ce4147fa86f41c61187b11333ee8ec
 EBUILD systemd-251.5.ebuild 15508 BLAKE2B dd89dde571cfd27fad856e2802c8b837d96b567f07fcae62af911f9dc6ebf6752ef7a287a7f1d695695a8f84cd43638a156101fcd53488fd25bdf43d65cb8560 SHA512 1c4b6a2dd35171dea0363d1331bfa67967fdb9bc8025cf4b3fea7b20af60748373473a3efed0710a8c86762ba53fb3bdcd0df62bb1e70a55a43a1ab722171ecd
 EBUILD systemd-251.6.ebuild 15557 BLAKE2B 124b3527e460ec93d8a1f5a5fea3f435aa8db9a6b25b729ef46480b451a89aa77800d7a6062b7ba94d817152951f6f22c58d68708e2fd0fafbf73841b23bb9a0 SHA512 09f4318b267ef45fcd92d4ce3f25d5c6e665f0d1662cb339796c60e38c48ab780977d93f816f80c8e7512f6cb2c9802e68914375b351a08d14d96d2ff30365e5
-EBUILD systemd-251.7.ebuild 15557 BLAKE2B 124b3527e460ec93d8a1f5a5fea3f435aa8db9a6b25b729ef46480b451a89aa77800d7a6062b7ba94d817152951f6f22c58d68708e2fd0fafbf73841b23bb9a0 SHA512 09f4318b267ef45fcd92d4ce3f25d5c6e665f0d1662cb339796c60e38c48ab780977d93f816f80c8e7512f6cb2c9802e68914375b351a08d14d96d2ff30365e5
+EBUILD systemd-251.7.ebuild 15593 BLAKE2B f47483dc0a9733ef033b7997ba34a2daa4f8ff204878b169fab36225f3837891d57a4bcd40821c5c7ca3168114a1925b4d28808f6a81c65711ed97737a67d5a6 SHA512 e7c8c13390f94e8507b6fdcd149678b8021630a8a8b262cee7d996b3aa3e230aad8beb7339dff35acd72149e6265096cabb180260283c906ff5cae6da1beffce
 EBUILD systemd-252.ebuild 15372 BLAKE2B f480ab02dd6910b271805ef126bfefd478b9c94487dd4d2134edebd5a15e780ecb9104ae16a0f50dd921f642cb78389ffb486cc9ea76ea3d4db863a0db12d63f SHA512 ee3c87a63e7295e02679364f7337985eaf073026e57672b6352bb65979224791e491222b4309ca66ecc4df6c1b312acb4b706419299800fa8c94e179c235f5c6
 EBUILD systemd-9999.ebuild 15372 BLAKE2B f480ab02dd6910b271805ef126bfefd478b9c94487dd4d2134edebd5a15e780ecb9104ae16a0f50dd921f642cb78389ffb486cc9ea76ea3d4db863a0db12d63f SHA512 ee3c87a63e7295e02679364f7337985eaf073026e57672b6352bb65979224791e491222b4309ca66ecc4df6c1b312acb4b706419299800fa8c94e179c235f5c6
 MISC metadata.xml 2545 BLAKE2B fc424b7f9e471860cba69b6f11ea2094c70f125cd55c42ea77e4549a399680c4444119c79424c266828a284b0214001421f760477b1341844dddd2d474d70c33 SHA512 f0b8c4614e3c88d123916bb3399d6025ab30ff839849b136a29e1960bf0c50699b3f09b5307f40b77cc8c5566c20b11de2364a08311adceb15507df3e4bb0565
diff --git a/sys-apps/systemd/files/251-meson-0.64.patch b/sys-apps/systemd/files/251-meson-0.64.patch
new file mode 100644
index 000000000000..6cc200bbd87d
--- /dev/null
+++ b/sys-apps/systemd/files/251-meson-0.64.patch
@@ -0,0 +1,26 @@
+From cddbc850270415a818aadabd71fe12dc0dddd508 Mon Sep 17 00:00:00 2001
+From: Jan Janssen <medhefgo@web.de>
+Date: Sun, 9 Oct 2022 17:16:12 +0200
+Subject: [PATCH] meson: Fix build with --optimization=plain
+
+Note that -O0 is deliberately filtered out as we have to compile with at
+least -O1 due to #24202.
+
+Fixes: #24323
+---
+ src/boot/efi/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
+index e0cd4ebad993..395386d3eda7 100644
+--- a/src/boot/efi/meson.build
++++ b/src/boot/efi/meson.build
+@@ -223,7 +223,7 @@ endif
+ if get_option('debug') and get_option('mode') == 'developer'
+         efi_cflags += ['-ggdb', '-DEFI_DEBUG']
+ endif
+-if get_option('optimization') != '0'
++if get_option('optimization') in ['1', '2', '3', 's', 'g']
+         efi_cflags += ['-O' + get_option('optimization')]
+ endif
+ if get_option('b_ndebug') == 'true' or (
diff --git a/sys-apps/systemd/systemd-251.7.ebuild b/sys-apps/systemd/systemd-251.7.ebuild
index de8a975e58e1..da3b1ca9e319 100644
--- a/sys-apps/systemd/systemd-251.7.ebuild
+++ b/sys-apps/systemd/systemd-251.7.ebuild
@@ -23,7 +23,7 @@ else
 	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 inherit bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
@@ -239,6 +239,7 @@ src_prepare() {
 		# bug #841770.
 		"${FILESDIR}/251-revert-fortify-source-3-fix.patch"
 		"${FILESDIR}/251-gpt-auto-no-cryptsetup.patch"
+		"${FILESDIR}/251-meson-0.64.patch"
 	)
 
 	if ! use vanilla; then