diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2020-06-24 12:58:21 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2020-06-24 13:13:01 -0700 |
| commit | eb3514d8750cfa4f367f40dc0cb313cd74e50941 (patch) | |
| tree | b0350916c892de32a64d8d3cd9a759129a208d8a /x11-base | |
| parent | x11-base/xorg-server: Drop old versions (diff) | |
| download | gentoo-eb3514d8750cfa4f367f40dc0cb313cd74e50941.tar.gz gentoo-eb3514d8750cfa4f367f40dc0cb313cd74e50941.tar.bz2 gentoo-eb3514d8750cfa4f367f40dc0cb313cd74e50941.zip | |
x11-base/xorg-server: Propagate changes to -9999
And trim trailing whitespace.
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild | 4 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-9999.ebuild | 19 |
2 files changed, 17 insertions, 6 deletions
diff --git a/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild b/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild index a7268b807957..8aae610d6d0e 100644 --- a/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild @@ -176,13 +176,13 @@ pkg_setup() { ) if use systemd || use elogind; then - XORG_CONFIGURE_OPTIONS+=( + XORG_CONFIGURE_OPTIONS+=( "--enable-systemd-logind" "--disable-install-setuid" "$(use_enable suid suid-wrapper)" ) else - XORG_CONFIGURE_OPTIONS+=( + XORG_CONFIGURE_OPTIONS+=( "--disable-systemd-logind" "--disable-suid-wrapper" "$(use_enable suid install-setuid)" diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 252ce275e869..347f504c887c 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} != 9999* ]]; then fi IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl +libglvnd minimal selinux +suid systemd +udev unwind xcsecurity" +IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl +libglvnd minimal selinux suid systemd +udev unwind xcsecurity" CDEPEND="libglvnd? ( media-libs/libglvnd[X] @@ -162,10 +162,7 @@ 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) - $(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 @@ -177,6 +174,20 @@ pkg_setup() { --without-fop --with-sha1=libcrypto ) + + if use systemd || use elogind; then + XORG_CONFIGURE_OPTIONS+=( + "--enable-systemd-logind" + "--disable-install-setuid" + "$(use_enable suid suid-wrapper)" + ) + else + XORG_CONFIGURE_OPTIONS+=( + "--disable-systemd-logind" + "--disable-suid-wrapper" + "$(use_enable suid install-setuid)" + ) + fi } src_install() { |