8 files changed, 255 insertions, 52 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 338f92143be8..ded8677c0496 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/arch-chroot/Manifest b/sys-apps/arch-chroot/Manifest
index 083ffecf5a85..3613f41486b3 100644
--- a/sys-apps/arch-chroot/Manifest
+++ b/sys-apps/arch-chroot/Manifest
@@ -1,3 +1,3 @@
 DIST arch-install-scripts-v28.tar.gz 19730 BLAKE2B 0ff5ba79b200ad642e049ec19217cc5c0794d627a28f42e03c0df2444fef4d8488a6ee011d26fb8fe958c1a1a2fa0a13920567e394b2389c772f516b1fe8f388 SHA512 09a027b04b70e01ccd1fd82e3a443c876bdf978b94a922de9dea4dbc187360460ea35720816724b72fc31b02338b11bf39b47ec9156518a8a3ade000530bf1df
-EBUILD arch-chroot-28.ebuild 817 BLAKE2B 65a7f38225cf111af6a2f00851fc4b7db9c2eaa5aeb308e09b6ddab1a6f6b92a7e3598d0adfe083cc69e501d3999b944dddd9cac113644fd5dcad954869f6d88 SHA512 fb877a89784d3cc15e0a33a81518acb42dd315aa644a6ef72088479f66c03a7f35cf969a9842506a1cd4b7b3a279762c4bd273c67f26dcf4c038d00efa05b82a
+EBUILD arch-chroot-28.ebuild 853 BLAKE2B 9d5d9e430ed04ae954f90a302f6d1bae1cad9394106710726fe88fe50640b8e29a14d76eac8a2039d0986f514159a9ff468f9266fbaa46bea1b59250718418ba SHA512 9d11ff9213d5c823d26541f88a4abb71587ff7165a52b86a298fa0d4dd15229f72e48a0a561faa1109c263a0aa1c005da8e8227e0e6ed17284c92c8c363b5b4e
 MISC metadata.xml 660 BLAKE2B 563818fc11864a0cc992d1ae36b2da1d7419dbed8fc5c63428b64c073af630139c1154a4e818b4dacb2e9d56923338483d4c290ef943745401d5ee905276d518 SHA512 885e4cc9b4f1795445a394dc401270263da33c030a8233c6a8efb2d1ec034cf915fe40d94e93122dfe4db91205593eaef2e69439197d77208194bdeea0ba75c6
