| 1 |
commit: eb3514d8750cfa4f367f40dc0cb313cd74e50941 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 24 19:58:21 2020 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 24 20:13:01 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb3514d8 |
| 7 |
|
| 8 |
x11-base/xorg-server: Propagate changes to -9999 |
| 9 |
|
| 10 |
And trim trailing whitespace. |
| 11 |
|
| 12 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 13 |
|
| 14 |
x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild | 4 ++-- |
| 15 |
x11-base/xorg-server/xorg-server-9999.ebuild | 19 +++++++++++++++---- |
| 16 |
2 files changed, 17 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
index a7268b80795..8aae610d6d0 100644 |
| 20 |
--- a/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild |
| 21 |
+++ b/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild |
| 22 |
@@ -176,13 +176,13 @@ pkg_setup() { |
| 23 |
) |
| 24 |
|
| 25 |
if use systemd || use elogind; then |
| 26 |
- XORG_CONFIGURE_OPTIONS+=( |
| 27 |
+ XORG_CONFIGURE_OPTIONS+=( |
| 28 |
"--enable-systemd-logind" |
| 29 |
"--disable-install-setuid" |
| 30 |
"$(use_enable suid suid-wrapper)" |
| 31 |
) |
| 32 |
else |
| 33 |
- XORG_CONFIGURE_OPTIONS+=( |
| 34 |
+ XORG_CONFIGURE_OPTIONS+=( |
| 35 |
"--disable-systemd-logind" |
| 36 |
"--disable-suid-wrapper" |
| 37 |
"$(use_enable suid install-setuid)" |
| 38 |
|
| 39 |
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild |
| 40 |
index 252ce275e86..347f504c887 100644 |
| 41 |
--- a/x11-base/xorg-server/xorg-server-9999.ebuild |
| 42 |
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild |
| 43 |
@@ -15,7 +15,7 @@ if [[ ${PV} != 9999* ]]; then |
| 44 |
fi |
| 45 |
|
| 46 |
IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" |
| 47 |
-IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl +libglvnd minimal selinux +suid systemd +udev unwind xcsecurity" |
| 48 |
+IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl +libglvnd minimal selinux suid systemd +udev unwind xcsecurity" |
| 49 |
|
| 50 |
CDEPEND="libglvnd? ( |
| 51 |
media-libs/libglvnd[X] |
| 52 |
@@ -162,10 +162,7 @@ pkg_setup() { |
| 53 |
$(use_enable udev config-udev) |
| 54 |
$(use_with doc doxygen) |
| 55 |
$(use_with doc xmlto) |
| 56 |
- $(usex !elogind $(use_enable systemd systemd-logind) '--enable-systemd-logind') |
| 57 |
$(use_with systemd systemd-daemon) |
| 58 |
- $(usex suid $(use_enable systemd suid-wrapper) '--disable-suid-wrapper') |
| 59 |
- $(usex suid $(use_enable !systemd install-setuid) '--disable-install-setuid') |
| 60 |
--enable-libdrm |
| 61 |
--sysconfdir="${EPREFIX}"/etc/X11 |
| 62 |
--localstatedir="${EPREFIX}"/var |
| 63 |
@@ -177,6 +174,20 @@ pkg_setup() { |
| 64 |
--without-fop |
| 65 |
--with-sha1=libcrypto |
| 66 |
) |
| 67 |
+ |
| 68 |
+ if use systemd || use elogind; then |
| 69 |
+ XORG_CONFIGURE_OPTIONS+=( |
| 70 |
+ "--enable-systemd-logind" |
| 71 |
+ "--disable-install-setuid" |
| 72 |
+ "$(use_enable suid suid-wrapper)" |
| 73 |
+ ) |
| 74 |
+ else |
| 75 |
+ XORG_CONFIGURE_OPTIONS+=( |
| 76 |
+ "--disable-systemd-logind" |
| 77 |
+ "--disable-suid-wrapper" |
| 78 |
+ "$(use_enable suid install-setuid)" |
| 79 |
+ ) |
| 80 |
+ fi |
| 81 |
} |
| 82 |
|
| 83 |
src_install() { |
Archives