summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Meier <maekke@gentoo.org>2015-06-14 19:50:29 +0000
committerMarkus Meier <maekke@gentoo.org>2015-06-14 19:50:29 +0000
commit35d5216464530b2b6a5f6c3b0bbf528a2bc52949 (patch)
treefd7dae4e8a72544e62fd9c7657875319882d958a /x11-base/xorg-server
parent[QA] Remove emul-linux-x86-* from dependencies. (diff)
downloadgentoo-2-35d5216464530b2b6a5f6c3b0bbf528a2bc52949.tar.gz
gentoo-2-35d5216464530b2b6a5f6c3b0bbf528a2bc52949.tar.bz2
gentoo-2-35d5216464530b2b6a5f6c3b0bbf528a2bc52949.zip
arm stable, bug #548002
(Portage version: 2.2.20/cvs/Linux x86_64, RepoMan options: --include-arches="arm", signed Manifest commit with key 072AD062)
Diffstat (limited to 'x11-base/xorg-server')
-rw-r--r--x11-base/xorg-server/ChangeLog5
-rw-r--r--x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index b9a1fbdcf22e..93caa1e5a02f 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-base/xorg-server
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.848 2015/06/13 10:55:05 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.849 2015/06/14 19:50:29 maekke Exp $
+
+ 14 Jun 2015; Markus Meier <maekke@gentoo.org> xorg-server-1.12.4-r5.ebuild:
+ arm stable, bug #548002
13 Jun 2015; Mikle Kolyada <zlogene@gentoo.org> xorg-server-1.12.4-r5.ebuild:
x86 stable wrt bug #548002
diff --git a/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild b/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild
index 0e9e671f86f1..cdd83ade9d5b 100644
--- a/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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-r5.ebuild,v 1.4 2015/06/13 10:55:05 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild,v 1.5 2015/06/14 19:50:29 maekke 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 ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
SRC_URI="${SRC_URI} mirror://gentoo/${PN}-1.12-cve-2014-8091..8103.patches.tar.xz"