gentoo auto-resync : 02:08:2023 - 10:49:50

5 files changed, 63 insertions, 132 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index a81f8b354861..7c83274f0614 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index a5eb3c63898c..71059f4ba93b 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -1,6 +1,6 @@
 AUX acl-2.3.1-musl-1.2.4-lfs64-fix.patch 1028 BLAKE2B 3ce13de7ee1f58b7fd1c39ca9b41132506f493e1c8b7e0b78ba312ced8f86b62146779e4cff4dcd53bbac613dd5311872cc38532f3ed30630ccbf3be44f45f88 SHA512 322a556e82be3e95dc9baf6964f2b80fd2f70f0d6f275221aa4ff9b8d8370b1a7b1517057a4c034ac5d9153c6bc83cd97f1a5fa3db1873537fbde78130eed1bf
 DIST acl-2.3.1.tar.xz 355676 BLAKE2B 15e81e8159ddb21ef0c262bef3101c0b6fa546738a2ab74c01ccc21fd1c3dc8ab6aaf84a06dee6da22291f3ca4feeffa60c7d11bfac1ab770a6ec28e1f1655e0 SHA512 7d02f05d17305f8587ab485395b00c7fdb8e44c1906d0d04b70a43a3020803e8b2b8c707abb6147f794867dfa87bd51769c2d3e11a3db55ecbd2006a6e6231dc
 EBUILD acl-2.3.1-r1.ebuild 1971 BLAKE2B cf1363a75104e369df946adaf99a9cb26ad9207418f90b283c5318b632b1ed47b7e47bf659500e25b3fb6b06f930b3fcaf5fca29c70d0da7680c7a925edd379f SHA512 065425580b662e56dac22d3bcde62e00bad9405646a993aecee3815c1062e114622433559f45b994aa757c1e72142c3fd512b8cde4b84e3b17ad210add00276f
-EBUILD acl-2.3.1-r2.ebuild 2040 BLAKE2B 85b7d1c56c3a556e1e88b8dd6abbf4d4fa4ab6ceaaffd5e7fc7dec66717ce9a447f54afc6672b87f96d8811341e099d239eeb23c41a012b9f77ac2aa52b4dcd7 SHA512 b4b42a2d62ed84f2c81f17fbfe82b8492b295d95a965af5b54e62fce2c3ec5837bcc857d2491f9a2c668e2b426ffcdc1a79224ad986ac152452c76bb410d63a4
+EBUILD acl-2.3.1-r2.ebuild 2039 BLAKE2B d15cc84b45f99a88610512a51fd765109779b62743bf95741fc68014f0edfa247e4cc5287c5b50c1151d4d292bdeee554755d3a9c234743eccae1701bde7cd24 SHA512 e2845ff2dc1ec98aa1790aa06d201bde3988068ad5511f67f1d461aeaa51f9c0a833e7ec474ce7d16ecbdf97948ec2b878b006c5b1435f3c6f3f4d1537827755
 EBUILD acl-2.3.1.ebuild 1411 BLAKE2B c872dcf27fccf0193428b73729982af5e2c4bfa4c27c846e283dd163e9b8da85cc20a6e7b93e2760ddb702a89326bea28699d98f4b57025f6055d740071c7d4b SHA512 bc6286a20b1adc7c7a48888639d074ffef069c38130621bb95ad6b04c3649dd855f56ccf40027b87ed758677fbd6d82b3781ee92e8886cb8612a70dadb32ad90
 MISC metadata.xml 345 BLAKE2B b168c40ceb66cfacdb1fbe9b5031705f5c3249afeb872163663564dac2ea85e6fa857804831a80b4c44323223b417a24a156d27f8231396d5b090e44a0dc9288 SHA512 e0cbeec10fb47ace3d0fd3c1ba8a5a0bba02345a3e0df30aa82777507fb6ab75f2705b06e7635a00406d2b0839bc41d0a9fafcd8926844e1d9877b8cf2ed6f78
diff --git a/sys-apps/acl/acl-2.3.1-r2.ebuild b/sys-apps/acl/acl-2.3.1-r2.ebuild
index 509974604ec4..0b93601194af 100644
--- a/sys-apps/acl/acl-2.3.1-r2.ebuild
+++ b/sys-apps/acl/acl-2.3.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls static-libs"
 
 RDEPEND="
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 043d32b6b9d6..bec070b73ae4 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -16,5 +16,5 @@ EBUILD portage-3.0.47-r1.ebuild 9272 BLAKE2B 5cfd00aa50d078fe299c5cf244064ddf63e
 EBUILD portage-3.0.48.1-r2.ebuild 9403 BLAKE2B a4df81d1c9e37bab4233bc81950311e2a6a63d128c01b7bf31ad67e26540e5511cd24ecd10694abd7f66a3f5d25a55f14f831237aee8d3386645af36ced1cf5f SHA512 7585547ae3b2c15b65e9a728305775fd5f1dd5109c1a4cd906128c4c74c863aae57e6fefe6363374778c68d380dbae7cb67ac843bf21083fb0c11ade0f78a878
 EBUILD portage-3.0.49-r1.ebuild 9399 BLAKE2B a1a18644449ef46cb0f5acd4fa73fdc20da4f9dc5f21e57051286c9c7c7696cfdd7b11955a86f51564fd671a2e89b8f5f28bb87a573b56a89a1b1648e059dada SHA512 f2cee72b1c4774780082a646233668f04bf1a9431158a1747158f43ffb8f6ddbd48ff1736af940f61420ae4b3cc93a00e976354785b986e571cf8269c84ef14f
 EBUILD portage-3.0.49-r2.ebuild 9535 BLAKE2B 5937530a60580c92b8d0454da87fdf4351aeeacdae75060a1134217436681ba51d04574efcfc0bc75c3eea67ae6ef9fd27dca95e27098842cdf81e3a90248d8f SHA512 999e4f9f6c47c9c9f072c27d1acb004072e95740f43d57db55e187cb11bc5b66917663db1cb3d81820d7c4a463d2722fe14eb1590a67d26134e044a32daf221f
