6 files changed, 311 insertions, 2 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 36af7da6f56a..c900df58be90 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index a2e347a525fc..67197256b1cf 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -6,6 +6,6 @@ DIST dtc-1.7.0.tar.xz 165548 BLAKE2B de433a1034b7ef75559bf39f85695d0b275cfd17bf1
 DIST dtc-1.7.1.tar.xz 169524 BLAKE2B c9d9d7c60ce13c8e138ab8ddf3e8166d7cf3867ca4e5ea53621bf73514319faf6a6bac09fb96c971554db9f77dd3428e01d53990586041092a64849685d8854b SHA512 3195924b374680e367d7be6b9793691efc0441858068c8bc8d8a908db00bbae781a99184b5c5e272af39045ec58cb0f92adbdd00ff808480b635bd632aa74719
 EBUILD dtc-1.6.0.ebuild 1498 BLAKE2B 4453bd177443ef093b2b01820a05c1404d0449678d04087dd84f48c07367ce5e9bd145320e05753808fa03391305e43ee57291a79292ef96745bbc6d30bbf5ec SHA512 9320f0921b710a2a520586daf731c1bd0cc378e6313509bb995803f0f8b7f602617a10a1ebddde96978a60e18441cad3652a5c1e07afc82f6a5cc738c40db90f
 EBUILD dtc-1.7.0.ebuild 1650 BLAKE2B 11b1546968bcb4cd2d1b3919a192e901488d87a85928faf2e8716619f7165fe4cfba7fb40d5f30909c33710e6da7cfd715dc32a38d76a7e55d6a5448df2b1c38 SHA512 a09327a832bee4225d6b9872183692c2e5cc453181284bb0050e474f7f343c30c830a0b170e965ed4c3981d938e78aaf2449b30b333d5ccde4e1d763c991f250
-EBUILD dtc-1.7.1.ebuild 1445 BLAKE2B 012b66db1ad5b5dd893702469f1a94f642eb55121d8b632fd04dec9b380bafae8265f0bd1b3cbb51fe60babdd29745c72a03d308c343979a0b2fea689101e000 SHA512 88747fa612955175018c74c22c8ca22f9f429126a9b2ec0d95598ee902cdc227d928b6ecb29f6ad45cc73cedb63a7e43fdee9bf5a29615b654eed2037c980eb1
+EBUILD dtc-1.7.1.ebuild 1441 BLAKE2B 0e84a85884dbecd96116776ec18540084843c7d520344ac4bcfd9d05c51985b3816941bd113f978b20618234fa39ea2474fbe077ad5bbe30ee17e368c983e8c8 SHA512 dc7b91624041102bd0b3e8114a64f843356602cb2f8276e1ed69e956292f5dbcd40924cff0f9e0c1668528524aa993cf70998b25955fbf1af13388bd0a0f4c71
 EBUILD dtc-9999.ebuild 1445 BLAKE2B 012b66db1ad5b5dd893702469f1a94f642eb55121d8b632fd04dec9b380bafae8265f0bd1b3cbb51fe60babdd29745c72a03d308c343979a0b2fea689101e000 SHA512 88747fa612955175018c74c22c8ca22f9f429126a9b2ec0d95598ee902cdc227d928b6ecb29f6ad45cc73cedb63a7e43fdee9bf5a29615b654eed2037c980eb1
 MISC metadata.xml 492 BLAKE2B dc331e157119b6db3bb419e04722511406295b39ee40bcae29dbbe3f8fa3737aa221c2d61b16b45b8361c1b6ffadd634ffa65377d33cc808d11a8128389bdfd0 SHA512 cf2441cf6ea1075cf633edf903a54a637cbaff2545ccd65290c1c1b3f5452ce3d74df5ce4ffe68ab15857eaea1ffeac7f3e80b42fb4dae3af1c3636e4b0766fb
