[gentoo-commits] gentoo-x86 commit in app-editors/emacs: emacs-18.59-r10.ebuild ChangeLog

["Michal Gorny (mgorny)" <mgorny@gentoo.org>]

mgorny      14/06/16 21:28:47

  Modified:             emacs-18.59-r10.ebuild ChangeLog
  Log:
  Disallow emul-linux-x86-*[abi_x86_32] from satisfying the deps to help PM understand that we are using the multilib package then.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

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

Index: emacs-18.59-r10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r10.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- emacs-18.59-r10.ebuild	16 May 2014 06:47:20 -0000	1.2
+++ emacs-18.59-r10.ebuild	16 Jun 2014 21:28:47 -0000	1.3
@@ -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.2 2014/05/16 06:47:20 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r10.ebuild,v 1.3 2014/06/16 21:28:47 mgorny Exp $
 
 EAPI=5
 
@@ -24,8 +24,8 @@
 		sys-libs/ncurses[abi_x86_x32(-)?]
 		!abi_x86_x32? (
 			|| (
-				sys-libs/ncurses[abi_x86_32(-)?]
-				app-emulation/emul-linux-x86-baselibs[development]
+				sys-libs/ncurses[abi_x86_32(-)]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
 			)
 		)
 	)"



1.636                app-editors/emacs/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v
retrieving revision 1.635
retrieving revision 1.636
diff -u -r1.635 -r1.636
--- ChangeLog	8 Jun 2014 12:26:29 -0000	1.635
+++ ChangeLog	16 Jun 2014 21:28:47 -0000	1.636
@@ -1,6 +1,10 @@
 # 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.635 2014/06/08 12:26:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.636 2014/06/16 21:28:47 mgorny Exp $
+
+  16 Jun 2014; Michał Górny <mgorny@gentoo.org> emacs-18.59-r10.ebuild:
+  Disallow emul-linux-x86-*[abi_x86_32] from satisfying the deps to help PM
+  understand that we are using the multilib package then.
 
   08 Jun 2014; Jeroen Roovers <jer@gentoo.org> emacs-23.4-r11.ebuild:
   Stable for HPPA (bug #512692).