diff --git a/sys-apps/arch-chroot/arch-chroot-28.ebuild b/sys-apps/arch-chroot/arch-chroot-28.ebuild
index 171cbdf83382..f2675b678611 100644
--- a/sys-apps/arch-chroot/arch-chroot-28.ebuild
+++ b/sys-apps/arch-chroot/arch-chroot-28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/archlinux/arch-install-scripts/archive/refs/tags/v${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~loong x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 
 BDEPEND="app-text/asciidoc"
 
diff --git a/sys-apps/moar/Manifest b/sys-apps/moar/Manifest
index 0c6c39bd19da..4565e3df7d18 100644
--- a/sys-apps/moar/Manifest
+++ b/sys-apps/moar/Manifest
@@ -1,10 +1,7 @@
-DIST moar-1.18.6-deps.tar.xz 4893264 BLAKE2B 48ac9d4992c2f6d1aa0f9160bde87bd19d66acfe912753645c9dbb6e5bc007eb68caf1fff53bae84b03e4a6607858717666b1527bf8d0080b0aca6dbb37a894e SHA512 bf141777d4fee5c14e76130671862f255675da3c628c21cb892d53a469a0872d4c7f47699c16c50728df76ba4d9e467e9b8744a322c1acc8d0151f9eb5987b66
-DIST moar-1.18.6.tar.gz 2786730 BLAKE2B 0c78fd8833a14141eecc246a0db71ec418cfd0552761ca71616620137e2eb44e173528e78da138707be19e3da76b7d9cf3bec73866c989b566d10ae8b20296e9 SHA512 9dd0972a7b2c77b8cf9eb4c927e95e5b85e1e10c0892a41d208c452c86951573a8f7d9919d467d7eae96581940e07d60e2f84a04c06347484a24c98f8307e8ca
-DIST moar-1.19.0-deps.tar.xz 4893264 BLAKE2B 48ac9d4992c2f6d1aa0f9160bde87bd19d66acfe912753645c9dbb6e5bc007eb68caf1fff53bae84b03e4a6607858717666b1527bf8d0080b0aca6dbb37a894e SHA512 bf141777d4fee5c14e76130671862f255675da3c628c21cb892d53a469a0872d4c7f47699c16c50728df76ba4d9e467e9b8744a322c1acc8d0151f9eb5987b66
-DIST moar-1.19.0.tar.gz 2789262 BLAKE2B c30f6b850d5f8998c56b6e0d8a7dbb4eadddf3b54b98904a8b947a0bef4248365091e25c2e956d3a97979b73fb93147d03c9ddda926d67c8db2111a14310bbda SHA512 096b4a6b7f5c714bfbf54bc7d9acc41c74519f360a5366fcc35c5a57b848acff73afd43abb581b9d8e7709855eb8f4d0e3ac3dc7c8b663cc2a59405c066b9652
 DIST moar-1.20.0-deps.tar.xz 5100896 BLAKE2B 0be3ca9e2fa88f8d57705f0a79a21088cf1c004740c784b3b8249fde03eae0557bfba97e9e9b5266ae37364e4a686c3e8c5a5556f8ff23f8aef90845f5c891eb SHA512 ec2e5dc41fab5327b7ec25a5aed199712421121fa6f2bed0c76658784ff6260cb6cdba3e478eb3bcdee7ae177acb2be34c35ca01ad7c35f36a1b62c8ff7ad673
 DIST moar-1.20.0.tar.gz 2793794 BLAKE2B 10fa1f59a0ec20703d8a478e190188555c668fddb37128dbe4821f47acba035dfa102403d5bb9f4f19af809d2e08fac9ede1e25f1aa333949ffc332ea41c2f7c SHA512 d85eb1b8e9cc01384eca606b0ccf0f76b55dd7d8635a5c4f075dbd5784bebaa4004c379b8a5ba018643d75c088dad83599a7d2faa7c15ff9d008b0c7ade76787
-EBUILD moar-1.18.6.ebuild 969 BLAKE2B 48cde082c556a547a62739d52c13b54d82048b4e09fc0fed118866c994c07518f79ba06bb6b68affac58de05e00d8e0bc3fb23c84ee7126dd311f654a9f66d5c SHA512 7367fef7d786418e8954eccdc20a2af84e16e109837fbbeab433ab42a867589d85dbce2fca7be648faf8321f0ddfec2e96fba0328ee5b452abee34ff5f4bf2b7
-EBUILD moar-1.19.0.ebuild 969 BLAKE2B 48cde082c556a547a62739d52c13b54d82048b4e09fc0fed118866c994c07518f79ba06bb6b68affac58de05e00d8e0bc3fb23c84ee7126dd311f654a9f66d5c SHA512 7367fef7d786418e8954eccdc20a2af84e16e109837fbbeab433ab42a867589d85dbce2fca7be648faf8321f0ddfec2e96fba0328ee5b452abee34ff5f4bf2b7
+DIST moar-1.21.0-deps.tar.xz 5100896 BLAKE2B 0be3ca9e2fa88f8d57705f0a79a21088cf1c004740c784b3b8249fde03eae0557bfba97e9e9b5266ae37364e4a686c3e8c5a5556f8ff23f8aef90845f5c891eb SHA512 ec2e5dc41fab5327b7ec25a5aed199712421121fa6f2bed0c76658784ff6260cb6cdba3e478eb3bcdee7ae177acb2be34c35ca01ad7c35f36a1b62c8ff7ad673
+DIST moar-1.21.0.tar.gz 2793970 BLAKE2B 696fc70d7fa05f6e3537272730a7d844c2fd5de94fb2a154906b8102096425c384fd8c54a0f9cdd5bde44b3310119fb5f1e52d98edc10e284c13cdfc44255a6e SHA512 8c91b6f910689496ebe3a5a59325fffc99aeee6808e0c65f01eead47b902481ee02841cdd33a62c90d99d760a2f052df89695b144ed2d7c5446733be7957dcb6
 EBUILD moar-1.20.0.ebuild 974 BLAKE2B 36b4ad20b4ce6d0f9bced9610617d53ff6e34b34d1c8ed9d0158f90fd061174d1976a9a7e64d94d68aed154e3656d7c583fa6e2022bd7789afbd921b24715171 SHA512 5530e5eed6eeb83b2353593ef9d85fd9b9c405aca5c0422c670f65679d37677f71bb0f731b9691f960620e9218726aa798b2125ae53a091f7d25ebb598a22043
+EBUILD moar-1.21.0.ebuild 974 BLAKE2B 36b4ad20b4ce6d0f9bced9610617d53ff6e34b34d1c8ed9d0158f90fd061174d1976a9a7e64d94d68aed154e3656d7c583fa6e2022bd7789afbd921b24715171 SHA512 5530e5eed6eeb83b2353593ef9d85fd9b9c405aca5c0422c670f65679d37677f71bb0f731b9691f960620e9218726aa798b2125ae53a091f7d25ebb598a22043
 MISC metadata.xml 316 BLAKE2B 19b5d071afbcad1f05744cca494156dc634f3fc35afaf4828dcf1e691e75a0f47f162b6cf548e5a333441f25327970f6a71d6acb436b60a68deeb7fb44659d45 SHA512 44155ffd972d79d47e41fe2ed38583e41eaaeb9f6b0de7e52b666930906f561e73d1f604acf602750ae1bed50e516dbbe36327b47ba2005813438e0d2db070e1
diff --git a/sys-apps/moar/moar-1.19.0.ebuild b/sys-apps/moar/moar-1.19.0.ebuild
deleted file mode 100644
index 25abd2aac1ff..000000000000
--- a/sys-apps/moar/moar-1.19.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="Pager designed to do the right thing without any configuration"
-HOMEPAGE="https://github.com/walles/moar"
-SRC_URI="https://github.com/walles/moar/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-
-LICENSE="BSD-2 BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# moarvm: https://github.com/walles/moar/issues/143
-RDEPEND="!dev-lang/moarvm"
-BDEPEND="
-	test? (
-		app-arch/bzip2
-		app-arch/xz-utils
-	)
-"
-
-src_compile() {
-	# https://github.com/walles/moar/blob/master/build.sh#L28
-	ego build -ldflags="-w -X main.versionString=${PV}" -o moar
-}
-
-src_test() {
-	# From test.sh (we don't run that because it has some linting etc)
-	ego test -timeout 20s ./...
-}
-
-src_install() {
-	dobin moar
-	doman moar.1
-	einstalldocs
-}
diff --git a/sys-apps/moar/moar-1.18.6.ebuild b/sys-apps/moar/moar-1.21.0.ebuild
index 25abd2aac1ff..b5588a90db7f 100644
--- a/sys-apps/moar/moar-1.18.6.ebuild
+++ b/sys-apps/moar/moar-1.21.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 47f628421f4b..28ccc376f903 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -7,9 +7,11 @@ DIST portage-3.0.49.tar.bz2 1152449 BLAKE2B a47f951a35828ba9c8fc88c2eab5222c98ed
 DIST portage-3.0.57.tar.bz2 1173286 BLAKE2B 793a150c94c939672783d7556e5fce80f7ff8895a616726d7adf92d6f8da99768c55db8a685f2dd548ab0bb09c29fd7548ee6fc1dfc51b55c530119690b92265 SHA512 4c5348e0dfc966db5ca1c08cc3fafc72dd2b3b402972b99b411f61f7a288190ecd9e5ac597dc62ee96eacc378818a4cac65b0fd040c9ff557e7cbe057a934829
 DIST portage-3.0.59.tar.bz2 1175098 BLAKE2B dbb8a22fd9417a74e60aa24ff064e9da5b4c54bd4936a0a1a4fdb0cd30d8568ca2424ef2a484883b538685a291a85009d942defdbb5cfa4e0072e9d977f238cd SHA512 8c86e0663327125e7cb36150d4aca1d7fcd2bf7ae25634ed916c2ee444809404aafb094adacacc0408509600f447d62d9c53e7bc25dd8c71c61e8758ac674638
 DIST portage-3.0.60.tar.bz2 1177524 BLAKE2B 1928e448e8f319e4f000e795587fa043155cf54871a14631f06cf96d0ff2372049d54da2196c878bd9c09b7db0578eaba72b15d85edc9c7b1514cc58f6ab24c3 SHA512 20b6af1778aff8ab7db64861393290ce57ef5ee4c9c1659d31ecd45374f10e230e6e9029d883c0647ab8f9e0d9b9fb0a22ddf70cb2281e4bcac949b7e4751428
+DIST portage-3.0.61.tar.bz2 1178151 BLAKE2B bad3140735b12a18a3108e91cc88146fc5c64ad3e3e056707eec7629927f718483a3e1ccf09f74de510ee7733b4d856c3c53692a6cc0f5fc1a7babf88fd7f06b SHA512 1401392a7bd2bf18e698e82af25a39db2aa9d8d9e8d9c07dea11ba5d5c866d2d3f8a3eccc8568b081aeaf6f668466921c61f58adbdd9dd5ffd9cf632bff2bdbd
 EBUILD portage-3.0.49-r2.ebuild 9527 BLAKE2B 6cad70f759ec4440c228193e2535d57d679eddee0c73d444c78880d38e9529588835f8de721e900495261c53ea9461e2bce1c1b63ed8d32f657f6e458119d18a SHA512 0a49e29242fb469a2d389b06a8e1fdf0187cb7d35c56e4ce3661722dc0668f1383ca52321417fa2110f2d02670b2e4cf43c319efa511e373ca4f2520e2ac2ba7
 EBUILD portage-3.0.57.ebuild 6846 BLAKE2B fdc6f76f9c5652efd31bb4d2ea36db9b24e8ff7256d526520f9c28546dc934907148784c015fd0a4a6ef15bd293d902f3e3836840896f9f75d0dd1c922ac65d3 SHA512 7720fefa1ea1eea3dfd4efae53f938c47fb3d01dd34d227f535cf17caf71605c9d4786739f0a863714b6157e3dbf34b891496b82533cf510a5c25c6c90215537
 EBUILD portage-3.0.59.ebuild 6917 BLAKE2B ef7dc450f16ae03afc355c28a7387d3fca4f7c2ea6a2d3d9598e1065aeb9c5c27914dc4d841b153659cc8ade991e8c91c054cefe6cf25793a113e25301ce2f20 SHA512 eac1103e34aad66917f44bd6f74af075d2be5638c70fb87431147b6cf54c1bd15f719ddea82d1b1f0c8667dbc7da6c03485267b120b58f6ca7c48b7c44e85a9e
 EBUILD portage-3.0.60.ebuild 6924 BLAKE2B b4281caf86b61a7653fbb1f5d9ace233d5c3969613e02a00de81fbd16a09f717798ea9f3e9ff00a0b273b3d70bc7d49a8a579a9a56d149c9f34869b1861d04b0 SHA512 53f97835922ce08cfc56458499ec9d9e7cde3a73c1832767098fa03509ed329a28ea1277d7c40cb7cc6a071b7fb2fb747e7f5bb09955b557820b3934734593d5
+EBUILD portage-3.0.61.ebuild 6924 BLAKE2B b4281caf86b61a7653fbb1f5d9ace233d5c3969613e02a00de81fbd16a09f717798ea9f3e9ff00a0b273b3d70bc7d49a8a579a9a56d149c9f34869b1861d04b0 SHA512 53f97835922ce08cfc56458499ec9d9e7cde3a73c1832767098fa03509ed329a28ea1277d7c40cb7cc6a071b7fb2fb747e7f5bb09955b557820b3934734593d5
 EBUILD portage-9999.ebuild 6924 BLAKE2B a8a4c8d980456a8fed82b49b1017037ff3f48f00e4a98f5ce7b023eb5af3c9dfcd6367121640ec8f092d080e62036db12de15709b483d7671c460c62c978a600 SHA512 a14d9925f026edc3d1aeaf7ccaf535f0ab999e41f44a592f97fb2a58c6926e049cd8a60bff6da6c3051a58689075a07ef0a7480fe9eca41fb79c6a12ab1c6f4e
 MISC metadata.xml 1539 BLAKE2B 0efa1ae365449d6593909046c32158a9f6755aa9252c34ae00eb866dd29a0b6a5c2e7a4af9293d0f87c4dd9231132fc5361acb0818fb6beff6dd6fbbdc6f409b SHA512 675f5baa1b3079592e3930b11ca18f324e27c42b5515f9ae815a26e53a465640fa6e9c4069df0e2121932b9f1cc73f2c9469c1529728f3c5ed5c3e687743ac0d
diff --git a/sys-apps/portage/portage-3.0.61.ebuild b/sys-apps/portage/portage-3.0.61.ebuild
new file mode 100644
index 000000000000..7d462427195c
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.61.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2024 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
+	|| (
+		>=dev-util/meson-1.3.0-r1
+		<dev-util/meson-1.3.0
+	)
+	$(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
+
+		env -u BINPKG_FORMAT \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_format || 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
+}