diff --git a/sys-apps/dtc/dtc-1.7.1.ebuild b/sys-apps/dtc/dtc-1.7.1.ebuild
index 6da2ddea52c2..589337ce7a82 100644
--- a/sys-apps/dtc/dtc-1.7.1.ebuild
+++ b/sys-apps/dtc/dtc-1.7.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Open Firmware device tree compiler"
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 9dcc862282a4..8c34b33d3d47 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,6 +1,7 @@
 AUX 0001-install-qa-checks.d-suppress-some-gnulib-implicit-co.patch 2812 BLAKE2B 7a1b1ad310c9b4b46e9778ad4c03bca34850cd6daa18dd567b9b1fb1ff7905fc709ef17af2173364d60c2fad8028f15fa827f3ea67c6f9367b44eec643a8174b SHA512 1ac91e837932df277dab1210ecf19923356ac87c27c52abc83c5de57a13bdc5a36335b817d3017bf68e075018186a3c26d804c1d7aea99a60c500acf4fb5d84f
 AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a747313021bb85c37b20327ab2feb9b2cc715849245875e7d8a5ae6ceee84b4a33d532996cb793bd SHA512 0df49e479e551648519ea4db0986584463eed498f77b133bd0e517389e71f4ff4069f1a5017c39f349bae62baa2ac32d968048c396261a9045ff00a0e5aa8bf4
 AUX portage-3.0.64-clang-splitdebug.patch 2586 BLAKE2B e650fc4b2d8a1478de3503d4534c23589dd9efdf9ec3a62e64a19923308a83fa5c4c3469f067a26eec6f3c67466da8dbd3c9b7645bcdd2504a62bd1881dd5cc3 SHA512 31107dcb0ae63c6d850229621716578eb047afff3f3ebed0a7e3553fad2193cca6cb4ed6a76fd2e76ea651b187ddad68ffdb84cf490fe00abfabf7731bbd9b3a
+AUX portage-3.0.66.1-webrsync.patch 3040 BLAKE2B 1d93c327b5822df67f034155759d702ce8edeff0605b7b5118ead8eec906cb77088f04d47453877e5be23c995c8ae02965e54778b9bc7db48ad74fe2fb328792 SHA512 24e798221c3791987afbdbc67ee87febbe99d4c52746fef5299c97815747350aa6a4982120515fc5691bb266d58d6a942ef99ffbd1c93944ebdf6dca0b940595
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 AUX portage-tmpdir.conf 76 BLAKE2B 79f35df57dbdcd461d94d558212261df7df54253d5205b40a0a0640ce2a7ae553a84d7aa8d8c11a776cac44b7573b842951ec11f8ab393145edb1786d6837e79 SHA512 4810d8ae1f8291d34b756897972841d30d5f50b48597a430cb8ddb102dab07a7f0d78c3901b6fdd6763180e92b5ae90a3cb88ae5a5c1cae845b23b49d03a87fd
 DIST portage-3.0.61.tar.bz2 1178151 BLAKE2B bad3140735b12a18a3108e91cc88146fc5c64ad3e3e056707eec7629927f718483a3e1ccf09f74de510ee7733b4d856c3c53692a6cc0f5fc1a7babf88fd7f06b SHA512 1401392a7bd2bf18e698e82af25a39db2aa9d8d9e8d9c07dea11ba5d5c866d2d3f8a3eccc8568b081aeaf6f668466921c61f58adbdd9dd5ffd9cf632bff2bdbd
