Update dependencies to explicitly state compatibility with libXfont versions. Restore arm64 keyword that was apparently dropped due to mistake.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x2324E7B566DF2611!

4 files changed, 28 insertions, 21 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/Manifest b/x11-base/xorg-server/Manifest
index 166fe6c89a9a..580eb18f830b 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -22,32 +22,32 @@ DIST xorg-server-1.15.2.tar.bz2 5551426 SHA256 3c0585607c654ded836da43a45a75492f
 DIST xorg-server-1.16-cve-2014-8091..8103.patches.tar.xz 27892 SHA256 47d8c9bb79c829389e7599aef1110d43afbc5bf744dbcf73d8f3cf01796d287a SHA512 f8b55c009166883b3e6ec2c8c7a2ff4ed61df6970afcc4f0efb9efa36741af194456a368d4b1c7ba9345ef973fb139a48eb50cb5a7ebc144b43749b9ffdb1f7b WHIRLPOOL 2f8b26c018f4ad4cf780ed7dcb0b844de64e7a612adc30c622d1956dfcee710086ffcc837ff0a64cdcc14d47720d82d8797374488bf0b52d77ca63adf6806885
 DIST xorg-server-1.16.4.tar.bz2 5817330 SHA256 abb6e1cc9213a9915a121f48576ff6739a0b8cdb3d32796f9a7743c9a6efc871 SHA512 f756fca65535aa921a85d8d8eb36ea2ba5b7af90a46d640b0ca76259a9abd9d323885087e11156528d95240937c70373045001ae20266a1b9e89909f007e9e74 WHIRLPOOL 63980a3e2b57d2860998344f21a6524598b3dc135c277e5a868e34b57ab5060681ae7137358b3ba8b9ca5fd622a91aeb06bd0ac9e3e5ce1f4dc55df2b2dc0e33
 DIST xorg-server-1.17.1.tar.bz2 5852385 SHA256 2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab SHA512 195a0e0a6bd9c7655e62dd40dfbd7dea77d10f1143d4fd6154e8bdbb463d3729f81ecd1e379d66f68e828d4f4583782c15ce260de24444802076844aec552c4f WHIRLPOOL a8a78b0bfa6137941e3434f083319a827f0332fd9c190922bb0a33381e86173868d236c96a89ee3049400f37521fe052838416f009713f004227f05b8717d776
-EBUILD xorg-server-1.12.4-r4.ebuild 7194 SHA256 b97dda9ed07ffad562841a3d67e562038e21437eadbfeec6646e6204566b9cc0 SHA512 c4b3a5c6bc6c017ac01be6330b32a8f575300d999d32f45742cebe8d7ab373f99c22ee31e9025b15cd5ef9bc6acae6ab9171b33495dee173a191db3924a3be31 WHIRLPOOL 714bf5b2b46881fc594bf0791a46bb330be4cdffe21f43a65229ab8bd15c7f480c307e2b1ef8a569d6566ebc826d635b36907faf21c4e0aed42e4628104e875d
+EBUILD xorg-server-1.12.4-r4.ebuild 7252 SHA256 d713e234780ec950a0b2ae794b9b1988301a4d86e448a83eac5df20fdfd5ee7a SHA512 803ae7d9f956c21df2c3a35cef668283d8ba9076c0c6914fa4729259029a8068de7680db095f0b4ccd2a569dd2041159fc16c4cebcc9e7e074fc561c3bae4673 WHIRLPOOL 8f414fc6df00455966f8c3973d9a821393c6fd4cfd003937377842b6b12c7fc52fa40aa13aec79407e7a534d24350c92f1446def8c2b86ff585948697b84f06f
 EBUILD xorg-server-1.15.2-r2.ebuild 7325 SHA256 1a9bfebcb2b7186d9324f4312358f2008beb5e948f93ff8dcf75540ec57a644b SHA512 5834e363ad99dd7e7b042196988dead55965d3d7a907b343d997b727167db676606a109fb73b7f9d2d7e89e9b5eb2912c90ae98c671443d3dbc5887693c242ee WHIRLPOOL 4ab7ae0728369d73f052fcd6d70eab3ce02e85bf14a479c74560291f5e86ec58dd856a4d174830813d25a5b29cc94e3e0811fc5dc34a82bc9300674f2965f3b7
 EBUILD xorg-server-1.16.4-r1.ebuild 6040 SHA256 d88cab66209d4d8caa9d4d95293fba1a613c7ce5ff88b0dc52f4c3f732ebc664 SHA512 beacfe3fb75f83f5743604f38e172d0636083a659c6089a22a7b2b6231b7df2bdd095335306b8051a5d21da050724bd6a7de8d2d861deae645d7853f1bbe43b2 WHIRLPOOL 8f2d51ae801e38dc5f3bd59b7a5cfe1b47ed58c808100bd2c97bfeb8b9f86374a9ee3a460454aea2655a324a7cf89d57f5c6700193d41cdd92b58d4dce9a1280
 EBUILD xorg-server-1.16.4-r2.ebuild 6148 SHA256 35b4e32fd257e19560a7abbba838b1d0336b11a1702d4399290f33adfd20a235 SHA512 60626fd94e69afe66e6d443f56241aeff8e64f1ae2153319ff20a60f388f29fba9f70cd06d1ab6010a76121859d603ca04f5d009c5d4b24703aed0222be85bcd WHIRLPOOL 78f5e6594f1e2013c794a4a47458602eaa6c84b78af6ae69a4a3f0f35187115b53a1f38f01c2f08d006171f373ba209c7b8c47e307010324c2e1c9d7d19f0d3b
 EBUILD xorg-server-1.16.4.ebuild 6931 SHA256 18cb3c288e9a55ce7876e77e9dcc723a6262c7c41afc3dbd1b6fa7fc57302de4 SHA512 af0c251f386526ab131eb72c9a38fac17822fbc2bff248c4fc351564095318aad66753ed94f468451eb0e7abc8a9305ce43ded1f5c0da003db0bb97927913a23 WHIRLPOOL 3b31e1114e24c4de8fcc11840a433f29224bea2e984ce809b09e1eafad274f5c4480b42dffa9632ef6d68d4c22885f0d0f91f7c662758a7ba2720a58d6b1e83c
