diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2018-08-24 08:51:43 +0200 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2018-08-24 08:51:43 +0200 |
| commit | 2121e950ff40bd58a313c2e3f6b7bd7f079771e2 (patch) | |
| tree | eb5c73bcce0a106c84238382ea3e5fd00954fa8a /app-editors | |
| parent | app-editors/emacs: Restore emacs-24.3 for compatibility testing. (diff) | |
| download | emacs-2121e950ff40bd58a313c2e3f6b7bd7f079771e2.tar.gz emacs-2121e950ff40bd58a313c2e3f6b7bd7f079771e2.tar.bz2 emacs-2121e950ff40bd58a313c2e3f6b7bd7f079771e2.zip | |
app-editors/emacs: Sync from gentoo repo.
Package-Manager: Portage-2.3.47, Repoman-2.3.10
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/emacs/emacs-24.3-r7.ebuild | 10 | ||||
| -rw-r--r-- | app-editors/emacs/metadata.xml | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/app-editors/emacs/emacs-24.3-r7.ebuild b/app-editors/emacs/emacs-24.3-r7.ebuild index b013715..ed89687 100644 --- a/app-editors/emacs/emacs-24.3-r7.ebuild +++ b/app-editors/emacs/emacs-24.3-r7.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="24.3" 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" -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" +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" REQUIRED_USE="?? ( aqua X )" RDEPEND="sys-libs/ncurses:0= @@ -58,8 +58,8 @@ RDEPEND="sys-libs/ncurses:0= ) ) gtk? ( - gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( x11-libs/gtk+:2 ) + gtk2? ( x11-libs/gtk+:2 ) + !gtk2? ( x11-libs/gtk+:3 ) ) !gtk? ( motif? ( @@ -204,7 +204,7 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" + myconf+=" --with-x-toolkit=$(usex gtk2 gtk2 gtk3)" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -223,6 +223,8 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi + ! use gtk && use gtk2 && ewarn \ + "USE flag \"gtk2\" 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" diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml index 720733b..61ab502 100644 --- a/app-editors/emacs/metadata.xml +++ b/app-editors/emacs/metadata.xml @@ -26,7 +26,7 @@ font name</flag> <flag name="gsettings">Use gsettings (<pkg>dev-libs/glib</pkg>) to read the system font name</flag> - <flag name="gtk3">Prefer version 3 of the GIMP Toolkit to version 2 + <flag name="gtk2">Prefer version 2 of the GIMP Toolkit to version 3 (<pkg>x11-libs/gtk+</pkg>)</flag> <flag name="gzip-el">Compress bundled Emacs Lisp source</flag> <flag name="imagemagick">Use <pkg>media-gfx/imagemagick</pkg> for image |