app-editors/emacs: Test for mailutils flag in src_install.

Instead of testing for existence of movemail.

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Ulrich Müller <ulm@gentoo.org>

4 files changed, 12 insertions, 16 deletions

diff --git a/app-editors/emacs/emacs-26.3-r3.ebuild b/app-editors/emacs/emacs-26.3-r3.ebuild
index 187d13793f72..dc65014ec5d0 100644
--- a/app-editors/emacs/emacs-26.3-r3.ebuild
+++ b/app-editors/emacs/emacs-26.3-r3.ebuild
@@ -14,8 +14,7 @@ SLOT="26"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 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 lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
 
-RDEPEND="acct-group/mail
-	app-emacs/emacs-common-gentoo[games?,gui(-)?]
+RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
 	sys-libs/ncurses:0=
 	acl? ( virtual/acl )
 	alsa? ( media-libs/alsa-lib )
@@ -27,7 +26,7 @@ RDEPEND="acct-group/mail
 	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 )
@@ -269,7 +268,7 @@ src_install() {
 	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
 
 	# movemail must be setgid mail
-	if [[ -f ${ED}/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail ]]; then
+	if ! use mailutils; then
 		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
 		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
 	fi
diff --git a/app-editors/emacs/emacs-27.1-r2.ebuild b/app-editors/emacs/emacs-27.1-r2.ebuild
index e297c44f3137..c0a8301900b1 100644
--- a/app-editors/emacs/emacs-27.1-r2.ebuild
+++ b/app-editors/emacs/emacs-27.1-r2.ebuild
@@ -43,8 +43,7 @@ LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
 RESTRICT="test"
 
-RDEPEND="acct-group/mail
-	app-emacs/emacs-common-gentoo[games?,gui(-)?]
+RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
 	sys-libs/ncurses:0=
 	acl? ( virtual/acl )
 	alsa? ( media-libs/alsa-lib )
@@ -58,7 +57,7 @@ RDEPEND="acct-group/mail
 	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 )
@@ -312,7 +311,7 @@ src_install() {
 	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
 
 	# movemail must be setgid mail
-	if [[ -f ${ED}/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail ]]; then
+	if ! use mailutils; then
 		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
 		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
 	fi
diff --git a/app-editors/emacs/emacs-27.1.9999-r1.ebuild b/app-editors/emacs/emacs-27.1.9999-r1.ebuild
index 60faa71894c5..a3e4ddfa6837 100644
--- a/app-editors/emacs/emacs-27.1.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-27.1.9999-r1.ebuild
@@ -43,8 +43,7 @@ LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
 RESTRICT="test"
 
-RDEPEND="acct-group/mail
-	app-emacs/emacs-common-gentoo[games?,gui(-)?]
+RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
 	sys-libs/ncurses:0=
 	acl? ( virtual/acl )
 	alsa? ( media-libs/alsa-lib )
@@ -58,7 +57,7 @@ RDEPEND="acct-group/mail
 	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 )
@@ -311,7 +310,7 @@ src_install() {
 	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
 
 	# movemail must be setgid mail
-	if [[ -f ${ED}/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail ]]; then
+	if ! use mailutils; then
 		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
 		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
 	fi
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild
index 79d4c689e4b0..9ea17e49b558 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -43,8 +43,7 @@ LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
 RESTRICT="test"
 
-RDEPEND="acct-group/mail
-	app-emacs/emacs-common-gentoo[games?,gui(-)?]
+RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
 	sys-libs/ncurses:0=
 	acl? ( virtual/acl )
 	alsa? ( media-libs/alsa-lib )
@@ -58,7 +57,7 @@ RDEPEND="acct-group/mail
 	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 )
@@ -310,7 +309,7 @@ src_install() {
 	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
 
 	# movemail must be setgid mail
-	if [[ -f ${ED}/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail ]]; then
+	if ! use mailutils; then
 		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
 		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
 	fi