diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2008-01-04 13:17:25 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2008-01-04 13:17:25 +0000 |
| commit | 9090a8eba3a2f4809124b86a948f457f284147d6 (patch) | |
| tree | 19ff121c94d298a5471b361c15aeab313393b2e2 /app-editors/emacs | |
| parent | Version bump from project overlay (diff) | |
| download | gentoo-2-9090a8eba3a2f4809124b86a948f457f284147d6.tar.gz gentoo-2-9090a8eba3a2f4809124b86a948f457f284147d6.tar.bz2 gentoo-2-9090a8eba3a2f4809124b86a948f457f284147d6.zip | |
Remove lesstif USE flag wrt bug #117057.
(Portage version: 2.1.4_rc14)
Diffstat (limited to 'app-editors/emacs')
| -rw-r--r-- | app-editors/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-21.4-r14.ebuild | 18 |
2 files changed, 11 insertions, 12 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index e5d2c2530b21..a4d9dbce1d0b 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-editors/emacs # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.225 2008/01/02 18:54:53 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.226 2008/01/04 13:17:25 ulm Exp $ + + 04 Jan 2008; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r14.ebuild: + Remove lesstif USE flag wrt bug #117057. Be verbose about toolkit selection. 02 Jan 2008; Ulrich Mueller <ulm@gentoo.org> emacs-22.1-r3.ebuild: Remove explicit zlib dependency. diff --git a/app-editors/emacs/emacs-21.4-r14.ebuild b/app-editors/emacs/emacs-21.4-r14.ebuild index e99de926d7f0..137dd50f2e2a 100644 --- a/app-editors/emacs/emacs-21.4-r14.ebuild +++ b/app-editors/emacs/emacs-21.4-r14.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r14.ebuild,v 1.9 2007/12/11 09:20:15 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r14.ebuild,v 1.10 2008/01/04 13:17:25 ulm Exp $ WANT_AUTOCONF="2.1" @@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/emacs/${P}a.tar.gz LICENSE="GPL-2 FDL-1.1 BSD" SLOT="21" KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="X Xaw3d leim lesstif motif nls sendmail" +IUSE="X Xaw3d leim motif nls sendmail" RDEPEND="sys-libs/ncurses X? ( @@ -30,10 +30,7 @@ RDEPEND="sys-libs/ncurses >=media-libs/tiff-3.5.5-r3 >=media-libs/libpng-1.2.1 Xaw3d? ( x11-libs/Xaw3d ) - motif? ( - lesstif? ( x11-libs/lesstif ) - !lesstif? ( >=x11-libs/openmotif-2.1.30 ) - ) + !Xaw3d? ( motif? ( virtual/motif ) ) ) sendmail? ( virtual/mta ) >=app-admin/eselect-emacs-0.7-r1" @@ -80,10 +77,6 @@ src_compile() { local myconf use nls || myconf="${myconf} --disable-nls" if use X ; then - if use motif && use lesstif; then - append-ldflags -L/usr/X11R6/lib/lesstif -R/usr/X11R6/lib/lesstif - append-cppflags -I/usr/X11R6/include/lesstif - fi myconf="${myconf} --with-x --with-xpm @@ -92,11 +85,14 @@ src_compile() { --with-gif --with-png" if use Xaw3d ; then + einfo "Configuring to build with Xaw3d (athena) support" myconf="${myconf} --with-x-toolkit=athena" elif use motif ; then + einfo "Configuring to build with motif toolkit support" myconf="${myconf} --with-x-toolkit=motif" else # do not build emacs with any toolkit, bug 35300 + einfo "Configuring to build with no toolkit" myconf="${myconf} --with-x-toolkit=no" fi else |