5 files changed, 284 insertions, 0 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 33e20908b279..7aedf2035c68 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/moar/Manifest b/sys-apps/moar/Manifest
index 352574817208..8bc2ae117583 100644
--- a/sys-apps/moar/Manifest
+++ b/sys-apps/moar/Manifest
@@ -6,8 +6,11 @@ DIST moar-1.18.0-deps.tar.xz 4760036 BLAKE2B 6fd72d710a620fdf104766be84f3fa68652
 DIST moar-1.18.0.tar.gz 2784174 BLAKE2B 3d9ee7fda27419b419f47bae3336d9f0d7ae48bbdad1fb8c501c85b4ea34aaaf6cf1c865f1b56d195ec6e129333d63e552d96b147fb9c26c739482a546d6286e SHA512 a76f19465d03deec8f778fda213be6ab33fdd48d309231f4f0ad0cdd8ea2facc41e2bdb1b74771c4a9ce3a31c30a72754f790e5eb9edb06e19d26fe3e224b507
 DIST moar-1.18.1-deps.tar.xz 4760036 BLAKE2B 6fd72d710a620fdf104766be84f3fa68652c760818cdee66bb8475cc8949872c82be026c04b54cb61c0108c5977cb1f787f9a4fa0316bde0293cdedb1f6f94f8 SHA512 f40520a1b2e94f4a3e97d6a4e19191484b66e13a57c7b30416c813d84cad3d29295e862d5b75870313cc905112425c731d052619d49e78b33fb3d5d8750df3df
 DIST moar-1.18.1.tar.gz 2784232 BLAKE2B eee1b0d805150f5a0e09b3038dd13189d20886fbe8159e9fddea4ea97edfafba400b5ab542795ba222c2757e684e41e2db95774ad33a8039e62e1244cd69c16e SHA512 2dbe3b4f461f6ee77b8093e1783a06cf1703ec8c5682565cfb3d28d296296b562fd1032126f0f3ad835de9236d31e2930456b59ed8efb168c5243f4265c6b355
+DIST moar-1.18.2-deps.tar.xz 4893264 BLAKE2B 48ac9d4992c2f6d1aa0f9160bde87bd19d66acfe912753645c9dbb6e5bc007eb68caf1fff53bae84b03e4a6607858717666b1527bf8d0080b0aca6dbb37a894e SHA512 bf141777d4fee5c14e76130671862f255675da3c628c21cb892d53a469a0872d4c7f47699c16c50728df76ba4d9e467e9b8744a322c1acc8d0151f9eb5987b66
+DIST moar-1.18.2.tar.gz 2784141 BLAKE2B 0ed2df0926390ef1de11cefb8933d39e90b704d943afe83e578adee745c0e27411e7f8b3741766176b6d66b44ee56592d8d0b84484d5e83d360dc4039428b3d4 SHA512 552e9fb635c554f16c250db1702314e34d2f961cbbd50106b696c096b31f2e7f86109e99c843911829905bb5390716f642ce0ebe70f0f1b71cada1b47c53e17a
 EBUILD moar-1.16.2.ebuild 917 BLAKE2B aa1dde2fe5aa703f2e860ff05e2d5edb6521bb537143ff39432132e4340f3ba7609ff2a2b6f6a04f0c29f4d351ed587c1879eba36cd85bae4752828500d82131 SHA512 ce60b3e76cb7e8515760cdbf90728557fd5a9e2be4e3df816dbd6ad934506a826256f9560bd6968309c06c4a9dcaddcd4602d42984e5cea1b40b094418ea0f6e
 EBUILD moar-1.17.1.ebuild 917 BLAKE2B aa1dde2fe5aa703f2e860ff05e2d5edb6521bb537143ff39432132e4340f3ba7609ff2a2b6f6a04f0c29f4d351ed587c1879eba36cd85bae4752828500d82131 SHA512 ce60b3e76cb7e8515760cdbf90728557fd5a9e2be4e3df816dbd6ad934506a826256f9560bd6968309c06c4a9dcaddcd4602d42984e5cea1b40b094418ea0f6e
 EBUILD moar-1.18.0.ebuild 917 BLAKE2B aa1dde2fe5aa703f2e860ff05e2d5edb6521bb537143ff39432132e4340f3ba7609ff2a2b6f6a04f0c29f4d351ed587c1879eba36cd85bae4752828500d82131 SHA512 ce60b3e76cb7e8515760cdbf90728557fd5a9e2be4e3df816dbd6ad934506a826256f9560bd6968309c06c4a9dcaddcd4602d42984e5cea1b40b094418ea0f6e
 EBUILD moar-1.18.1.ebuild 917 BLAKE2B aa1dde2fe5aa703f2e860ff05e2d5edb6521bb537143ff39432132e4340f3ba7609ff2a2b6f6a04f0c29f4d351ed587c1879eba36cd85bae4752828500d82131 SHA512 ce60b3e76cb7e8515760cdbf90728557fd5a9e2be4e3df816dbd6ad934506a826256f9560bd6968309c06c4a9dcaddcd4602d42984e5cea1b40b094418ea0f6e
