| 1 |
commit: 2121e950ff40bd58a313c2e3f6b7bd7f079771e2 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 24 06:51:43 2018 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 24 06:51:43 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=2121e950 |
| 7 |
|
| 8 |
app-editors/emacs: Sync from gentoo repo. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.47, Repoman-2.3.10 |
| 11 |
|
| 12 |
app-editors/emacs/emacs-24.3-r7.ebuild | 10 ++++++---- |
| 13 |
app-editors/emacs/metadata.xml | 2 +- |
| 14 |
2 files changed, 7 insertions(+), 5 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-editors/emacs/emacs-24.3-r7.ebuild b/app-editors/emacs/emacs-24.3-r7.ebuild |
| 17 |
index b013715..ed89687 100644 |
| 18 |
--- a/app-editors/emacs/emacs-24.3-r7.ebuild |
| 19 |
+++ b/app-editors/emacs/emacs-24.3-r7.ebuild |
| 20 |
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz |
| 21 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
| 22 |
SLOT="24.3" |
| 23 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
| 24 |
-IUSE="alsa aqua athena dbus gconf gif gpm gsettings gtk +gtk3 gzip-el imagemagick jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm" |
| 25 |
+IUSE="alsa aqua athena dbus gconf gif gpm gsettings gtk gtk2 gzip-el imagemagick jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm" |
| 26 |
REQUIRED_USE="?? ( aqua X )" |
| 27 |
|
| 28 |
RDEPEND="sys-libs/ncurses:0= |
| 29 |
@@ -58,8 +58,8 @@ RDEPEND="sys-libs/ncurses:0= |
| 30 |
) |
| 31 |
) |
| 32 |
gtk? ( |
| 33 |
- gtk3? ( x11-libs/gtk+:3 ) |
| 34 |
- !gtk3? ( x11-libs/gtk+:2 ) |
| 35 |
+ gtk2? ( x11-libs/gtk+:2 ) |
| 36 |
+ !gtk2? ( x11-libs/gtk+:3 ) |
| 37 |
) |
| 38 |
!gtk? ( |
| 39 |
motif? ( |
| 40 |
@@ -204,7 +204,7 @@ src_configure() { |
| 41 |
recommended that you compile Emacs with the Athena/Lucid or the |
| 42 |
Motif toolkit instead. |
| 43 |
EOF |
| 44 |
- myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" |
| 45 |
+ myconf+=" --with-x-toolkit=$(usex gtk2 gtk2 gtk3)" |
| 46 |
for f in motif Xaw3d athena; do |
| 47 |
use ${f} && ewarn \ |
| 48 |
"USE flag \"${f}\" has no effect if \"gtk\" is set." |
| 49 |
@@ -223,6 +223,8 @@ src_configure() { |
| 50 |
einfo "Configuring to build with no toolkit" |
| 51 |
myconf+=" --with-x-toolkit=no" |
| 52 |
fi |
| 53 |
+ ! use gtk && use gtk2 && ewarn \ |
| 54 |
+ "USE flag \"gtk2\" has no effect if \"gtk\" is not set." |
| 55 |
elif use aqua; then |
| 56 |
einfo "Configuring to build with Nextstep (Cocoa) support" |
| 57 |
myconf+=" --with-ns --disable-ns-self-contained" |
| 58 |
|
| 59 |
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml |
| 60 |
index 720733b..61ab502 100644 |
| 61 |
--- a/app-editors/emacs/metadata.xml |
| 62 |
+++ b/app-editors/emacs/metadata.xml |
| 63 |
@@ -26,7 +26,7 @@ |
| 64 |
font name</flag> |
| 65 |
<flag name="gsettings">Use gsettings (<pkg>dev-libs/glib</pkg>) to read the |
| 66 |
system font name</flag> |
| 67 |
- <flag name="gtk3">Prefer version 3 of the GIMP Toolkit to version 2 |
| 68 |
+ <flag name="gtk2">Prefer version 2 of the GIMP Toolkit to version 3 |
| 69 |
(<pkg>x11-libs/gtk+</pkg>)</flag> |
| 70 |
<flag name="gzip-el">Compress bundled Emacs Lisp source</flag> |
| 71 |
<flag name="imagemagick">Use <pkg>media-gfx/imagemagick</pkg> for image |
Archives