From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B3BD815808C for ; Sun, 6 Mar 2022 09:18:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D111FE0855; Sun, 6 Mar 2022 09:18:49 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B324DE0855 for ; Sun, 6 Mar 2022 09:18:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4A21534324E for ; Sun, 6 Mar 2022 09:18:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A55BD310 for ; Sun, 6 Mar 2022 09:18:45 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1646558313.8d540d6288330867b079239bdc306393447d7d9a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-base/xorg-server/xorg-server-1.20.14-r1.ebuild x11-base/xorg-server/xorg-server-1.20.14.ebuild x11-base/xorg-server/xorg-server-21.1.3-r1.ebuild x11-base/xorg-server/xorg-server-21.1.3.ebuild x11-base/xorg-server/xorg-server-9999.ebuild X-VCS-Directories: x11-base/xorg-server/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8d540d6288330867b079239bdc306393447d7d9a X-VCS-Branch: master Date: Sun, 6 Mar 2022 09:18:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2080d72c-f5a1-4762-a176-0938ba13e143 X-Archives-Hash: b294aa089e5d86fc818caf62b4083604 commit: 8d540d6288330867b079239bdc306393447d7d9a Author: Sam James gentoo org> AuthorDate: Sun Mar 6 09:13:40 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Mar 6 09:18:33 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d540d62 x11-base/xorg-server: fix automagic dependency on libselinux, audit Signed-off-by: Sam James gentoo.org> ...{xorg-server-1.20.14.ebuild => xorg-server-1.20.14-r1.ebuild} | 9 +++++++-- .../{xorg-server-21.1.3.ebuild => xorg-server-21.1.3-r1.ebuild} | 8 ++++++-- 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 similarity index 96% rename from x11-base/xorg-server/xorg-server-1.20.14.ebuild rename to 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 similarity index 97% rename from x11-base/xorg-server/xorg-server-21.1.3.ebuild rename to 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)