From: Ulrich Müller <ulm@gentoo.org>
Date: Sat, 18 Mar 2017 12:36:07 +0000 (+0100)
Subject: app-editors/emacs-vcs: New mailutils USE flag.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=afd041b56c8f6f911a664480357ae5ac52304a74;p=gentoo.git

app-editors/emacs-vcs: New mailutils USE flag.

Also configure --without-pop unconditionally, because the internal
movemail implementation doesn't support encryption. Users should
enable the mailutils flag if they need POP support.

Package-Manager: Portage-2.3.5, Repoman-2.3.2
---

diff --git a/app-editors/emacs-vcs/emacs-vcs-26.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.0.9999.ebuild
index 3d19dbbd8241..a51934fd3d50 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.0.9999.ebuild
@@ -28,13 +28,12 @@ HOMEPAGE="https://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="26"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib mailutils motif pax_kernel png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"
 
 RDEPEND="sys-libs/ncurses:0=
 	>=app-eselect/eselect-emacs-1.16
 	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
-	net-libs/liblockfile
 	acl? ( virtual/acl )
 	alsa? ( media-libs/alsa-lib )
 	dbus? ( sys-apps/dbus )
@@ -43,6 +42,8 @@ RDEPEND="sys-libs/ncurses:0=
 	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
 	kerberos? ( virtual/krb5 )
 	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	mailutils? ( net-mail/mailutils[clients] )
+	!mailutils? ( net-libs/liblockfile )
 	selinux? ( sys-libs/libselinux )
 	ssl? ( net-libs/gnutls )
 	systemd? ( sys-apps/systemd )
@@ -230,6 +231,7 @@ src_configure() {
 		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
 		--without-compress-install \
 		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		--without-pop \
 		$(use_enable acl) \
 		$(use_with dbus) \
 		$(use_with dynamic-loading modules) \
@@ -238,6 +240,7 @@ src_configure() {
 		$(use_with hesiod) \
 		$(use_with kerberos) $(use_with kerberos kerberos5) \
 		$(use_with libxml2 xml2) \
+		$(use_with mailutils) \
 		$(use_with selinux) \
 		$(use_with ssl gnutls) \
 		$(use_with systemd libsystemd) \
diff --git a/app-editors/emacs-vcs/metadata.xml b/app-editors/emacs-vcs/metadata.xml
index f718ce593239..a9cf8efdbc3c 100644
--- a/app-editors/emacs-vcs/metadata.xml
+++ b/app-editors/emacs-vcs/metadata.xml
@@ -39,6 +39,8 @@
     processing</flag>
   <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
     of the internal Lisp implementations</flag>
+  <flag name="mailutils">Retrieve e-mail using <pkg>net-mail/mailutils</pkg>
+    instead of the internal movemail substitute</flag>
   <flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
   <flag name="source">Install C source files and make them available for
     find-function</flag>