ulm 14/07/02 07:21:54 Modified: ChangeLog emacs-18.59-r10.ebuild Log: Get rid of the abi_x86_32 USE flag, it is redundant. Remove REQUIRED_USE. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Revision Changes Path 1.640 app-editors/emacs/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.640&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.640&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.639&r2=1.640 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v retrieving revision 1.639 retrieving revision 1.640 diff -u -r1.639 -r1.640 --- ChangeLog 19 Jun 2014 19:55:06 -0000 1.639 +++ ChangeLog 2 Jul 2014 07:21:53 -0000 1.640 @@ -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.639 2014/06/19 19:55:06 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.640 2014/07/02 07:21:53 ulm Exp $ + + 02 Jul 2014; Ulrich Müller <[email protected]> emacs-18.59-r10.ebuild: + Get rid of the abi_x86_32 USE flag, it is redundant. Remove REQUIRED_USE. 19 Jun 2014; Ulrich Müller <[email protected]> -emacs-23.4-r10.ebuild: Remove old. 1.5 app-editors/emacs/emacs-18.59-r10.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r10.ebuild?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r10.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r10.ebuild?r1=1.4&r2=1.5 Index: emacs-18.59-r10.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r10.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- emacs-18.59-r10.ebuild 18 Jun 2014 19:01:09 -0000 1.4 +++ emacs-18.59-r10.ebuild 2 Jul 2014 07:21:53 -0000 1.5 @@ -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 @@ 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 @@ 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 ;;