+EBUILD moar-1.18.2.ebuild 917 BLAKE2B aa1dde2fe5aa703f2e860ff05e2d5edb6521bb537143ff39432132e4340f3ba7609ff2a2b6f6a04f0c29f4d351ed587c1879eba36cd85bae4752828500d82131 SHA512 ce60b3e76cb7e8515760cdbf90728557fd5a9e2be4e3df816dbd6ad934506a826256f9560bd6968309c06c4a9dcaddcd4602d42984e5cea1b40b094418ea0f6e
 MISC metadata.xml 316 BLAKE2B 19b5d071afbcad1f05744cca494156dc634f3fc35afaf4828dcf1e691e75a0f47f162b6cf548e5a333441f25327970f6a71d6acb436b60a68deeb7fb44659d45 SHA512 44155ffd972d79d47e41fe2ed38583e41eaaeb9f6b0de7e52b666930906f561e73d1f604acf602750ae1bed50e516dbbe36327b47ba2005813438e0d2db070e1
diff --git a/sys-apps/moar/moar-1.18.2.ebuild b/sys-apps/moar/moar-1.18.2.ebuild
new file mode 100644
index 000000000000..091d314e2ac3
--- /dev/null
+++ b/sys-apps/moar/moar-1.18.2.ebuild
@@ -0,0 +1,41 @@
+# 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 )"
+
+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/portage/Manifest b/sys-apps/portage/Manifest
index b564d5c2c886..cc20ba50a2c3 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -9,11 +9,13 @@ DIST portage-3.0.49.tar.bz2 1152449 BLAKE2B a47f951a35828ba9c8fc88c2eab5222c98ed
 DIST portage-3.0.50.tar.bz2 1153508 BLAKE2B b90d93f8922acdb5486a52c1354c6c9829fac608971078a641b604b57240065eec4e82cc9cb2fb8b4ba485a7f2d52473c0a90295b29eb578638ad11cd3cf2943 SHA512 355841af862077f9203d6f8cbe904f4966516597444f38ef535fc06d0fe5c21d9c1da139a44407fdd69b56eb9c49c286187d856ef4e9b9bc6b21bab5b772a88f
 DIST portage-3.0.51.tar.bz2 1155503 BLAKE2B 1095ab616993951da8f4d43cef4cf815672c67cb48ea2fe5aeb6b7c629058bfab1557d2b9508f2e3e9f38676733b5d60ec6a3686bc57840065c428508769cb1c SHA512 bf237819173bed9df3b63ada067a2a99700618d88fd4b528146c56bdd592f2452003db6cc6da4a445b647eb4d8bb591260ea0d2a5627ad540526a2e802025836
 DIST portage-3.0.52.tar.bz2 1157447 BLAKE2B 61e4d32f9713b9b0a2df6ca636b2d756dacdb93f862eeab8a8b46d436b9c90d3d5d04989023dc5580ce0c4a6827fa623e5b32ce3d5094ff56ccde7a53c1af81c SHA512 1a249b140cc24b6d83314ad0b3f4ca73fcff3df01f1207c2fe661b16e78ab1155bb6dca4fb89100910fce13bf0fc21636232f9560360cf12f2c43b803d2a0429
