summaryrefslogtreecommitdiff
path: root/x11-base
diff options
context:
space:
mode:
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/Manifest2
-rw-r--r--x11-base/xorg-server/xorg-server-1.20.11-r100.ebuild (renamed from x11-base/xorg-server/xorg-server-1.20.10-r100.ebuild)25
2 files changed, 15 insertions, 12 deletions
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index dd5b3cd6..fad12568 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1 +1 @@
-DIST xorg-server-1.20.10.tar.bz2 6307058 BLAKE2B 13306e5f4f7f2b4531f2af5103337defa1d441bff78f20ea4d564a7d046ee546406812b6836fe94ca9323189382754270989b2ac7ded8950ddb2b15562c6ff21 SHA512 a07bee380bb72f2117fe6f831a6e4aded19bea1f2b36e42a019a30348e98d6fe65c0617cf819be9c6b405502f88cafb829df30aab32393774b71f1418a4cefae
+DIST xorg-server-1.20.11.tar.bz2 6476116 BLAKE2B 71ec31c4ed050a3e27fadd525f1039895e43571c04b0a1efa9b35fda318f17b3c89d403c914c591345e7d245a7ebbd6e0f206e4415c1d54f1368fb0735a3d7ef SHA512 1017015b9fd5d53788abe3641d877e6df8609841fa5c1847c0a5e133ddcc1b758a5d695304ebd36828099ec201a85b6b70b46f5ea4f81c5bd3a16fa6e175e3c2
diff --git a/x11-base/xorg-server/xorg-server-1.20.10-r100.ebuild b/x11-base/xorg-server/xorg-server-1.20.11-r100.ebuild
index 2ee6fdb1..c85af5ab 100644
--- a/x11-base/xorg-server/xorg-server-1.20.10-r100.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.11-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,11 +10,12 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
DESCRIPTION="X.Org X servers"
SLOT="0/${PV}"
if [[ ${PV} != 9999* ]]; then
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
fi
IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl minimal selinux suid systemd +udev unwind xcsecurity"
+IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl minimal selinux suid systemd test +udev unwind xcsecurity"
+RESTRICT="!test? ( test )"
CDEPEND="
media-libs/libglvnd[X]
@@ -32,7 +33,6 @@ CDEPEND="
>=x11-libs/libxkbfile-1.0.4
>=x11-libs/libxshmfence-1.1
>=x11-libs/pixman-0.27.2
- >=x11-libs/xtrans-1.3.5
>=x11-misc/xbitmaps-1.0.1
>=x11-misc/xkeyboard-config-2.4.1-r3
dmx? (
@@ -83,12 +83,11 @@ CDEPEND="
sys-auth/elogind[pam]
sys-auth/pambase[elogind]
)
- !!x11-drivers/nvidia-drivers[-libglvnd(-)]
+ !!x11-drivers/nvidia-drivers[-libglvnd(+)]
"
-
DEPEND="${CDEPEND}
- sys-devel/flex
>=x11-base/xorg-proto-2018.4
+ >=x11-libs/xtrans-1.3.5
dmx? (
doc? (
|| (
@@ -97,13 +96,16 @@ DEPEND="${CDEPEND}
www-client/w3m
)
)
- )"
-
+ )
+"
RDEPEND="${CDEPEND}
- gui-libs/display-manager-init
+ !systemd? ( gui-libs/display-manager-init )
selinux? ( sec-policy/selinux-xserver )
"
-
+BDEPEND="
+ sys-devel/flex
+ wayland? ( dev-util/wayland-scanner )
+"
PDEPEND="
xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"
@@ -143,6 +145,7 @@ pkg_setup() {
$(use_enable debug)
$(use_enable dmx)
$(use_enable kdrive)
+ $(use_enable test unit-tests)
$(use_enable unwind libunwind)
$(use_enable wayland xwayland)
$(use_enable !minimal record)