gentoo resync : 05.04.2019

14 files changed, 43 insertions, 34 deletions

diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 50d9e800cdc0..f480b20a773e 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest
index 73638b5760c6..182b61eed270 100644
--- a/x11-base/xcb-proto/Manifest
+++ b/x11-base/xcb-proto/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-proto-1.13.tar.bz2 151981 BLAKE2B 04d90838f8a892103e6d7aa807f1b0b6794f1538c6c986ad3cba67cff3a963ff680e45c2137c5d6330736a3aa1a387d61fc247f23487de9dada2f4013590b4a1 SHA512 002aa2aa0ad503977e03419c6f136f1e3aa8c787916830ce6d6be8f81ca99edc1d8fc5f71ce8c592b490cc767bf6567695f0bafe55fe3f743076bcddbaac07f7
-EBUILD xcb-proto-1.13.ebuild 1531 BLAKE2B 27ebc43319a56641b2013c9cbb027cb0baa059326ac129f2dc5f17a9ce3449f1271863440da38f2a9b9cb7e135b0dfc623d28b0377da98fbb4e1de8d33587161 SHA512 a98a081e84fae154ae9070453fd10117c6fe72d56b2843125c88db0554e6fbc3c2e80158fbae68b9809e068484b98c5338075ecdd6c5b073061c4c6d54c234a0
+EBUILD xcb-proto-1.13.ebuild 1587 BLAKE2B 6c31bbc9cb7c4e1063f991a19eabb62067013d5e86883b0b3b7e40b32c71e1350165e2a75debd319b0c57b7dc4cbd8971b274e31e7cc8c16aa845311a844e1da SHA512 b1ff4923b3e43a062b2b2a6245b9a08dddb402d8bf982e1b6f0830f32ca6a15f7b947073899bd1ab16b58c2dde494dbaac026177ea1a90d582a9db652cd89398
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-base/xcb-proto/xcb-proto-1.13.ebuild b/x11-base/xcb-proto/xcb-proto-1.13.ebuild
index 2140e9956510..c7879409035f 100644
--- a/x11-base/xcb-proto/xcb-proto-1.13.ebuild
+++ b/x11-base/xcb-proto/xcb-proto-1.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,8 +10,8 @@ XORG_STATIC=no
 inherit python-r1 xorg-2
 
 DESCRIPTION="X C-language Bindings protocol headers"
-HOMEPAGE="https://xcb.freedesktop.org/"
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/proto.git"
+HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
diff --git a/x11-base/xorg-drivers/Manifest b/x11-base/xorg-drivers/Manifest
index daa17d4ea3b6..398fe5d6e487 100644
--- a/x11-base/xorg-drivers/Manifest
+++ b/x11-base/xorg-drivers/Manifest
@@ -1,3 +1,3 @@
-EBUILD xorg-drivers-1.20.ebuild 3888 BLAKE2B 216ab0e63a12918474f833fd2a59b98461ec6b07b7207b16c1712e2a4353f5dc593026574c1a0ed74e1016909fba89cac8add23715d187170b0ccbb4d3f02fc6 SHA512 2adbf364fe0b754e538da039ab572e95d70a25e9f63b2ae8e01f77dbdb0fc904b183a2cf4a4769b2fad31ce7b2def95260bff76f74734a085afbaf834638f4e4
-EBUILD xorg-drivers-9999.ebuild 3776 BLAKE2B b25688c30cba425288fb2efef507172830091ea03d77e9c2d92f71236c9d6cbdf8a80ca1a052b3877181bd496de3d8389f5c7e888403468ddaa68162fdb9fda2 SHA512 4d103eba289d8adbf22f814de6f117248be86b0cbf89637f2fdacef50595a0b932cf3990ecf0757be99b03325eb521a1faec5002ac5d2416565606c17e52db30
+EBUILD xorg-drivers-1.20.ebuild 3720 BLAKE2B 4cdd3fd92ad8d01f0ba3cb27134a4177e3ac2a1c77cf8a033fd190ddd79141d1c99ca78d05d0665d5eec1b23e346366508638d5b4319c3ae62a5e9c2b62f14ea SHA512 aa5ae48b6aa8f7937089ec4a0f8edb4bfd153aea13f4dc810e8c9dfbd88c175850fcbd8015a1a53253afc58c1cf017ea5f0a11e6969ec3202bca5c4b641cd78d
+EBUILD xorg-drivers-9999.ebuild 3608 BLAKE2B 4d1d2b7456b9c8610ab22a910e5ad502e4fa29f0973c147566f6ac302dcf80667019753e355bb0ea06999568e18509572ebfbeed87437ce75fd6c1103f0d7cf2 SHA512 7deb8c1b48e66283bdf6093a350b2b1adab8d9634bb1ac5a4e7fa7703f60ae965b08f6b1dedc986e42623bbb989be761d3cc778b6fe1f6cb57c9375f393ab468
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
index 6dded19fd409..5b88eba38a21 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
@@ -43,14 +43,12 @@ IUSE_VIDEO_CARDS="
 	video_cards_radeon
 	video_cards_radeonsi
 	video_cards_siliconmotion
