Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-base/xwayland/
Date: Tue, 03 Jan 2023 15:55:44
Message-Id: 1672761330.8268a113aaddf90933c676cf0fe88e49e5b26302.mattst88@gentoo
1 commit: 8268a113aaddf90933c676cf0fe88e49e5b26302
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 3 15:31:50 2023 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 3 15:55:30 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8268a113
7
8 x11-base/xwayland: Drop old versions
9
10 Bug: https://bugs.gentoo.org/877459
11 Bug: https://bugs.gentoo.org/885825
12 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
13
14 x11-base/xwayland/Manifest | 2 -
15 x11-base/xwayland/xwayland-22.1.5.ebuild | 100 -------------------------------
16 x11-base/xwayland/xwayland-22.1.6.ebuild | 100 -------------------------------
17 3 files changed, 202 deletions(-)
18
19 diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
20 index 83668248e534..ef87dd1bd85b 100644
21 --- a/x11-base/xwayland/Manifest
22 +++ b/x11-base/xwayland/Manifest
23 @@ -1,3 +1 @@
24 -DIST xwayland-22.1.5.tar.xz 1273444 BLAKE2B a6773f2b9655d0651a0a686f5e1fa41bdeaba998dc3e42c2c24dcc262d2affdb055c7ab0cf32b94ba11c82cbfe91bfcf10eb651f678feda95fccb55cc21d2e4f SHA512 806219692be297419777ad5343158f72473a691f7c8be4468fac185a3bc5e3b6811755de3133c12f3694480e51529ac3fa409b22640a80a233925716fec24c06
25 -DIST xwayland-22.1.6.tar.xz 1273532 BLAKE2B aa0604e425c8e5648966f58d8baa56163f7f39b439618e4fe556cdbfd7d417e4d8b1d34a7d850d31ed51b782e268c05f8d8ef4c8c48b3f8c702aabe8e579fb0f SHA512 a78f44f14a6c1e25afbf245c5c757a253f0607afdc80c8b852cf6f810247566d1cc17b63d4442a21d8e69bdb696faf1014438ad98a977fbed9a11b9c5b85e0a4
26 DIST xwayland-22.1.7.tar.xz 1273476 BLAKE2B 9e128ff85690c6fb35eb196eefd49b1cf24aed290fd74cdb6e2fb8ad72d61b8dd9dccf83bdafc9a8e1ba13dc61135a7756dbae5ff40490d2076516d72818dbb1 SHA512 dc4187d4e9e1bbf5f431a4a71da01b773be3a8870c3f82da599739d9f72756ac69c1fb8cc3b6c96c88da3c1dd40ce42429a3a003c08f90fc337ebaf6200de649
27
28 diff --git a/x11-base/xwayland/xwayland-22.1.5.ebuild b/x11-base/xwayland/xwayland-22.1.5.ebuild
29 deleted file mode 100644
30 index afcd2774aad0..000000000000
31 --- a/x11-base/xwayland/xwayland-22.1.5.ebuild
32 +++ /dev/null
33 @@ -1,100 +0,0 @@
34 -# Copyright 2021-2022 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=8
38 -
39 -inherit meson
40 -
41 -if [[ ${PV} == "9999" ]] ; then
42 - EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
43 - inherit git-r3
44 -else
45 - SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
46 - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
47 -fi
48 -
49 -DESCRIPTION="Standalone X server running under Wayland"
50 -HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
51 -
52 -IUSE="selinux video_cards_nvidia unwind xcsecurity"
53 -
54 -LICENSE="MIT"
55 -SLOT="0"
56 -
57 -COMMON_DEPEND="
58 - dev-libs/libbsd
59 - dev-libs/openssl:=
60 - >=dev-libs/wayland-1.20
61 - >=dev-libs/wayland-protocols-1.22
62 - media-fonts/font-util
63 - >=media-libs/libepoxy-1.5.4[X,egl(+)]
64 - media-libs/libglvnd[X]
65 - >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
66 - >=x11-libs/libdrm-2.4.89
67 - >=x11-libs/libXau-1.0.4
68 - x11-libs/libxcvt
69 - >=x11-libs/libXdmcp-1.0.2
70 - >=x11-libs/libXfont2-2.0.1
71 - x11-libs/libxkbfile
72 - >=x11-libs/libxshmfence-1.1
73 - >=x11-libs/pixman-0.27.2
74 - >=x11-misc/xkeyboard-config-2.4.1-r3
75 -
76 - unwind? ( sys-libs/libunwind )
77 - video_cards_nvidia? ( gui-libs/egl-wayland )
78 -"
79 -DEPEND="
80 - ${COMMON_DEPEND}
81 - x11-base/xorg-proto
82 - >=x11-libs/xtrans-1.3.5
83 -"
84 -RDEPEND="
85 - ${COMMON_DEPEND}
86 - x11-apps/xkbcomp
87 - !<=x11-base/xorg-server-1.20.11
88 - selinux? ( sec-policy/selinux-xserver )
89 -"
90 -BDEPEND="
91 - sys-devel/flex
92 - dev-util/wayland-scanner
93 -"
94 -
95 -PATCHES=(
96 - "${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
97 -)
98 -
99 -src_configure() {
100 - local emesonargs=(
101 - $(meson_use selinux xselinux)
102 - $(meson_use unwind libunwind)
103 - $(meson_use xcsecurity)
104 - $(meson_use video_cards_nvidia xwayland_eglstream)
105 - -Ddpms=true
106 - -Ddri3=true
107 - -Ddrm=true
108 - -Ddtrace=false
109 - -Dglamor=true
110 - -Dglx=true
111 - -Dipv6=true
112 - -Dsecure-rpc=false
113 - -Dscreensaver=true
114 - -Dsha1=libcrypto
115 - -Dxace=true
116 - -Dxdmcp=true
117 - -Dxinerama=true
118 - -Dxvfb=true
119 - -Dxv=true
120 - -Dxwayland-path="${EPREFIX}"/usr/bin
121 - -Ddocs=false
122 - -Ddevel-docs=false
123 - -Ddocs-pdf=false
124 - )
125 -
126 - meson_src_configure
127 -}
128 -
129 -src_install() {
130 - dosym ../bin/Xwayland /usr/libexec/Xwayland
131 -
132 - meson_src_install
133 -}
134
135 diff --git a/x11-base/xwayland/xwayland-22.1.6.ebuild b/x11-base/xwayland/xwayland-22.1.6.ebuild
136 deleted file mode 100644
137 index 384312c2aa5c..000000000000
138 --- a/x11-base/xwayland/xwayland-22.1.6.ebuild
139 +++ /dev/null
140 @@ -1,100 +0,0 @@
141 -# Copyright 2021-2022 Gentoo Authors
142 -# Distributed under the terms of the GNU General Public License v2
143 -
144 -EAPI=8
145 -
146 -inherit meson
147 -
148 -if [[ ${PV} == "9999" ]] ; then
149 - EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
150 - inherit git-r3
151 -else
152 - SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
153 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
154 -fi
155 -
156 -DESCRIPTION="Standalone X server running under Wayland"
157 -HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
158 -
159 -IUSE="selinux video_cards_nvidia unwind xcsecurity"
160 -
161 -LICENSE="MIT"
162 -SLOT="0"
163 -
164 -COMMON_DEPEND="
165 - dev-libs/libbsd
166 - dev-libs/openssl:=
167 - >=dev-libs/wayland-1.20
168 - >=dev-libs/wayland-protocols-1.22
169 - media-fonts/font-util
170 - >=media-libs/libepoxy-1.5.4[X,egl(+)]
171 - media-libs/libglvnd[X]
172 - >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
173 - >=x11-libs/libdrm-2.4.89
174 - >=x11-libs/libXau-1.0.4
175 - x11-libs/libxcvt
176 - >=x11-libs/libXdmcp-1.0.2
177 - >=x11-libs/libXfont2-2.0.1
178 - x11-libs/libxkbfile
179 - >=x11-libs/libxshmfence-1.1
180 - >=x11-libs/pixman-0.27.2
181 - >=x11-misc/xkeyboard-config-2.4.1-r3
182 -
183 - unwind? ( sys-libs/libunwind )
184 - video_cards_nvidia? ( gui-libs/egl-wayland )
185 -"
186 -DEPEND="
187 - ${COMMON_DEPEND}
188 - x11-base/xorg-proto
189 - >=x11-libs/xtrans-1.3.5
190 -"
191 -RDEPEND="
192 - ${COMMON_DEPEND}
193 - x11-apps/xkbcomp
194 - !<=x11-base/xorg-server-1.20.11
195 - selinux? ( sec-policy/selinux-xserver )
196 -"
197 -BDEPEND="
198 - sys-devel/flex
199 - dev-util/wayland-scanner
200 -"
201 -
202 -PATCHES=(
203 - "${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
204 -)
205 -
206 -src_configure() {
207 - local emesonargs=(
208 - $(meson_use selinux xselinux)
209 - $(meson_use unwind libunwind)
210 - $(meson_use xcsecurity)
211 - $(meson_use video_cards_nvidia xwayland_eglstream)
212 - -Ddpms=true
213 - -Ddri3=true
214 - -Ddrm=true
215 - -Ddtrace=false
216 - -Dglamor=true
217 - -Dglx=true
218 - -Dipv6=true
219 - -Dsecure-rpc=false
220 - -Dscreensaver=true
221 - -Dsha1=libcrypto
222 - -Dxace=true
223 - -Dxdmcp=true
224 - -Dxinerama=true
225 - -Dxvfb=true
226 - -Dxv=true
227 - -Dxwayland-path="${EPREFIX}"/usr/bin
228 - -Ddocs=false
229 - -Ddevel-docs=false
230 - -Ddocs-pdf=false
231 - )
232 -
233 - meson_src_configure
234 -}
235 -
236 -src_install() {
237 - dosym ../bin/Xwayland /usr/libexec/Xwayland
238 -
239 - meson_src_install
240 -}