| 1 |
commit: a8fd7ecbd8b1b95400628779fc86289b76cb4407 |
| 2 |
Author: Felix Janda <felix.janda <AT> posteo <DOT> de> |
| 3 |
AuthorDate: Sat Feb 3 19:28:58 2018 +0000 |
| 4 |
Commit: Felix Janda <felix.janda <AT> posteo <DOT> de> |
| 5 |
CommitDate: Sat Feb 3 19:28:58 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=a8fd7ecb |
| 7 |
|
| 8 |
app-editors/emacs-25.3 sync with main tree |
| 9 |
|
| 10 |
app-editors/emacs/emacs-25.3.ebuild | 28 +++++++++++----------------- |
| 11 |
1 file changed, 11 insertions(+), 17 deletions(-) |
| 12 |
|
| 13 |
diff --git a/app-editors/emacs/emacs-25.3.ebuild b/app-editors/emacs/emacs-25.3.ebuild |
| 14 |
index 363a94b..4008c49 100644 |
| 15 |
--- a/app-editors/emacs/emacs-25.3.ebuild |
| 16 |
+++ b/app-editors/emacs/emacs-25.3.ebuild |
| 17 |
@@ -1,4 +1,4 @@ |
| 18 |
-# Copyright 1999-2017 Gentoo Foundation |
| 19 |
+# Copyright 1999-2018 Gentoo Foundation |
| 20 |
# Distributed under the terms of the GNU General Public License v2 |
| 21 |
|
| 22 |
EAPI=6 |
| 23 |
@@ -11,8 +11,8 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz" |
| 24 |
|
| 25 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
| 26 |
SLOT="25" |
| 27 |
-KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~sh ~sparc ~x86" |
| 28 |
-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" |
| 29 |
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86" |
| 30 |
+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" |
| 31 |
REQUIRED_USE="?? ( aqua X )" |
| 32 |
|
| 33 |
RDEPEND="sys-libs/ncurses:0= |
| 34 |
@@ -54,14 +54,8 @@ RDEPEND="sys-libs/ncurses:0= |
| 35 |
) |
| 36 |
) |
| 37 |
gtk? ( |
| 38 |
- xwidgets? ( |
| 39 |
- x11-libs/gtk+:3 |
| 40 |
- net-libs/webkit-gtk:3= |
| 41 |
- ) |
| 42 |
- !xwidgets? ( |
| 43 |
- gtk3? ( x11-libs/gtk+:3 ) |
| 44 |
- !gtk3? ( x11-libs/gtk+:2 ) |
| 45 |
- ) |
| 46 |
+ gtk3? ( x11-libs/gtk+:3 ) |
| 47 |
+ !gtk3? ( x11-libs/gtk+:2 ) |
| 48 |
) |
| 49 |
!gtk? ( |
| 50 |
motif? ( >=x11-libs/motif-2.3:0 ) |
| 51 |
@@ -163,12 +157,12 @@ src_configure() { |
| 52 |
recommended that you compile Emacs with the Athena/Lucid or the |
| 53 |
Motif toolkit instead. |
| 54 |
EOF |
| 55 |
- if use xwidgets; then |
| 56 |
- myconf+=" --with-x-toolkit=gtk3 --with-xwidgets" |
| 57 |
- else |
| 58 |
+ #if use xwidgets; then |
| 59 |
+ # myconf+=" --with-x-toolkit=gtk3 --with-xwidgets" |
| 60 |
+ #else |
| 61 |
myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" |
| 62 |
myconf+=" --without-xwidgets" |
| 63 |
- fi |
| 64 |
+ #fi |
| 65 |
for f in motif Xaw3d athena; do |
| 66 |
use ${f} && ewarn \ |
| 67 |
"USE flag \"${f}\" has no effect if \"gtk\" is set." |
| 68 |
@@ -187,8 +181,8 @@ src_configure() { |
| 69 |
einfo "Configuring to build with no toolkit" |
| 70 |
myconf+=" --with-x-toolkit=no" |
| 71 |
fi |
| 72 |
- ! use gtk && use xwidgets && ewarn \ |
| 73 |
- "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." |
| 74 |
+ #! use gtk && use xwidgets && ewarn \ |
| 75 |
+ # "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." |
| 76 |
elif use aqua; then |
| 77 |
einfo "Configuring to build with Nextstep (Cocoa) support" |
| 78 |
myconf+=" --with-ns --disable-ns-self-contained" |
Archives