-	video_cards_tdfx
 	video_cards_tegra
 	video_cards_vc4
 	video_cards_vesa
 	video_cards_via
 	video_cards_virtualbox
 	video_cards_vmware
-	video_cards_voodoo
 	video_cards_nvidia
 "
 
@@ -88,14 +86,12 @@ PDEPEND="
 	video_cards_radeon?        ( >=x11-drivers/xf86-video-ati-18.0.1-r1 )
 	video_cards_radeonsi?      ( >=x11-drivers/xf86-video-ati-18.0.1-r1[glamor] )
 	video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.9 )
-	video_cards_tdfx?          ( >=x11-drivers/xf86-video-tdfx-1.4.7 )
 	video_cards_tegra?         ( >=x11-base/xorg-server-${PV}[glamor] )
 	video_cards_vc4?           ( >=x11-base/xorg-server-${PV}[glamor] )
 	video_cards_vesa?          ( x11-drivers/xf86-video-vesa )
 	video_cards_via?           ( x11-drivers/xf86-video-openchrome )
 	video_cards_virtualbox?    ( x11-drivers/xf86-video-vboxvideo )
 	video_cards_vmware?        ( >=x11-drivers/xf86-video-vmware-13.3.0 )
-	video_cards_voodoo?        ( x11-drivers/xf86-video-voodoo )
 
 	!<x11-drivers/xf86-input-evdev-2.10.4
 "
diff --git a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
index 136ba53416f3..5b7d51f4782e 100644
--- a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
@@ -43,14 +43,12 @@ IUSE_VIDEO_CARDS="
 	video_cards_radeon
 	video_cards_radeonsi
 	video_cards_siliconmotion
-	video_cards_tdfx
 	video_cards_tegra
 	video_cards_vc4
 	video_cards_vesa
 	video_cards_via
 	video_cards_virtualbox
 	video_cards_vmware
-	video_cards_voodoo
 	video_cards_nvidia
 "
 
@@ -88,14 +86,12 @@ PDEPEND="
 	video_cards_radeon?        ( >=x11-drivers/xf86-video-ati-18.0.1-r1 )
 	video_cards_radeonsi?      ( >=x11-drivers/xf86-video-ati-18.0.1-r1[glamor] )
 	video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.9 )
-	video_cards_tdfx?          ( >=x11-drivers/xf86-video-tdfx-1.4.7 )
 	video_cards_tegra?         ( >=x11-base/xorg-server-${PV}[glamor] )
 	video_cards_vc4?           ( >=x11-base/xorg-server-${PV}[glamor] )
 	video_cards_vesa?          ( x11-drivers/xf86-video-vesa )
 	video_cards_via?           ( x11-drivers/xf86-video-openchrome )
 	video_cards_virtualbox?    ( x11-drivers/xf86-video-vboxvideo )
 	video_cards_vmware?        ( >=x11-drivers/xf86-video-vmware-13.3.0 )
-	video_cards_voodoo?        ( x11-drivers/xf86-video-voodoo )
 
 	!<x11-drivers/xf86-input-evdev-2.10.4
 "
diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest
index e34cd76880e3..d922f946ddaf 100644
--- a/x11-base/xorg-proto/Manifest
+++ b/x11-base/xorg-proto/Manifest
@@ -1,4 +1,4 @@
 DIST xorgproto-2018.4.tar.gz 493597 BLAKE2B f25a637317ff2d7ba34d416368261b5afb617e42a1fb642cc78ab3e877752a81291fe0523d1af6cd0fe27399676b14a70ceea7178d521187423bb503c9b1c63b SHA512 f79a47fc3de04d7258769869c11e99eff7fa4a4b5925cf60f9f7579f946d7d0e737224e9a54d18e439a3586126e66e0764c0f09ed50987c781955b9b9a1e0362
