diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2011-09-08 14:10:03 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2011-09-08 14:10:03 +0000 |
| commit | 4de90312d0db66456f14456e6c056c8ed5b28ddc (patch) | |
| tree | 6077e3ffed979f5e4d77f67c81b1276c3c2d76b3 /app-editors/emacs | |
| parent | Add ~x86-fbsd (diff) | |
| download | gentoo-2-4de90312d0db66456f14456e6c056c8ed5b28ddc.tar.gz gentoo-2-4de90312d0db66456f14456e6c056c8ed5b28ddc.tar.bz2 gentoo-2-4de90312d0db66456f14456e6c056c8ed5b28ddc.zip | |
Backport some changes from the emacs-vcs live ebuild.
(Portage version: 2.1.10.14/cvs/Linux x86_64)
Diffstat (limited to 'app-editors/emacs')
| -rw-r--r-- | app-editors/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-23.3-r2.ebuild | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index c955ae897b17..49e59b043f8b 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-editors/emacs # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.428 2011/08/29 16:28:42 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.429 2011/09/08 14:10:03 ulm Exp $ + + 02 Sep 2011; Ulrich Mueller <ulm@gentoo.org> emacs-23.3-r2.ebuild: + Backport some changes from the emacs-vcs live ebuild. 29 Aug 2011; Ulrich Mueller <ulm@gentoo.org> emacs-23.3-r1.ebuild, emacs-23.3-r2.ebuild: diff --git a/app-editors/emacs/emacs-23.3-r2.ebuild b/app-editors/emacs/emacs-23.3-r2.ebuild index 7254872021e6..42ff73125825 100644 --- a/app-editors/emacs/emacs-23.3-r2.ebuild +++ b/app-editors/emacs/emacs-23.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r2.ebuild,v 1.2 2011/08/29 16:28:42 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r2.ebuild,v 1.3 2011/09/08 14:10:03 ulm Exp $ EAPI=4 WANT_AUTOMAKE="none" @@ -127,15 +127,16 @@ src_configure() { myconf="${myconf} $(use_with gif) $(use_with jpeg)" myconf="${myconf} $(use_with png) $(use_with svg rsvg)" myconf="${myconf} $(use_with tiff) $(use_with xpm)" - myconf="${myconf} $(use_with xft)" if use xft; then + myconf="${myconf} --with-xft" myconf="${myconf} $(use_with m17n-lib libotf)" myconf="${myconf} $(use_with m17n-lib m17n-flt)" else + myconf="${myconf} --without-xft" myconf="${myconf} --without-libotf --without-m17n-flt" use m17n-lib && ewarn \ - "USE flag \"m17n-lib\" has no effect because xft is not set." + "USE flag \"m17n-lib\" has no effect if \"xft\" is not set." fi # GTK+ is the default toolkit if USE=gtk is chosen with other @@ -146,7 +147,7 @@ src_configure() { myconf="${myconf} --with-x-toolkit=gtk" elif use Xaw3d; then einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit" - myconf="${myconf} --with-x-toolkit=athena" + myconf="${myconf} --with-x-toolkit=lucid" elif use motif; then einfo "Configuring to build with Motif toolkit" myconf="${myconf} --with-x-toolkit=motif" |