aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAric Belsito <lluixhi@gmail.com>2016-11-26 15:38:22 -0800
committerAric Belsito <lluixhi@gmail.com>2016-11-26 15:38:22 -0800
commitd06ae2570a2b2d80d75e13133e18b40355373e89 (patch)
tree7d502fb4fd3bf2c724b5ef1842cc404dacd13d94 /x11-base
parentnet-misc/freerdp: Add stable version. (diff)
downloadmusl-d06ae2570a2b2d80d75e13133e18b40355373e89.tar.gz
musl-d06ae2570a2b2d80d75e13133e18b40355373e89.tar.bz2
musl-d06ae2570a2b2d80d75e13133e18b40355373e89.zip
x11-base/xorg-server: Bump to 1.18.4
Sync with upstream. Change keywords on 1.17.4 to only include arm because we only use an arm patch. Drop the r99 postfix.
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/Manifest12
-rw-r--r--x11-base/xorg-server/files/xdm-setup.initd-12
-rw-r--r--x11-base/xorg-server/files/xdm.initd-112
-rw-r--r--x11-base/xorg-server/xorg-server-1.16.4.ebuild (renamed from x11-base/xorg-server/xorg-server-1.16.4-r99.ebuild)6
-rw-r--r--x11-base/xorg-server/xorg-server-1.17.4.ebuild6
-rw-r--r--x11-base/xorg-server/xorg-server-1.18.4.ebuild (renamed from x11-base/xorg-server/xorg-server-1.18.3-r99.ebuild)0
6 files changed, 14 insertions, 14 deletions
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 45e2d2d..b5ed0a9 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,6 +1,6 @@
-AUX xdm-setup.initd-1 231 SHA256 f88aadaea4a0d39bfac4e5bee60c316e0dbe6443d34b1f4629bf2324394883f7 SHA512 ad67389976657127b3c59f86f20f167868acb91afb5bec6fc8e532469bc86f65d95667a13b6f7ecafa829dcf41ec1758ee007bab78951c6d0bec34f828a0618b WHIRLPOOL f44c55b51c69f14dac809a5e7505f8561789dde931bb11420703ce3ab5f08f0214460c69d19e2e67d8c59964540ae02b9f57a1c2ce75e34c395ce77b7d03b211
+AUX xdm-setup.initd-1 232 SHA256 5985efb5e707b1817b4452410068a322a4db2a00ee0f84e41f3b35b31b9b4dd5 SHA512 809be51c6fcbc251e7feb18e0e8026d4b5a17d4f15478b80159daabf505ccc4e7e03c991373e6de5ad49fc7e3c39814d094ac5b80744a5207bdb192a59683a30 WHIRLPOOL 35c8db787d1a6a35a0027f772dac8dabe9d3dd9e341dd7193dcceddbe3c874054f73ec92a3a4cc756583134cb858d8f64ebd01221ca1d155afde6c58c3659b7f
AUX xdm.confd-4 562 SHA256 9d26b72bb28611a60a6b9f942b8d8cfe47b59f926be89af9709b5912668344d8 SHA512 facfb91c0b4e0b1cae86b707d263523215633720e1e8f4595639411f936907b321643e8a06111dd3f7b74fa601476e4b0d09768edfdec762c73fa07cb227588b WHIRLPOOL d701fb5f40ecde2b2f2bb56970576c8abde1499916168fee4a6d27afbc1c0493eb17ddd1a8ee70bfbc77d553a47e219e538febada4946d19cccbdabc90f40e6f
-AUX xdm.initd-11 6027 SHA256 19992228827ae635f3ef08c1b08889afedfa563efa50bc2fb7db211caa8d1510 SHA512 049a6ed1f8c0d55939f736793f988a86010cefb3e8fada60b5a12dc40ccb8e733c7036a4f61af67b1cab0cc24ab14ffadea92c0b1dbb56a41bd6e8869ab9759a WHIRLPOOL 3b7be586db0d33d25a7127f565957c4dbb347f2a681365bd37115a86868246d43cb83542225c23d705b11943c8e7087a6f362685e66a479fdb551e4231cb7981
+AUX xdm.initd-11 6028 SHA256 89728c129014a9ddcd0607da207be91d7b40f22541db51e0e8d22b8d110c40f5 SHA512 4b931a59b79864ffa4e887a92ba16f80ddaafbae2690be41413b0ba05dc46c094a5a97e7677dc0f50120b542265f5495675062e7517da5a74a0131247d7f7fc0 WHIRLPOOL 33c9ac02edb0d3e4347151989a00725f0533a2ed5bdd2fb37f90a917f75b114577aecce94ef4b395b4daec4433e961fdd5ab390f875d645cca169a82b2d3d28b
AUX xorg-server-1.12-ia64-fix_inx_outx.patch 1737 SHA256 bf996a01faf3d1e6f00f12b17373a2530e7e433d3e6c4cac8935ebddc91cd089 SHA512 18bf9bbb973ae4e3f95ffafca8f82845f0c318c3b2dbf0cf9089a2614215ecf000b9037bfed7d80d9367be01247bf316ba2f6e16aa04fe79c54d81441c962bcd WHIRLPOOL cd133d58fc74de9d49773fe2a570d023cea38d09d7550fb9097a8c83a8393e8fc829ffaac566eee732475410e5d8063d0f99d437a68a67e8d3f65d012522240e
AUX xorg-server-1.12-unloadsubmodule.patch 1373 SHA256 c68c4c0749b9229c3ca11c72b5ca98b58c7dbaf5c7311ce45890204bdc637c3c SHA512 a6a8ebbb1005f2ea9cfdfc928209a23fe213caab31a889c3290f14bcae0a9afd40176330e2e56cb5ff986d522505e7fb98fa0c71187f403e2afd33c9c919780e WHIRLPOOL 7e9dce7dc4e064567e68697a2966f87cef756670db7e49da50c8d9a5379d7930c3f9642913b8482b8c7597067ef9098e1989284986b5ec605aca6a536329c05c
AUX xorg-server-1.14.3-musl.patch 916 SHA256 aa3d44a6b21a7991eb730d5ddf345e8ab9cf2a319648576b30a1cf5be2621fd1 SHA512 06bc6860c6fc5508c3e7458f2a6061ad02e893d0ba6303423fe76d12b223ef609f225383da891ecbaf448d9ba82bad94f33d5854763b467c1845588fbbbafcb2 WHIRLPOOL 52e957f34a738fe79eb54707252642ee2a748fc10655a02d6998f5f93380766082a772f1de91d8c65042421329af70a9057580dd5f521edec48516ba58803793
@@ -11,8 +11,8 @@ AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 SHA256 07ef91cb5
AUX xorg-sets.conf 199 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 WHIRLPOOL 4acac88e1688ea71df59a86a8a188b5369ad05f61e1369cd620eecd754511578e961a537ff6d0b22156f671d3485289cbc941dfe83bea24a27329b7bebb46c7d
DIST xorg-server-1.16.4.tar.bz2 5817330 SHA256 abb6e1cc9213a9915a121f48576ff6739a0b8cdb3d32796f9a7743c9a6efc871 SHA512 f756fca65535aa921a85d8d8eb36ea2ba5b7af90a46d640b0ca76259a9abd9d323885087e11156528d95240937c70373045001ae20266a1b9e89909f007e9e74 WHIRLPOOL 63980a3e2b57d2860998344f21a6524598b3dc135c277e5a868e34b57ab5060681ae7137358b3ba8b9ca5fd622a91aeb06bd0ac9e3e5ce1f4dc55df2b2dc0e33
DIST xorg-server-1.17.4.tar.bz2 5791384 SHA256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 SHA512 4b8377b86ca88f27dcf59db2996b2ee620ce6f181a37dc47600365db588d48f2f3ca66a3149e7c856e686e5783b1cccb2ba0827aa7413299163dfca869f4d376 WHIRLPOOL c5baa1b01e57eac9e18bd1890c0a7e2246836524645057d5e05a1a19225d863645616aafaadbf9d083ffb672d47ea1934ad8323d813533e9519f0d92f9a1c6ab
-DIST xorg-server-1.18.3.tar.bz2 5867330 SHA256 ea739c22517cdbe2b5f7c0a5fd05fe8a10ac0629003e71c0c7862f4bb60142cd SHA512 9540b2fb69bf531b57e54af09b103c92c8d9d9cc4e6abe911f63b73b7c63eb6587eeae87927d7bdd7be83749785bf6b395891f85394e86ad2b01c182749f2171 WHIRLPOOL 8ddf040ff24a4668a460b323b6604347120868658d61b9b84853568f768f7f84267d7caf299c4fe306aeff0bc68d28613a51eaee5a2904bfd524e2aac7ff2e7a
-EBUILD xorg-server-1.16.4-r99.ebuild 6767 SHA256 9d2027c38b5e6cb0f8ecb7f97733172af29d2834dfb023a5f3bdc5a178938cf5 SHA512 08b8b271c273ba27ac06fcca259ffdf87beaf8768ee326af8750a4f79bf78b99d935d2afa1249086961d5f937e65d597db7f08831d4df7db56ab65e2d9a36f25 WHIRLPOOL b94da2f8bbccefd58b53437042cc3211a75abeaefa814e0fae4b829db055ce4034994dd1395fa2a809aa7c52af16140859de1920d1324a253aa688f1d7a5b911
-EBUILD xorg-server-1.17.4.ebuild 6282 SHA256 d522e5273a368d66e8cd95906c47873009325dd83cd29dd9dfb4dd3765c8a675 SHA512 ca9bb36a6c1bb26a579f44496931a8302c8b78c1a5287cbd772447cd79c7b468785b5dfb28368aad47ac8ed4368dab65313ca68528d7145566eb8561d184a2ef WHIRLPOOL 019705c66bc05cbaa8b08affe45de151ec04ccc101df6cb717ec926a7dcadb085f74a774801c3b516dfd01f930fb3ceb00db7047ac93741b768542f0b0a9c11e
-EBUILD xorg-server-1.18.3-r99.ebuild 6115 SHA256 538e0f93f41cef8b58628ae60bc94ab57716d19187363979eb0381745903102a SHA512 1c696fd0c6c5a9ec14d3a3df826c7a02d0de58790f2ddd579c7a0e68f1c46ddccfbae4acd5b8f2e15c0c65f14cc8647020dac75eddd49eebb513b5f76fc89212 WHIRLPOOL d0f153e9c7e85bb90a3990d6dae032e57681227160cf67c068998f50038c6ef98a35d9f4c89319c17c495e1eea08b378d790a749ca8502b2352d679a10e4a919
+DIST xorg-server-1.18.4.tar.bz2 6009508 SHA256 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 SHA512 2055948caa1437547ea823a70d8b24584b65338bb9f1bbf75e3ad7fd60ec9684378facaffa05b7ce496d904213cd192085a43ba889a1476d5fbc813b7e41b56b WHIRLPOOL f9ba5ffb49e6ac7ca20d64d27712a0a8f10c6560256a20e9f944d6438dc5f5eebe53daf6af110084da67a622e92874969047518e72ff181de0d64d83030d629f
+EBUILD xorg-server-1.16.4.ebuild 6867 SHA256 8efa7f03ede2f1c8e029da79298d327642be69abbd9aeccb40c5deaea2f02586 SHA512 841d47e5565f1dc3aa09616c963e2d8a87e6342547a35e936992835397bfff93fac1ede0677fd24f38b86393c1a3f0639155fd1ad4b0c8e197d7c364ab55fc6b WHIRLPOOL a2fcb8a18cc861ac1efbe9dad65f9c19e46a75db0d900c93a9d1b8bbef8f07c271707175878718d803a51e2cd0f5ea57bc4e1cf7bb2afc26faa7791c27308743
+EBUILD xorg-server-1.17.4.ebuild 6268 SHA256 af632318465138602e33f7817e80e611bd3ebe341a82f88b8b05488e473c255f SHA512 d74dc4d3aeb89f457da4c68845de885d65e0d524aa4a0fe90c3050fa606d9e3f856ab0d540cb8c9459f2eea22b8ef7654cea93432aa2efd731f3a1fc530b4d96 WHIRLPOOL bd1f346462069471f3f2ca777b6e7708fd5f3453ed53ea2a75eaf2db790729933280d414a514582381b321248e08fb5b409e6ef6db4aeb43d12d83d9c968b76f
+EBUILD xorg-server-1.18.4.ebuild 6115 SHA256 538e0f93f41cef8b58628ae60bc94ab57716d19187363979eb0381745903102a SHA512 1c696fd0c6c5a9ec14d3a3df826c7a02d0de58790f2ddd579c7a0e68f1c46ddccfbae4acd5b8f2e15c0c65f14cc8647020dac75eddd49eebb513b5f76fc89212 WHIRLPOOL d0f153e9c7e85bb90a3990d6dae032e57681227160cf67c068998f50038c6ef98a35d9f4c89319c17c495e1eea08b378d790a749ca8502b2352d679a10e4a919
MISC metadata.xml 877 SHA256 b41a133db7c20ca9b78a620f30af984d178baef7207c8c4329e1309835e8b522 SHA512 370e41da26388e328697958396b808c831e07245dc9e2ea230316bee8067d8501d032a0c9f89b7f1ea27c816490803839a8f14485aacde6143b3db38a6e1ede2 WHIRLPOOL ce70642eac3ef6ea824755d4d1bc7bdf8e5d3b95300ef43a41e1f5e710df0f12179f0a15b21dae0fbebb0dd56e35008f1e991463215a7f23dd2fd977400da40b
diff --git a/x11-base/xorg-server/files/xdm-setup.initd-1 b/x11-base/xorg-server/files/xdm-setup.initd-1
index e96a8c0..917cd12 100644
--- a/x11-base/xorg-server/files/xdm-setup.initd-1
+++ b/x11-base/xorg-server/files/xdm-setup.initd-1
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/x11-base/xorg-server/files/xdm.initd-11 b/x11-base/xorg-server/files/xdm.initd-11
index 7f0626e..70b81c0 100644
--- a/x11-base/xorg-server/files/xdm.initd-11
+++ b/x11-base/xorg-server/files/xdm.initd-11
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2
# $Id$
diff --git a/x11-base/xorg-server/xorg-server-1.16.4-r99.ebuild b/x11-base/xorg-server/xorg-server-1.16.4.ebuild
index a64c452..87443c2 100644
--- a/x11-base/xorg-server/xorg-server-1.16.4-r99.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.16.4.ebuild
@@ -10,14 +10,14 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
DESCRIPTION="X.Org X servers"
SLOT="0/1.16.1"
-KEYWORDS="amd64 ~arm ~mips ppc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland"
CDEPEND=">=app-eselect/eselect-opengl-1.0.8
!>=app-eselect/eselect-opengl-1.3.0
- dev-libs/openssl:=
+ dev-libs/openssl:0=
media-libs/freetype
>=x11-apps/iceauth-1.0.2
>=x11-apps/rgb-1.0.3
@@ -71,7 +71,7 @@ CDEPEND=">=app-eselect/eselect-opengl-1.0.8
>=x11-apps/xinit-1.3
systemd? (
sys-apps/dbus
- sys-apps/systemd
+ <sys-apps/systemd-230
)"
DEPEND="${CDEPEND}
diff --git a/x11-base/xorg-server/xorg-server-1.17.4.ebuild b/x11-base/xorg-server/xorg-server-1.17.4.ebuild
index fdb41b1..f90e731 100644
--- a/x11-base/xorg-server/xorg-server-1.17.4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.17.4.ebuild
@@ -10,13 +10,13 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
DESCRIPTION="X.Org X servers"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~mips ppc x86"
+KEYWORDS="arm"
IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb"
IUSE="${IUSE_SERVERS} glamor ipv6 libressl minimal nptl selinux +suid systemd tslib +udev unwind wayland"
CDEPEND=">=app-eselect/eselect-opengl-1.3.0
- !libressl? ( dev-libs/openssl:0 )
+ !libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl )
media-libs/freetype
>=x11-apps/iceauth-1.0.2
@@ -79,7 +79,7 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0
>=x11-apps/xinit-1.3.3-r1
systemd? (
sys-apps/dbus
- sys-apps/systemd
+ <sys-apps/systemd-230
)"
DEPEND="${CDEPEND}
diff --git a/x11-base/xorg-server/xorg-server-1.18.3-r99.ebuild b/x11-base/xorg-server/xorg-server-1.18.4.ebuild
index edc100e..edc100e 100644
--- a/x11-base/xorg-server/xorg-server-1.18.3-r99.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.18.4.ebuild