gentoo auto-resync : 28:12:2023 - 01:37:43

7 files changed, 252 insertions, 75 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index acd5d09d3ca5..0449884642ac 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/polychromatic/Manifest b/sys-apps/polychromatic/Manifest
index 44fa0c1dd00a..f4d24f87eff8 100644
--- a/sys-apps/polychromatic/Manifest
+++ b/sys-apps/polychromatic/Manifest
@@ -1,6 +1,4 @@
-DIST polychromatic-0.8.2.tar.gz 1697776 BLAKE2B 209d27258e4e6cedb6d8d0c5e50168ab82854605a90e67cf550e5aaa5a5aec539c84155a0fee44986ae63fba33b8778ad426b0e648ef51e71bb33f42a86909ad SHA512 0965881feb60cdcb2415cf177b951548b6bfefd642fc28305fd37f339e891252bd9a1c9dff296381f53ea221758dbc68ca2968a191d3b7db96c6ee2ec8936c07
 DIST polychromatic-0.8.3.tar.gz 1762021 BLAKE2B eb4925fdd5be892c4f490424f357e8d1a2db79ac4bd9b4ae2a6f05662022837ba624d23c373b073de8045207511c50a6f2c4ba6cc4a6f276c2553edcbae25eaf SHA512 e2b26bfda985a2a80373dfa2c10e85a96724eec16c513e825841b7363b692c3edf51fc7ddc0735e28bb1c5074ebd22e9390606d314df35fc61cb185a0fd0acfc
-EBUILD polychromatic-0.8.2.ebuild 1904 BLAKE2B 3b9311faf13e46e18a85db308a6c2dd77fdfab60c09bbf6116381cc17147c96bad47d81e8e5f8715cb8688e4127db1f66857764a2cf6297d1a15860c64ae1fe1 SHA512 3287e9e1d28f3ee49c22ddd5ce968659a9db789eff2af8597bfacea105e3a6f7ae0d11b6372c4da3e024fe656c7c5495637a80c921d327d1469af32b7d5fca4b
-EBUILD polychromatic-0.8.3.ebuild 1905 BLAKE2B 525f69c17166ecc5a77684539cef9123166205aee84db0162f49eb536e9462e9d6b80f7312d5745f400e2f45e312b812a3549edb545df59769743a5b651b091e SHA512 0bcd0e2eaafb3dcad881142a37654296828c44efc6b14083ac3f53d2012df2f61bb9b0943e4e666fce49d970026fd455719cafcb9c70862ef9e5a1b75fe77d66
-EBUILD polychromatic-9999.ebuild 1905 BLAKE2B 525f69c17166ecc5a77684539cef9123166205aee84db0162f49eb536e9462e9d6b80f7312d5745f400e2f45e312b812a3549edb545df59769743a5b651b091e SHA512 0bcd0e2eaafb3dcad881142a37654296828c44efc6b14083ac3f53d2012df2f61bb9b0943e4e666fce49d970026fd455719cafcb9c70862ef9e5a1b75fe77d66
+EBUILD polychromatic-0.8.3-r1.ebuild 1905 BLAKE2B 149506c4c5bcb6df832d39c2dc482328fe1ecadcd38b52119b19ba25149653449beac38e5acee7afab8f9e0f49137184c461d3891e8cd85b6360525b5830985b SHA512 196b59767cae6c8fb8068422eb4929af1f8b2114c04b72b5788494224d3436b48c180f32f964e81a0975e52f18f6a09b0e15540d80bd89097749927afdcf9665
+EBUILD polychromatic-9999.ebuild 1906 BLAKE2B b503e4438618e0bb4bc8f51ed36223b506e4e388f4d3174d3bee44958a2378ea65d1e491581bad9482cdd9acc7afb87a2eab77697027fdc0f28ba0a439cf7c38 SHA512 a004b450d591c9c48c1c6b6fb7b9502909608a978b5bc21034a7bfc5d7537e10cfcb2ca60d175ee9c8446a6673821a24a8f3b9cc40287fa06af3688d8d261b40
 MISC metadata.xml 993 BLAKE2B 193ed9d7f922efa078e7856084b828ff4f97d8606a1979206b3ff4a36ddcc6ff88a1adc3d0d899261fef5ae5751a1204fb27a03b0a8ff7510578f431a89a0cd2 SHA512 245f395c90cfbe36dae2bc1da5f1c6d2513ebde78a44e7a785a4bb9c01cf24ea0be81405c82eb8f4fbc34d34a4990a36359e98658d1340e47172257a867aa8db
