summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/metadata.xml1
-rw-r--r--x11-base/xorg-server/xorg-server-1.20.4.ebuild14
-rw-r--r--x11-base/xorg-server/xorg-server-9999.ebuild14
3 files changed, 23 insertions, 6 deletions
diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml
index 74e52195b25..5c14eec54c8 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.4.ebuild b/x11-base/xorg-server/xorg-server-1.20.4.ebuild
index 6a9a3eb1cea..e5f0a8e00ee 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 +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 )
+ !suid? ( ^^ ( 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 187e506211e..37a69179370 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 +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 )
+ !suid? ( ^^ ( 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