summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2012-06-08 12:07:47 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2012-06-08 12:07:47 +0000
commitd6867377689b693ec2fae3529fe7815cdae6c144 (patch)
treec2636263102197f74468407caea18c3bc6765224 /x11-base
parentx86 stable wrt bug #418739 (diff)
downloadgentoo-2-d6867377689b693ec2fae3529fe7815cdae6c144.tar.gz
gentoo-2-d6867377689b693ec2fae3529fe7815cdae6c144.tar.bz2
gentoo-2-d6867377689b693ec2fae3529fe7815cdae6c144.zip
x86 stable wrt bug #412609
(Portage version: 2.1.10.49/cvs/Linux i686)
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog6
-rw-r--r--x11-base/xorg-server/xorg-server-1.10.6-r1.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 236b8be48766..20cfbb103a0c 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-base/xorg-server
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.657 2012/06/07 19:57:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.658 2012/06/08 12:07:47 phajdan.jr Exp $
+
+ 08 Jun 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ xorg-server-1.10.6-r1.ebuild:
+ x86 stable wrt bug #412609
07 Jun 2012; Brent Baude <ranger@gentoo.org> xorg-server-1.11.4.ebuild:
Marking xorg-server-1.11.4 ppc for bug 419549
diff --git a/x11-base/xorg-server/xorg-server-1.10.6-r1.ebuild b/x11-base/xorg-server/xorg-server-1.10.6-r1.ebuild
index 15139a6f6aa2..b5948142206b 100644
--- a/x11-base/xorg-server/xorg-server-1.10.6-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.10.6-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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-r1.ebuild,v 1.3 2012/06/06 14:57:16 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.6-r1.ebuild,v 1.4 2012/06/08 12:07:47 phajdan.jr Exp $
EAPI=4
@@ -9,7 +9,7 @@ inherit xorg-2 multilib versionator
EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
DESCRIPTION="X.Org X servers"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd"
IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
IUSE="${IUSE_SERVERS} ipv6 minimal nptl tslib +udev"