gentoo resync : 18.11.2018

4 files changed, 11 insertions, 12 deletions

diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 5c2a1e6c4a64..4c5a582ce181 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 96614e8b822c..76e0e8c5a660 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -9,6 +9,6 @@ AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d
 DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
 DIST xorg-server-1.20.3.tar.bz2 6205000 BLAKE2B 9fc8acf1812d0aa4800941dd1846060f91edf1e7ebc92b35e8c2028266d88d3ab3ba14e95f535e5ee41941f8e20769ee75723ba609f5653d4892f97bc5cf91c4 SHA512 ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba
 EBUILD xorg-server-1.19.5-r2.ebuild 5766 BLAKE2B 87a961606f85b4c83d9eaebc9cac3ab8d650bf27a204a74f847459996c6cd51c28b94f5ee91bcee549e06a07aa260bf132609a60be733ddc5b51759d111aef4b SHA512 d63b8c99b046240476c93559fb9b672f0214db117c82e05130413b1751e57a43babdc366c7ec9ff0d9db9d08a3b1aa7493da7a6e3e9a73d531722374067b6dd6
-EBUILD xorg-server-1.20.3.ebuild 5600 BLAKE2B 17ed0b4df66b5198c12eafc775d309f6bbf6cd5808d9dbe37870224ce9dec91acf65666aeaa0f0834e3cc0a4f6f10cebbd6be7fb2e551465fb88e6045ee30d53 SHA512 b51b252d1f9da4b7c2cbdcda42f4aad3e4ba9afd6f39916239bac14547e6a75503bc54e20a40f2568518e8b18b62bea7508d7b4ea7505f01968b2598e670449f
-EBUILD xorg-server-9999.ebuild 5638 BLAKE2B 089e41bab9a3639bd91140387b43c2031219363ef2cee9f088dedf31dd486c088230f550c8ad48129aacddc2c518d2c023cccbfbd70415a5cd8d0951314ef697 SHA512 9d219e903be491b81cbf46d5638a73c781e6e49ed1a13cdbebbd6e8701ad7d155b98ecd4cf1d826ae432dcc623fd0d75bcaa3ad5f56965a58390613314ad9735
+EBUILD xorg-server-1.20.3.ebuild 5683 BLAKE2B 5d26497bd5eb00e0bc55f9724ca7ea7730813bd5b0054fadf662f5893408b1beaf56cf7f5fcb655d31bc71ed7375b551a8f0393c6c366b36c24c9b9895245fe3 SHA512 415a8ebfb20924ba9776adb1675596bc818c1d4a6d6f37bd1f551b1a642fc977071c39218ceaeaeb68e80139aa04f8a3f0c652761454c7b5aa66b5e743ff9a6d
+EBUILD xorg-server-9999.ebuild 5692 BLAKE2B 9c1e868d44693b9ceaa5d2f51711c162d8b4c1d3d1b4fcaffc005d0d4fa341a86b293bdbb4a0d9d9a0349dafe4da138fefdca8528af2f4dfb8c09d3954dfb1b8 SHA512 48d73f4bc95aaf354fbd36171c419d1c919ab46b21002271d94b8a3e2993764e08199b5062fd534b85102a4d5122d8512792340c37da0dcd1ce033119dd8d636
 MISC metadata.xml 934 BLAKE2B ffffcceb822cadfd48ff18063acd7adfeba6b651099c91f14159b2af4486b1475578da54865d99ef0acc78e34bfc3b1e7e6bca1d179ab7f151417c53c1a05a35 SHA512 97fffbdf402a70c9cb84062ac6c906b8a9d35ceebbe35b28547387e4a9e2706c595f842f64bee92925415bd49593f3a3b0213072ff2c0ab22209dc37e243d4ac
diff --git a/x11-base/xorg-server/xorg-server-1.20.3.ebuild b/x11-base/xorg-server/xorg-server-1.20.3.ebuild
index ee373ffae9fc..f3cc6ce0bda4 100644
--- a/x11-base/xorg-server/xorg-server-1.20.3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.3.ebuild
@@ -13,8 +13,8 @@ if [[ ${PV} != 9999* ]]; then
 	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
-IUSE_SERVERS="dmx kdrive suid wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity"
+IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux +suid systemd +udev unwind xcsecurity"
 
 CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 	!libressl? ( dev-libs/openssl:0= )
@@ -162,8 +162,8 @@ src_configure() {
 		$(use_with doc xmlto)
 		$(use_with systemd systemd-daemon)
 		$(use_enable systemd systemd-logind)
-		$(use_enable systemd suid-wrapper)
-		$(use_enable suid install-setuid)
+		$(usex suid $(use_enable systemd suid-wrapper) '--disable-suid-wrapper')
+		$(usex suid $(use_enable !systemd install-setuid) '--disable-install-setuid')
 		--enable-libdrm
 		--sysconfdir="${EPREFIX}"/etc/X11
 		--localstatedir="${EPREFIX}"/var
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 6f158c57aacd..d1cbe013ded9 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,8 +13,8 @@ if [[ ${PV} != 9999* ]]; then
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
-IUSE_SERVERS="dmx kdrive suid wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity"
+IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux +suid systemd +udev unwind xcsecurity"
 
 CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 	!libressl? ( dev-libs/openssl:0= )
@@ -163,8 +163,8 @@ src_configure() {
 		$(use_with doc xmlto)
 		$(use_with systemd systemd-daemon)
 		$(use_enable systemd systemd-logind)
-		$(use_enable systemd suid-wrapper)
-		$(use_enable suid install-setuid)
+		$(usex suid $(use_enable systemd suid-wrapper) '--disable-suid-wrapper')
+		$(usex suid $(use_enable !systemd install-setuid) '--disable-install-setuid')
 		--enable-libdrm
 		--sysconfdir="${EPREFIX}"/etc/X11
 		--localstatedir="${EPREFIX}"/var
@@ -174,7 +174,6 @@ src_configure() {
 		--disable-linux-acpi
 		--without-dtrace
 		--without-fop
-		--with-os-vendor=Gentoo
 		--with-sha1=libcrypto
 	)