gentoo resync : 25.11.2020

10 files changed, 66 insertions, 27 deletions

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 4dc3d5934b9c..e8dd8bae07f9 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -8,12 +8,12 @@ DIST emacs-25.3-patches-2.tar.xz 2488 BLAKE2B 93c6a18e7f729a5b4d299974581c99835e
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.1.tar.xz 43752012 BLAKE2B 433fbf234c711954269e7e10348abbd4a2bc4c357a59164c625a5ccee2de85a149636c70ad3fad3c09dbbd24900badfd2c0c645017bb33ab3e25d3decff72057 SHA512 dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064
-EBUILD emacs-18.59-r13.ebuild 4354 BLAKE2B 0c7713a041659ddda2794957a830532fc31ad9a4dca38dc3f662be580f4f4a24b97e8c7de6cbbd5230524934e2e7d59f5aa263815996e3c51343504a4701f237 SHA512 97c565fcd3d4dab90e1967ec071d93a993aacfdac020137b19e7b063b384aadb86f2131aa45a48fff4b8730427b9d81fd51f9d4b66a3dc0334deb2fb0c21f4d6
-EBUILD emacs-23.4-r19.ebuild 10987 BLAKE2B 9837cedc2675773c59e583f40f4d3bbcdeac64235912569638e7aa879037b0d53a38fd25e81698f8993ce822562cb6ce9f3f6b8f6a404945caab9dec24c3cbe9 SHA512 dfa1b140f5ba8d9787d2e2b3a4c183c1657faabb73c4973aeaad1d911c293ead947374b674ae80e782d1b437a9d69ba574a0b231d2f6e30e72c18291e7973f17
-EBUILD emacs-24.5-r8.ebuild 10839 BLAKE2B 71f333423f8399ff9a4eb343d5c521c24f43705c84819d671396c90d94f691a13047afba7880e09d71a586110f1a2a911327c4d6b3fa3ae9e98ba924c2cbfc29 SHA512 dc1f984e87cc347dcc8708ba4c52d1b66e031ac19c0e203df28e940e64ac02aaca56c978d1cfbf553d7ddf3847a67c8ee54888f4beb1d0cdd7534035ce264c90
-EBUILD emacs-25.3-r7.ebuild 11181 BLAKE2B 1db9d77454b1390a8747b5cf63941554ec2e88430b13d36e95c2ba050356fdcc0084fec2c7b0b1320e206d901626e736c23e83911dd0ffe93d85d4370179fb1e SHA512 dda6dbfa227997eafa93d363779162b074766a9313774cd4aa4006e605ad9967f86f61b27d0b817d01afce9cc3148c40f63cb47dae9f1267122512cdc37454d1
-EBUILD emacs-26.3-r2.ebuild 11968 BLAKE2B 60a9d7c23bf25d6c1a8d6b8d65c3689891a86756d2b0ae2dbad1ff3671afdb7b2dff60eb0e2863bd834480910f41e9a3f04bd20368158686a64ca3281623defd SHA512 ca3729faa843ee6e7f0ca7140c9cc8425b1a62e98a2fdd2cb6ced64afbec0bf5e84fd0e1a8dc990de0f85cb53ad3ed4efb8faed059246f5aa7b3539083851763
-EBUILD emacs-27.1-r1.ebuild 13513 BLAKE2B 1bc8d27d10cba67c9201ce3dc76111cbb5a57d98e1637661e45af3b58d98d48ea5ed22c13d8f7f19c91aaef6ee68dc2323c5c3d6ab38dddca113320c96069239 SHA512 02316ba347aaaa2ba0bff764dd87e99d5cf49e0f8dc604ee57b8a7acb69c27a315dd76cfcd1a83ba957356c1f3ec45338d36850a3008511ceef6aafd082d4559
-EBUILD emacs-27.1.9999-r1.ebuild 13477 BLAKE2B 0331ea699d68acfff608efcc88f367e30633c0b115a04ed24328325786fb06730d7b063996a2b85ab01a74f8d790edbd706a8d6dc49e4f6ccab6c4d793e5c0b2 SHA512 e26cf52c1e67c57a9f9dec311a45e0ff6d8531e75774e55790bdeac257b9e03f189eeaa5ba82e09856e2ad892f0e4355e3f5010ee29812ec5ac99e6c3839de37
-EBUILD emacs-28.0.9999.ebuild 13448 BLAKE2B db0e9b950299594bd63f8a5b755bb52f8dfc47cbb10cca4ad71638d80e06bbbbb88e42bc5ec5c04ba96e86d56c2165a9ce153768dfe7be42462a5e67f50d837e SHA512 3cf9cdcb2b176472a0402d365119f674637a1218b35adab9edc14d67ce9e57d674a9932831b47e4367ff14f7f3efa74165b7350f0ca8a8971910a090aebf516d
-MISC metadata.xml 2990 BLAKE2B 226689581e5cdf7452a5b43b9b2a7ec05f4e4080e1b95f8ea0857223e074f6d05abd21c8c996ce77d33ce68f50146d99f63f7e6a64bda02f8c9317b8fa424faf SHA512 e70def35534dbc3b2803d60c5d1913a1f455b47e3f3e93a199f84b832e97eb87b9a1a43f5d2c3398496c1178437e9a2b70d18ed9802332f130b7950fdcdb71fb
+EBUILD emacs-18.59-r13.ebuild 4370 BLAKE2B eda9ea6895a647fb6576737cd1f45f528ac1fbc09aa45ad8c90d9b77130aac4f56f209808cf405c3a696afbf22fa919e5cb4ab0420925fdf971e0038fd868502 SHA512 c00ea63528ffe15ee6a40dc559d9736eed3aaaaa2a23237158a4a41386369e28dc7303d39146d82e640b8d601376d842de475fe892ce9e1eb453215bee66f796
+EBUILD emacs-23.4-r20.ebuild 11175 BLAKE2B 81160f566444d92fc5ea43f78334590e94a22facf875a51b55e932e460dcf8d09aef6a338e207966ac95353f79ccc639e6aea6021bcd1d6a96d30a5877ed388d SHA512 32a5899626ad5fce7067df0445458af251a5ff14e9bdece643c7784770e576600c0670cbdb588e341d7e81799a45186f35554e20ce5d8a2ef910b2f12a623b62
+EBUILD emacs-24.5-r9.ebuild 11045 BLAKE2B 9f96003288deb53fd79f259d7c84c2daf95fe501e8183684c0a4ddff1ddeda0fb6e2a2e224dce2ad8df573ada00d9c7ba1ae8d0ad26cb926a51d4b86780149ad SHA512 17038fe4cd88fcb220d23eda3c22a498639af4b05b0d3da38b2b5eb3b4a210c6aef9cfa8b6cd3fcf5830ac7b422533b3aeaf1b9c65edcd0a7502a860717e0d51
+EBUILD emacs-25.3-r8.ebuild 11387 BLAKE2B aa940b1226a213ae9260db0517ad9e7da2a4fc2ddeb5d2d08414f36a207ee3089fb109f603496511865814848f016d4a40d4699085af25640c18c27f5da9289d SHA512 b55fa576211fd48ddce54f9a8b4718c81ec6d425fe895fe97f44b4f5c74ddbad84ffc920eed7140c6b1f234de134d7643cf91c7e98030d761f8cad000c4bdbbf
+EBUILD emacs-26.3-r3.ebuild 12205 BLAKE2B 79b910b2bb1e50f52ee2af4b8b3099a96eee2d37fa268daf551ceb7da87afd6bf2da0b126e4a223bc714dc5beb473e102465c5bd8d295bda8abe6169647175f1 SHA512 86f2afa0d62bf84952eb4a16052a9779b87595025de6cfa2c4d118b362ae56b3510f56c942ee7508d8897c1514e38c02d759230a64bb73c8d280060009326b50
+EBUILD emacs-27.1-r2.ebuild 13750 BLAKE2B 3c6cc5c865676e09d7902637b76106148f5a2cf7f64cd47056401e91421668a8b9ab162d9e0e47cabd155f7d8451e576e06c84a1937ad173b300578b6795adf1 SHA512 37316aea5e8c4fbfcfbfe61e01edba0cf137f76d5b8ceba40c4aff32454f91cf9f5724f2682481ee3b512e4b75d7d224be7fd7f94b26a66c552893b5f370fea5
+EBUILD emacs-27.1.9999-r1.ebuild 13714 BLAKE2B 156f0487d366dffffa9ddef9647733f59842bc6ce0078f746b70e5836722911e8f7b10f3b6dc4e96ce0e388e25d5faf56c059dbee9b7b99bb64ef2103571acbd SHA512 d9173643778778a0c6e721a924a6e26ea8fc29dfb7f2c5de359d82402fc7a9da1800efd2be906e7270807004140a37c59c1f39429711b9769c1a2dd44e8b18e6
+EBUILD emacs-28.0.9999.ebuild 13685 BLAKE2B 95c15cb3aba782ed60b393e23f29d2d6d7ed79fd37711fc96f8d24080a287900e1f8f6b01ce3c22746ea3395f838ed524fdb90006844f1a665f2c140078e51f2 SHA512 32ad801c80e322b5112bec39de7d7b0bd9bcc12654c874b54cc189d029e5fd683af20b06e9c28eea72bee9def032bc8af7658a8b0720e7bc68c695f1d9fecf56
+MISC metadata.xml 3000 BLAKE2B f580f25a92f18d36e29880184ddacfc3f59af8e86c9e9b5e0ab0deeff7fb367a79a0331db4d8d85f9c338feba342d683caa3294d06d11e2c1a3c715a5c2649b8 SHA512 ce622b330c89f3c545ccf0f899efd19795cb3279d15762b04248ebaed07e288b51f45f6f0776f5cf6f44f90500220b8026384016808d722085dad2cad020cb51
diff --git a/app-editors/emacs/emacs-18.59-r13.ebuild b/app-editors/emacs/emacs-18.59-r13.ebuild
index 4f56535c58dd..8b1d8fc4bd28 100644
--- a/app-editors/emacs/emacs-18.59-r13.ebuild
+++ b/app-editors/emacs/emacs-18.59-r13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs flag-o-matic multilib
+inherit toolchain-funcs flag-o-matic multilib eapi8-dosym
 
 DESCRIPTION="The extensible self-documenting text editor"
 HOMEPAGE="https://www.gnu.org/software/emacs/"