-EBUILD xorg-proto-2018.4.ebuild 1831 BLAKE2B a215f2196f843247791a146dc76888b0d8b1991507dbaf6b11552afbc50122f51d4b478668480e7638daa00fb82e20550e5c3e1416e549ad811206b86e0f4af8 SHA512 d20781e94d0b7bf5654c28ea6c0256928f52dcbad2c192b40c074a273e8d41cfbc86c3010fddb82c7a2c17172064f5c2ad0d51dd564a4f2670e8e8dee469dfd2
-EBUILD xorg-proto-9999.ebuild 1779 BLAKE2B 80ae4a59428a02d2cd6d282b46eabfb9d5722a4e131303ec99c648f03d24431ba430468d570fc9099fbf012d83236f4211f9b88238ba50e0fa77e7dd0b016491 SHA512 f5cbce5ea638fb9c0520c5572e0fc39c47ed3b2c3cfd6fe105d2641136f240acd377bfaf9efc336decaf3670ef31b0bfd0d67e1305966a0a0279450d3383f685
+EBUILD xorg-proto-2018.4.ebuild 1831 BLAKE2B 0d091e47a6a7e43127d95b0c8f5bedea3302f877afa76f5e9e584cb2f8305945834ad9c2edb578271684fc5b5495bbf11a33d7e7bddbc3cec371d1aa5bfd3ecc SHA512 0d3ce67401709406ef36bc17ce2720a1d9d82c71b805309390ccdd47f63d692b84b628997be9aeedca7f1f5a25f6965a9bc0335509a83b9cac613ec199b01eeb
+EBUILD xorg-proto-9999.ebuild 1776 BLAKE2B 01f87948e7e817ee88f946fcd3c7489e9cd70b987bb4c96265c120ebea3d52f1931d9db4a33d652e55c29895861efd861d0694d1d9f0f9ef2345e10873ca3745 SHA512 5336a0a6a7d52a7cb7a464f07eb3e9ae3d7322d8cd17b5725b9e6e743b60be90d7a13049e6d943f0fdd5246a545a0ce10e39e81fb79b6fae1c26ec421fa13ef5
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-base/xorg-proto/xorg-proto-2018.4.ebuild b/x11-base/xorg-proto/xorg-proto-2018.4.ebuild
index a5b2a6dbded1..7f883941f8f7 100644
--- a/x11-base/xorg-proto/xorg-proto-2018.4.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-2018.4.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="${PN/xorg-/xorg}"
 MY_P="${MY_PN}-${PV}"
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/proto/${MY_PN}"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/${MY_PN}.git"
 
 if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
@@ -15,7 +15,7 @@ fi
 inherit ${GIT_ECLASS} meson
 
 DESCRIPTION="X.Org combined protocol headers"
-HOMEPAGE="https://cgit.freedesktop.org/xorg/proto/xorgproto/"
+HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
diff --git a/x11-base/xorg-proto/xorg-proto-9999.ebuild b/x11-base/xorg-proto/xorg-proto-9999.ebuild
index d2b4b3d11867..9399dc7c97f1 100644
--- a/x11-base/xorg-proto/xorg-proto-9999.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="${PN/xorg-/xorg}"
 MY_P="${MY_PN}-${PV}"
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/proto/${MY_PN}"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/${MY_PN}.git"
 
 if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
@@ -15,7 +15,7 @@ fi
 inherit ${GIT_ECLASS} meson
 
 DESCRIPTION="X.Org combined protocol headers"
-HOMEPAGE="https://cgit.freedesktop.org/xorg/proto/xorgproto/"
+HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 2c367c61577b..68cbfcf9c7f7 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -9,7 +9,7 @@ AUX xorg-server-1.20.4-shm-reindent-shm_tmpfile-to-follow-our-standards.patch 17
 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
 DIST xorg-server-1.20.3.tar.bz2 6205000 BLAKE2B 9fc8acf1812d0aa4800941dd1846060f91edf1e7ebc92b35e8c2028266d88d3ab3ba14e95f535e5ee41941f8e20769ee75723ba609f5653d4892f97bc5cf91c4 SHA512 ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba
 DIST xorg-server-1.20.4.tar.bz2 6123780 BLAKE2B 224dda54f433315f6614cbee5bc54db91d9d9e190c06ac7f26e334b80b9d4a612ff4b2a4f10f50a6f928ecdbea40172d5578289fbf88411f006bcd473253b05d SHA512 f1c92ef6d7613e0636973d3395b48dfdad42230847ab1c8b1cea84647a968f649f9aba97bdb01c10ee8351cbe954d4e6ca4a0fc84bb8fa662d49c8ba2aee00a8
