gentoo resync : 16.04.2018

5 files changed, 8 insertions, 52 deletions

diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 190b269b6551..3ef66fc31c7b 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 298d7c6f1df0..4b102cbf601b 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -4,11 +4,10 @@ AUX xdm.initd-11 6021 BLAKE2B 75b0ae0adb0a96324d6cd7be98686e3806ea87dada2cdd8ecb
 AUX xorg-server-1.12-unloadsubmodule.patch 1373 BLAKE2B 4c6017bcdc53964ecc796e1beaf8a8714a85f1cfe65032df3e9ea23378b4d2db0057ea7a75ab00e8d5d89ae0d63c766dce05350446f69ffe69bb668d06e2e68b SHA512 a6a8ebbb1005f2ea9cfdfc928209a23fe213caab31a889c3290f14bcae0a9afd40176330e2e56cb5ff986d522505e7fb98fa0c71187f403e2afd33c9c919780e
 AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b425d652ebb83d116cabbf92d1530d2c616910ddbb96fb574cdad8d3f1ce2b4fcf9fb16aa2950b40a0723c9d00465d8e6d72299f1ea181a257d014c80 SHA512 5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5
 AUX xorg-server-1.19.4-sysmacros.patch 986 BLAKE2B 04c111591a6a558913217b24aa2357478e7d931b6cee5185dda31ebd38d68463b4a158a18d8a60ffa7ccc5c65e246f261ebbf7c0ebc81fd3ae31e7579b7adab4 SHA512 858676058779363741901ffbf79666f723f917b49f8627ddd2f31768873adfb416a70bc298e2356861cb5abca8be54a6c64f8fa4fd11a91cce072b93857ad168
-AUX xorg-server-1.19.99.901-randr-fix-crash.patch 1774 BLAKE2B 6c8aba90b64989dc215b02514eb53412f8a7353a43373094bf0d0a8564338a4c409f5eabe4a2244fbaba46e6ed0b70d5253027319c92385c83b3a90f8e1911f6 SHA512 8513e59ea8d9782c6f088f202436b1f773a3e782d00a09c879ef49a050bc32aee0eaa8f545ecc4441e57ab82778b07d4e78b480356391e41c528d5b6b3fdda1e
 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
 DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
-DIST xorg-server-1.19.99.901.tar.bz2 6131851 BLAKE2B 5b3588fe7c42d10eb89fa4ebea5ab6f2c7fb25f876ec6a5c5b523062f5c712c52c20767aa60b607847b50aa12ec75307b8715d63aa92331b70a1971c8d740670 SHA512 c2fbe4868788cd0d6d5fe546acb8c2ddec39ac3e851f352ee438a785a248a048a87073972f51ff98ef36a35a6753f8c2f22c2ecfc719d47dd9bb3c453fdb3ae5
+DIST xorg-server-1.19.99.904.tar.bz2 6083787 BLAKE2B 7b5ba4601494ab7714a977e6fcced12e373f5aaf30d433560a899d4446116cc4a5e22ae21378fea6ab07b68bad1a2544e065fd1d449b3b155b2c0e8a6787e479 SHA512 b9dccc777d0a30c6b40bddffe1f359dde4103539c6598f04bf8cf5f59e6770229221a199c1866b4eba0cf8d2d87fe878985bbd2e3c6ec5b65e3f16195ea8d57e
 EBUILD xorg-server-1.19.5-r1.ebuild 6481 BLAKE2B 7188ba3c7f817474511de8d06050a13b56889f4346db5aadc281abc88b72af9781cf99f9c793f63cbe0666d2c9abc333c229f40ffd500b5f1e09cc63fb487456 SHA512 937fbc0858228d52542ac8f8d22eabdd3787d6ea477ef5275cb9675a3de0fe10adeee83e51cce50397e713523fae907a14ab2080803076d8f5af368bd50f9ba9
-EBUILD xorg-server-1.19.99.901-r1.ebuild 5527 BLAKE2B c45891b660c40bf0349f62a4d136df96be60086f35d2269e1c07d696685eb01db1b99b221e0ab726eac1f95fc39b819b28ca6211a90f36f16d492ce04c565eaa SHA512 071b1f705e487a28fa0be4e2fe92f78121c0d53c2d1fa0d94be2a0df6a0e8a4035257cf5befcc2a020f666bf7ce968f4be32d958cf6c645b2c7141c4da6c7214
-EBUILD xorg-server-9999.ebuild 5497 BLAKE2B db336086785d717268fe6ed174b679fc03890e902360adf88a9be890baf106e9cfae206a92e94ecdd95971027e9c3b7ef6517b7d44567c7153c9e358cf40778d SHA512 596696ce4251bd9ff508483f2e653e188d15e75f2f111548f429547730ca6ec5953db219bc05846603be221c89f647d6f608e604ced391cec69c20f15fdd8aec
+EBUILD xorg-server-1.19.99.904.ebuild 5550 BLAKE2B 5754df3f70aa9bf1a4bdc64b751801b410e2443847eb21df0a305ef517e265397f65e6454ec450751b183a72252baddb847ca645f5d5080b2c541388760f71f5 SHA512 0ebac3a78cd805b57bee23c7fb693864cdcc59a2d8ae11ef2bbac15e093dc833c91332315fe5a52ddcadf1f3dc95e89a814af047c098c59484f19dab945f085e
+EBUILD xorg-server-9999.ebuild 5550 BLAKE2B 5754df3f70aa9bf1a4bdc64b751801b410e2443847eb21df0a305ef517e265397f65e6454ec450751b183a72252baddb847ca645f5d5080b2c541388760f71f5 SHA512 0ebac3a78cd805b57bee23c7fb693864cdcc59a2d8ae11ef2bbac15e093dc833c91332315fe5a52ddcadf1f3dc95e89a814af047c098c59484f19dab945f085e
 MISC metadata.xml 934 BLAKE2B ffffcceb822cadfd48ff18063acd7adfeba6b651099c91f14159b2af4486b1475578da54865d99ef0acc78e34bfc3b1e7e6bca1d179ab7f151417c53c1a05a35 SHA512 97fffbdf402a70c9cb84062ac6c906b8a9d35ceebbe35b28547387e4a9e2706c595f842f64bee92925415bd49593f3a3b0213072ff2c0ab22209dc37e243d4ac