+DIST portage-3.0.53.tar.bz2 1162321 BLAKE2B 1c38bc97d9aca2ce4062ed0fc2ef9297911379a32f1ed32b4d5ced760970edbfb9579471efd69c0fc16e3227ef6444d60c2bb19be6d809eabe832250d340b4b5 SHA512 d747acc922da2d6f2dc10a8b5a6c7cf4b325ab903b3c5634d5aa1927bbfffa306076ad780a4634d7bcf6092b763b753b02c14f1a21197706559d370c6eee00a1
 EBUILD portage-3.0.45.3-r2.ebuild 9026 BLAKE2B aaba365eaafaffb9dd2d8a66c41fa51c9f5cd7c462fb52f6c77ebc5401361e0875e5696ccea13a647189c53765842f019e255ce14bbb8290f4f8e2ca45a2b051 SHA512 07c1d7ebe215da5031e1f7d6a926e31387d31d3e8ee59fb0a4e86bde8c06b0f6b698ac885c7acc18db1461859c84055b2e8b9a21af36ddbe4692db920e62b377
 EBUILD portage-3.0.46.ebuild 9028 BLAKE2B 45cc1c243acdcd59535c2b0ae9f0ab94719f5892d9d15574b1f19cd849b26b01c8ade885a219d270aec61c9973bb39c05c82f61988bf414c972e2a696c9ec6a5 SHA512 daa29ed42c599011e6b93e765a97bc55262acffd01dccc3c681a4e2fcd5eefd1aa173024221e71e6d8cb463f024b71c7bb276632cd5a7a58a3a2d470124899d3
 EBUILD portage-3.0.49-r2.ebuild 9527 BLAKE2B 7be78ac1979d89e8ad41d6d1dab8ee3f89b8edaeaac34286f4dceeb044fa613db4dd1f0cb4b091b6fd1813f58abbea71f483ff41d2ac4eadc6e76ea05218482c SHA512 67f55f308c4b0014ada740d5ea06645e6de47ddd40db0998fd99afcb0d78a9a1640639a3e516a9a5b369726fc6b9902750f9c7738f7f0b6daf6373c3de2f14cd
 EBUILD portage-3.0.50.ebuild 6691 BLAKE2B 7044bfe92aa4018164744420f11d51c0d31180b5e01f1ad88bdabf1a0f5240cffb19705abaa2defe4f6b2b98486bdd88abf3f6f55b6062aa9155e4a3353f9859 SHA512 7a0d692f9df7ae2acc4b9684ef99caaa794a75495b99e3de6e8b8ea4876a97db1eb27d5635d2b5ea82239bbcc69ceabcc39b9beb48565a830509d8981082d821
 EBUILD portage-3.0.51.ebuild 6685 BLAKE2B d483723430a1fe2527384860aa7dee344214ecae1b81d3b32d84d3ac68108b6a6b5f2a07e6d8906c2de5ae328cecc224d963a2db5ed76ae97a26e093994f98c4 SHA512 53133767fd3f019da9f912bb150c3952433d04043ad101a13cbba07ba589d93176c801adbd36b6f2333d8c1d5ceafe576b446ff54793eaed1d867d0bcc2aa3ff
 EBUILD portage-3.0.52.ebuild 6712 BLAKE2B 76902f4538bda738b8ec3a00d34b33c5b52bd2aad6e8532f01390604949f641523b100cb2365a86bf9cafbe2fd52a6ab3dc75d77c1dec8cba9f395713fa606ad SHA512 780ab06b65b4aecd8570ad62168b2d10dee338fad072cfdc4da37f4c1d6542171d95acb786a4256492a4690c634157a2430d82fc75ad8fb8314dc1e75e4415d9
+EBUILD portage-3.0.53.ebuild 6712 BLAKE2B 76902f4538bda738b8ec3a00d34b33c5b52bd2aad6e8532f01390604949f641523b100cb2365a86bf9cafbe2fd52a6ab3dc75d77c1dec8cba9f395713fa606ad SHA512 780ab06b65b4aecd8570ad62168b2d10dee338fad072cfdc4da37f4c1d6542171d95acb786a4256492a4690c634157a2430d82fc75ad8fb8314dc1e75e4415d9
 EBUILD portage-9999.ebuild 6712 BLAKE2B 76902f4538bda738b8ec3a00d34b33c5b52bd2aad6e8532f01390604949f641523b100cb2365a86bf9cafbe2fd52a6ab3dc75d77c1dec8cba9f395713fa606ad SHA512 780ab06b65b4aecd8570ad62168b2d10dee338fad072cfdc4da37f4c1d6542171d95acb786a4256492a4690c634157a2430d82fc75ad8fb8314dc1e75e4415d9
 MISC metadata.xml 1539 BLAKE2B 0efa1ae365449d6593909046c32158a9f6755aa9252c34ae00eb866dd29a0b6a5c2e7a4af9293d0f87c4dd9231132fc5361acb0818fb6beff6dd6fbbdc6f409b SHA512 675f5baa1b3079592e3930b11ca18f324e27c42b5515f9ae815a26e53a465640fa6e9c4069df0e2121932b9f1cc73f2c9469c1529728f3c5ed5c3e687743ac0d
diff --git a/sys-apps/portage/portage-3.0.53.ebuild b/sys-apps/portage/portage-3.0.53.ebuild
new file mode 100644
index 000000000000..5bf30b190b87
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.53.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.4
+	!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
+}