diff options
Diffstat (limited to 'app-editors/emacs/emacs-18.59-r10.ebuild')
| -rw-r--r-- | app-editors/emacs/emacs-18.59-r10.ebuild | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/app-editors/emacs/emacs-18.59-r10.ebuild b/app-editors/emacs/emacs-18.59-r10.ebuild index 02d6f83f4279..b9a77f1573f0 100644 --- a/app-editors/emacs/emacs-18.59-r10.ebuild +++ b/app-editors/emacs/emacs-18.59-r10.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-r10.ebuild,v 1.4 2014/06/18 19:01:09 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r10.ebuild,v 1.5 2014/07/02 07:21:53 ulm Exp $ EAPI=5 @@ -15,13 +15,12 @@ SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${P}.tar.gz LICENSE="GPL-1+ GPL-2+ BSD" #HPND SLOT="18" KEYWORDS="amd64 x86" -IUSE="+abi_x86_32 abi_x86_x32" -REQUIRED_USE="amd64? ( || ( abi_x86_32 abi_x86_x32 ) )" +IUSE="abi_x86_x32" -RDEPEND="sys-libs/ncurses - >=app-admin/eselect-emacs-1.16 +RDEPEND=">=app-admin/eselect-emacs-1.16 + sys-libs/ncurses amd64? ( - >=sys-libs/ncurses-5.9-r3[abi_x86_x32(-)?] + abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3[abi_x86_x32(-)] ) !abi_x86_x32? ( || ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] @@ -47,11 +46,9 @@ src_configure() { if use abi_x86_x32; then arch=x86-x32 multilib_toolchain_setup x32 - elif use abi_x86_32; then + else arch=intel386 multilib_toolchain_setup x86 - else - die "Need 32 bit ABI on amd64" fi ;; x86) arch=intel386 ;; |