diff --git a/x11-base/xorg-server/files/xorg-server-1.19.99.901-randr-fix-crash.patch b/x11-base/xorg-server/files/xorg-server-1.19.99.901-randr-fix-crash.patch
deleted file mode 100644
index bcaaf867c7a7..000000000000
--- a/x11-base/xorg-server/files/xorg-server-1.19.99.901-randr-fix-crash.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 2af0a50a4bb9be9f58681d417ceb9a7029caaf3b Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 28 Feb 2018 11:23:41 -0500
-Subject: [PATCH] randr: Fix a crash on initialization with GPU screens
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RRSetChanged (immediately above) was immune to screens with no master,
-but RRTellChanged was not:
-
-    Thread 1 "X" received signal SIGSEGV, Segmentation fault.
-    RRTellChanged (pScreen=<optimized out>) at ../../randr/randr.c:576
-    576             mastersp = rrGetScrPriv(master);
-    (gdb) bt
-    #0  RRTellChanged (pScreen=<optimized out>) at ../../randr/randr.c:576
-    #1  0x000055555566f1e9 in RRNoticePropertyChange (value=0x555555bfbf28, property=70, output=0x555555bfef10) at ../../randr/rrproperty.c:153
-    #2  RRChangeOutputProperty (output=output@entry=0x555555bfef10, property=<optimized out>, type=type@entry=19, format=format@entry=32, mode=<optimized out>, mode@entry=0, len=len@entry=1, value=0x7fffffffe77c, sendevent=1, pending=0)
-        at ../../randr/rrproperty.c:263
-    #3  0x000055555566dba5 in RROutputSetNonDesktop (output=output@entry=0x555555bfef10, nonDesktop=nonDesktop@entry=0) at ../../randr/rroutput.c:333
-    ...
-
-Reported-by: Michel Dänzer <michel@daenzer.net>
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
- randr/randr.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/randr/randr.c b/randr/randr.c
-index 339ad3ece..feb54bcc8 100644
---- a/randr/randr.c
-+++ b/randr/randr.c
-@@ -602,6 +602,8 @@ RRTellChanged(ScreenPtr pScreen)
- 
-     if (pScreen->isGPU) {
-         master = pScreen->current_master;
-+        if (!master)
-+            return;
-         mastersp = rrGetScrPriv(master);
-     }
-     else {
--- 
-2.16.1
-
diff --git a/x11-base/xorg-server/xorg-server-1.19.99.901-r1.ebuild b/x11-base/xorg-server/xorg-server-1.19.99.904.ebuild
index 19c536df784f..7af80e32dab9 100644
--- a/x11-base/xorg-server/xorg-server-1.19.99.901-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.19.99.904.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git"
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
 if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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"
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
@@ -117,7 +117,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
 	# needed for new eselect-opengl, bug #541232
 	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
-	"${FILESDIR}"/${P}-randr-fix-crash.patch
 )
 
 pkg_pretend() {
@@ -162,8 +161,9 @@ src_configure() {
 		$(use_with doc xmlto)
 		$(use_with systemd systemd-daemon)
 		$(use_enable systemd systemd-logind)
+		$(use_enable systemd suid-wrapper)
+		$(use_enable !systemd install-setuid)
 		--enable-libdrm
-		--enable-suid-wrapper
 		--sysconfdir="${EPREFIX}"/etc/X11
 		--localstatedir="${EPREFIX}"/var
 		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 04dd3ce93361..7af80e32dab9 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -161,8 +161,9 @@ src_configure() {
 		$(use_with doc xmlto)
 		$(use_with systemd systemd-daemon)
 		$(use_enable systemd systemd-logind)
+		$(use_enable systemd suid-wrapper)
+		$(use_enable !systemd install-setuid)
 		--enable-libdrm
-		--enable-suid-wrapper
 		--sysconfdir="${EPREFIX}"/etc/X11
 		--localstatedir="${EPREFIX}"/var
 		--with-fontrootdir="${EPREFIX}"/usr/share/fonts