gentoo auto-resync : 01:12:2023 - 05:09:19

5 files changed, 242 insertions, 2 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 7d8b7cd66247..567248e5bc42 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/install-xattr/Manifest b/sys-apps/install-xattr/Manifest
index c61da52e95e0..ef4f11365a17 100644
--- a/sys-apps/install-xattr/Manifest
+++ b/sys-apps/install-xattr/Manifest
@@ -1,7 +1,7 @@
 AUX 0.8/0001-install-xattr-avoid-accessing-empty-storage.patch 1493 BLAKE2B e0e2fc6beb906cae339275dfede7188bf95170f4efecfdeea8cc8aa65ecca7f353694120f123799f536fb5bb91e35f9d5c77fdd092f3768e22d8f26d1e8abdd2 SHA512 0df1f97066e3f9f5479c996d307b48039332bf555e2c8d4b64572d60fa4ac8f47d442c6be5ceb8281a11c47bba4d6f3bf204fd3434b04884cef6d43ef2193a35
 AUX 0.8/0002-install-xattr-fix-small-memory-leak.patch 2235 BLAKE2B 7149e3180ffddd658b20ba9e45593a4cee0f3610e26b28497a1e4f639b476e797f60f962cae573233fdbc1040b281301b6d4e3cc43875bec6a1ed739f6f82f42 SHA512 2ad58f650b8026dea0d32dee911d66438d5a7b13bea290b050f6e932496d35ff58189ba89a52d7b761589bba2865a58d3720eed7206d8199959b11750877ab30
 DIST install-xattr-0.8.tar.bz2 16359 BLAKE2B 25c483211ea6d01f46d9739fd3f1327e543e8b986a252d97e8b012ff6169a9b6430dc0ab7c184bf04c6665182c242eb37f7059d2d23cecececea723bde74cb56 SHA512 3af95a724d95286854767fe28679b024de8d257ce2d21addecbd40906e10bf48cfd4263609c6c2f436c6a807e91d24118110fda041091fadbefd848c892af778
