1 |
commit: 754b94e14c0feaf6079488dcc9a7a70ffde07d18 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 30 22:00:29 2021 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 30 23:04:16 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=754b94e1 |
7 |
|
8 |
x11-base/xorg-server: Drop old versions |
9 |
|
10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
11 |
|
12 |
x11-base/xorg-server/Manifest | 2 - |
13 |
x11-base/xorg-server/xorg-server-1.20.11-r2.ebuild | 216 ------------------- |
14 |
x11-base/xorg-server/xorg-server-1.20.11-r4.ebuild | 218 -------------------- |
15 |
x11-base/xorg-server/xorg-server-1.20.11.ebuild | 229 --------------------- |
16 |
x11-base/xorg-server/xorg-server-1.20.12.ebuild | 221 -------------------- |
17 |
5 files changed, 886 deletions(-) |
18 |
|
19 |
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest |
20 |
index 3d0a6225a80..de7291d1fbe 100644 |
21 |
--- a/x11-base/xorg-server/Manifest |
22 |
+++ b/x11-base/xorg-server/Manifest |
23 |
@@ -1,3 +1 @@ |
24 |
-DIST xorg-server-1.20.11.tar.bz2 6476116 BLAKE2B 71ec31c4ed050a3e27fadd525f1039895e43571c04b0a1efa9b35fda318f17b3c89d403c914c591345e7d245a7ebbd6e0f206e4415c1d54f1368fb0735a3d7ef SHA512 1017015b9fd5d53788abe3641d877e6df8609841fa5c1847c0a5e133ddcc1b758a5d695304ebd36828099ec201a85b6b70b46f5ea4f81c5bd3a16fa6e175e3c2 |
25 |
-DIST xorg-server-1.20.12.tar.xz 5143456 BLAKE2B 1e70823890ccb382add92b8bda9e88168477d651edee70a97fd7632a290a20b8848f2c364aa859700e3e8528e4211d39104fa7dafac3f75f8e51afcfa98cffcf SHA512 98350c42fb1f10c965663c1c8d4b225689a6a63163d788d454aa71b28b9cc8fcf9709a932f882358a13ca0c277c0c15812d05919092b4c32828d4ed61cca0406 |
26 |
DIST xorg-server-1.20.13.tar.xz 5122260 BLAKE2B 4435d25d8b379142fcc4bf60d82e52417ac3ab22a77ededa1472785d67c23bfb95be8e10465fc4859645405b8e580d6dcb262caea39c408e724d0e5ea61b37af SHA512 4e0b7bd4e070dc52cb2c51c2056feb133de2c0487d359392ed63abba9702910cd2e2983e9415973d8d6e9672eac78be6f39202687fc56610877914ce722554b3 |
27 |
|
28 |
diff --git a/x11-base/xorg-server/xorg-server-1.20.11-r2.ebuild b/x11-base/xorg-server/xorg-server-1.20.11-r2.ebuild |
29 |
deleted file mode 100644 |
30 |
index 7ba74e51022..00000000000 |
31 |
--- a/x11-base/xorg-server/xorg-server-1.20.11-r2.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,216 +0,0 @@ |
34 |
-# Copyright 1999-2021 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=7 |
38 |
- |
39 |
-XORG_DOC=doc |
40 |
-inherit xorg-3 multilib flag-o-matic toolchain-funcs |
41 |
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" |
42 |
- |
43 |
-DESCRIPTION="X.Org X servers" |
44 |
-SLOT="0/${PV}" |
45 |
-if [[ ${PV} != 9999* ]]; then |
46 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
47 |
-fi |
48 |
- |
49 |
-IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" |
50 |
-IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity" |
51 |
-RESTRICT="!test? ( test )" |
52 |
- |
53 |
-CDEPEND=" |
54 |
- media-libs/libglvnd[X] |
55 |
- dev-libs/openssl:0= |
56 |
- >=x11-apps/iceauth-1.0.2 |
57 |
- >=x11-apps/rgb-1.0.3 |
58 |
- >=x11-apps/xauth-1.0.3 |
59 |
- x11-apps/xkbcomp |
60 |
- >=x11-libs/libdrm-2.4.89 |
61 |
- >=x11-libs/libpciaccess-0.12.901 |
62 |
- >=x11-libs/libXau-1.0.4 |
63 |
- >=x11-libs/libXdmcp-1.0.2 |
64 |
- >=x11-libs/libXfont2-2.0.1 |
65 |
- >=x11-libs/libxkbfile-1.0.4 |
66 |
- >=x11-libs/libxshmfence-1.1 |
67 |
- >=x11-libs/pixman-0.27.2 |
68 |
- >=x11-misc/xbitmaps-1.0.1 |
69 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
70 |
- dmx? ( |
71 |
- x11-libs/libXt |
72 |
- >=x11-libs/libdmx-1.0.99.1 |
73 |
- >=x11-libs/libX11-1.1.5 |
74 |
- >=x11-libs/libXaw-1.0.4 |
75 |
- >=x11-libs/libXext-1.0.99.4 |
76 |
- >=x11-libs/libXfixes-5.0 |
77 |
- >=x11-libs/libXi-1.2.99.1 |
78 |
- >=x11-libs/libXmu-1.0.3 |
79 |
- x11-libs/libXrender |
80 |
- >=x11-libs/libXres-1.0.3 |
81 |
- >=x11-libs/libXtst-1.0.99.2 |
82 |
- ) |
83 |
- kdrive? ( |
84 |
- >=x11-libs/libXext-1.0.5 |
85 |
- x11-libs/libXv |
86 |
- ) |
87 |
- xephyr? ( |
88 |
- x11-libs/libxcb[xkb] |
89 |
- x11-libs/xcb-util |
90 |
- x11-libs/xcb-util-image |
91 |
- x11-libs/xcb-util-keysyms |
92 |
- x11-libs/xcb-util-renderutil |
93 |
- x11-libs/xcb-util-wm |
94 |
- ) |
95 |
- !minimal? ( |
96 |
- >=x11-libs/libX11-1.1.5 |
97 |
- >=x11-libs/libXext-1.0.5 |
98 |
- >=media-libs/mesa-18[X(+),egl,gbm] |
99 |
- >=media-libs/libepoxy-1.5.4[X,egl(+)] |
100 |
- ) |
101 |
- udev? ( virtual/libudev:= ) |
102 |
- unwind? ( sys-libs/libunwind ) |
103 |
- >=x11-apps/xinit-1.3.3-r1 |
104 |
- systemd? ( |
105 |
- sys-apps/dbus |
106 |
- sys-apps/systemd |
107 |
- ) |
108 |
- elogind? ( |
109 |
- sys-apps/dbus |
110 |
- sys-auth/elogind[pam] |
111 |
- sys-auth/pambase[elogind] |
112 |
- ) |
113 |
- !!x11-drivers/nvidia-drivers[-libglvnd(+)] |
114 |
-" |
115 |
-DEPEND="${CDEPEND} |
116 |
- >=x11-base/xorg-proto-2018.4 |
117 |
- >=x11-libs/xtrans-1.3.5 |
118 |
- dmx? ( |
119 |
- doc? ( |
120 |
- || ( |
121 |
- www-client/links |
122 |
- www-client/lynx |
123 |
- www-client/w3m |
124 |
- ) |
125 |
- ) |
126 |
- ) |
127 |
-" |
128 |
-RDEPEND="${CDEPEND} |
129 |
- !systemd? ( gui-libs/display-manager-init ) |
130 |
- selinux? ( sec-policy/selinux-xserver ) |
131 |
- wayland? ( x11-base/xwayland ) |
132 |
-" |
133 |
-BDEPEND=" |
134 |
- sys-devel/flex |
135 |
-" |
136 |
-PDEPEND=" |
137 |
- xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" |
138 |
- |
139 |
-REQUIRED_USE="!minimal? ( |
140 |
- || ( ${IUSE_SERVERS} ) |
141 |
- ) |
142 |
- elogind? ( udev ) |
143 |
- ?? ( elogind systemd ) |
144 |
- minimal? ( !wayland ) |
145 |
- xephyr? ( kdrive )" |
146 |
- |
147 |
-UPSTREAMED_PATCHES=( |
148 |
-) |
149 |
- |
150 |
-PATCHES=( |
151 |
- "${UPSTREAMED_PATCHES[@]}" |
152 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
153 |
- # needed for new eselect-opengl, bug #541232 |
154 |
- "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
155 |
-) |
156 |
- |
157 |
-src_configure() { |
158 |
- # localstatedir is used for the log location; we need to override the default |
159 |
- # from ebuild.sh |
160 |
- # sysconfdir is used for the xorg.conf location; same applies |
161 |
- # NOTE: fop is used for doc generating; and I have no idea if Gentoo |
162 |
- # package it somewhere |
163 |
- local XORG_CONFIGURE_OPTIONS=( |
164 |
- $(use_enable ipv6) |
165 |
- $(use_enable debug) |
166 |
- $(use_enable dmx) |
167 |
- $(use_enable kdrive) |
168 |
- $(use_enable test unit-tests) |
169 |
- $(use_enable unwind libunwind) |
170 |
- $(use_enable !minimal record) |
171 |
- $(use_enable !minimal xfree86-utils) |
172 |
- $(use_enable !minimal dri) |
173 |
- $(use_enable !minimal dri2) |
174 |
- $(use_enable !minimal dri3) |
175 |
- $(use_enable !minimal glamor) |
176 |
- $(use_enable !minimal glx) |
177 |
- $(use_enable xcsecurity) |
178 |
- $(use_enable xephyr) |
179 |
- $(use_enable xnest) |
180 |
- $(use_enable xorg) |
181 |
- $(use_enable xvfb) |
182 |
- $(use_enable udev config-udev) |
183 |
- $(use_with doc doxygen) |
184 |
- $(use_with doc xmlto) |
185 |
- $(use_with systemd systemd-daemon) |
186 |
- --disable-xwayland |
187 |
- --enable-libdrm |
188 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
189 |
- --localstatedir="${EPREFIX}"/var |
190 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
191 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
192 |
- --disable-config-hal |
193 |
- --disable-linux-acpi |
194 |
- --without-dtrace |
195 |
- --without-fop |
196 |
- --with-os-vendor=Gentoo |
197 |
- --with-sha1=libcrypto |
198 |
- CPP="$(tc-getPROG CPP cpp)" |
199 |
- ) |
200 |
- |
201 |
- if use systemd || use elogind; then |
202 |
- XORG_CONFIGURE_OPTIONS+=( |
203 |
- --enable-systemd-logind |
204 |
- --disable-install-setuid |
205 |
- $(use_enable suid suid-wrapper) |
206 |
- ) |
207 |
- else |
208 |
- XORG_CONFIGURE_OPTIONS+=( |
209 |
- --disable-systemd-logind |
210 |
- --disable-suid-wrapper |
211 |
- $(use_enable suid install-setuid) |
212 |
- ) |
213 |
- fi |
214 |
- |
215 |
- xorg-3_src_configure |
216 |
-} |
217 |
- |
218 |
-server_based_install() { |
219 |
- if ! use xorg; then |
220 |
- rm -f "${ED}"/usr/share/man/man1/Xserver.1x \ |
221 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
222 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
223 |
- "${ED}"/usr/share/man/man1/Xserver.1x || die |
224 |
- fi |
225 |
-} |
226 |
- |
227 |
-src_install() { |
228 |
- xorg-3_src_install |
229 |
- |
230 |
- server_based_install |
231 |
- |
232 |
- if ! use minimal && use xorg; then |
233 |
- # Install xorg.conf.example into docs |
234 |
- dodoc "${S}"/hw/xfree86/xorg.conf.example |
235 |
- fi |
236 |
- |
237 |
- # install the @x11-module-rebuild set for Portage |
238 |
- insinto /usr/share/portage/config/sets |
239 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
240 |
- |
241 |
- find "${ED}"/var -type d -empty -delete || die |
242 |
-} |
243 |
- |
244 |
-pkg_postrm() { |
245 |
- # Get rid of module dir to ensure opengl-update works properly |
246 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
247 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
248 |
- fi |
249 |
-} |
250 |
|
251 |
diff --git a/x11-base/xorg-server/xorg-server-1.20.11-r4.ebuild b/x11-base/xorg-server/xorg-server-1.20.11-r4.ebuild |
252 |
deleted file mode 100644 |
253 |
index 82ce49e9485..00000000000 |
254 |
--- a/x11-base/xorg-server/xorg-server-1.20.11-r4.ebuild |
255 |
+++ /dev/null |
256 |
@@ -1,218 +0,0 @@ |
257 |
-# Copyright 1999-2021 Gentoo Authors |
258 |
-# Distributed under the terms of the GNU General Public License v2 |
259 |
- |
260 |
-EAPI=7 |
261 |
- |
262 |
-XORG_DOC=doc |
263 |
-inherit xorg-3 multilib flag-o-matic toolchain-funcs |
264 |
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" |
265 |
- |
266 |
-DESCRIPTION="X.Org X servers" |
267 |
-SLOT="0/${PV}" |
268 |
-if [[ ${PV} != 9999* ]]; then |
269 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
270 |
-fi |
271 |
- |
272 |
-IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb" |
273 |
-IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity" |
274 |
-RESTRICT="!test? ( test )" |
275 |
- |
276 |
-CDEPEND=" |
277 |
- media-libs/libglvnd[X] |
278 |
- dev-libs/openssl:0= |
279 |
- >=x11-apps/iceauth-1.0.2 |
280 |
- >=x11-apps/rgb-1.0.3 |
281 |
- >=x11-apps/xauth-1.0.3 |
282 |
- x11-apps/xkbcomp |
283 |
- >=x11-libs/libdrm-2.4.89 |
284 |
- >=x11-libs/libpciaccess-0.12.901 |
285 |
- >=x11-libs/libXau-1.0.4 |
286 |
- >=x11-libs/libXdmcp-1.0.2 |
287 |
- >=x11-libs/libXfont2-2.0.1 |
288 |
- >=x11-libs/libxkbfile-1.0.4 |
289 |
- >=x11-libs/libxshmfence-1.1 |
290 |
- >=x11-libs/pixman-0.27.2 |
291 |
- >=x11-misc/xbitmaps-1.0.1 |
292 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
293 |
- dmx? ( |
294 |
- x11-libs/libXt |
295 |
- >=x11-libs/libdmx-1.0.99.1 |
296 |
- >=x11-libs/libX11-1.1.5 |
297 |
- >=x11-libs/libXaw-1.0.4 |
298 |
- >=x11-libs/libXext-1.0.99.4 |
299 |
- >=x11-libs/libXfixes-5.0 |
300 |
- >=x11-libs/libXi-1.2.99.1 |
301 |
- >=x11-libs/libXmu-1.0.3 |
302 |
- x11-libs/libXrender |
303 |
- >=x11-libs/libXres-1.0.3 |
304 |
- >=x11-libs/libXtst-1.0.99.2 |
305 |
- ) |
306 |
- kdrive? ( |
307 |
- >=x11-libs/libXext-1.0.5 |
308 |
- x11-libs/libXv |
309 |
- ) |
310 |
- xephyr? ( |
311 |
- x11-libs/libxcb[xkb] |
312 |
- x11-libs/xcb-util |
313 |
- x11-libs/xcb-util-image |
314 |
- x11-libs/xcb-util-keysyms |
315 |
- x11-libs/xcb-util-renderutil |
316 |
- x11-libs/xcb-util-wm |
317 |
- ) |
318 |
- !minimal? ( |
319 |
- >=x11-libs/libX11-1.1.5 |
320 |
- >=x11-libs/libXext-1.0.5 |
321 |
- >=media-libs/mesa-18[X(+),egl,gbm] |
322 |
- >=media-libs/libepoxy-1.5.4[X,egl(+)] |
323 |
- ) |
324 |
- udev? ( virtual/libudev:= ) |
325 |
- unwind? ( sys-libs/libunwind ) |
326 |
- >=x11-apps/xinit-1.3.3-r1 |
327 |
- systemd? ( |
328 |
- sys-apps/dbus |
329 |
- sys-apps/systemd |
330 |
- ) |
331 |
- elogind? ( |
332 |
- sys-apps/dbus |
333 |
- sys-auth/elogind[pam] |
334 |
- sys-auth/pambase[elogind] |
335 |
- ) |
336 |
- !!x11-drivers/nvidia-drivers[-libglvnd(+)] |
337 |
-" |
338 |
-DEPEND="${CDEPEND} |
339 |
- >=x11-base/xorg-proto-2018.4 |
340 |
- >=x11-libs/xtrans-1.3.5 |
341 |
- dmx? ( |
342 |
- doc? ( |
343 |
- || ( |
344 |
- www-client/links |
345 |
- www-client/lynx |
346 |
- www-client/w3m |
347 |
- ) |
348 |
- ) |
349 |
- ) |
350 |
-" |
351 |
-RDEPEND="${CDEPEND} |
352 |
- !systemd? ( gui-libs/display-manager-init ) |
353 |
- selinux? ( sec-policy/selinux-xserver ) |
354 |
-" |
355 |
-BDEPEND=" |
356 |
- sys-devel/flex |
357 |
-" |
358 |
-PDEPEND=" |
359 |
- xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" |
360 |
- |
361 |
-REQUIRED_USE="!minimal? ( |
362 |
- || ( ${IUSE_SERVERS} ) |
363 |
- ) |
364 |
- elogind? ( udev ) |
365 |
- ?? ( elogind systemd ) |
366 |
- xephyr? ( kdrive )" |
367 |
- |
368 |
-UPSTREAMED_PATCHES=( |
369 |
-) |
370 |
- |
371 |
-PATCHES=( |
372 |
- "${UPSTREAMED_PATCHES[@]}" |
373 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
374 |
- # needed for new eselect-opengl, bug #541232 |
375 |
- "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
376 |
-) |
377 |
- |
378 |
-src_configure() { |
379 |
- # localstatedir is used for the log location; we need to override the default |
380 |
- # from ebuild.sh |
381 |
- # sysconfdir is used for the xorg.conf location; same applies |
382 |
- # NOTE: fop is used for doc generating; and I have no idea if Gentoo |
383 |
- # package it somewhere |
384 |
- local XORG_CONFIGURE_OPTIONS=( |
385 |
- $(use_enable ipv6) |
386 |
- $(use_enable debug) |
387 |
- $(use_enable dmx) |
388 |
- $(use_enable kdrive) |
389 |
- $(use_enable test unit-tests) |
390 |
- $(use_enable unwind libunwind) |
391 |
- $(use_enable !minimal record) |
392 |
- $(use_enable !minimal xfree86-utils) |
393 |
- $(use_enable !minimal dri) |
394 |
- $(use_enable !minimal dri2) |
395 |
- $(use_enable !minimal dri3) |
396 |
- $(use_enable !minimal glamor) |
397 |
- $(use_enable !minimal glx) |
398 |
- $(use_enable xcsecurity) |
399 |
- $(use_enable xephyr) |
400 |
- $(use_enable xnest) |
401 |
- $(use_enable xorg) |
402 |
- $(use_enable xvfb) |
403 |
- $(use_enable udev config-udev) |
404 |
- $(use_with doc doxygen) |
405 |
- $(use_with doc xmlto) |
406 |
- $(use_with systemd systemd-daemon) |
407 |
- --disable-xwayland |
408 |
- --enable-libdrm |
409 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
410 |
- --localstatedir="${EPREFIX}"/var |
411 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
412 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
413 |
- --disable-config-hal |
414 |
- --disable-linux-acpi |
415 |
- --without-dtrace |
416 |
- --without-fop |
417 |
- --with-os-vendor=Gentoo |
418 |
- --with-sha1=libcrypto |
419 |
- CPP="$(tc-getPROG CPP cpp)" |
420 |
- ) |
421 |
- |
422 |
- if use systemd || use elogind; then |
423 |
- XORG_CONFIGURE_OPTIONS+=( |
424 |
- --enable-systemd-logind |
425 |
- --disable-install-setuid |
426 |
- $(use_enable suid suid-wrapper) |
427 |
- ) |
428 |
- else |
429 |
- XORG_CONFIGURE_OPTIONS+=( |
430 |
- --disable-systemd-logind |
431 |
- --disable-suid-wrapper |
432 |
- $(use_enable suid install-setuid) |
433 |
- ) |
434 |
- fi |
435 |
- |
436 |
- xorg-3_src_configure |
437 |
-} |
438 |
- |
439 |
-server_based_install() { |
440 |
- if ! use xorg; then |
441 |
- rm -f "${ED}"/usr/share/man/man1/Xserver.1x \ |
442 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
443 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
444 |
- "${ED}"/usr/share/man/man1/Xserver.1x || die |
445 |
- fi |
446 |
-} |
447 |
- |
448 |
-src_install() { |
449 |
- xorg-3_src_install |
450 |
- |
451 |
- server_based_install |
452 |
- |
453 |
- if ! use minimal && use xorg; then |
454 |
- # Install xorg.conf.example into docs |
455 |
- dodoc "${S}"/hw/xfree86/xorg.conf.example |
456 |
- |
457 |
- rm \ |
458 |
- "${ED}"/usr/bin/cvt \ |
459 |
- "${ED}"/usr/share/man/man1/cvt.1 || die |
460 |
- fi |
461 |
- |
462 |
- # install the @x11-module-rebuild set for Portage |
463 |
- insinto /usr/share/portage/config/sets |
464 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
465 |
- |
466 |
- find "${ED}"/var -type d -empty -delete || die |
467 |
-} |
468 |
- |
469 |
-pkg_postrm() { |
470 |
- # Get rid of module dir to ensure opengl-update works properly |
471 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
472 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
473 |
- fi |
474 |
-} |
475 |
|
476 |
diff --git a/x11-base/xorg-server/xorg-server-1.20.11.ebuild b/x11-base/xorg-server/xorg-server-1.20.11.ebuild |
477 |
deleted file mode 100644 |
478 |
index 609ab534563..00000000000 |
479 |
--- a/x11-base/xorg-server/xorg-server-1.20.11.ebuild |
480 |
+++ /dev/null |
481 |
@@ -1,229 +0,0 @@ |
482 |
-# Copyright 1999-2021 Gentoo Authors |
483 |
-# Distributed under the terms of the GNU General Public License v2 |
484 |
- |
485 |
-EAPI=7 |
486 |
- |
487 |
-XORG_DOC=doc |
488 |
-inherit xorg-3 multilib flag-o-matic toolchain-funcs |
489 |
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" |
490 |
- |
491 |
-DESCRIPTION="X.Org X servers" |
492 |
-SLOT="0/${PV}" |
493 |
-if [[ ${PV} != 9999* ]]; then |
494 |
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" |
495 |
-fi |
496 |
- |
497 |
-IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" |
498 |
-IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity" |
499 |
-RESTRICT="!test? ( test )" |
500 |
- |
501 |
-CDEPEND=" |
502 |
- media-libs/libglvnd[X] |
503 |
- dev-libs/openssl:0= |
504 |
- >=x11-apps/iceauth-1.0.2 |
505 |
- >=x11-apps/rgb-1.0.3 |
506 |
- >=x11-apps/xauth-1.0.3 |
507 |
- x11-apps/xkbcomp |
508 |
- >=x11-libs/libdrm-2.4.89 |
509 |
- >=x11-libs/libpciaccess-0.12.901 |
510 |
- >=x11-libs/libXau-1.0.4 |
511 |
- >=x11-libs/libXdmcp-1.0.2 |
512 |
- >=x11-libs/libXfont2-2.0.1 |
513 |
- >=x11-libs/libxkbfile-1.0.4 |
514 |
- >=x11-libs/libxshmfence-1.1 |
515 |
- >=x11-libs/pixman-0.27.2 |
516 |
- >=x11-misc/xbitmaps-1.0.1 |
517 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
518 |
- dmx? ( |
519 |
- x11-libs/libXt |
520 |
- >=x11-libs/libdmx-1.0.99.1 |
521 |
- >=x11-libs/libX11-1.1.5 |
522 |
- >=x11-libs/libXaw-1.0.4 |
523 |
- >=x11-libs/libXext-1.0.99.4 |
524 |
- >=x11-libs/libXfixes-5.0 |
525 |
- >=x11-libs/libXi-1.2.99.1 |
526 |
- >=x11-libs/libXmu-1.0.3 |
527 |
- x11-libs/libXrender |
528 |
- >=x11-libs/libXres-1.0.3 |
529 |
- >=x11-libs/libXtst-1.0.99.2 |
530 |
- ) |
531 |
- kdrive? ( |
532 |
- >=x11-libs/libXext-1.0.5 |
533 |
- x11-libs/libXv |
534 |
- ) |
535 |
- xephyr? ( |
536 |
- x11-libs/libxcb[xkb] |
537 |
- x11-libs/xcb-util |
538 |
- x11-libs/xcb-util-image |
539 |
- x11-libs/xcb-util-keysyms |
540 |
- x11-libs/xcb-util-renderutil |
541 |
- x11-libs/xcb-util-wm |
542 |
- ) |
543 |
- !minimal? ( |
544 |
- >=x11-libs/libX11-1.1.5 |
545 |
- >=x11-libs/libXext-1.0.5 |
546 |
- >=media-libs/mesa-18[X(+),egl,gbm] |
547 |
- >=media-libs/libepoxy-1.5.4[X,egl(+)] |
548 |
- ) |
549 |
- udev? ( virtual/libudev:= ) |
550 |
- unwind? ( sys-libs/libunwind ) |
551 |
- wayland? ( |
552 |
- >=dev-libs/wayland-1.3.0 |
553 |
- >=media-libs/libepoxy-1.5.4[egl(+)] |
554 |
- >=dev-libs/wayland-protocols-1.18 |
555 |
- ) |
556 |
- >=x11-apps/xinit-1.3.3-r1 |
557 |
- systemd? ( |
558 |
- sys-apps/dbus |
559 |
- sys-apps/systemd |
560 |
- ) |
561 |
- elogind? ( |
562 |
- sys-apps/dbus |
563 |
- sys-auth/elogind[pam] |
564 |
- sys-auth/pambase[elogind] |
565 |
- ) |
566 |
- !!x11-drivers/nvidia-drivers[-libglvnd(+)] |
567 |
-" |
568 |
-DEPEND="${CDEPEND} |
569 |
- >=x11-base/xorg-proto-2018.4 |
570 |
- >=x11-libs/xtrans-1.3.5 |
571 |
- dmx? ( |
572 |
- doc? ( |
573 |
- || ( |
574 |
- www-client/links |
575 |
- www-client/lynx |
576 |
- www-client/w3m |
577 |
- ) |
578 |
- ) |
579 |
- ) |
580 |
-" |
581 |
-RDEPEND="${CDEPEND} |
582 |
- !systemd? ( gui-libs/display-manager-init ) |
583 |
- selinux? ( sec-policy/selinux-xserver ) |
584 |
-" |
585 |
-BDEPEND=" |
586 |
- sys-devel/flex |
587 |
- wayland? ( dev-util/wayland-scanner ) |
588 |
-" |
589 |
-PDEPEND=" |
590 |
- xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" |
591 |
- |
592 |
-REQUIRED_USE="!minimal? ( |
593 |
- || ( ${IUSE_SERVERS} ) |
594 |
- ) |
595 |
- elogind? ( udev ) |
596 |
- ?? ( elogind systemd ) |
597 |
- minimal? ( !wayland ) |
598 |
- xephyr? ( kdrive )" |
599 |
- |
600 |
-UPSTREAMED_PATCHES=( |
601 |
-) |
602 |
- |
603 |
-PATCHES=( |
604 |
- "${UPSTREAMED_PATCHES[@]}" |
605 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
606 |
- # needed for new eselect-opengl, bug #541232 |
607 |
- "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
608 |
-) |
609 |
- |
610 |
-pkg_setup() { |
611 |
- if use wayland && use minimal; then |
612 |
- ewarn "glamor is necessary for acceleration under Xwayland." |
613 |
- ewarn "Performance may be unacceptable without it." |
614 |
- ewarn "Build with USE=-minimal to enable glamor." |
615 |
- fi |
616 |
-} |
617 |
- |
618 |
-src_configure() { |
619 |
- # localstatedir is used for the log location; we need to override the default |
620 |
- # from ebuild.sh |
621 |
- # sysconfdir is used for the xorg.conf location; same applies |
622 |
- # NOTE: fop is used for doc generating; and I have no idea if Gentoo |
623 |
- # package it somewhere |
624 |
- local XORG_CONFIGURE_OPTIONS=( |
625 |
- $(use_enable ipv6) |
626 |
- $(use_enable debug) |
627 |
- $(use_enable dmx) |
628 |
- $(use_enable kdrive) |
629 |
- $(use_enable test unit-tests) |
630 |
- $(use_enable unwind libunwind) |
631 |
- $(use_enable wayland xwayland) |
632 |
- $(use_enable !minimal record) |
633 |
- $(use_enable !minimal xfree86-utils) |
634 |
- $(use_enable !minimal dri) |
635 |
- $(use_enable !minimal dri2) |
636 |
- $(use_enable !minimal dri3) |
637 |
- $(use_enable !minimal glamor) |
638 |
- $(use_enable !minimal glx) |
639 |
- $(use_enable xcsecurity) |
640 |
- $(use_enable xephyr) |
641 |
- $(use_enable xnest) |
642 |
- $(use_enable xorg) |
643 |
- $(use_enable xvfb) |
644 |
- $(use_enable udev config-udev) |
645 |
- $(use_with doc doxygen) |
646 |
- $(use_with doc xmlto) |
647 |
- $(use_with systemd systemd-daemon) |
648 |
- --enable-libdrm |
649 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
650 |
- --localstatedir="${EPREFIX}"/var |
651 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
652 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
653 |
- --disable-config-hal |
654 |
- --disable-linux-acpi |
655 |
- --without-dtrace |
656 |
- --without-fop |
657 |
- --with-os-vendor=Gentoo |
658 |
- --with-sha1=libcrypto |
659 |
- CPP="$(tc-getPROG CPP cpp)" |
660 |
- ) |
661 |
- |
662 |
- if use systemd || use elogind; then |
663 |
- XORG_CONFIGURE_OPTIONS+=( |
664 |
- --enable-systemd-logind |
665 |
- --disable-install-setuid |
666 |
- $(use_enable suid suid-wrapper) |
667 |
- ) |
668 |
- else |
669 |
- XORG_CONFIGURE_OPTIONS+=( |
670 |
- --disable-systemd-logind |
671 |
- --disable-suid-wrapper |
672 |
- $(use_enable suid install-setuid) |
673 |
- ) |
674 |
- fi |
675 |
- |
676 |
- xorg-3_src_configure |
677 |
-} |
678 |
- |
679 |
-server_based_install() { |
680 |
- if ! use xorg; then |
681 |
- rm -f "${ED}"/usr/share/man/man1/Xserver.1x \ |
682 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
683 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
684 |
- "${ED}"/usr/share/man/man1/Xserver.1x || die |
685 |
- fi |
686 |
-} |
687 |
- |
688 |
-src_install() { |
689 |
- xorg-3_src_install |
690 |
- |
691 |
- server_based_install |
692 |
- |
693 |
- if ! use minimal && use xorg; then |
694 |
- # Install xorg.conf.example into docs |
695 |
- dodoc "${S}"/hw/xfree86/xorg.conf.example |
696 |
- fi |
697 |
- |
698 |
- # install the @x11-module-rebuild set for Portage |
699 |
- insinto /usr/share/portage/config/sets |
700 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
701 |
- |
702 |
- find "${ED}"/var -type d -empty -delete || die |
703 |
-} |
704 |
- |
705 |
-pkg_postrm() { |
706 |
- # Get rid of module dir to ensure opengl-update works properly |
707 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
708 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
709 |
- fi |
710 |
-} |
711 |
|
712 |
diff --git a/x11-base/xorg-server/xorg-server-1.20.12.ebuild b/x11-base/xorg-server/xorg-server-1.20.12.ebuild |
713 |
deleted file mode 100644 |
714 |
index 9d8b35301a6..00000000000 |
715 |
--- a/x11-base/xorg-server/xorg-server-1.20.12.ebuild |
716 |
+++ /dev/null |
717 |
@@ -1,221 +0,0 @@ |
718 |
-# Copyright 1999-2021 Gentoo Authors |
719 |
-# Distributed under the terms of the GNU General Public License v2 |
720 |
- |
721 |
-EAPI=7 |
722 |
- |
723 |
-XORG_DOC=doc |
724 |
-XORG_TARBALL_SUFFIX="xz" |
725 |
-inherit xorg-3 multilib flag-o-matic toolchain-funcs |
726 |
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" |
727 |
- |
728 |
-DESCRIPTION="X.Org X servers" |
729 |
-SLOT="0/${PV}" |
730 |
-if [[ ${PV} != 9999* ]]; then |
731 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
732 |
-fi |
733 |
- |
734 |
-IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" |
735 |
-IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity" |
736 |
-RESTRICT="!test? ( test )" |
737 |
- |
738 |
-CDEPEND=" |
739 |
- media-libs/libglvnd[X] |
740 |
- dev-libs/openssl:0= |
741 |
- >=x11-apps/iceauth-1.0.2 |
742 |
- >=x11-apps/rgb-1.0.3 |
743 |
- >=x11-apps/xauth-1.0.3 |
744 |
- x11-apps/xkbcomp |
745 |
- >=x11-libs/libdrm-2.4.89 |
746 |
- >=x11-libs/libpciaccess-0.12.901 |
747 |
- >=x11-libs/libXau-1.0.4 |
748 |
- >=x11-libs/libXdmcp-1.0.2 |
749 |
- >=x11-libs/libXfont2-2.0.1 |
750 |
- >=x11-libs/libxkbfile-1.0.4 |
751 |
- >=x11-libs/libxshmfence-1.1 |
752 |
- >=x11-libs/pixman-0.27.2 |
753 |
- >=x11-misc/xbitmaps-1.0.1 |
754 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
755 |
- dmx? ( |
756 |
- x11-libs/libXt |
757 |
- >=x11-libs/libdmx-1.0.99.1 |
758 |
- >=x11-libs/libX11-1.1.5 |
759 |
- >=x11-libs/libXaw-1.0.4 |
760 |
- >=x11-libs/libXext-1.0.99.4 |
761 |
- >=x11-libs/libXfixes-5.0 |
762 |
- >=x11-libs/libXi-1.2.99.1 |
763 |
- >=x11-libs/libXmu-1.0.3 |
764 |
- x11-libs/libXrender |
765 |
- >=x11-libs/libXres-1.0.3 |
766 |
- >=x11-libs/libXtst-1.0.99.2 |
767 |
- ) |
768 |
- kdrive? ( |
769 |
- >=x11-libs/libXext-1.0.5 |
770 |
- x11-libs/libXv |
771 |
- ) |
772 |
- xephyr? ( |
773 |
- x11-libs/libxcb[xkb] |
774 |
- x11-libs/xcb-util |
775 |
- x11-libs/xcb-util-image |
776 |
- x11-libs/xcb-util-keysyms |
777 |
- x11-libs/xcb-util-renderutil |
778 |
- x11-libs/xcb-util-wm |
779 |
- ) |
780 |
- !minimal? ( |
781 |
- >=x11-libs/libX11-1.1.5 |
782 |
- >=x11-libs/libXext-1.0.5 |
783 |
- >=media-libs/mesa-18[X(+),egl,gbm] |
784 |
- >=media-libs/libepoxy-1.5.4[X,egl(+)] |
785 |
- ) |
786 |
- udev? ( virtual/libudev:= ) |
787 |
- unwind? ( sys-libs/libunwind ) |
788 |
- >=x11-apps/xinit-1.3.3-r1 |
789 |
- systemd? ( |
790 |
- sys-apps/dbus |
791 |
- sys-apps/systemd |
792 |
- ) |
793 |
- elogind? ( |
794 |
- sys-apps/dbus |
795 |
- sys-auth/elogind[pam] |
796 |
- sys-auth/pambase[elogind] |
797 |
- ) |
798 |
- !!x11-drivers/nvidia-drivers[-libglvnd(+)] |
799 |
-" |
800 |
-DEPEND="${CDEPEND} |
801 |
- >=x11-base/xorg-proto-2018.4 |
802 |
- >=x11-libs/xtrans-1.3.5 |
803 |
- dmx? ( |
804 |
- doc? ( |
805 |
- || ( |
806 |
- www-client/links |
807 |
- www-client/lynx |
808 |
- www-client/w3m |
809 |
- ) |
810 |
- ) |
811 |
- ) |
812 |
-" |
813 |
-RDEPEND="${CDEPEND} |
814 |
- !systemd? ( gui-libs/display-manager-init ) |
815 |
- selinux? ( sec-policy/selinux-xserver ) |
816 |
- wayland? ( x11-base/xwayland ) |
817 |
-" |
818 |
-BDEPEND=" |
819 |
- sys-devel/flex |
820 |
-" |
821 |
-PDEPEND=" |
822 |
- xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" |
823 |
- |
824 |
-REQUIRED_USE="!minimal? ( |
825 |
- || ( ${IUSE_SERVERS} ) |
826 |
- ) |
827 |
- elogind? ( udev ) |
828 |
- ?? ( elogind systemd ) |
829 |
- minimal? ( !wayland ) |
830 |
- xephyr? ( kdrive )" |
831 |
- |
832 |
-UPSTREAMED_PATCHES=( |
833 |
-) |
834 |
- |
835 |
-PATCHES=( |
836 |
- "${UPSTREAMED_PATCHES[@]}" |
837 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
838 |
- # needed for new eselect-opengl, bug #541232 |
839 |
- "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
840 |
-) |
841 |
- |
842 |
-src_configure() { |
843 |
- # localstatedir is used for the log location; we need to override the default |
844 |
- # from ebuild.sh |
845 |
- # sysconfdir is used for the xorg.conf location; same applies |
846 |
- # NOTE: fop is used for doc generating; and I have no idea if Gentoo |
847 |
- # package it somewhere |
848 |
- local XORG_CONFIGURE_OPTIONS=( |
849 |
- $(use_enable ipv6) |
850 |
- $(use_enable debug) |
851 |
- $(use_enable dmx) |
852 |
- $(use_enable kdrive) |
853 |
- $(use_enable test unit-tests) |
854 |
- $(use_enable unwind libunwind) |
855 |
- $(use_enable !minimal record) |
856 |
- $(use_enable !minimal xfree86-utils) |
857 |
- $(use_enable !minimal dri) |
858 |
- $(use_enable !minimal dri2) |
859 |
- $(use_enable !minimal dri3) |
860 |
- $(use_enable !minimal glamor) |
861 |
- $(use_enable !minimal glx) |
862 |
- $(use_enable xcsecurity) |
863 |
- $(use_enable xephyr) |
864 |
- $(use_enable xnest) |
865 |
- $(use_enable xorg) |
866 |
- $(use_enable xvfb) |
867 |
- $(use_enable udev config-udev) |
868 |
- $(use_with doc doxygen) |
869 |
- $(use_with doc xmlto) |
870 |
- $(use_with systemd systemd-daemon) |
871 |
- --disable-xwayland |
872 |
- --enable-libdrm |
873 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
874 |
- --localstatedir="${EPREFIX}"/var |
875 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
876 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
877 |
- --disable-config-hal |
878 |
- --disable-linux-acpi |
879 |
- --without-dtrace |
880 |
- --without-fop |
881 |
- --with-os-vendor=Gentoo |
882 |
- --with-sha1=libcrypto |
883 |
- CPP="$(tc-getPROG CPP cpp)" |
884 |
- ) |
885 |
- |
886 |
- if use systemd || use elogind; then |
887 |
- XORG_CONFIGURE_OPTIONS+=( |
888 |
- --enable-systemd-logind |
889 |
- --disable-install-setuid |
890 |
- $(use_enable suid suid-wrapper) |
891 |
- ) |
892 |
- else |
893 |
- XORG_CONFIGURE_OPTIONS+=( |
894 |
- --disable-systemd-logind |
895 |
- --disable-suid-wrapper |
896 |
- $(use_enable suid install-setuid) |
897 |
- ) |
898 |
- fi |
899 |
- |
900 |
- xorg-3_src_configure |
901 |
-} |
902 |
- |
903 |
-server_based_install() { |
904 |
- if ! use xorg; then |
905 |
- rm -f "${ED}"/usr/share/man/man1/Xserver.1x \ |
906 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
907 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
908 |
- "${ED}"/usr/share/man/man1/Xserver.1x || die |
909 |
- fi |
910 |
-} |
911 |
- |
912 |
-src_install() { |
913 |
- xorg-3_src_install |
914 |
- |
915 |
- server_based_install |
916 |
- |
917 |
- if ! use minimal && use xorg; then |
918 |
- # Install xorg.conf.example into docs |
919 |
- dodoc "${S}"/hw/xfree86/xorg.conf.example |
920 |
- |
921 |
- rm \ |
922 |
- "${ED}"/usr/bin/cvt \ |
923 |
- "${ED}"/usr/share/man/man1/cvt.1 || die |
924 |
- fi |
925 |
- |
926 |
- # install the @x11-module-rebuild set for Portage |
927 |
- insinto /usr/share/portage/config/sets |
928 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
929 |
- |
930 |
- find "${ED}"/var -type d -empty -delete || die |
931 |
-} |
932 |
- |
933 |
-pkg_postrm() { |
934 |
- # Get rid of module dir to ensure opengl-update works properly |
935 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
936 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
937 |
- fi |
938 |
-} |