diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2014-03-29 11:56:09 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2014-03-29 11:56:09 +0000 |
| commit | 3ff7c66bda21fe9aba9272e81c18519c1dbb6da3 (patch) | |
| tree | 9aab1e4606487f909829987f820b31ee21998f86 /app-editors | |
| parent | Version bump. (diff) | |
| download | gentoo-2-3ff7c66bda21fe9aba9272e81c18519c1dbb6da3.tar.gz gentoo-2-3ff7c66bda21fe9aba9272e81c18519c1dbb6da3.tar.bz2 gentoo-2-3ff7c66bda21fe9aba9272e81c18519c1dbb6da3.zip | |
Drop x32 support in stable ebuild due to broken dependency tree.
(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/ChangeLog | 5 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-18.59-r8.ebuild | 13 |
2 files changed, 9 insertions, 9 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index c8d81dd8fc8f..12cbc73b826a 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-editors/emacs # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.608 2014/03/12 05:27:57 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.609 2014/03/29 11:56:09 ulm Exp $ + + 29 Mar 2014; Ulrich Müller <ulm@gentoo.org> emacs-18.59-r8.ebuild: + Drop x32 support in stable ebuild due to broken dependency tree. 09 Mar 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org> emacs-18.59-r9.ebuild: x86 stable wrt bug #502262 diff --git a/app-editors/emacs/emacs-18.59-r8.ebuild b/app-editors/emacs/emacs-18.59-r8.ebuild index 6d91a19401bd..941a99fff890 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 +# 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-r8.ebuild,v 1.13 2013/12/26 16:14:00 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.14 2014/03/29 11:56:09 ulm Exp $ EAPI=4 @@ -19,12 +19,12 @@ IUSE="" RDEPEND="sys-libs/ncurses >=app-admin/eselect-emacs-1.2 - amd64? ( !abi_x86_x32? ( + amd64? ( || ( sys-libs/ncurses[abi_x86_32(-)] app-emulation/emul-linux-x86-baselibs[development] ) - ) )" + )" # X? ( x11-libs/libX11[-xcb] ) DEPEND="${RDEPEND} virtual/pkgconfig" @@ -40,10 +40,7 @@ src_configure() { local arch case ${ARCH} in amd64) - if has x32 ${MULTILIB_ABIS}; then - arch=x86-x32 - multilib_toolchain_setup x32 - elif has x86 ${MULTILIB_ABIS}; then + if has x86 ${MULTILIB_ABIS}; then arch=intel386 multilib_toolchain_setup x86 else |