Stable for s390, wrt bug #466222

(Portage version: 2.1.11.55/cvs/Linux ppc64, signed Manifest commit with key 7194459F)

6 files changed, 16 insertions, 11 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 832594adc5b6..ee873c3359e8 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.737 2013/04/22 10:12:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.738 2013/04/22 10:35:15 ago Exp $
+
+  22 Apr 2013; Agostino Sarubbo <ago@gentoo.org> xorg-server-1.10.6-r2.ebuild,
+  xorg-server-1.11.4-r2.ebuild, xorg-server-1.12.4-r1.ebuild,
+  xorg-server-1.13.4.ebuild, xorg-server-1.9.5-r2.ebuild:
+  Stable for s390, wrt bug #466222
 
   22 Apr 2013; Agostino Sarubbo <ago@gentoo.org> xorg-server-1.10.6-r2.ebuild,
   xorg-server-1.11.4-r2.ebuild, xorg-server-1.12.4-r1.ebuild,
diff --git a/x11-base/xorg-server/xorg-server-1.10.6-r2.ebuild b/x11-base/xorg-server/xorg-server-1.10.6-r2.ebuild
index 055e2a48dfe2..d84aef47c825 100644
--- a/x11-base/xorg-server/xorg-server-1.10.6-r2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.10.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.6-r2.ebuild,v 1.7 2013/04/22 10:12:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.6-r2.ebuild,v 1.8 2013/04/22 10:35:15 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~x86-fbsd"
 
 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} ipv6 minimal nptl tslib +udev"
diff --git a/x11-base/xorg-server/xorg-server-1.11.4-r2.ebuild b/x11-base/xorg-server/xorg-server-1.11.4-r2.ebuild
index ee9d40792c7a..02ebafeed699 100644
--- a/x11-base/xorg-server/xorg-server-1.11.4-r2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.11.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.11.4-r2.ebuild,v 1.7 2013/04/22 10:12:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.11.4-r2.ebuild,v 1.8 2013/04/22 10:35:15 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~x86-fbsd"
 
 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev"
diff --git a/x11-base/xorg-server/xorg-server-1.12.4-r1.ebuild b/x11-base/xorg-server/xorg-server-1.12.4-r1.ebuild
index 65519914d4af..8ad36ca86a06 100644
--- a/x11-base/xorg-server/xorg-server-1.12.4-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.12.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.4-r1.ebuild,v 1.7 2013/04/22 10:12:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.4-r1.ebuild,v 1.8 2013/04/22 10:35:15 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev"
diff --git a/x11-base/xorg-server/xorg-server-1.13.4.ebuild b/x11-base/xorg-server/xorg-server-1.13.4.ebuild
index c2265c7d8525..fdb263044235 100644
--- a/x11-base/xorg-server/xorg-server-1.13.4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.13.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.13.4.ebuild,v 1.8 2013/04/22 10:12:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.13.4.ebuild,v 1.9 2013/04/22 10:35:15 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev"
diff --git a/x11-base/xorg-server/xorg-server-1.9.5-r2.ebuild b/x11-base/xorg-server/xorg-server-1.9.5-r2.ebuild
index 4d7c3de39c04..a37fa72e1216 100644
--- a/x11-base/xorg-server/xorg-server-1.9.5-r2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.9.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.5-r2.ebuild,v 1.7 2013/04/22 10:12:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.5-r2.ebuild,v 1.8 2013/04/22 10:35:15 ago Exp $
 
 EAPI=5
 inherit flag-o-matic xorg-2 multilib versionator
@@ -11,7 +11,7 @@ OPENGL_DIR="xorg-x11"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~x86-fbsd"
 
 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} doc ipv6 minimal nptl tslib +udev"