4 files changed, 292 insertions, 0 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 0aa186d61a55..48cd146f3220 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 4cdbc2d68467..da929aa0f9d9 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,5 +1,6 @@
 AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a747313021bb85c37b20327ab2feb9b2cc715849245875e7d8a5ae6ceee84b4a33d532996cb793bd SHA512 0df49e479e551648519ea4db0986584463eed498f77b133bd0e517389e71f4ff4069f1a5017c39f349bae62baa2ac32d968048c396261a9045ff00a0e5aa8bf4
 AUX portage-3.0.66.1-webrsync.patch 3040 BLAKE2B 1d93c327b5822df67f034155759d702ce8edeff0605b7b5118ead8eec906cb77088f04d47453877e5be23c995c8ae02965e54778b9bc7db48ad74fe2fb328792 SHA512 24e798221c3791987afbdbc67ee87febbe99d4c52746fef5299c97815747350aa6a4982120515fc5691bb266d58d6a942ef99ffbd1c93944ebdf6dca0b940595
+AUX portage-3.0.67-nicer-depend-phase-output.patch 2008 BLAKE2B 4c75bef5308ef8da1e7c7b5a1f20aa6ea4a00b39b41bdcb8a3f5998a00f313eb6cc570739fbb7879715fbf52ffb8c0c8a229cf6b8604db1816adb1c341124d41 SHA512 4b5d152d7497aba6b4f64c229a8dbd74ac9ebc4712db6756fa2d234583e040850ea23756f51b2bc333d16ac83e2591e5c8c31b7bf30d1b83317926f6185dde9b
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 AUX portage-tmpdir.conf 76 BLAKE2B 79f35df57dbdcd461d94d558212261df7df54253d5205b40a0a0640ce2a7ae553a84d7aa8d8c11a776cac44b7573b842951ec11f8ab393145edb1786d6837e79 SHA512 4810d8ae1f8291d34b756897972841d30d5f50b48597a430cb8ddb102dab07a7f0d78c3901b6fdd6763180e92b5ae90a3cb88ae5a5c1cae845b23b49d03a87fd
 DIST portage-3.0.65.tar.bz2 1193321 BLAKE2B 4734b0a2b17cf0cdbd0bedac9efa6cecb5799460e1faa8b8ab137fa017e17d47d6d5da6382e75322f21d4be77a31acffbacd753c70b43b011613cc5a6332bc96 SHA512 c864bcb3bef11916128852a5f50b161d82529d7316ec970703a9ec948c46a51148419ef1dfde2906f72347dd41d0eebd49f5a1769a228d97145f5517c34dbff8
@@ -8,6 +9,7 @@ DIST portage-3.0.67.tar.bz2 1196776 BLAKE2B 4a9056d388b012a0fa343d6fc50c9c3b455c
 DIST portage-3.0.68.tar.bz2 1198758 BLAKE2B fbe3a14babbe5687d075c7e691027d04e7a34a35c3199c981e176bae365242e1dc7d4122f2d7a385444798b9413c415ca40801825a9dd9c99c3590efca8087e6 SHA512 4ed6d0945ad94ee19260996dd2ba9fa5e013560a50de887eb7e8df87a3649552316cbc62ee8ef9b4a025d9d98fb74e85ee7734b7a8fe7416450b8d6818fdcfab
 EBUILD portage-3.0.65-r1.ebuild 6776 BLAKE2B 06f1d5e62b178276acf0a4c908697fe337f004fcd8bc8b0855f604ceacd60d37331024115a99dc6b1711c2a67d91f94d29f7a5e278519d8be0fc8a3a93c38367 SHA512 c55d309d9bf3706d3e272f3634dc6c33222074d8dc2f289109631b4f6db24df62fbb355a70c8bdf74f3d76c0a799b262726c92efaea9e7e52fa49e4b175abb20
 EBUILD portage-3.0.66.1-r1.ebuild 6401 BLAKE2B 91539d4020cb0b91ed61c1c0f0fa15935cdca80a9326765ab0bb28e4d79edc35e3cac07728979178bc7112010318ae9bafebbc008b94958a9ef5f3243e18bcdb SHA512 8e77a4da3d898f820d8afc9a028a2b3cfebb41e77d2fdae0131f8087ad0794cb2ede27b2bad7a37d4a9d36595d2523e6ec67f70ee96bc6169fada6aff5448c41
