commit: a8fd7ecbd8b1b95400628779fc86289b76cb4407
Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Sat Feb 3 19:28:58 2018 +0000
Commit: Felix Janda <felix.janda <AT> posteo <DOT> de>
CommitDate: Sat Feb 3 19:28:58 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=a8fd7ecb
app-editors/emacs-25.3 sync with main tree
app-editors/emacs/emacs-25.3.ebuild | 28 +++++++++++-----------------
1 file changed, 11 insertions(+), 17 deletions(-)
diff --git a/app-editors/emacs/emacs-25.3.ebuild
b/app-editors/emacs/emacs-25.3.ebuild
index 363a94b..4008c49 100644
--- a/app-editors/emacs/emacs-25.3.ebuild
+++ b/app-editors/emacs/emacs-25.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,8 +11,8 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="25"
-KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~sh ~sparc ~x86"
-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 tiff
toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc
x86"
+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 tiff
toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
REQUIRED_USE="?? ( aqua X )"
RDEPEND="sys-libs/ncurses:0=
@@ -54,14 +54,8 @@ RDEPEND="sys-libs/ncurses:0=
)
)
gtk? (
- xwidgets? (
- x11-libs/gtk+:3
- net-libs/webkit-gtk:3=
- )
- !xwidgets? (
- gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( x11-libs/gtk+:2 )
- )
+ gtk3? ( x11-libs/gtk+:3 )
+ !gtk3? ( x11-libs/gtk+:2 )
)
!gtk? (
motif? ( >=x11-libs/motif-2.3:0 )
@@ -163,12 +157,12 @@ src_configure() {
recommended that you compile Emacs with the
Athena/Lucid or the
Motif toolkit instead.
EOF
- if use xwidgets; then
- myconf+=" --with-x-toolkit=gtk3 --with-xwidgets"
- else
+ #if use xwidgets; then
+ # myconf+=" --with-x-toolkit=gtk3 --with-xwidgets"
+ #else
myconf+=" --with-x-toolkit=$(usex gtk3 gtk3
gtk2)"
myconf+=" --without-xwidgets"
- fi
+ #fi
for f in motif Xaw3d athena; do
use ${f} && ewarn \
"USE flag \"${f}\" has no effect if
\"gtk\" is set."
@@ -187,8 +181,8 @@ src_configure() {
einfo "Configuring to build with no toolkit"
myconf+=" --with-x-toolkit=no"
fi
- ! use gtk && use xwidgets && ewarn \
- "USE flag \"xwidgets\" has no effect if \"gtk\" is not
set."
+ #! use gtk && use xwidgets && ewarn \
+ # "USE flag \"xwidgets\" has no effect if \"gtk\" is not
set."
elif use aqua; then
einfo "Configuring to build with Nextstep (Cocoa) support"
myconf+=" --with-ns --disable-ns-self-contained"
