diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2014-04-04 18:18:44 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2014-04-04 18:18:44 +0000 |
| commit | 4d2f889e8d299333fd265082c6419948a8aa2eac (patch) | |
| tree | 0ea248398bb42fdef0d176676195a097451352f0 /app-editors | |
| parent | Install emacs man page under the same name as the binary. Remove old compatib... (diff) | |
| download | gentoo-2-4d2f889e8d299333fd265082c6419948a8aa2eac.tar.gz gentoo-2-4d2f889e8d299333fd265082c6419948a8aa2eac.tar.bz2 gentoo-2-4d2f889e8d299333fd265082c6419948a8aa2eac.zip | |
Restore alternative emul-linux-x86-* dependency for stable candidate.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/emacs/emacs-18.59-r9.ebuild | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app-editors/emacs/emacs-18.59-r9.ebuild b/app-editors/emacs/emacs-18.59-r9.ebuild index 2ec4bb683c0a..e736ebd151a4 100644 --- a/app-editors/emacs/emacs-18.59-r9.ebuild +++ b/app-editors/emacs/emacs-18.59-r9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r9.ebuild,v 1.4 2014/03/12 05:27:57 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r9.ebuild,v 1.5 2014/04/04 18:18:44 ulm Exp $ EAPI=5 @@ -22,7 +22,12 @@ RDEPEND="sys-libs/ncurses >=app-admin/eselect-emacs-1.2 amd64? ( sys-libs/ncurses[abi_x86_x32(-)?] - !abi_x86_x32? ( sys-libs/ncurses[abi_x86_32(-)?] ) + !abi_x86_x32? ( + || ( + sys-libs/ncurses[abi_x86_32(-)?] + app-emulation/emul-linux-x86-baselibs[development] + ) + ) )" # X? ( x11-libs/libX11[-xcb] ) DEPEND="${RDEPEND} |