+EBUILD portage-3.0.67-r1.ebuild 6498 BLAKE2B 6398ca6a0c199aaf09b462b2b6dce28f0c6a1c1e5fa5d6ee5818b144e34cca30aa4ae59a09360b417e0253afa14ec5d8144d9c883b0089e625e9703691361285 SHA512 b90067d525797b8e8d5ae9cde9eacc1a508a93f487a43522659c3e2afeeff81ef541eb64ec957a5b76e29033226d7fab2e9c7ef6f972b2a6994c2fbbbc934fae
 EBUILD portage-3.0.67.ebuild 6425 BLAKE2B 726e9d4bf10c75ebc1dbb47ff1aaf6613f68ffb03b3c041dcfc64d68ec3f1092e47a0b55b3709b5f4b2389eb432dabdf7ef865762eefbd50924306747ccfc86f SHA512 d115583ddadacb1d6a2b6469fd2df72b29f8310dead8e91e84d4c54018b5ba10e0918f9aea87b5fc7b97c215fd5b296b7b4f522c1c3bb0a0491766b31f0c8d7a
 EBUILD portage-3.0.68.ebuild 6433 BLAKE2B afa25e70693b34882e13ea2e9beffbf3ff820f4d780b6cc125c4930c02bc0fa1e12209b3a54bc9b59a9cd237a56144045d667fad561899542be51472a4bd0e1d SHA512 ff2c0513c6dbeefe619f9adde8873c412b0967142830daead468f17f99681caef3bbd99209f8f7f0031fbcd456d04c6d45cd7dd5a3a232bd7c7bdd4a753619e5
 EBUILD portage-9999.ebuild 6425 BLAKE2B 726e9d4bf10c75ebc1dbb47ff1aaf6613f68ffb03b3c041dcfc64d68ec3f1092e47a0b55b3709b5f4b2389eb432dabdf7ef865762eefbd50924306747ccfc86f SHA512 d115583ddadacb1d6a2b6469fd2df72b29f8310dead8e91e84d4c54018b5ba10e0918f9aea87b5fc7b97c215fd5b296b7b4f522c1c3bb0a0491766b31f0c8d7a
diff --git a/sys-apps/portage/files/portage-3.0.67-nicer-depend-phase-output.patch b/sys-apps/portage/files/portage-3.0.67-nicer-depend-phase-output.patch
new file mode 100644
index 000000000000..d63075ce7185
--- /dev/null
+++ b/sys-apps/portage/files/portage-3.0.67-nicer-depend-phase-output.patch
@@ -0,0 +1,55 @@
+https://gitweb.gentoo.org/proj/portage.git/commit/?id=c9a982117e07bbbfc4cd84fedc1c02623cf8e51e
+
+From c9a982117e07bbbfc4cd84fedc1c02623cf8e51e Mon Sep 17 00:00:00 2001
+From: Michał Górny <mgorny@gentoo.org>
+Date: Thu, 10 Apr 2025 12:20:08 +0200
+Subject: isolated-functions.sh: Output package in einfo during depend phase
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Output a banner containing the package name and version, When the einfo
+family of functions is used during the depend phase.  Before, these
+messages would be printed out of context, requiring the caller to
+explicitly include the package name.
+
+The result is, for example:
+
+```
+Calculating dependencies \
+Messages from dev-python/protobuf-4.23.3::gentoo:
+ * distutils_enable_tests setup.py is deprecated and will be removed.
+ * Please use unittest or pytest instead.
+ |
+Messages from dev-python/protobuf-4.22.5::gentoo:
+ * distutils_enable_tests setup.py is deprecated and will be removed.
+ * Please use unittest or pytest instead.
+ -
+```
+
+Closes: https://github.com/gentoo/portage/pull/1433
+Signed-off-by: Michał Górny <mgorny@gentoo.org>
+---
+ bin/isolated-functions.sh | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
+index d4248366d..40d2132be 100644
+--- a/bin/isolated-functions.sh
++++ b/bin/isolated-functions.sh
+@@ -259,6 +259,13 @@ __vecho() {
+ # Internal logging function, don't use this in ebuilds
+ __elog_base() {
+ 	local messagetype
++	if [[ ${EBUILD_PHASE} == depend && -z ${__PORTAGE_ELOG_BANNER_OUTPUT} ]]; then
++		# in depend phase, we want to output a banner indicating which
++		# package emitted the message
++		echo >&2
++		echo "Messages for package ${PORTAGE_COLOR_INFO}${CATEGORY}/${PF}::${PORTAGE_REPO_NAME}${PORTAGE_COLOR_NORMAL}:" >&2
++		__PORTAGE_ELOG_BANNER_OUTPUT=1
++	fi
+ 	[[ -z "${1}" || -z "${T}" || ! -d "${T}/logging" ]] && return 1
+ 	case "${1}" in
+ 		INFO|WARN|ERROR|LOG|QA)
+-- 
+cgit v1.2.3-65-gdbad
diff --git a/sys-apps/portage/portage-3.0.67-r1.ebuild b/sys-apps/portage/portage-3.0.67-r1.ebuild
new file mode 100644
index 000000000000..f96bfd870795
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.67-r1.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit meson linux-info 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 ~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 )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-arch/tar-1.27
+	>=dev-build/meson-1.3.0-r1
+	>=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
+	)
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+# 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-20240703
+		>=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
+	) )
+"
+# 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
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.67-nicer-depend-phase-output.patch
+)
+
+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 EPYTEST_XDIST=1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	python_foreach_impl epytest
+}
+
+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_fix_shebang "${pydirs[@]}"
+	python_optimize "${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}}" \
+			ED="${ED}" \
+			"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+		env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			ED="${ED}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+		env -u FEATURES -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			ED="${ED}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
+
+		env -u BINPKG_FORMAT \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			ED="${ED}" \
+			"${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
+}