-EBUILD install-xattr-0.8-r1.ebuild 1017 BLAKE2B 4b282b2a7b6350bc71f334030e86e97d80d3dc85a6a891387d1c1f0e854d0e63f39bf86220808667dbee20faee57c088475c6f657d8f88ca8d1f2e5611d5e093 SHA512 d1dcd8c298700dce9657ebfaad629c1fab8f135553adfbc8f0463d258f70889e4b4c9175d3b7e42d88afd2e7102d6da3e8f476d18ee993cf90c4a1497de56bfe
+EBUILD install-xattr-0.8-r1.ebuild 1012 BLAKE2B 374938f0d10b9ab16c2a7bd52912b5cf6686926f5fc66443e4db62b2064ed0f0a461899d2451f03a63c43e49e27447ec239d27cc93fd65ea5e6431eb9e48ffec SHA512 bd9d3329e80ef6dbd1fd80ea3ffb051df363bfe907b0a359e91dbef02b7a34679b9e1f3ac18c28234c6e58ba86dfced521d3576025dcf90918a3313b0fbd47d1
 EBUILD install-xattr-0.8.ebuild 1006 BLAKE2B ed568765285654f323b5d38b324c0da6c2cabf2c450c2fc7d9a31dec5a876adcb0275de1448c80bbce4619d259f6dd95e4aad376f196d2a41a97072ac345275e SHA512 0819e998357e972c89dfcb7257e155348df4aa854cbcfc4dfea01f4411ca8c1a607c0f14a1e8c55a676210d0b639935b6eaeca2c9ae0e0edb5d069614acf9506
 EBUILD install-xattr-9999.ebuild 971 BLAKE2B e9725d58e099850e6ca3b151e23a258c7dc680d115a7ec9be86edbac32cf3d5e4875713383da9438e7d3ce15a25d80560042c2c816ed9503dcd7004ebe34bc4c SHA512 94a6020f4baa8a123f2d97393fc5c2d55226211427f2d7f220f77cb1d713ad6c9d1aa7413cd137542bbc7308909d8686aa95a9e2b91ae294475078d815257b68
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/install-xattr/install-xattr-0.8-r1.ebuild b/sys-apps/install-xattr/install-xattr-0.8-r1.ebuild
index 0fd1e0a41e24..31bc0c92dff6 100644
--- a/sys-apps/install-xattr/install-xattr-0.8-r1.ebuild
+++ b/sys-apps/install-xattr/install-xattr-0.8-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/install-xattr/${P}.tar.bz2"
-	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"
 	S="${WORKDIR}"/${PN}
 fi
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 72c943dd70ba..eb0a21c9d14f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -13,6 +13,7 @@ DIST portage-3.0.52.tar.bz2 1157447 BLAKE2B 61e4d32f9713b9b0a2df6ca636b2d756dacd
 DIST portage-3.0.53.tar.bz2 1162321 BLAKE2B 1c38bc97d9aca2ce4062ed0fc2ef9297911379a32f1ed32b4d5ced760970edbfb9579471efd69c0fc16e3227ef6444d60c2bb19be6d809eabe832250d340b4b5 SHA512 d747acc922da2d6f2dc10a8b5a6c7cf4b325ab903b3c5634d5aa1927bbfffa306076ad780a4634d7bcf6092b763b753b02c14f1a21197706559d370c6eee00a1
 DIST portage-3.0.54.tar.bz2 1164619 BLAKE2B b70ed74a557470068f873b544bc7efc497f4121b2189601c44f9ddc1571e80cdc1387148cdd705604a24a2357289385345df5d60e03e7ebff1e8797bed350fe4 SHA512 2e9e16dae4a30e2bfed2d5eab7eb4e4c8260cc1b5a826d247e98908fb8669e4e5176d7f59a01d4d7a302f874fe1d80c17da87bb87d31f98af7a79e1823fa4009
 DIST portage-3.0.55.tar.bz2 1167100 BLAKE2B 8dd4ffa3f816e34a9afa5ba70d0ae252797a782cf8b3dd4df9c4fe52f1fb218d757b3679a5d43229accdbed52ae70bb6a706768839bf735b342bdfc598e252a1 SHA512 de891a7a91012546ded5ac6f3427324d1d959beeb7442339f350728bee3337ff49e48a113b191dc0d515f3545b8662ff26ad434bb9cbfbc23bd47938a8932fce
+DIST portage-3.0.56.tar.bz2 1166588 BLAKE2B f6e8d8dbfb3b157f1e5577419ef78c8e63b6f754ffa94da22e6466f11b77738e11fc9ad4803341b6640a6c7f48bd73bb02a12643b8176d60147e88aa1fb48314 SHA512 6eac4edb286f3ef0074cbaaf3b216c8dd40fe474e1a9bd6f86d7185cceabe19edb76b324af76d9fa1005ba8809d624354c21ab84284aba0d92e467612bd9fe47
 EBUILD portage-3.0.45.3-r2.ebuild 9026 BLAKE2B 48786771a530eb0dd7c8e93536dceefa1a0433cd1467a8bef84ff52b8f8932abbda3f742ead1b05c1d75db8d97b3ef2124dddf12164ccc74d6e8558fac065504 SHA512 7d361598083421293c74cacbc24929825beddf132f4e2dfa110a97ec262e5841f7885bec6dafa31076afa6b48dd0e72f53703d2e0ffe2a4aa92b5f6cd6d658e6
 EBUILD portage-3.0.46.ebuild 9028 BLAKE2B 2be98cc99c708e434c9e451a1257f6c891ad529cba3363431d85030475f3c293b12bf6e2a81a6de35b64692405199f3583d43d207031dfb45fd361c51aaaf394 SHA512 af75ee0c836bd570f9ff43f9f236d418b825f7def2e798a1d10157a98b48239185c3654806ebe5f13db1b240f428f3c7f2a492d410d1bae2a8bcbd797dcde493
 EBUILD portage-3.0.49-r2.ebuild 9527 BLAKE2B 6cad70f759ec4440c228193e2535d57d679eddee0c73d444c78880d38e9529588835f8de721e900495261c53ea9461e2bce1c1b63ed8d32f657f6e458119d18a SHA512 0a49e29242fb469a2d389b06a8e1fdf0187cb7d35c56e4ce3661722dc0668f1383ca52321417fa2110f2d02670b2e4cf43c319efa511e373ca4f2520e2ac2ba7