-EBUILD xorg-server-1.20.3.ebuild 5681 BLAKE2B a1088fde11b98f2b99ed3285b1227faf6f43b0e7c4d962027cbfeb2dbb2993323e975a4961c329c000c694243a6bb566f7a91c0932a678bcb85046a3b55d0976 SHA512 4631c5cc8b66959b00f550d7492eb3be466178b032083d393cd4dd69410e53d8535760f522a13b44ede8c488ce477c8159d2dc04629f51584890944cf66edf26
-EBUILD xorg-server-1.20.4.ebuild 5672 BLAKE2B 6121ba98208ad053a5cf7bd3dd1603cf908c3c182eda35327ba77b492fa7109d0f8325a417d4eb8e256baf1ed7e1b44389f9b47cab1b9a6a15794f1ea04daf5b SHA512 3bf5357ba36d8fd73da64bc58936d5e77168ebe7571cbd5af06018337711870376df1e2fcc6e36e7cda385e33956e6c8292566abac1f00259698cc70f9157740
-EBUILD xorg-server-9999.ebuild 5413 BLAKE2B 64fe101633a849cc52aa458afc35095139eaa5243d6db290915eaa1a27a1e144e2c2cb54c012770725a0220b3c9cc446d8e31ee0f22dafc54a9278af8daf5754 SHA512 eadabec90532ffe7f9c7dbee572580ea704923a96eea501f0362ab4e5e94a42d7a7f1e17a1614062069ae1df86603830f818a1e4c37708715389bdca72ebd0da
-MISC metadata.xml 858 BLAKE2B 0264739bcd577241b649d094bf9252fa46350ecf27f2685586b3d20f8d85656729c224483dc09ac2f6abcdf0c1e2a2fd67aa5c86e02cdf754becb5cb5d5080a0 SHA512 12f4a444557ad2deb04e230c6b52faacd5d670184e928f89f949411cc3888b1a97aae88589381ca75d2b7e1c88f1b5f30e2256a700fd00ba145c87f21a701edd
+EBUILD xorg-server-1.20.3.ebuild 5676 BLAKE2B 32355c665571a87933be6ad780106e9bd40e11861c8fa6e66b935d73b79a0dc6d635d1f79fe9a56ab2059449e128ecb37568603699a87344853ff42d1c68e156 SHA512 624bb6f21bbf10fcb21c1218931323374252ae96ca8f5078bc650cff291fd1b6a062605fd104fc0d7984c15beb1887b84c1aa33b83b94bdb217efbda1a9dccff
+EBUILD xorg-server-1.20.4.ebuild 5841 BLAKE2B 433f32d63aee091eb2a641e3a8dc7e5e56d0b371ea3beac2a1734f27a77f030426c44dfeeac6a7e1a7ac43459c7d0cf166be72be307409b276c713f09bc5e1b9 SHA512 2e9d110b08d7a0f9b2a9845ebad6be7697b04e8d92a3bb6de8d43e60b59f062dffe27838ea307d12ab648c28f8a45f1de18911ab2bd372fb62844f2506fbe2e2
+EBUILD xorg-server-9999.ebuild 5582 BLAKE2B 25f4c05b485b2c55519cbe0eef71bcb40f658731bf19a6b4224bb48305da3865b3b1b7e06faec78fa51986a8a8b2ee3890957d0879a4761e73607575e2e8d560 SHA512 8f246f5671616beee25887cee51a5b8b0c871ce869a15970ac27f026cc0fef61f83b279518d056a2b9943e96e65d579bda9e7aaf9b7281f21c4d706443d8dc0a
+MISC metadata.xml 960 BLAKE2B 886751450005aa4b2c197e0aa439028ab0138e8947a8deb005890ca4845e6e19b19f3134e7e3d105ef2bab68e6f8605fee87a082dd25cbd7fe223b9268ecc607 SHA512 d027e5a630ec940e6c2c5f216fa159aa25092cbbb7078efe2bc52ebee28b856297d0a641f57a2c108cb13ad61e9d8d0007ae9d6f2c2ff01ec4632650ec1b72df
diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml
index 74e52195b253..5c14eec54c86 100644
--- a/x11-base/xorg-server/metadata.xml
+++ b/x11-base/xorg-server/metadata.xml
@@ -7,6 +7,7 @@
 </maintainer>
 <use>
 	<flag name="dmx">Build the Distributed Multiheaded X server</flag>
