summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-base')
-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 d76e2a7c3ebc..104442da3540 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.846 2015/06/13 04:51:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.847 2015/06/13 09:19:21 zlogene Exp $
+
+ 13 Jun 2015; Mikle Kolyada <zlogene@gentoo.org> xorg-server-1.12.4-r5.ebuild:
+ amd64 stable wrt bug #548002
13 Jun 2015; Jeroen Roovers <jer@gentoo.org> xorg-server-1.12.4-r5.ebuild:
Stable for PPC64 (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 2be3c106c52d..75d5c01d45f0 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.2 2015/06/13 04:51:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild,v 1.3 2015/06/13 09:19:21 zlogene 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"