@@ -22,5 +23,6 @@ EBUILD portage-3.0.52.ebuild 6712 BLAKE2B 30cd93ffdd565f7d3f7380c1d86c8f1eb29e0b
 EBUILD portage-3.0.53.ebuild 6712 BLAKE2B 30cd93ffdd565f7d3f7380c1d86c8f1eb29e0b9be15c52482612b9badabe5f1f3335c1b994341a2a643b8901dc2049a300db38aa54dc19cc6c2e62970c3f9ae4 SHA512 15023ec0a54e2cfc62f5f934b54829d8a342f20ea86d5d98aadf14d26db19fc269983b0635264eb23f784ecb15bbcda8734be87940f14c1abcd48aefa5d18596
 EBUILD portage-3.0.54-r1.ebuild 6807 BLAKE2B e982e9b70f2dfcd42c9e86f61bc8981c7bb3da9b9fb7b1c8873ad2a15217d7feb559ef555f00e5af621c435ef36965236d5dfa26abf01bdaa1d8148d59cc3fd7 SHA512 ef6f0b57d4ddc0dd963f341c944f2f7260b8ef00e1185a26bcd5534573f5bd7af40b098bd8171233cca05de7c1396713dfaaaeebac0ce80098f9ef7c664f18af
 EBUILD portage-3.0.55.ebuild 6712 BLAKE2B 30cd93ffdd565f7d3f7380c1d86c8f1eb29e0b9be15c52482612b9badabe5f1f3335c1b994341a2a643b8901dc2049a300db38aa54dc19cc6c2e62970c3f9ae4 SHA512 15023ec0a54e2cfc62f5f934b54829d8a342f20ea86d5d98aadf14d26db19fc269983b0635264eb23f784ecb15bbcda8734be87940f14c1abcd48aefa5d18596
+EBUILD portage-3.0.56.ebuild 6712 BLAKE2B 30cd93ffdd565f7d3f7380c1d86c8f1eb29e0b9be15c52482612b9badabe5f1f3335c1b994341a2a643b8901dc2049a300db38aa54dc19cc6c2e62970c3f9ae4 SHA512 15023ec0a54e2cfc62f5f934b54829d8a342f20ea86d5d98aadf14d26db19fc269983b0635264eb23f784ecb15bbcda8734be87940f14c1abcd48aefa5d18596
 EBUILD portage-9999.ebuild 6712 BLAKE2B 30cd93ffdd565f7d3f7380c1d86c8f1eb29e0b9be15c52482612b9badabe5f1f3335c1b994341a2a643b8901dc2049a300db38aa54dc19cc6c2e62970c3f9ae4 SHA512 15023ec0a54e2cfc62f5f934b54829d8a342f20ea86d5d98aadf14d26db19fc269983b0635264eb23f784ecb15bbcda8734be87940f14c1abcd48aefa5d18596
 MISC metadata.xml 1539 BLAKE2B 0efa1ae365449d6593909046c32158a9f6755aa9252c34ae00eb866dd29a0b6a5c2e7a4af9293d0f87c4dd9231132fc5361acb0818fb6beff6dd6fbbdc6f409b SHA512 675f5baa1b3079592e3930b11ca18f324e27c42b5515f9ae815a26e53a465640fa6e9c4069df0e2121932b9f1cc73f2c9469c1529728f3c5ed5c3e687743ac0d