-EBUILD xorg-server-1.17.1-r1.ebuild 6399 SHA256 12e7f6a06837668a796cffa9a49b713c8f62ab0f44e0573f8f9dcf8bb70e2f7e SHA512 5d8ada54b4cefff3ea403e23171c794021838f3c3f2f46ddd6994bce1fedbcf0bc254e412fbd47499ee87192e4841a19e24f35f4d5e2e17c0455e948c81a4326 WHIRLPOOL de8c82471a47fa14faf292a08e4d99bcfa410d8984f0ff40deec3d41fb507b76d34f77c5f08ea5b8311af8b9936ce0f08d4662e5b26323ef5422e29dc48d259d
+EBUILD xorg-server-1.17.1-r1.ebuild 6408 SHA256 46862271cf9f9fd007d4c4174bc96dc42000ca11462902da7516a85b2be89447 SHA512 a8a1cc10191fbe9e0fbc1fb54fbb22120ddcadf01c524a647dc9f1f207aa7ec8e268845cf738dd237134d6bfd4dc94486e87325537319c00523947c7ec70ff59 WHIRLPOOL b2702a0d01c51b4c290b954cbd4583563695435ff164adb0d2cea311cb7f77ba394fcc4372f3228d97606ead69508cb23820123e06648ad62a1004b80f0fe51a
 EBUILD xorg-server-1.17.1.ebuild 6291 SHA256 1c3506cab3fdd6fd145758dd3d03aa4e7fae11c99789e6eb770700e62c73eb54 SHA512 f962a2a07095205422a3e26eb9547d495a63e88876bff51ca8ef9401cb2fb67835dff79b8e47fd30c011a7b9c395afdb1aa35743fae505d95b06dc0559a37213 WHIRLPOOL b157b7c16166d9de523cea526d3917d72802e771ee40cf68e9632b992fa49c101d5ea945c81e0e14034e11b3de11b353b7ced17cedf394d9109929e5ad847436
-MISC ChangeLog 65707 SHA256 0e05523946e8a01a69628b5e53e947d0c46ed1b5723e726d42129384829db6ae SHA512 3648ea4fd990db6351804a76ef109542d3649cf94a14817ab914cf1eed8b8a653f2c4447f4b0235fb423f31887b231a5635cd6df9fac601d600a5c000ff0eef7 WHIRLPOOL 7054c278efea8116f39733bc2f6aa02f4ebbace4a32e16d8c569fdbe657983016ac13f4f2e08570d8ebeb856f97f53f43034d45295192131add9db439b38221f
+MISC ChangeLog 65987 SHA256 c063e1968b9d0d5422349dcd2cacfa096fce5ab5dd2744f018bd2676b43cf58a SHA512 f8e90b3b2ab436192c08005c9863ab35840a71e2a691292bbf25bb44e84747282270248df7aa1c67223f639b0a8eb26ab5ae723162a5abfbe9cd8ee9c69b7a68 WHIRLPOOL 309fd2bfc828b12f09883b34155d2416935f8f24839c5c2562e6f9917e224d425abe3c17ddfc4f2f3ab9ccd4ab2e48b57c17044480a4d7d4c85fe644aebe392e
 MISC ChangeLog-2009 109242 SHA256 76119bd85f64b74b4f8129911eef944e8f1baa3ae38bbfb65bcd6197a6f58c88 SHA512 200b2a1f8d66bc4461de84a5b675ae9bdc1fd38ffea339cdc69afdb613d7a6d6ffe29175fba62b10c4f9d95e050035933f59e21172bf9c545d7a70137c8d04f4 WHIRLPOOL 1c084a461e803c1a6627986cb2444cd7a23743f409df5bb1ca5f55d1e7c3106670cfc2cd4f875a479e0c75513b7937ee35b591b4016b715f7fa45209e098cece
 MISC metadata.xml 803 SHA256 11ce7d6b3d1a4b32ac268d791e3e9fc1a47e579fb0587f87caf4c064c1abc355 SHA512 73fee10d52b8012ee64bdb789d0ecc0368c418822ec823ad22c1eac3c7c4af37c561a58599db68a6638059624e6f37e7d3cb5f3fd363255a372a9614c1deaf75 WHIRLPOOL f26245d7f8c9bf8c653730e1e832781289e06e43dc6cbc1efc422b6e8e3f7342e5a94f8cb731b4c2193c40af6087048da0ca384e4f13e697f86098296936e2e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVCHQ1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVCHVYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy
-MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYR790P/j1mybMhRtw0DEpd+d8vbMel
-PgG4DPpFL7s0Mwrw8tUSFVDd36fbE8ZCaI5tJ+c0qh07+5vr6eodYWV+VexlZdJG
-cPHBTchx1maSO0APFbrTX4sw3mBqMLF+UQfyc0fmzbqtcajIa07JGp2VQFcTdbHn
-cvNmS9GOrPUg3IF1W0+l5iYS+QGxuJePrmuY1GOrKAjS8ugijQ2dwUMgPZ3Gj21e
-gQ/orVwq3v2rI5AuYpYN8Z7owqwJBwbIScs8KT1iJoPoY3Qhkfc0vIdcos5vOyvm
-rS7bG4DPep4UBrwv2K7FBJqsC81/S0GwtaPnAA7fgHWfo9Efhxi8j/7Dry8I0uAG
-b6V9yyr1qSnhUSuuDObe7bGeWsIMTHlXOSIFYFEhpoa54axg6blbwNCYqwd8ByJC
-3u5m6uJKVx8Ny2TVnRqP6GCvvNxfMZ9A59z7vnapINMythpRlOT/HkM8A6x4y2MW
-Geoz+jdOYBJ7jnjKe5g4VsYJjL6fmUkWdZh67OUKbfulF38rEd3uSaTHukny2WQc
-foeQ1MmUFxygOb0t39nl5seayfpzJADBwyyoGBthzwnijdAxGRE3ekxN3FOVics6
-Rn1lLJ6zBBhWbzspiYjl4IzgIhPK0mpzLJzh9V4tLbdWD09TaF8JftF2cgZp3mED
-DX+fFApDvFaWUJJFHRLX
-=XD86
+MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYRN9MQAJaW3MWw+WY7E1b7KFldSlfT
+Ns6eikR8xydLKpsGzMqWLRSVlVOf9xBGaiIM5aJllAYvtrpMYQbIzglC/4fstTmc
+ubzHE/Jw99WYg0485GFTlxlANg0XLLhb4UsLThwdTmCgYFulMzqbc1Fe73OUWxis
+gmMU9z2rc4OBArkyX0NyWTgvCvPAAksYH+f9eG+Hx9cdEc5wE0KawKmZVf7jHJ6w
+M3C7sKi3Gn14ahTMiW+hxe98TYIAqJJbITcaDPZDHxbBacBCJ4JlRhGePpoFvQgP
+ErpNnWkrVUUMviuSt3fe/sdGErU/jj9lgjSFEdffrcG7U/yNhgec8AUefyIoLIpb
+Qsh29FnOcDxV3MQUxXPYFqsEEnl1AReyPBw16PSp/ITBncQA94CJ34nBDPooicMr
+22IoE0r4xX1KnyO9aLQMpfAz1558cjah4ACDic6pLgZWdIkIuQj2TnsXz/WOU1W8
+sbPYeSFyP2ks8fk7LsnMQBnLywiq3eiu60vp7Q8CtNFqg56oBEu5Y6rHARP1LHts
+WBjEISKbRIlM+9edsY8G5opqaQmbMLNkslfMZp3bBuV1f3/hIHGCxeoCS+orPf+l
+LMSla0w5xdiIDP6NzncRbPjnF5c3UnaUHKmRh29KQy/4s7m5w7S+a9/9KODu4ruS
+1Ayu898Dw+/Vm/5+z03X
+=1rir
 -----END PGP SIGNATURE-----
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"