@@ -123,7 +123,7 @@ src_install() {
 		yow env server
 	do
 		mv "${D}"${basedir}/etc/${i} "${D}"/usr/libexec/emacs/${PV}/${i} || die
-		dosym ../../../../libexec/emacs/${PV}/${i} ${basedir}/etc/${i}
+		dosym8 -r /usr/libexec/emacs/${PV}/${i} ${basedir}/etc/${i}
 	done
 	for i in test-distrib make-docfile; do
 		rm "${D}"${basedir}/etc/${i} || die
@@ -135,7 +135,7 @@ src_install() {
 	# move Info files
 	dodir /usr/share/info
 	mv "${D}"${basedir}/info "${D}"/usr/share/info/emacs-${SLOT} || die
-	dosym ../../info/emacs-${SLOT} "${basedir}"/info
+	dosym8 -r /usr/share/info/emacs-${SLOT} ${basedir}/info
 	docompress -x /usr/share/info
 
 	# move Info dir to avoid collisions with the dir file generated by portage
diff --git a/app-editors/emacs/emacs-23.4-r19.ebuild b/app-editors/emacs/emacs-23.4-r20.ebuild
index a7ebc3b34702..7817b1255749 100644
--- a/app-editors/emacs/emacs-23.4-r19.ebuild
+++ b/app-editors/emacs/emacs-23.4-r20.ebuild
@@ -16,7 +16,8 @@ SLOT="23"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="alsa aqua athena dbus games gconf gif gpm gtk gui gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars Xaw3d xft +xpm"
 
-RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
+RDEPEND="acct-group/mail
+	app-emacs/emacs-common-gentoo[games?,gui(-)?]
 	net-libs/liblockfile
 	sys-libs/ncurses:0=
 	kerberos? ( virtual/krb5 )
@@ -249,6 +250,10 @@ src_install() {
 	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
 	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
 
+	# movemail must be setgid mail
+	fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
 	rm -rf "${ED}"/usr/share/{applications,icons}
diff --git a/app-editors/emacs/emacs-24.5-r8.ebuild b/app-editors/emacs/emacs-24.5-r9.ebuild
index 19dd854cd077..d205fe64db89 100644
--- a/app-editors/emacs/emacs-24.5-r8.ebuild
+++ b/app-editors/emacs/emacs-24.5-r9.ebuild
@@ -15,7 +15,8 @@ SLOT="24"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gtk2 gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
 
-RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
+RDEPEND="acct-group/mail
+	app-emacs/emacs-common-gentoo[games?,gui(-)?]
 	net-libs/liblockfile
 	sys-libs/ncurses:0=
 	acl? ( virtual/acl )
@@ -229,7 +230,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
+	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
 
 	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
 		|| die "moving emacs executable failed"
@@ -242,6 +243,10 @@ src_install() {
 	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
 	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
 
+	# movemail must be setgid mail
+	fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
 	rm -rf "${ED}"/usr/share/{applications,icons}
diff --git a/app-editors/emacs/emacs-25.3-r7.ebuild b/app-editors/emacs/emacs-25.3-r8.ebuild
index d54d8a9d32f4..2deef88cebcf 100644
--- a/app-editors/emacs/emacs-25.3-r7.ebuild
+++ b/app-editors/emacs/emacs-25.3-r8.ebuild
@@ -15,7 +15,8 @@ SLOT="25"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
 
-RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
+RDEPEND="acct-group/mail
+	app-emacs/emacs-common-gentoo[games?,gui(-)?]
 	net-libs/liblockfile
 	sys-libs/ncurses:0=
 	acl? ( virtual/acl )
@@ -238,7 +239,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
+	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
 
 	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
 		|| die "moving emacs executable failed"
@@ -251,6 +252,10 @@ src_install() {
 	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
 	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
 
+	# movemail must be setgid mail
+	fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
 	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
diff --git a/app-editors/emacs/emacs-26.3-r2.ebuild b/app-editors/emacs/emacs-26.3-r3.ebuild
index 764b1ea0cc7c..dc65014ec5d0 100644
--- a/app-editors/emacs/emacs-26.3-r2.ebuild
+++ b/app-editors/emacs/emacs-26.3-r3.ebuild
@@ -26,7 +26,7 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
 	lcms? ( media-libs/lcms:2 )
 	libxml2? ( >=dev-libs/libxml2-2.2.0 )
 	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( net-libs/liblockfile )
+	!mailutils? ( acct-group/mail net-libs/liblockfile )
 	selinux? ( sys-libs/libselinux )
 	ssl? ( net-libs/gnutls:0= )
 	systemd? ( sys-apps/systemd )
@@ -256,7 +256,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
+	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
 
 	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
 	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
@@ -267,6 +267,12 @@ src_install() {
 	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
 	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
 
+	# movemail must be setgid mail
+	if ! use mailutils; then
+		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fi
+
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
 	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
diff --git a/app-editors/emacs/emacs-27.1-r1.ebuild b/app-editors/emacs/emacs-27.1-r2.ebuild
index 2f899ce692e2..c0a8301900b1 100644
--- a/app-editors/emacs/emacs-27.1-r1.ebuild
+++ b/app-editors/emacs/emacs-27.1-r2.ebuild
@@ -57,7 +57,7 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
 	lcms? ( media-libs/lcms:2 )
 	libxml2? ( >=dev-libs/libxml2-2.2.0 )
 	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( net-libs/liblockfile )
+	!mailutils? ( acct-group/mail net-libs/liblockfile )
 	selinux? ( sys-libs/libselinux )
 	ssl? ( net-libs/gnutls:0= )
 	systemd? ( sys-apps/systemd )
@@ -299,7 +299,7 @@ src_configure() {
 #}
 
 src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
+	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
 
 	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
 	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
@@ -310,6 +310,12 @@ src_install() {
 	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
 	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
 
+	# movemail must be setgid mail
+	if ! use mailutils; then
+		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fi
+
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
 	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
diff --git a/app-editors/emacs/emacs-27.1.9999-r1.ebuild b/app-editors/emacs/emacs-27.1.9999-r1.ebuild
index bd826f2edf16..a3e4ddfa6837 100644
--- a/app-editors/emacs/emacs-27.1.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-27.1.9999-r1.ebuild
@@ -57,7 +57,7 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
 	lcms? ( media-libs/lcms:2 )
 	libxml2? ( >=dev-libs/libxml2-2.2.0 )
 	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( net-libs/liblockfile )
+	!mailutils? ( acct-group/mail net-libs/liblockfile )
 	selinux? ( sys-libs/libselinux )
 	ssl? ( net-libs/gnutls:0= )
 	systemd? ( sys-apps/systemd )
@@ -298,7 +298,7 @@ src_configure() {
 #}
 
 src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
+	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
 
 	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
 	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
@@ -309,6 +309,12 @@ src_install() {
 	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
 	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
 
+	# movemail must be setgid mail
+	if ! use mailutils; then
+		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fi
+
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
 	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild
index 478d84767fce..9ea17e49b558 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -57,7 +57,7 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
 	lcms? ( media-libs/lcms:2 )
 	libxml2? ( >=dev-libs/libxml2-2.2.0 )
 	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( net-libs/liblockfile )
+	!mailutils? ( acct-group/mail net-libs/liblockfile )
 	selinux? ( sys-libs/libselinux )
 	ssl? ( net-libs/gnutls:0= )
 	systemd? ( sys-apps/systemd )
@@ -297,7 +297,7 @@ src_configure() {
 #}
 
 src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
+	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
 
 	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
 	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
@@ -308,6 +308,12 @@ src_install() {
 	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
 	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
 
+	# movemail must be setgid mail
+	if ! use mailutils; then
+		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fi
+
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
 	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index 0ae048b21bd4..1d93ee69f3e1 100644
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@@ -22,8 +22,8 @@
 <use>
   <flag name="athena">Enable the MIT Athena widget set
     (<pkg>x11-libs/libXaw</pkg>)</flag>
-  <flag name="dynamic-loading">Enable loading of dynamic libraries at
-    runtime</flag>
+  <flag name="dynamic-loading">Enable loading of dynamic libraries (modules)
+    at runtime</flag>
   <flag name="games">Support shared score files for games</flag>
   <flag name="gconf">Use <pkg>gnome-base/gconf</pkg> to read the system
     font name</flag>