| 1 |
ulm 14/07/02 07:21:54 |
| 2 |
|
| 3 |
Modified: ChangeLog emacs-18.59-r10.ebuild |
| 4 |
Log: |
| 5 |
Get rid of the abi_x86_32 USE flag, it is redundant. Remove REQUIRED_USE. |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.640 app-editors/emacs/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.640&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.640&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.639&r2=1.640 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v |
| 19 |
retrieving revision 1.639 |
| 20 |
retrieving revision 1.640 |
| 21 |
diff -u -r1.639 -r1.640 |
| 22 |
--- ChangeLog 19 Jun 2014 19:55:06 -0000 1.639 |
| 23 |
+++ ChangeLog 2 Jul 2014 07:21:53 -0000 1.640 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for app-editors/emacs |
| 26 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.639 2014/06/19 19:55:06 ulm Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.640 2014/07/02 07:21:53 ulm Exp $ |
| 29 |
+ |
| 30 |
+ 02 Jul 2014; Ulrich Müller <ulm@g.o> emacs-18.59-r10.ebuild: |
| 31 |
+ Get rid of the abi_x86_32 USE flag, it is redundant. Remove REQUIRED_USE. |
| 32 |
|
| 33 |
19 Jun 2014; Ulrich Müller <ulm@g.o> -emacs-23.4-r10.ebuild: |
| 34 |
Remove old. |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.5 app-editors/emacs/emacs-18.59-r10.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r10.ebuild?rev=1.5&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r10.ebuild?rev=1.5&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r10.ebuild?r1=1.4&r2=1.5 |
| 43 |
|
| 44 |
Index: emacs-18.59-r10.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r10.ebuild,v |
| 47 |
retrieving revision 1.4 |
| 48 |
retrieving revision 1.5 |
| 49 |
diff -u -r1.4 -r1.5 |
| 50 |
--- emacs-18.59-r10.ebuild 18 Jun 2014 19:01:09 -0000 1.4 |
| 51 |
+++ emacs-18.59-r10.ebuild 2 Jul 2014 07:21:53 -0000 1.5 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2014 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r10.ebuild,v 1.4 2014/06/18 19:01:09 mgorny Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r10.ebuild,v 1.5 2014/07/02 07:21:53 ulm Exp $ |
| 57 |
|
| 58 |
EAPI=5 |
| 59 |
|
| 60 |
@@ -15,13 +15,12 @@ |
| 61 |
LICENSE="GPL-1+ GPL-2+ BSD" #HPND |
| 62 |
SLOT="18" |
| 63 |
KEYWORDS="amd64 x86" |
| 64 |
-IUSE="+abi_x86_32 abi_x86_x32" |
| 65 |
-REQUIRED_USE="amd64? ( || ( abi_x86_32 abi_x86_x32 ) )" |
| 66 |
+IUSE="abi_x86_x32" |
| 67 |
|
| 68 |
-RDEPEND="sys-libs/ncurses |
| 69 |
- >=app-admin/eselect-emacs-1.16 |
| 70 |
+RDEPEND=">=app-admin/eselect-emacs-1.16 |
| 71 |
+ sys-libs/ncurses |
| 72 |
amd64? ( |
| 73 |
- >=sys-libs/ncurses-5.9-r3[abi_x86_x32(-)?] |
| 74 |
+ abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3[abi_x86_x32(-)] ) |
| 75 |
!abi_x86_x32? ( |
| 76 |
|| ( |
| 77 |
>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] |
| 78 |
@@ -47,11 +46,9 @@ |
| 79 |
if use abi_x86_x32; then |
| 80 |
arch=x86-x32 |
| 81 |
multilib_toolchain_setup x32 |
| 82 |
- elif use abi_x86_32; then |
| 83 |
+ else |
| 84 |
arch=intel386 |
| 85 |
multilib_toolchain_setup x86 |
| 86 |
- else |
| 87 |
- die "Need 32 bit ABI on amd64" |
| 88 |
fi |
| 89 |
;; |
| 90 |
x86) arch=intel386 ;; |
Archives