summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2015-03-17 18:41:00 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2015-03-17 18:41:00 +0000
commit201bc1ce57dea1b54a5004da8eef9d737d8b78e3 (patch)
tree2b9ed56d5efe70df29e2769f12eed9ff7e702a5c /x11-base
parentAdd necessary Blocker, thanks kobboi for reporting (diff)
downloadgentoo-2-201bc1ce57dea1b54a5004da8eef9d737d8b78e3.tar.gz
gentoo-2-201bc1ce57dea1b54a5004da8eef9d737d8b78e3.tar.bz2
gentoo-2-201bc1ce57dea1b54a5004da8eef9d737d8b78e3.zip
Update dependencies to explicitly state compatibility with libXfont versions. Restore arm64 keyword that was apparently dropped due to mistake.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x2324E7B566DF2611!)
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog7
-rw-r--r--x11-base/xorg-server/xorg-server-1.12.4-r4.ebuild4
-rw-r--r--x11-base/xorg-server/xorg-server-1.17.1-r1.ebuild4
3 files changed, 11 insertions, 4 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index c7e00ffde26c..2b7766063c7d 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.841 2015/03/17 18:36:09 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.842 2015/03/17 18:41:00 chithanh Exp $
+
+ 17 Mar 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ xorg-server-1.12.4-r4.ebuild, xorg-server-1.17.1-r1.ebuild:
+ Update dependencies to explicitly state compatibility with libXfont versions.
+ Restore arm64 keyword that was apparently dropped due to mistake.
17 Mar 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
-xorg-server-1.12.4-r3.ebuild, -xorg-server-1.15.2-r1.ebuild,
diff --git a/x11-base/xorg-server/xorg-server-1.12.4-r4.ebuild b/x11-base/xorg-server/xorg-server-1.12.4-r4.ebuild
index d0555f1d29ac..56ce49f2e2c9 100644
--- a/x11-base/xorg-server/xorg-server-1.12.4-r4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.12.4-r4.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-r4.ebuild,v 1.9 2015/03/14 13:39:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.4-r4.ebuild,v 1.10 2015/03/17 18:41:00 chithanh Exp $
EAPI=5
@@ -28,6 +28,7 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8
>=x11-libs/libXau-1.0.4
>=x11-libs/libXdmcp-1.0.2
>=x11-libs/libXfont-1.4.2
+ <x11-libs/libXfont-1.5.0
>=x11-libs/libxkbfile-1.0.4
>=x11-libs/pixman-0.21.8
>=x11-libs/xtrans-1.2.2
@@ -67,6 +68,7 @@ DEPEND="${RDEPEND}
>=x11-proto/damageproto-1.1
>=x11-proto/fixesproto-5.0
>=x11-proto/fontsproto-2.0.2
+ <x11-proto/fontsproto-2.1.3
>=x11-proto/glproto-1.4.14
>=x11-proto/inputproto-2.1.99.3
>=x11-proto/kbproto-1.0.3
diff --git a/x11-base/xorg-server/xorg-server-1.17.1-r1.ebuild b/x11-base/xorg-server/xorg-server-1.17.1-r1.ebuild
index f7917a355806..cd91508b7e60 100644
--- a/x11-base/xorg-server/xorg-server-1.17.1-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.17.1-r1.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.17.1-r1.ebuild,v 1.1 2015/02/27 21:44:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.17.1-r1.ebuild,v 1.2 2015/03/17 18:41:00 chithanh 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb"
IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland"