diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2011-01-31 20:33:26 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2011-01-31 20:33:26 +0000 |
| commit | 89351b4d7b0e845b86b7f082d4c0614a313c8b34 (patch) | |
| tree | 767df65628bee64c67e83c0ab2d524c696962c70 /app-editors/emacs | |
| parent | Version bump wrt #353082 by Kevin McCarthy. (diff) | |
| download | gentoo-2-89351b4d7b0e845b86b7f082d4c0614a313c8b34.tar.gz gentoo-2-89351b4d7b0e845b86b7f082d4c0614a313c8b34.tar.bz2 gentoo-2-89351b4d7b0e845b86b7f082d4c0614a313c8b34.zip | |
Add explicit --without-ns configure option.
(Portage version: 2.1.9.35/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.2-r3.ebuild | 18 |
2 files changed, 13 insertions, 10 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index 3f33a560699b..b716b7d14475 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.406 2011/01/30 08:42:03 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.407 2011/01/31 20:33:26 ulm Exp $ + + 31 Jan 2011; Ulrich Mueller <ulm@gentoo.org> emacs-23.2-r3.ebuild: + Add explicit --without-ns configure option. *emacs-23.2-r3 (30 Jan 2011) *emacs-22.3-r7 (30 Jan 2011) diff --git a/app-editors/emacs/emacs-23.2-r3.ebuild b/app-editors/emacs/emacs-23.2-r3.ebuild index 6cb259415fd8..aad8cfbabaa1 100644 --- a/app-editors/emacs/emacs-23.2-r3.ebuild +++ b/app-editors/emacs/emacs-23.2-r3.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.2-r3.ebuild,v 1.1 2011/01/30 08:42:03 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.2-r3.ebuild,v 1.2 2011/01/31 20:33:26 ulm Exp $ EAPI=4 WANT_AUTOMAKE="none" @@ -141,13 +141,8 @@ src_configure() { myconf="${myconf} $(use_with sound)" fi - if use aqua; then - einfo "Configuring to build with Cocoa support" - use X && ewarn "aqua USE flag disables X." - myconf="${myconf} --with-ns --disable-ns-self-contained" - myconf="${myconf} --without-x" - elif use X; then - myconf="${myconf} --with-x" + if use X; then + myconf="${myconf} --with-x --without-ns" myconf="${myconf} $(use_with gconf)" myconf="${myconf} $(use_with toolkit-scroll-bars)" myconf="${myconf} $(use_with gif) $(use_with jpeg)" @@ -188,8 +183,13 @@ src_configure() { && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")" tk="${tk}${tk:+ }${f}" done - else + elif use aqua; then + einfo "Configuring to build with Cocoa support" + use X && ewarn "aqua USE flag disables X." + myconf="${myconf} --with-ns --disable-ns-self-contained" myconf="${myconf} --without-x" + else + myconf="${myconf} --without-x --without-ns" fi myconf="${myconf} $(use_with hesiod)" |