@@ -13,6 +14,7 @@ EBUILD portage-3.0.61-r2.ebuild 6913 BLAKE2B 599679650a95d2c8587a0b617ff135103df
 EBUILD portage-3.0.63-r2.ebuild 7005 BLAKE2B 54d7507f8d762b4af3a2bd0b78955b938f34347b59248b57939e5dfa417f49c472e58d81d053c2b0a91ede0ad0419f8fbd8d7c65d85ed4299aea487393d0fa71 SHA512 9613dbbdecfd0e14e6cf214742bf15cea7c7355c82fb78b5e96897b1a39c769f95f8e199e065e6409ebf693f64df55c824c2df1a65c0ef061683771d82d4d852
 EBUILD portage-3.0.64-r4.ebuild 6919 BLAKE2B 562ea0c8a6cd0f6be74e186489c3a8b1c4cd7ac8589c3cee1da0f86ada41fba0a987efa4493d5fd875adb3bcaa3880952c8da3c8e071137fa0f7cf1314f77ed7 SHA512 ddec04ec82bef64a1fcec1c7cc2ac1fa6a37201bc321da98a0f5a4aa443121d2e2bcfa64cb0c9ba6c7daf47ea5b794cf6b7abcadccbd625900d4bc2e782e6447
 EBUILD portage-3.0.65-r1.ebuild 6776 BLAKE2B 06f1d5e62b178276acf0a4c908697fe337f004fcd8bc8b0855f604ceacd60d37331024115a99dc6b1711c2a67d91f94d29f7a5e278519d8be0fc8a3a93c38367 SHA512 c55d309d9bf3706d3e272f3634dc6c33222074d8dc2f289109631b4f6db24df62fbb355a70c8bdf74f3d76c0a799b262726c92efaea9e7e52fa49e4b175abb20
+EBUILD portage-3.0.66.1-r1.ebuild 6409 BLAKE2B c85f4e974c7237569a6bb91c7d4043f85c1a2e7965aea4c94f603f9ebe31f11e12f4604bfb45e6c4b4408de095d311911e347b8952682524c23d43dd35944429 SHA512 b7adfed426dc2b580978eed8852bcb837c7bd12cdb505520cca5ba00c59110b8c42c90cb0f3cf9b6bc76b0d5ac831658a0bff5ef099fbf8a7a69848f956531c2
 EBUILD portage-3.0.66.1.ebuild 6361 BLAKE2B dbb0bc671fe61839d0594ba8d730c7abb5bafdcd35b7a106a1f2661d7c63d3fde8559dfe4f08039f4905724318d19b32ce287edf5a3a48c16e17fbab0cf15513 SHA512 a9f0927b000d4954bd557773b8c4aa616c69640f5c8bf0865486f543c70ccd2fe54a093577333a117819cfd8de21e66cc3e52ef81e6614dbdd6b298e59055593
 EBUILD portage-3.0.66.ebuild 6361 BLAKE2B dbb0bc671fe61839d0594ba8d730c7abb5bafdcd35b7a106a1f2661d7c63d3fde8559dfe4f08039f4905724318d19b32ce287edf5a3a48c16e17fbab0cf15513 SHA512 a9f0927b000d4954bd557773b8c4aa616c69640f5c8bf0865486f543c70ccd2fe54a093577333a117819cfd8de21e66cc3e52ef81e6614dbdd6b298e59055593
 EBUILD portage-9999.ebuild 6361 BLAKE2B dbb0bc671fe61839d0594ba8d730c7abb5bafdcd35b7a106a1f2661d7c63d3fde8559dfe4f08039f4905724318d19b32ce287edf5a3a48c16e17fbab0cf15513 SHA512 a9f0927b000d4954bd557773b8c4aa616c69640f5c8bf0865486f543c70ccd2fe54a093577333a117819cfd8de21e66cc3e52ef81e6614dbdd6b298e59055593
