Gentoo Archives: gentoo-commits

From: Piotr Karbowski <slashbeast@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/
Date: Sun, 01 Aug 2021 19:18:54
Message-Id: 1627845528.d4eecca2664a2ffd5e6afd2df2a339a6ffd85f1e.slashbeast@gentoo
1 commit: d4eecca2664a2ffd5e6afd2df2a339a6ffd85f1e
2 Author: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 1 19:16:50 2021 +0000
4 Commit: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 1 19:18:48 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4eecca2
7
8 x11-base/xorg-server: 1.20.13-r1 and 9999 wayland USE drop.
9
10 Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>
11
12 .../{xorg-server-1.20.13.ebuild => xorg-server-1.20.13-r1.ebuild} | 4 +---
13 x11-base/xorg-server/xorg-server-9999.ebuild | 4 +---
14 2 files changed, 2 insertions(+), 6 deletions(-)
15
16 diff --git a/x11-base/xorg-server/xorg-server-1.20.13.ebuild b/x11-base/xorg-server/xorg-server-1.20.13-r1.ebuild
17 similarity index 97%
18 rename from x11-base/xorg-server/xorg-server-1.20.13.ebuild
19 rename to x11-base/xorg-server/xorg-server-1.20.13-r1.ebuild
20 index e1f219414a3..93c416de760 100644
21 --- a/x11-base/xorg-server/xorg-server-1.20.13.ebuild
22 +++ b/x11-base/xorg-server/xorg-server-1.20.13-r1.ebuild
23 @@ -14,7 +14,7 @@ if [[ ${PV} != 9999* ]]; then
24 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
25 fi
26
27 -IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
28 +IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb"
29 IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity"
30 RESTRICT="!test? ( test )"
31
32 @@ -96,7 +96,6 @@ DEPEND="${CDEPEND}
33 RDEPEND="${CDEPEND}
34 !systemd? ( gui-libs/display-manager-init )
35 selinux? ( sec-policy/selinux-xserver )
36 - wayland? ( x11-base/xwayland )
37 "
38 BDEPEND="
39 sys-devel/flex
40 @@ -109,7 +108,6 @@ REQUIRED_USE="!minimal? (
41 )
42 elogind? ( udev )
43 ?? ( elogind systemd )
44 - minimal? ( !wayland )
45 xephyr? ( kdrive )"
46
47 UPSTREAMED_PATCHES=(
48
49 diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
50 index e1f219414a3..93c416de760 100644
51 --- a/x11-base/xorg-server/xorg-server-9999.ebuild
52 +++ b/x11-base/xorg-server/xorg-server-9999.ebuild
53 @@ -14,7 +14,7 @@ if [[ ${PV} != 9999* ]]; then
54 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
55 fi
56
57 -IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
58 +IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb"
59 IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity"
60 RESTRICT="!test? ( test )"
61
62 @@ -96,7 +96,6 @@ DEPEND="${CDEPEND}
63 RDEPEND="${CDEPEND}
64 !systemd? ( gui-libs/display-manager-init )
65 selinux? ( sec-policy/selinux-xserver )
66 - wayland? ( x11-base/xwayland )
67 "
68 BDEPEND="
69 sys-devel/flex
70 @@ -109,7 +108,6 @@ REQUIRED_USE="!minimal? (
71 )
72 elogind? ( udev )
73 ?? ( elogind systemd )
74 - minimal? ( !wayland )
75 xephyr? ( kdrive )"
76
77 UPSTREAMED_PATCHES=(