-EBUILD portage-9999.ebuild 9120 BLAKE2B 45b27f174dbc7677da962d79b171f29fb9f99ad516e44bf7399c9aaa0d44f022b1c6b1558c81f3c7c129bd49104995a17b802137cf3705005e9a6d04da158092 SHA512 e70486c13ed43caf6b0e3e3b21a7bfd3ed9fd925fe88c94c26f65bc6afa29c1e7b1216a155f3b86539458c7e46e85dc7d0cb3be803000a005b2ed977837ed94d
+EBUILD portage-9999.ebuild 6306 BLAKE2B 60702ffc3316a8fcb5661e1c6da1cf91d64d718befad9226a0ccd751fbb6680011a253a3c579de2ae5f9bc6aaa2c10a247df0bce732ee41753ffe7299c66c8e8 SHA512 39269f3650ee4a292942a4de212cfe741d1c6497639c91bcc1f1ec13dec1258c30ca28fe0c0fb072a1a9d2002f0adb940396a4156589c7a216857002ef13ba99
 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 a322e5529936..6bb5c1c1d398 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -3,13 +3,11 @@
 
 EAPI=7
 
-DISTUTILS_EXT=1
 PYTHON_COMPAT=( pypy3 python3_{10..12} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
-SETUPTOOLS_USE_DISTUTILS=local
 TMPFILES_OPTIONAL=1
 
-inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix
+inherit meson linux-info python-r1 tmpfiles
 
 DESCRIPTION="The package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
@@ -28,13 +26,21 @@ 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
+
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	' python3_12)
 	test? ( 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
@@ -51,6 +57,7 @@ DEPEND="
 # Require sandbox-2.2 for bug #288863.
 # For whirlpool hash, require python[ssl] (bug #425046).
 RDEPEND="
+	${PYTHON_DEPS}
 	acct-user/portage
 	app-arch/zstd
 	>=app-arch/tar-1.27
@@ -90,154 +97,78 @@ PDEPEND="
 	)
 "
 
-distutils_enable_tests pytest
-
 pkg_pretend() {
 	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
 
-	if use native-extensions && tc-is-cross-compiler; then
-		einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)"
-	fi
-
 	check_extra_config
 }
 
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if [[ ${PV} != 9999 ]] ; then
-		sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
-	fi
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i lib/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir warn-on-large-env"' \
-			>> cnf/make.globals || die
-	fi
+src_prepare() {
+	default
 
-	if use native-extensions && ! tc-is-cross-compiler; then
-		printf "[build_ext]\nportage_ext_modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
+	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
+}
 
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-			-w "/_BINARY/" lib/portage/const.py
-
-		einfo "Prefixing shebangs ..."
-		> "${T}/shebangs" || die
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				echo "${REPLY}" >> "${T}/shebangs" || die
-			fi
-		done < <(find . -type f -executable ! -name etc-update -print0)
-
-		if [[ -s ${T}/shebangs ]]; then
-			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
-		fi
-
-		einfo "Adjusting make.globals, repos.conf and etc-update ..."
-		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+src_configure() {
+	local code_only=false
+	python_foreach_impl my_src_configure
+}
 
-		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
-	fi
+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 native-extensions)
+		$(meson_use gentoo-dev)
+		$(meson_use ipc)
+		$(meson_use xattr)
+	)
 
-	cd "${S}/cnf" || die
-	if [[ -f "make.conf.example.${ARCH}".diff ]] ; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
+	if use build; then
+		emesonargs+=( -Drsync-verify=false )
 	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
+		emesonargs+=( $(meson_use rsync-verify) )
 	fi
-}
 
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use apidoc && targets+=( apidoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
+	meson_src_configure
+	code_only=true
 }
 
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
+src_compile() {
+	python_foreach_impl meson_src_compile
 }
 
-python_install_all() {
-	distutils-r1_python_install_all
+src_install() {
+	python_foreach_impl my_src_install
+	dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf
 
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use apidoc && targets+=(
-		install_apidoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
+	local scripts
+	mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/{bin,sbin}/* || die)
+	python_replicate_script "${scripts[@]}"
+}
 
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
+my_src_install() {
+	local pydirs=(
+		"${D}$(python_get_sitedir)"
+		"${D}/usr/lib/portage/${EPYTHON}"
+	)
 
-	dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf
+	meson_src_install
+	python_optimize "${pydirs[@]}"
+	python_fix_shebang "${pydirs[@]}"
+}
 
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
+src_test() {
+	python_foreach_impl meson_src_test --no-rebuild --verbose
 }
 
 pkg_preinst() {