diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2014-07-02 07:21:53 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2014-07-02 07:21:53 +0000 |
| commit | aeb27fdd988d8835da975f9bc37b628549fc6f79 (patch) | |
| tree | c11afa376afa4016dff2a7296abb9c395383f31a /app-editors | |
| parent | Version bump (diff) | |
| download | gentoo-2-aeb27fdd988d8835da975f9bc37b628549fc6f79.tar.gz gentoo-2-aeb27fdd988d8835da975f9bc37b628549fc6f79.tar.bz2 gentoo-2-aeb27fdd988d8835da975f9bc37b628549fc6f79.zip | |
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!)
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-18.59-r10.ebuild | 15 |
2 files changed, 10 insertions, 10 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index 7495658b4320..49be4a066267 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.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 <ulm@gentoo.org> 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 <ulm@gentoo.org> -emacs-23.4-r10.ebuild: Remove old. 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 ;; |