s390 stable wrt #313861

(Portage version: 2.1.8.3/cvs/Linux ia64)

4 files changed, 11 insertions, 7 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 6405c3e1a474..d3549956a958 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.382 2010/09/15 15:46:18 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.383 2010/09/19 17:44:20 armin76 Exp $
+
+  19 Sep 2010; Raúl Porcel <armin76@gentoo.org> emacs-21.4-r20.ebuild,
+  emacs-22.3-r4.ebuild, emacs-23.1-r3.ebuild:
+  s390 stable wrt #313861
 
   15 Sep 2010; Christian Faulhammer <fauli@gentoo.org> emacs-23.2.ebuild:
   stable x86, bug 337417
diff --git a/app-editors/emacs/emacs-21.4-r20.ebuild b/app-editors/emacs/emacs-21.4-r20.ebuild
index 1359b394337b..634a45cf6e46 100644
--- a/app-editors/emacs/emacs-21.4-r20.ebuild
+++ b/app-editors/emacs/emacs-21.4-r20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r20.ebuild,v 1.8 2010/06/25 14:55:41 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r20.ebuild,v 1.9 2010/09/19 17:44:20 armin76 Exp $
 
 EAPI=2
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
 
 LICENSE="GPL-2 FDL-1.1 BSD as-is MIT"
 SLOT="21"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 ~s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="X Xaw3d leim motif sendmail"
 
 DEPEND="sys-libs/ncurses
diff --git a/app-editors/emacs/emacs-22.3-r4.ebuild b/app-editors/emacs/emacs-22.3-r4.ebuild
index 11a841c83171..98f0831d13bf 100644
--- a/app-editors/emacs/emacs-22.3-r4.ebuild
+++ b/app-editors/emacs/emacs-22.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r4.ebuild,v 1.10 2010/06/25 14:55:41 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r4.ebuild,v 1.11 2010/09/19 17:44:20 armin76 Exp $
 
 EAPI=2
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.gz
 
 LICENSE="GPL-3 FDL-1.2 BSD as-is MIT"
 SLOT="22"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 ~s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="alsa gif gtk gzip-el hesiod jpeg kerberos motif png sound source tiff toolkit-scroll-bars X Xaw3d +xpm"
 RESTRICT="strip"
 
diff --git a/app-editors/emacs/emacs-23.1-r3.ebuild b/app-editors/emacs/emacs-23.1-r3.ebuild
index 6ead059ea889..140adddbd1c7 100644
--- a/app-editors/emacs/emacs-23.1-r3.ebuild
+++ b/app-editors/emacs/emacs-23.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.1-r3.ebuild,v 1.12 2010/06/25 17:44:18 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.1-r3.ebuild,v 1.13 2010/09/19 17:44:20 armin76 Exp $
 
 EAPI=2
 
@@ -30,7 +30,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode"
 SLOT="23"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 ~s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="alsa dbus gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
 RESTRICT="strip"