From dc7cbdfa65fd814b3b9aa3c56257da201109e807 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 Apr 2019 21:17:31 +0100 Subject: gentoo resync : 05.04.2019 --- x11-base/xorg-server/Manifest | 8 ++++---- x11-base/xorg-server/metadata.xml | 1 + x11-base/xorg-server/xorg-server-1.20.3.ebuild | 2 +- x11-base/xorg-server/xorg-server-1.20.4.ebuild | 16 ++++++++++++---- x11-base/xorg-server/xorg-server-9999.ebuild | 16 ++++++++++++---- 5 files changed, 30 insertions(+), 13 deletions(-) (limited to 'x11-base/xorg-server') 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 @@ Build the Distributed Multiheaded X server + Use elogind to get control over framebuffer when running as regular user Enable Glamor OpenGL 2D acceleration Build the kdrive X servers Enable libunwind usage for backtraces 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 -- cgit v1.2.3