diff --git a/sys-apps/polychromatic/polychromatic-0.8.2.ebuild b/sys-apps/polychromatic/polychromatic-0.8.3-r1.ebuild
index c65eca31c666..77b33608e6d4 100644
--- a/sys-apps/polychromatic/polychromatic-0.8.2.ebuild
+++ b/sys-apps/polychromatic/polychromatic-0.8.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit meson python-single-r1 readme.gentoo-r1 xdg
 
diff --git a/sys-apps/polychromatic/polychromatic-0.8.3.ebuild b/sys-apps/polychromatic/polychromatic-0.8.3.ebuild
deleted file mode 100644
index f3045e367458..000000000000
--- a/sys-apps/polychromatic/polychromatic-0.8.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit meson python-single-r1 readme.gentoo-r1 xdg
-
-DESCRIPTION="RGB lighting management software for GNU/Linux powered by OpenRazer"
-HOMEPAGE="https://polychromatic.app/
-	https://github.com/polychromatic/polychromatic/"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=x11-libs/gtk+-3.20:3[introspection]
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[svg,${PYTHON_USEDEP}]
-		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/colour[${PYTHON_USEDEP}]
-		dev-python/distro[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		sys-apps/openrazer[client,${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	dev-util/intltool
-	dev-lang/sassc
-"
-
-DOC_CONTENTS="To automatically start up Polychromatic on session login copy
-/usr/share/polychromatic/polychromatic-autostart.desktop file into Your user's
-~/.config/autostart/ directory."
-
-src_install() {
-	meson_src_install
-	python_optimize
-	readme.gentoo_create_doc
-
-	python_doscript "${S}"/polychromatic-{cli,controller,helper,tray-applet}
-
-	# Do not force polychromatic to autostart on session login.
-	# Move it into /usr/share/polychromatic and treat it as an example file
-	# that could be installed into user's ~/.config/autostart/ directory.
-	mv "${ED}"/etc/xdg/autostart/${PN}-autostart.desktop \
-	   "${ED}"/usr/share/${PN}/${PN}-autostart.desktop || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/sys-apps/polychromatic/polychromatic-9999.ebuild b/sys-apps/polychromatic/polychromatic-9999.ebuild
index f3045e367458..7baaa20d6a71 100644
--- a/sys-apps/polychromatic/polychromatic-9999.ebuild
+++ b/sys-apps/polychromatic/polychromatic-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit meson python-single-r1 readme.gentoo-r1 xdg
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index e1c529134f7c..1d700cfe3271 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -8,10 +8,12 @@ DIST portage-3.0.51.tar.bz2 1155503 BLAKE2B 1095ab616993951da8f4d43cef4cf815672c
 DIST portage-3.0.56.tar.bz2 1166588 BLAKE2B f6e8d8dbfb3b157f1e5577419ef78c8e63b6f754ffa94da22e6466f11b77738e11fc9ad4803341b6640a6c7f48bd73bb02a12643b8176d60147e88aa1fb48314 SHA512 6eac4edb286f3ef0074cbaaf3b216c8dd40fe474e1a9bd6f86d7185cceabe19edb76b324af76d9fa1005ba8809d624354c21ab84284aba0d92e467612bd9fe47
 DIST portage-3.0.57.tar.bz2 1173286 BLAKE2B 793a150c94c939672783d7556e5fce80f7ff8895a616726d7adf92d6f8da99768c55db8a685f2dd548ab0bb09c29fd7548ee6fc1dfc51b55c530119690b92265 SHA512 4c5348e0dfc966db5ca1c08cc3fafc72dd2b3b402972b99b411f61f7a288190ecd9e5ac597dc62ee96eacc378818a4cac65b0fd040c9ff557e7cbe057a934829
 DIST portage-3.0.58.tar.bz2 1174162 BLAKE2B 7e8edbdc20410116280d7d20bd7a97760970d34add34be84b66e7af5ea6e8f28d0123fdf6c43acc761a7d0ae75ac0badca96436b0d0272e4cfab36dfc67792e9 SHA512 58e9d93feeee1e8802202f7abe5b8085297c2e45fd160d0f6de0d10480defcb626fa4d55d273a950f796ed8a479dda9eedaa1175a8710f67880efb73c41687bd
+DIST portage-3.0.59.tar.bz2 1175098 BLAKE2B dbb8a22fd9417a74e60aa24ff064e9da5b4c54bd4936a0a1a4fdb0cd30d8568ca2424ef2a484883b538685a291a85009d942defdbb5cfa4e0072e9d977f238cd SHA512 8c86e0663327125e7cb36150d4aca1d7fcd2bf7ae25634ed916c2ee444809404aafb094adacacc0408509600f447d62d9c53e7bc25dd8c71c61e8758ac674638
 EBUILD portage-3.0.49-r2.ebuild 9527 BLAKE2B 6cad70f759ec4440c228193e2535d57d679eddee0c73d444c78880d38e9529588835f8de721e900495261c53ea9461e2bce1c1b63ed8d32f657f6e458119d18a SHA512 0a49e29242fb469a2d389b06a8e1fdf0187cb7d35c56e4ce3661722dc0668f1383ca52321417fa2110f2d02670b2e4cf43c319efa511e373ca4f2520e2ac2ba7
 EBUILD portage-3.0.51.ebuild 6683 BLAKE2B 3d304c8162f3c17f4b3dc41d75e3d7621a51e047d33edb8e71117742fc177828bfaba8dd8dde1220be135d8ff49c59706f403a3fa86cde0cf1fbdf094b2995b7 SHA512 6c434c44076430241a2b2799de655d2013c01d4a56d373bfe5654c21c7bb3e273095dc129d0fb03f6ed8b0ef960ec4a18967bc7c5fc6f72af60a046840881d78
 EBUILD portage-3.0.56-r1.ebuild 6765 BLAKE2B c0a62cc0bc972889706dc8df58f016375bcaaf6e140e377144212ac1864b1ded4f4490a4f7a2b90100e162af4e34df71a8a56c2c4dd89fd314b711f0d41c3ad6 SHA512 7841d06b60844b4bceaa29709048b741e896c8c702c180cb33fa51fee407fae78a1166bc79736e2a74895580d93a8dc5b383b0409073917a4c183fc62c3d832a
 EBUILD portage-3.0.57.ebuild 6846 BLAKE2B fdc6f76f9c5652efd31bb4d2ea36db9b24e8ff7256d526520f9c28546dc934907148784c015fd0a4a6ef15bd293d902f3e3836840896f9f75d0dd1c922ac65d3 SHA512 7720fefa1ea1eea3dfd4efae53f938c47fb3d01dd34d227f535cf17caf71605c9d4786739f0a863714b6157e3dbf34b891496b82533cf510a5c25c6c90215537
 EBUILD portage-3.0.58.ebuild 6924 BLAKE2B a8a4c8d980456a8fed82b49b1017037ff3f48f00e4a98f5ce7b023eb5af3c9dfcd6367121640ec8f092d080e62036db12de15709b483d7671c460c62c978a600 SHA512 a14d9925f026edc3d1aeaf7ccaf535f0ab999e41f44a592f97fb2a58c6926e049cd8a60bff6da6c3051a58689075a07ef0a7480fe9eca41fb79c6a12ab1c6f4e
+EBUILD portage-3.0.59.ebuild 6924 BLAKE2B a8a4c8d980456a8fed82b49b1017037ff3f48f00e4a98f5ce7b023eb5af3c9dfcd6367121640ec8f092d080e62036db12de15709b483d7671c460c62c978a600 SHA512 a14d9925f026edc3d1aeaf7ccaf535f0ab999e41f44a592f97fb2a58c6926e049cd8a60bff6da6c3051a58689075a07ef0a7480fe9eca41fb79c6a12ab1c6f4e
 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.59.ebuild b/sys-apps/portage/portage-3.0.59.ebuild
new file mode 100644
index 000000000000..0fa6790375b9
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.59.ebuild
@@ -0,0 +1,246 @@
+# 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
+	|| (
+		>=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
+}