| 1 |
ulm 14/03/29 11:56:09 |
| 2 |
|
| 3 |
Modified: ChangeLog emacs-18.59-r8.ebuild |
| 4 |
Log: |
| 5 |
Drop x32 support in stable ebuild due to broken dependency tree. |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.609 app-editors/emacs/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.609&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.609&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.608&r2=1.609 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v |
| 19 |
retrieving revision 1.608 |
| 20 |
retrieving revision 1.609 |
| 21 |
diff -u -r1.608 -r1.609 |
| 22 |
--- ChangeLog 12 Mar 2014 05:27:57 -0000 1.608 |
| 23 |
+++ ChangeLog 29 Mar 2014 11:56:09 -0000 1.609 |
| 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.608 2014/03/12 05:27:57 phajdan.jr Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.609 2014/03/29 11:56:09 ulm Exp $ |
| 29 |
+ |
| 30 |
+ 29 Mar 2014; Ulrich Müller <ulm@g.o> emacs-18.59-r8.ebuild: |
| 31 |
+ Drop x32 support in stable ebuild due to broken dependency tree. |
| 32 |
|
| 33 |
09 Mar 2014; Pawel Hajdan jr <phajdan.jr@g.o> emacs-18.59-r9.ebuild: |
| 34 |
x86 stable wrt bug #502262 |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.14 app-editors/emacs/emacs-18.59-r8.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?rev=1.14&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?rev=1.14&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?r1=1.13&r2=1.14 |
| 43 |
|
| 44 |
Index: emacs-18.59-r8.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v |
| 47 |
retrieving revision 1.13 |
| 48 |
retrieving revision 1.14 |
| 49 |
diff -u -r1.13 -r1.14 |
| 50 |
--- emacs-18.59-r8.ebuild 26 Dec 2013 16:14:00 -0000 1.13 |
| 51 |
+++ emacs-18.59-r8.ebuild 29 Mar 2014 11:56:09 -0000 1.14 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
-# Copyright 1999-2013 Gentoo Foundation |
| 54 |
+# Copyright 1999-2014 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.13 2013/12/26 16:14:00 ulm Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.14 2014/03/29 11:56:09 ulm Exp $ |
| 58 |
|
| 59 |
EAPI=4 |
| 60 |
|
| 61 |
@@ -19,12 +19,12 @@ |
| 62 |
|
| 63 |
RDEPEND="sys-libs/ncurses |
| 64 |
>=app-admin/eselect-emacs-1.2 |
| 65 |
- amd64? ( !abi_x86_x32? ( |
| 66 |
+ amd64? ( |
| 67 |
|| ( |
| 68 |
sys-libs/ncurses[abi_x86_32(-)] |
| 69 |
app-emulation/emul-linux-x86-baselibs[development] |
| 70 |
) |
| 71 |
- ) )" |
| 72 |
+ )" |
| 73 |
# X? ( x11-libs/libX11[-xcb] ) |
| 74 |
DEPEND="${RDEPEND} |
| 75 |
virtual/pkgconfig" |
| 76 |
@@ -40,10 +40,7 @@ |
| 77 |
local arch |
| 78 |
case ${ARCH} in |
| 79 |
amd64) |
| 80 |
- if has x32 ${MULTILIB_ABIS}; then |
| 81 |
- arch=x86-x32 |
| 82 |
- multilib_toolchain_setup x32 |
| 83 |
- elif has x86 ${MULTILIB_ABIS}; then |
| 84 |
+ if has x86 ${MULTILIB_ABIS}; then |
| 85 |
arch=intel386 |
| 86 |
multilib_toolchain_setup x86 |
| 87 |
else |
Archives