diff --git a/sys-apps/portage/portage-3.0.56.ebuild b/sys-apps/portage/portage-3.0.56.ebuild
new file mode 100644
index 000000000000..f261a5eae11a
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.56.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit meson linux-info multiprocessing python-r1 tmpfiles
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="
+		https://anongit.gentoo.org/git/proj/portage.git
+		https://github.com/gentoo/portage.git
+	"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# setuptools is still needed as a workaround for Python 3.12+ for now.
+# https://github.com/mesonbuild/meson/issues/7702
+#
+# >=meson-1.2.1-r1 for bug #912051
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/meson-1.2.1-r1
+	$(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(+)') )
+	apidoc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-epytext[${PYTHON_USEDEP}]
+	)
+	doc? (
+		~app-text/docbook-xml-dtd-4.4
+		app-text/xmlto
+	)
+"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+RDEPEND="
+	${PYTHON_DEPS}
+	acct-user/portage
+	>=app-arch/tar-1.27
+	app-arch/zstd
+	>=app-misc/pax-utils-0.1.17
+	dev-lang/python-exec:2
+	>=sys-apps/baselayout-2.9
+	>=sys-apps/findutils-4.9
+	!build? (
+		>=app-admin/eselect-1.2
+		app-portage/getuto
+		>=app-shells/bash-5.0:0
+		>=sec-keys/openpgp-keys-gentoo-release-20230329
+		>=sys-apps/sed-4.0.5
+		rsync-verify? (
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
+		)
+	)
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/gentoolkit-0.4.6
+	!<app-portage/repoman-2.3.10
+	!~app-portage/repoman-3.0.0
+"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		>=sys-apps/coreutils-6.4
+		>=sys-apps/file-5.44-r3
+	)
+"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	check_extra_config
+}
+
+src_prepare() {
+	default
+
+	if use prefix-guest; then
+		sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+			-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+			-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+}
+
+src_configure() {
+	local code_only=false
+	python_foreach_impl my_src_configure
+}
+
+my_src_configure() {
+	local emesonargs=(
+		-Dcode-only=${code_only}
+		-Deprefix="${EPREFIX}"
+		-Dportage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		$(meson_use doc)
+		$(meson_use apidoc)
+		$(meson_use gentoo-dev)
+		$(meson_use ipc)
+		$(meson_use xattr)
+	)
+
+	if use native-extensions && [[ "${EPYTHON}" != "pypy3" ]] ; then
+		emesonargs+=( -Dnative-extensions=true )
+	else
+		emesonargs+=( -Dnative-extensions=false )
+	fi
+
+	if use build; then
+		emesonargs+=( -Drsync-verify=false )
+	else
+		emesonargs+=( $(meson_use rsync-verify) )
+	fi
+
+	meson_src_configure
+	code_only=true
+}
+
+src_compile() {
+	python_foreach_impl meson_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
+}
+
+src_install() {
+	python_foreach_impl my_src_install
+	dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf
+
+	local scripts
+	mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/{bin,sbin}/* || die)
+	python_replicate_script "${scripts[@]}"
+}
+
+my_src_install() {
+	local pydirs=(
+		"${D}$(python_get_sitedir)"
+		"${ED}/usr/lib/portage/${EPYTHON}"
+	)
+
+	meson_src_install
+	python_optimize "${pydirs[@]}"
+	python_fix_shebang "${pydirs[@]}"
+}
+
+pkg_preinst() {
+	if ! use build && [[ -z ${ROOT} ]]; then
+		python_setup
+		local sitedir=$(python_get_sitedir)
+		[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
+		env -u DISTDIR \
+			-u PORTAGE_OVERRIDE_EPREFIX \
+			-u PORTAGE_REPOSITORIES \
+			-u PORTDIR \
+			-u PORTDIR_OVERLAY \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+		env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+		env -u FEATURES -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
+	fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
+}
+
+pkg_postinst() {
+	# Warn about obsolete "enotice" script, bug #867010
+	local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
+	if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
+		eerror "Obsolete 'enotice' script detected!"
+		eerror "Please remove this from ${bashrc} to avoid problems."
+		eerror "See bug 867010 for more details."
+	fi
+}