[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

[Ulrich Müller]

commit:     553b751b2efe95f3c8ecccf118d2f4e2e1d97ad1
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  5 18:58:22 2016 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Mar  5 19:10:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=553b751b

app-editors/emacs: Enable SSL/TLS support with ssl instead of gnutls flag.

Package-Manager: portage-2.2.27

 app-editors/emacs/emacs-24.5-r1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-editors/emacs/emacs-24.5-r1.ebuild 
b/app-editors/emacs/emacs-24.5-r1.ebuild
index c16f16f..6f51878 100644
--- a/app-editors/emacs/emacs-24.5-r1.ebuild
+++ b/app-editors/emacs/emacs-24.5-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk 
+gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib 
motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int 
X Xaw3d xft +xpm zlib"
+IUSE="acl alsa aqua athena dbus 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 tiff toolkit-scroll-bars wide-int X 
Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"
 
 RDEPEND="sys-libs/ncurses:0
@@ -24,13 +24,13 @@ RDEPEND="sys-libs/ncurses:0
        acl? ( virtual/acl )
        alsa? ( media-libs/alsa-lib )
        dbus? ( sys-apps/dbus )
-       gnutls? ( net-libs/gnutls )
        gpm? ( sys-libs/gpm )
        hesiod? ( net-dns/hesiod )
        !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
        kerberos? ( virtual/krb5 )
        libxml2? ( >=dev-libs/libxml2-2.2.0 )
        selinux? ( sys-libs/libselinux )
+       ssl? ( net-libs/gnutls )
        zlib? ( sys-libs/zlib )
        X? (
                x11-libs/libXmu
@@ -196,12 +196,12 @@ src_configure() {
                --with-file-notification=$(usev inotify || usev gfile || echo 
no) \
                $(use_enable acl) \
                $(use_with dbus) \
-               $(use_with gnutls) \
                $(use_with gpm) \
                $(use_with hesiod) \
                $(use_with kerberos) $(use_with kerberos kerberos5) \
                $(use_with libxml2 xml2) \
                $(use_with selinux) \
+               $(use_with ssl gnutls) \
                $(use_with wide-int) \
                $(use_with zlib) \
                ${myconf}