From 0706fc6986773f4e4d391deff4ad5143c464ea4e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 24 Mar 2019 17:44:59 +0000 Subject: Revert "gentoo resync : 24.03.2019" This reverts commit aa3411e241a201d53a2689766fe419f2756819f3. --- x11-base/Manifest.gz | Bin 1049 -> 1049 bytes x11-base/xorg-server/Manifest | 6 +++--- x11-base/xorg-server/metadata.xml | 1 - x11-base/xorg-server/xorg-server-1.20.4.ebuild | 14 +++----------- x11-base/xorg-server/xorg-server-9999.ebuild | 14 +++----------- 5 files changed, 9 insertions(+), 26 deletions(-) (limited to 'x11-base') diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz index 5518ff3fdec7..50d9e800cdc0 100644 Binary files a/x11-base/Manifest.gz and b/x11-base/Manifest.gz differ diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index c42d232b1bee..2c367c61577b 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -10,6 +10,6 @@ AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d 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 5846 BLAKE2B dc9afebc4c303ee2f972e53db7d1c80ea796d6e2d5b080e9ac39ce85940ef9ed8438b9654d9032c89b4eac100a7f0d3dc9c39d77e8dd43f4c4aabb72642cadbd SHA512 4c626209d0c3a0b015791db282a208d7be25fa1d6285799a26ec4de530d0f7b89263e8543996c5075730f43bbf22deaaed32066299b70cbb17ace31eca846508 -EBUILD xorg-server-9999.ebuild 5587 BLAKE2B 3cf6459866f564bae225f8cc2eeab80529e96de83e04cdebdc5ff4fc47f5cb4d5a8f8352e559d6f9314f54534037ad04fb6185d113e9dffd55fa4621b7eee3ea SHA512 e52a3f7bca458db0212fde50263c2ade90c2d24711121c98776539319ee576075d813695618d4a6df2ea8ac1dd84a3f182d64d77164a5387b59c734af9c276fc -MISC metadata.xml 960 BLAKE2B 886751450005aa4b2c197e0aa439028ab0138e8947a8deb005890ca4845e6e19b19f3134e7e3d105ef2bab68e6f8605fee87a082dd25cbd7fe223b9268ecc607 SHA512 d027e5a630ec940e6c2c5f216fa159aa25092cbbb7078efe2bc52ebee28b856297d0a641f57a2c108cb13ad61e9d8d0007ae9d6f2c2ff01ec4632650ec1b72df +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 diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml index 5c14eec54c86..74e52195b253 100644 --- a/x11-base/xorg-server/metadata.xml +++ b/x11-base/xorg-server/metadata.xml @@ -7,7 +7,6 @@ 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.4.ebuild b/x11-base/xorg-server/xorg-server-1.20.4.ebuild index 96600b70e5e2..6a9a3eb1cea4 100644 --- a/x11-base/xorg-server/xorg-server-1.20.4.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.4.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} != 9999* ]]; then fi IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl minimal selinux +suid systemd +udev unwind xcsecurity" +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= ) @@ -81,13 +81,7 @@ 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 @@ -113,8 +107,6 @@ PDEPEND=" REQUIRED_USE="!minimal? ( || ( ${IUSE_SERVERS} ) ) - elogind? ( udev ) - ?? ( elogind systemd ) minimal? ( !glamor !wayland ) xephyr? ( kdrive )" @@ -164,8 +156,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 40361a76003f..187e506211e4 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} != 9999* ]]; then fi IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl minimal selinux +suid systemd +udev unwind xcsecurity" +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= ) @@ -80,13 +80,7 @@ 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 @@ -112,8 +106,6 @@ PDEPEND=" REQUIRED_USE="!minimal? ( || ( ${IUSE_SERVERS} ) ) - elogind? ( udev ) - ?? ( elogind systemd ) minimal? ( !glamor !wayland ) xephyr? ( kdrive )" @@ -160,8 +152,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