ulm         14/05/16 06:47:20

  Modified:             ChangeLog emacs-18.59-r10.ebuild
  Removed:              emacs-18.59-r9.ebuild
  Log:
  Allow emul-linux-* as alternative dependency, since this is still stage I of 
the gx86-multilib roadmap. Stable on amd64 and x86, bug 510456. Remove old.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
9433907D693FB5B8!)

Revision  Changes    Path
1.621                app-editors/emacs/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.621&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.621&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.620&r2=1.621

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v
retrieving revision 1.620
retrieving revision 1.621
diff -u -r1.620 -r1.621
--- ChangeLog   15 May 2014 20:01:46 -0000      1.620
+++ ChangeLog   16 May 2014 06:47:20 -0000      1.621
@@ -1,6 +1,11 @@
 # 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.620 
2014/05/15 20:01:46 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.621 
2014/05/16 06:47:20 ulm Exp $
+
+  16 May 2014; Ulrich Müller <[email protected]> -emacs-18.59-r9.ebuild,
+  emacs-18.59-r10.ebuild:
+  Allow emul-linux-* as alternative dependency, since this is still stage I of
+  the gx86-multilib roadmap. Stable on amd64 and x86, bug 510456. Remove old.
 
   15 May 2014; Markus Meier <[email protected]> emacs-24.3-r6.ebuild:
   arm stable, bug #509830



1.2                  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.2&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r10.ebuild?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r10.ebuild?r1=1.1&r2=1.2

Index: emacs-18.59-r10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r10.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emacs-18.59-r10.ebuild      4 Apr 2014 18:08:44 -0000       1.1
+++ emacs-18.59-r10.ebuild      16 May 2014 06:47:20 -0000      1.2
@@ -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.1 2014/04/04 18:08:44 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r10.ebuild,v 
1.2 2014/05/16 06:47:20 ulm Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-1+ GPL-2+ BSD" #HPND
 SLOT="18"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+abi_x86_32 abi_x86_x32"
 REQUIRED_USE="amd64? ( || ( abi_x86_32 abi_x86_x32 ) )"
 
@@ -22,7 +22,12 @@
        >=app-admin/eselect-emacs-1.16
        amd64? (
                sys-libs/ncurses[abi_x86_x32(-)?]
-               !abi_x86_x32? ( sys-libs/ncurses[abi_x86_32(-)?] )
+               !abi_x86_x32? (
+                       || (
+                               sys-libs/ncurses[abi_x86_32(-)?]
+                               
app-emulation/emul-linux-x86-baselibs[development]
+                       )
+               )
        )"
 #      X? ( x11-libs/libX11[-xcb] )
 DEPEND="${RDEPEND}




Reply via email to