diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2013-08-21 21:07:48 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2013-08-21 21:07:48 +0000 |
| commit | f9451e817cebdc54117201aa133b3f0979d6985c (patch) | |
| tree | a2c0f09ee1641ac2cf4e4f3016bc17cbe8d3b9fd /app-editors/emacs | |
| parent | Warn people from enabling weird setup with USE="consolekit systemd" and havin... (diff) | |
| download | gentoo-2-f9451e817cebdc54117201aa133b3f0979d6985c.tar.gz gentoo-2-f9451e817cebdc54117201aa133b3f0979d6985c.tar.bz2 gentoo-2-f9451e817cebdc54117201aa133b3f0979d6985c.zip | |
Add ncurses[abi_x86_32] as alternative dependency on amd64.
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Diffstat (limited to 'app-editors/emacs')
| -rw-r--r-- | app-editors/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-18.59-r8.ebuild | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index 428b82ddc3ad..c3ca57f37bf8 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-editors/emacs # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.597 2013/08/14 06:25:43 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.598 2013/08/21 21:07:48 ulm Exp $ + + 21 Aug 2013; Ulrich Müller <ulm@gentoo.org> emacs-18.59-r8.ebuild: + Add ncurses[abi_x86_32] as alternative dependency on amd64. 14 Aug 2013; Ulrich Müller <ulm@gentoo.org> emacs-24.3-r2.ebuild: Don't call configure with --program-transform-name, upstream bug #15091. diff --git a/app-editors/emacs/emacs-18.59-r8.ebuild b/app-editors/emacs/emacs-18.59-r8.ebuild index e8996c9302d7..2afaff03acb2 100644 --- a/app-editors/emacs/emacs-18.59-r8.ebuild +++ b/app-editors/emacs/emacs-18.59-r8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.11 2013/08/06 10:54:22 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.12 2013/08/21 21:07:48 ulm Exp $ EAPI=4 @@ -20,7 +20,10 @@ IUSE="" RDEPEND="sys-libs/ncurses >=app-admin/eselect-emacs-1.2 amd64? ( !abi_x86_x32? ( - app-emulation/emul-linux-x86-baselibs[development] + || ( + sys-libs/ncurses[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development] + ) ) )" # X? ( x11-libs/libX11[-xcb] ) DEPEND="${RDEPEND} |