ulm 14/03/29 11:56:09 Modified: ChangeLog emacs-18.59-r8.ebuild Log: 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!)
Revision Changes Path 1.609 app-editors/emacs/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.609&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.609&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.608&r2=1.609 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v retrieving revision 1.608 retrieving revision 1.609 diff -u -r1.608 -r1.609 --- ChangeLog 12 Mar 2014 05:27:57 -0000 1.608 +++ ChangeLog 29 Mar 2014 11:56:09 -0000 1.609 @@ -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 <[email protected]> emacs-18.59-r8.ebuild: + Drop x32 support in stable ebuild due to broken dependency tree. 09 Mar 2014; Pawel Hajdan jr <[email protected]> emacs-18.59-r9.ebuild: x86 stable wrt bug #502262 1.14 app-editors/emacs/emacs-18.59-r8.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?rev=1.14&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?rev=1.14&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?r1=1.13&r2=1.14 Index: emacs-18.59-r8.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- emacs-18.59-r8.ebuild 26 Dec 2013 16:14:00 -0000 1.13 +++ emacs-18.59-r8.ebuild 29 Mar 2014 11:56:09 -0000 1.14 @@ -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 @@ 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 @@ 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
