diff options
| author |   Sam James <sam@gentoo.org> | 2022-03-06 09:13:40 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-03-06 09:18:33 +0000 |
| commit | 8d540d6288330867b079239bdc306393447d7d9a (patch) | |
| tree | bbc1b5fc70000d08eafba13b73f60950ce0a69f2 /x11-base/xorg-server | |
| parent | sys-process/audit: drop 3.0.1, 3.0.2, 3.0.3 (diff) | |
| download | gentoo-8d540d6288330867b079239bdc306393447d7d9a.tar.gz gentoo-8d540d6288330867b079239bdc306393447d7d9a.tar.bz2 gentoo-8d540d6288330867b079239bdc306393447d7d9a.zip | |
x11-base/xorg-server: fix automagic dependency on libselinux, audit
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'x11-base/xorg-server')
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.20.14-r1.ebuild (renamed from x11-base/xorg-server/xorg-server-1.20.14.ebuild) | 9 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-21.1.3-r1.ebuild (renamed from x11-base/xorg-server/xorg-server-21.1.3.ebuild) | 8 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-9999.ebuild | 8 |
3 files changed, 19 insertions, 6 deletions
diff --git a/x11-base/xorg-server/xorg-server-1.20.14.ebuild b/x11-base/xorg-server/xorg-server-1.20.14-r1.ebuild index 0c0e77d2d5a9..ba7bcec8880c 100644 --- a/x11-base/xorg-server/xorg-server-1.20.14.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.14-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -66,8 +66,12 @@ CDEPEND=" >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) - unwind? ( sys-libs/libunwind ) + unwind? ( sys-libs/libunwind:= ) >=x11-apps/xinit-1.3.3-r1 + selinux? ( + sys-process/audit + sys-libs/libselinux:= + ) systemd? ( sys-apps/dbus sys-apps/systemd @@ -131,6 +135,7 @@ src_configure() { $(use_enable !minimal glx) $(use_enable xcsecurity) $(use_enable xephyr) + $(use_enable selinux xselinux) $(use_enable xnest) $(use_enable xorg) $(use_enable xvfb) diff --git a/x11-base/xorg-server/xorg-server-21.1.3.ebuild b/x11-base/xorg-server/xorg-server-21.1.3-r1.ebuild index fc33d0cec0b4..6b140fe486f3 100644 --- a/x11-base/xorg-server/xorg-server-21.1.3.ebuild +++ b/x11-base/xorg-server/xorg-server-21.1.3-r1.ebuild @@ -54,8 +54,11 @@ CDEPEND=" >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) - unwind? ( sys-libs/libunwind ) - selinux? ( sys-libs/libselinux ) + unwind? ( sys-libs/libunwind:= ) + selinux? ( + sys-process/audit + sys-libs/libselinux:= + ) systemd? ( sys-apps/dbus sys-apps/systemd @@ -118,6 +121,7 @@ src_configure() { $(meson_use udev udev_kms) $(meson_use unwind libunwind) $(meson_use xcsecurity) + $(meson_use selinux xselinux) $(meson_use xephyr) $(meson_use xnest) $(meson_use xorg) diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 79b9ff4ad7a3..646bf1f1723c 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -54,8 +54,11 @@ CDEPEND=" >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) - unwind? ( sys-libs/libunwind ) - selinux? ( sys-libs/libselinux ) + unwind? ( sys-libs/libunwind:= ) + selinux? ( + sys-process/audit + sys-libs/libselinux:= + ) systemd? ( sys-apps/dbus sys-apps/systemd @@ -118,6 +121,7 @@ src_configure() { $(meson_use udev udev_kms) $(meson_use unwind libunwind) $(meson_use xcsecurity) + $(meson_use selinux xselinux) $(meson_use xephyr) $(meson_use xnest) $(meson_use xorg) |