+	<flag name="elogind">Use elogind to get control over framebuffer when running as regular user</flag>
 	<flag name="glamor">Enable Glamor OpenGL 2D acceleration</flag>
 	<flag name="kdrive">Build the kdrive X servers</flag>
 	<flag name="unwind">Enable libunwind usage for backtraces</flag>
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 45a9266a6104..228ac01881d9 100644
--- a/x11-base/xorg-server/xorg-server-1.20.3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.3.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 XORG_DOC=doc
 inherit xorg-2 multilib versionator flag-o-matic
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
diff --git a/x11-base/xorg-server/xorg-server-1.20.4.ebuild b/x11-base/xorg-server/xorg-server-1.20.4.ebuild
index 6a9a3eb1cea4..f6eb007ca3a8 100644
--- a/x11-base/xorg-server/xorg-server-1.20.4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.4.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 XORG_DOC=doc
 XORG_EAUTORECONF="yes"
 inherit xorg-3 multilib flag-o-matic
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
@@ -15,7 +15,7 @@ if [[ ${PV} != 9999* ]]; then
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux +suid systemd +udev unwind xcsecurity"
+IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl minimal selinux +suid systemd +udev unwind xcsecurity"
 
 CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 	!libressl? ( dev-libs/openssl:0= )
@@ -81,7 +81,13 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 	systemd? (
 		sys-apps/dbus
 		sys-apps/systemd
-	)"
+	)
+	elogind? (
+		sys-apps/dbus
+		sys-auth/elogind
+		sys-auth/pambase[elogind]
+	)
+	"
 
 DEPEND="${CDEPEND}
 	sys-devel/flex
@@ -107,6 +113,8 @@ PDEPEND="
 REQUIRED_USE="!minimal? (
 		|| ( ${IUSE_SERVERS} )
 	)
+	elogind? ( udev )
+	?? ( elogind systemd )
 	minimal? ( !glamor !wayland )
 	xephyr? ( kdrive )"
 
@@ -156,8 +164,8 @@ pkg_setup() {
 		$(use_enable udev config-udev)
 		$(use_with doc doxygen)
 		$(use_with doc xmlto)
+		$(usex !elogind $(use_enable systemd systemd-logind) '--enable-systemd-logind')
 		$(use_with systemd systemd-daemon)
-		$(use_enable systemd systemd-logind)
 		$(usex suid $(use_enable systemd suid-wrapper) '--disable-suid-wrapper')
 		$(usex suid $(use_enable !systemd install-setuid) '--disable-install-setuid')
 		--enable-libdrm
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 187e506211e4..fa2165bade9b 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 XORG_DOC=doc
 inherit xorg-3 multilib flag-o-matic
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
@@ -14,7 +14,7 @@ if [[ ${PV} != 9999* ]]; then
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux +suid systemd +udev unwind xcsecurity"
+IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl minimal selinux +suid systemd +udev unwind xcsecurity"
 
 CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 	!libressl? ( dev-libs/openssl:0= )
@@ -80,7 +80,13 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 	systemd? (
 		sys-apps/dbus
 		sys-apps/systemd
-	)"
+	)
+	elogind? (
+		sys-apps/dbus
+		sys-auth/elogind
+		sys-auth/pambase[elogind]
+	)
+	"
 
 DEPEND="${CDEPEND}
 	sys-devel/flex
@@ -106,6 +112,8 @@ PDEPEND="
 REQUIRED_USE="!minimal? (
 		|| ( ${IUSE_SERVERS} )
 	)
+	elogind? ( udev )
+	?? ( elogind systemd )
 	minimal? ( !glamor !wayland )
 	xephyr? ( kdrive )"
 
@@ -152,8 +160,8 @@ pkg_setup() {
 		$(use_enable udev config-udev)
 		$(use_with doc doxygen)
 		$(use_with doc xmlto)
+		$(usex !elogind $(use_enable systemd systemd-logind) '--enable-systemd-logind')
 		$(use_with systemd systemd-daemon)
-		$(use_enable systemd systemd-logind)
 		$(usex suid $(use_enable systemd suid-wrapper) '--disable-suid-wrapper')
 		$(usex suid $(use_enable !systemd install-setuid) '--disable-install-setuid')
 		--enable-libdrm