1 |
commit: 7e2d3a26cf29f7f6ff57cbf72919a5420ead1ca5 |
2 |
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 29 08:05:22 2022 +0000 |
4 |
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 29 08:05:22 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e2d3a26 |
7 |
|
8 |
x11-base/xorg-server: drop 1.20.14-r1 |
9 |
|
10 |
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> |
11 |
|
12 |
profiles/package.mask | 5 - |
13 |
x11-base/xorg-server/Manifest | 1 - |
14 |
x11-base/xorg-server/xorg-server-1.20.14-r1.ebuild | 214 --------------------- |
15 |
3 files changed, 220 deletions(-) |
16 |
|
17 |
diff --git a/profiles/package.mask b/profiles/package.mask |
18 |
index 88c24775b1f3..6e1efb1e2063 100644 |
19 |
--- a/profiles/package.mask |
20 |
+++ b/profiles/package.mask |
21 |
@@ -208,11 +208,6 @@ dev-python/sentinels |
22 |
dev-python/speaklater |
23 |
dev-python/zxcvbn |
24 |
|
25 |
-# Matt Turner <mattst88@g.o> (2022-08-29) |
26 |
-# Unpatched security vulerabilities. Bug #857780. |
27 |
-# Removal on 2022-09-29. |
28 |
-=x11-base/xorg-server-1.20* |
29 |
- |
30 |
# hololeap <hololeap@××××××××××.com> (2022-08-21) |
31 |
# doctest-parallel does not currently work with Setup.hs (used internally by |
32 |
# haskell-cabal.eclass) |
33 |
|
34 |
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest |
35 |
index 0c2475b4b60f..02f162f18bb8 100644 |
36 |
--- a/x11-base/xorg-server/Manifest |
37 |
+++ b/x11-base/xorg-server/Manifest |
38 |
@@ -1,3 +1,2 @@ |
39 |
-DIST xorg-server-1.20.14.tar.xz 5178288 BLAKE2B e60cbb6f3023639598d518fb53e3df3a2aced8f8950279f3a1642ad0a9545bea756574c4d41383cba966dc76c317859065b2290c8420668547f26f1d6e508da3 SHA512 be3dc32cce7d55d7e38c5f6557027f13f39224c76cc83e5800555d5ce89dbdc3731773a2d186a5b97db9fc8731a2b2dd6e9829af2b01ee2559246d4aef7c4963 |
40 |
DIST xorg-server-21.1.3.tar.xz 4955948 BLAKE2B 1907007e4131378ead2b8757e84e8e9403148c9b3cdffc68d7c54faf5ab0efa6b594b635940fce8af4b8334e4a1c67984f59fc2f3642e48b54eb2f2dcc7fd8f5 SHA512 cf5fed023eadda62ae732f8c4d427c272ebe005188341290f3d03147042c103b00cbb94d86a0256da815fb9b9a3da315c21a05ee0c926c1a2ff0c54ab0c0638b |
41 |
DIST xorg-server-21.1.4.tar.xz 4940176 BLAKE2B 8f68c7de102f7f8d0f56566a518025bb32c079184d5a5556dc8e651111b6a018669102b18ec2e9470d3ab91f51291618f9c49281915d885fc30446e1b54d2134 SHA512 eb5b8520d02908f72719e6ecfbf7a9bf139acb65ccae04d1db4223a8a2384cd3a94bd5afef10cce327b751b800cc2b79bfaa5ae35c95c3a217f775168082e68f |
42 |
|
43 |
diff --git a/x11-base/xorg-server/xorg-server-1.20.14-r1.ebuild b/x11-base/xorg-server/xorg-server-1.20.14-r1.ebuild |
44 |
deleted file mode 100644 |
45 |
index ba7bcec8880c..000000000000 |
46 |
--- a/x11-base/xorg-server/xorg-server-1.20.14-r1.ebuild |
47 |
+++ /dev/null |
48 |
@@ -1,214 +0,0 @@ |
49 |
-# Copyright 1999-2022 Gentoo Authors |
50 |
-# Distributed under the terms of the GNU General Public License v2 |
51 |
- |
52 |
-EAPI=7 |
53 |
- |
54 |
-XORG_TARBALL_SUFFIX="xz" |
55 |
-inherit xorg-3 toolchain-funcs |
56 |
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" |
57 |
- |
58 |
-DESCRIPTION="X.Org X servers" |
59 |
-SLOT="0/${PV}" |
60 |
-if [[ ${PV} != 9999* ]]; then |
61 |
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" |
62 |
-fi |
63 |
- |
64 |
-IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb" |
65 |
-IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity" |
66 |
-RESTRICT="!test? ( test )" |
67 |
- |
68 |
-CDEPEND=" |
69 |
- media-libs/libglvnd[X] |
70 |
- dev-libs/openssl:0= |
71 |
- >=x11-apps/iceauth-1.0.2 |
72 |
- >=x11-apps/rgb-1.0.3 |
73 |
- >=x11-apps/xauth-1.0.3 |
74 |
- x11-apps/xkbcomp |
75 |
- >=x11-libs/libdrm-2.4.89 |
76 |
- >=x11-libs/libpciaccess-0.12.901 |
77 |
- >=x11-libs/libXau-1.0.4 |
78 |
- >=x11-libs/libXdmcp-1.0.2 |
79 |
- >=x11-libs/libXfont2-2.0.1 |
80 |
- >=x11-libs/libxkbfile-1.0.4 |
81 |
- >=x11-libs/libxshmfence-1.1 |
82 |
- >=x11-libs/pixman-0.27.2 |
83 |
- >=x11-misc/xbitmaps-1.0.1 |
84 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
85 |
- dmx? ( |
86 |
- x11-libs/libXt |
87 |
- >=x11-libs/libdmx-1.0.99.1 |
88 |
- >=x11-libs/libX11-1.1.5 |
89 |
- >=x11-libs/libXaw-1.0.4 |
90 |
- >=x11-libs/libXext-1.0.99.4 |
91 |
- >=x11-libs/libXfixes-5.0 |
92 |
- >=x11-libs/libXi-1.2.99.1 |
93 |
- >=x11-libs/libXmu-1.0.3 |
94 |
- x11-libs/libXrender |
95 |
- >=x11-libs/libXres-1.0.3 |
96 |
- >=x11-libs/libXtst-1.0.99.2 |
97 |
- ) |
98 |
- kdrive? ( |
99 |
- >=x11-libs/libXext-1.0.5 |
100 |
- x11-libs/libXv |
101 |
- ) |
102 |
- xephyr? ( |
103 |
- x11-libs/libxcb[xkb] |
104 |
- x11-libs/xcb-util |
105 |
- x11-libs/xcb-util-image |
106 |
- x11-libs/xcb-util-keysyms |
107 |
- x11-libs/xcb-util-renderutil |
108 |
- x11-libs/xcb-util-wm |
109 |
- ) |
110 |
- !minimal? ( |
111 |
- >=x11-libs/libX11-1.1.5 |
112 |
- >=x11-libs/libXext-1.0.5 |
113 |
- >=media-libs/mesa-18[X(+),egl(+),gbm(+)] |
114 |
- >=media-libs/libepoxy-1.5.4[X,egl(+)] |
115 |
- ) |
116 |
- udev? ( virtual/libudev:= ) |
117 |
- unwind? ( sys-libs/libunwind:= ) |
118 |
- >=x11-apps/xinit-1.3.3-r1 |
119 |
- selinux? ( |
120 |
- sys-process/audit |
121 |
- sys-libs/libselinux:= |
122 |
- ) |
123 |
- systemd? ( |
124 |
- sys-apps/dbus |
125 |
- sys-apps/systemd |
126 |
- ) |
127 |
- elogind? ( |
128 |
- sys-apps/dbus |
129 |
- sys-auth/elogind[pam] |
130 |
- sys-auth/pambase[elogind] |
131 |
- ) |
132 |
- !!x11-drivers/nvidia-drivers[-libglvnd(+)] |
133 |
-" |
134 |
-DEPEND="${CDEPEND} |
135 |
- >=x11-base/xorg-proto-2018.4 |
136 |
- >=x11-libs/xtrans-1.3.5 |
137 |
-" |
138 |
-RDEPEND="${CDEPEND} |
139 |
- !systemd? ( gui-libs/display-manager-init ) |
140 |
- selinux? ( sec-policy/selinux-xserver ) |
141 |
-" |
142 |
-BDEPEND=" |
143 |
- sys-devel/flex |
144 |
-" |
145 |
-PDEPEND=" |
146 |
- xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" |
147 |
- |
148 |
-REQUIRED_USE="!minimal? ( |
149 |
- || ( ${IUSE_SERVERS} ) |
150 |
- ) |
151 |
- elogind? ( udev ) |
152 |
- ?? ( elogind systemd ) |
153 |
- xephyr? ( kdrive )" |
154 |
- |
155 |
-UPSTREAMED_PATCHES=( |
156 |
-) |
157 |
- |
158 |
-PATCHES=( |
159 |
- "${UPSTREAMED_PATCHES[@]}" |
160 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
161 |
- # needed for new eselect-opengl, bug #541232 |
162 |
- "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
163 |
-) |
164 |
- |
165 |
-src_configure() { |
166 |
- # localstatedir is used for the log location; we need to override the default |
167 |
- # from ebuild.sh |
168 |
- # sysconfdir is used for the xorg.conf location; same applies |
169 |
- # NOTE: fop is used for doc generating; and I have no idea if Gentoo |
170 |
- # package it somewhere |
171 |
- local XORG_CONFIGURE_OPTIONS=( |
172 |
- $(use_enable debug) |
173 |
- $(use_enable dmx) |
174 |
- $(use_enable kdrive) |
175 |
- $(use_enable test unit-tests) |
176 |
- $(use_enable unwind libunwind) |
177 |
- $(use_enable !minimal record) |
178 |
- $(use_enable !minimal xfree86-utils) |
179 |
- $(use_enable !minimal dri) |
180 |
- $(use_enable !minimal dri2) |
181 |
- $(use_enable !minimal dri3) |
182 |
- $(use_enable !minimal glamor) |
183 |
- $(use_enable !minimal glx) |
184 |
- $(use_enable xcsecurity) |
185 |
- $(use_enable xephyr) |
186 |
- $(use_enable selinux xselinux) |
187 |
- $(use_enable xnest) |
188 |
- $(use_enable xorg) |
189 |
- $(use_enable xvfb) |
190 |
- $(use_enable udev config-udev) |
191 |
- $(use_with systemd systemd-daemon) |
192 |
- --enable-ipv6 |
193 |
- --disable-xwayland |
194 |
- --enable-libdrm |
195 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
196 |
- --localstatedir="${EPREFIX}"/var |
197 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
198 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
199 |
- --disable-config-hal |
200 |
- --disable-linux-acpi |
201 |
- --without-dtrace |
202 |
- --without-doxygen |
203 |
- --without-fop |
204 |
- --without-xmlto |
205 |
- --with-os-vendor=Gentoo |
206 |
- --with-sha1=libcrypto |
207 |
- CPP="$(tc-getPROG CPP cpp)" |
208 |
- ) |
209 |
- |
210 |
- if use systemd || use elogind; then |
211 |
- XORG_CONFIGURE_OPTIONS+=( |
212 |
- --enable-systemd-logind |
213 |
- --disable-install-setuid |
214 |
- $(use_enable suid suid-wrapper) |
215 |
- ) |
216 |
- else |
217 |
- XORG_CONFIGURE_OPTIONS+=( |
218 |
- --disable-systemd-logind |
219 |
- --disable-suid-wrapper |
220 |
- $(use_enable suid install-setuid) |
221 |
- ) |
222 |
- fi |
223 |
- |
224 |
- xorg-3_src_configure |
225 |
-} |
226 |
- |
227 |
-server_based_install() { |
228 |
- if ! use xorg; then |
229 |
- rm -f "${ED}"/usr/share/man/man1/Xserver.1x \ |
230 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
231 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
232 |
- "${ED}"/usr/share/man/man1/Xserver.1x || die |
233 |
- fi |
234 |
-} |
235 |
- |
236 |
-src_install() { |
237 |
- xorg-3_src_install |
238 |
- |
239 |
- server_based_install |
240 |
- |
241 |
- if ! use minimal && use xorg; then |
242 |
- # Install xorg.conf.example into docs |
243 |
- dodoc "${S}"/hw/xfree86/xorg.conf.example |
244 |
- |
245 |
- rm \ |
246 |
- "${ED}"/usr/bin/cvt \ |
247 |
- "${ED}"/usr/share/man/man1/cvt.1 || die |
248 |
- fi |
249 |
- |
250 |
- # install the @x11-module-rebuild set for Portage |
251 |
- insinto /usr/share/portage/config/sets |
252 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
253 |
- |
254 |
- find "${ED}"/var -type d -empty -delete || die |
255 |
-} |
256 |
- |
257 |
-pkg_postrm() { |
258 |
- # Get rid of module dir to ensure opengl-update works properly |
259 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
260 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
261 |
- fi |
262 |
-} |