diff --git a/sys-apps/portage/files/portage-3.0.66.1-webrsync.patch b/sys-apps/portage/files/portage-3.0.66.1-webrsync.patch
new file mode 100644
index 000000000000..7586c8a9ff98
--- /dev/null
+++ b/sys-apps/portage/files/portage-3.0.66.1-webrsync.patch
@@ -0,0 +1,76 @@
+https://bugs.gentoo.org/940120
+https://gitweb.gentoo.org/proj/portage.git/commit/?id=123a7be533161b14cacc4aa98708fbf1027ecce1
+
+From 123a7be533161b14cacc4aa98708fbf1027ecce1 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 2 Oct 2024 06:02:24 +0100
+Subject: Revert "emerge-webrsync: actually honour the
+ sync-webrsync-verify-signature attribute"
+
+This reverts commit f99eb91227918d5bf0cc531e78bd597c73b7ce1f.
+
+Revert for now as we understand the status quo better, and this
+breaks syncing w/ emerge-webrsync. I'll come back to this but I'd
+rather work with a known quantity for now than rush a fix.
+
+Bug: https://bugs.gentoo.org/940120
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ bin/emerge-webrsync        | 9 ++++-----
+ misc/emerge-delta-webrsync | 9 ++++-----
+ 2 files changed, 8 insertions(+), 10 deletions(-)
+
+diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
+index 124bcaddc..caa4986da 100755
+--- a/bin/emerge-webrsync
++++ b/bin/emerge-webrsync
+@@ -105,17 +105,16 @@ do_debug=0
+ keep=false
+ 
+ handle_pgp_setup() {
+-	local attr repo_has_webrsync_verify webrsync_gpg
+-
+ 	# WEBRSYNC_VERIFY_SIGNATURE=0: disable PGP verification
+ 	# WEBRSYNC_VERIFY_SIGNATURE=1: use gemato for verification, fallback to regular gpg
+ 	# WEBRSYNC_VERIFY_SIGNATURE=2: use legacy FEATURES="webrsync-gpg"
+ 	WEBRSYNC_VERIFY_SIGNATURE=1
+ 
+-	has webrsync-gpg ${FEATURES} && webrsync_gpg=1
++	has webrsync-gpg ${FEATURES} && webrsync_gpg=1 || webrsync_gpg=0
+ 
+-	attr=$(__repo_attr "${repo_name}" sync-webrsync-verify-signature)
+-	[[ ${attr,,} == @(true|yes) ]] && repo_has_webrsync_verify=1
++	repo_has_webrsync_verify=$(
++		has $(__repo_attr "${repo_name}" sync-webrsync-verify-signature	| LC_ALL=C tr '[:upper:]' '[:lower:]') true yes
++	)
+ 
+ 	if [[ -n ${PORTAGE_TEMP_GPG_DIR} ]] || [[ ${repo_has_webrsync_verify} -eq 1 ]]; then
+ 		# If FEATURES=webrsync-gpg is enabled then allow direct emerge-webrsync
+diff --git a/misc/emerge-delta-webrsync b/misc/emerge-delta-webrsync
+index 8550c15fe..a788cdb0e 100755
+--- a/misc/emerge-delta-webrsync
++++ b/misc/emerge-delta-webrsync
+@@ -165,17 +165,16 @@ if [[ ! -d $STATE_DIR ]]; then
+ fi
+ 
+ handle_pgp_setup() {
+-	local attr repo_has_webrsync_verify webrsync_gpg
+-
+ 	# WEBRSYNC_VERIFY_SIGNATURE=0: disable PGP verification
+ 	# WEBRSYNC_VERIFY_SIGNATURE=1: use gemato for verification, fallback to regular gpg
+ 	# WEBRSYNC_VERIFY_SIGNATURE=2: use legacy FEATURES="webrsync-gpg"
+ 	WEBRSYNC_VERIFY_SIGNATURE=1
+ 
+-	has webrsync-gpg ${FEATURES} && webrsync_gpg=1
++	has webrsync-gpg ${FEATURES} && webrsync_gpg=1 || webrsync_gpg=0
+ 
+-	attr=$(__repo_attr "${repo_name}" sync-webrsync-verify-signature)
+-	[[ ${attr,,} == @(true|yes) ]] && repo_has_webrsync_verify=1
++	repo_has_webrsync_verify=$(
++		has $(__repo_attr "${repo_name}" sync-webrsync-verify-signature	| LC_ALL=C tr '[:upper:]' '[:lower:]') true yes
++	)
+ 
+ 	if [[ -n ${PORTAGE_TEMP_GPG_DIR} ]] || [[ ${repo_has_webrsync_verify} -eq 1 ]]; then
+ 		# If FEATURES=webrsync-gpg is enabled then allow direct emerge-webrsync
+-- 
+cgit v1.2.3-65-gdbad
diff --git a/sys-apps/portage/portage-3.0.66.1-r1.ebuild b/sys-apps/portage/portage-3.0.66.1-r1.ebuild
new file mode 100644
index 000000000000..9cedc14fc954
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.66.1-r1.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 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}"/${P}-webrsync.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}}" \
+			"${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
+}