| 1 |
commit: 2770505a4547a8f25b82b690236f655dc3a2eee0 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 3 15:31:47 2023 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 3 15:55:29 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2770505a |
| 7 |
|
| 8 |
x11-base/xorg-server: 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/xorg-server/Manifest | 2 - |
| 15 |
x11-base/xorg-server/xorg-server-21.1.4-r1.ebuild | 195 ---------------------- |
| 16 |
x11-base/xorg-server/xorg-server-21.1.4.ebuild | 190 --------------------- |
| 17 |
x11-base/xorg-server/xorg-server-21.1.5.ebuild | 195 ---------------------- |
| 18 |
4 files changed, 582 deletions(-) |
| 19 |
|
| 20 |
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest |
| 21 |
index 38bf06fea8ea..4ac6d8491663 100644 |
| 22 |
--- a/x11-base/xorg-server/Manifest |
| 23 |
+++ b/x11-base/xorg-server/Manifest |
| 24 |
@@ -1,3 +1 @@ |
| 25 |
-DIST xorg-server-21.1.4.tar.xz 4940176 BLAKE2B 8f68c7de102f7f8d0f56566a518025bb32c079184d5a5556dc8e651111b6a018669102b18ec2e9470d3ab91f51291618f9c49281915d885fc30446e1b54d2134 SHA512 eb5b8520d02908f72719e6ecfbf7a9bf139acb65ccae04d1db4223a8a2384cd3a94bd5afef10cce327b751b800cc2b79bfaa5ae35c95c3a217f775168082e68f |
| 26 |
-DIST xorg-server-21.1.5.tar.xz 4929120 BLAKE2B 40f31250101293fa048c3c32278caaf0350fcf0b153a295d7574a6698893fa3c2d14078714a3c6ee7755b66c1f0ccf80b8faacb27aa5d7c279bc09fa6285ffd5 SHA512 a39c6ba36f94241d330b679a9a6fe2c5fda73fc3f5a9308a7a9cfd0d58503e407291759c9e553455c07cf5a3862952ae3904334eeca29c97ff5af7cffd2e6953 |
| 27 |
DIST xorg-server-21.1.6.tar.xz 4977496 BLAKE2B 8bcfa0a29f7b84b3ba9357d8ae9b1c7a5dc108159cf059f9c76c2c15f00be0d34964a3240937d146ae5f58a2d94deb091facacab984f8f905848bef5679cf46a SHA512 5e3cf879facf3a04aa64b7f6129226ea68a97109a7daca5146b57b4c707cc76a4fbad1924997dd319efd8c8c20eb5bb59570a719101b76ae07e923b7e9656239 |
| 28 |
|
| 29 |
diff --git a/x11-base/xorg-server/xorg-server-21.1.4-r1.ebuild b/x11-base/xorg-server/xorg-server-21.1.4-r1.ebuild |
| 30 |
deleted file mode 100644 |
| 31 |
index 85f83743b7ff..000000000000 |
| 32 |
--- a/x11-base/xorg-server/xorg-server-21.1.4-r1.ebuild |
| 33 |
+++ /dev/null |
| 34 |
@@ -1,195 +0,0 @@ |
| 35 |
-# Copyright 1999-2022 Gentoo Authors |
| 36 |
-# Distributed under the terms of the GNU General Public License v2 |
| 37 |
- |
| 38 |
-EAPI=8 |
| 39 |
- |
| 40 |
-XORG_TARBALL_SUFFIX="xz" |
| 41 |
-XORG_EAUTORECONF="no" |
| 42 |
-inherit flag-o-matic xorg-3 meson |
| 43 |
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" |
| 44 |
- |
| 45 |
-DESCRIPTION="X.Org X servers" |
| 46 |
-SLOT="0/${PV}" |
| 47 |
-if [[ ${PV} != 9999* ]]; then |
| 48 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
| 49 |
-fi |
| 50 |
- |
| 51 |
-IUSE_SERVERS="xephyr xnest xorg xvfb" |
| 52 |
-IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity" |
| 53 |
-RESTRICT="!test? ( test )" |
| 54 |
- |
| 55 |
-CDEPEND=" |
| 56 |
- media-libs/libglvnd[X] |
| 57 |
- dev-libs/libbsd |
| 58 |
- dev-libs/openssl:0= |
| 59 |
- >=x11-apps/iceauth-1.0.2 |
| 60 |
- >=x11-apps/rgb-1.0.3 |
| 61 |
- >=x11-apps/xauth-1.0.3 |
| 62 |
- x11-apps/xkbcomp |
| 63 |
- >=x11-libs/libdrm-2.4.89 |
| 64 |
- >=x11-libs/libpciaccess-0.12.901 |
| 65 |
- >=x11-libs/libXau-1.0.4 |
| 66 |
- >=x11-libs/libXdmcp-1.0.2 |
| 67 |
- >=x11-libs/libXfont2-2.0.1 |
| 68 |
- >=x11-libs/libxkbfile-1.0.4 |
| 69 |
- >=x11-libs/libxshmfence-1.1 |
| 70 |
- >=x11-libs/pixman-0.27.2 |
| 71 |
- >=x11-misc/xbitmaps-1.0.1 |
| 72 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
| 73 |
- xorg? ( |
| 74 |
- >=x11-libs/libxcvt-0.1.0 |
| 75 |
- ) |
| 76 |
- xnest? ( |
| 77 |
- >=x11-libs/libXext-1.0.99.4 |
| 78 |
- >=x11-libs/libX11-1.1.5 |
| 79 |
- ) |
| 80 |
- xephyr? ( |
| 81 |
- x11-libs/libxcb |
| 82 |
- x11-libs/xcb-util |
| 83 |
- x11-libs/xcb-util-image |
| 84 |
- x11-libs/xcb-util-keysyms |
| 85 |
- x11-libs/xcb-util-renderutil |
| 86 |
- x11-libs/xcb-util-wm |
| 87 |
- ) |
| 88 |
- !minimal? ( |
| 89 |
- >=media-libs/mesa-18[X(+),egl(+),gbm(+)] |
| 90 |
- >=media-libs/libepoxy-1.5.4[X,egl(+)] |
| 91 |
- ) |
| 92 |
- udev? ( virtual/libudev:= ) |
| 93 |
- unwind? ( sys-libs/libunwind:= ) |
| 94 |
- selinux? ( |
| 95 |
- sys-process/audit |
| 96 |
- sys-libs/libselinux:= |
| 97 |
- ) |
| 98 |
- systemd? ( |
| 99 |
- sys-apps/dbus |
| 100 |
- sys-apps/systemd |
| 101 |
- ) |
| 102 |
- elogind? ( |
| 103 |
- sys-apps/dbus |
| 104 |
- sys-auth/elogind[pam] |
| 105 |
- sys-auth/pambase[elogind] |
| 106 |
- ) |
| 107 |
- !!x11-drivers/nvidia-drivers[-libglvnd(+)] |
| 108 |
-" |
| 109 |
-DEPEND="${CDEPEND} |
| 110 |
- >=x11-base/xorg-proto-2021.4.99.2 |
| 111 |
- >=x11-libs/xtrans-1.3.5 |
| 112 |
- media-fonts/font-util |
| 113 |
- test? ( >=x11-libs/libxcvt-0.1.0 ) |
| 114 |
-" |
| 115 |
-RDEPEND="${CDEPEND} |
| 116 |
- !systemd? ( gui-libs/display-manager-init ) |
| 117 |
- selinux? ( sec-policy/selinux-xserver ) |
| 118 |
- xorg? ( >=x11-apps/xinit-1.3.3-r1 ) |
| 119 |
-" |
| 120 |
-BDEPEND=" |
| 121 |
- sys-devel/flex |
| 122 |
-" |
| 123 |
-PDEPEND=" |
| 124 |
- xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" |
| 125 |
- |
| 126 |
-REQUIRED_USE="!minimal? ( |
| 127 |
- || ( ${IUSE_SERVERS} ) |
| 128 |
- ) |
| 129 |
- elogind? ( udev ) |
| 130 |
- ?? ( elogind systemd )" |
| 131 |
- |
| 132 |
-UPSTREAMED_PATCHES=( |
| 133 |
- # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/953 |
| 134 |
- "${FILESDIR}"/${PN}-21.1.4-BadIDChoice.patch |
| 135 |
-) |
| 136 |
- |
| 137 |
-PATCHES=( |
| 138 |
- "${UPSTREAMED_PATCHES[@]}" |
| 139 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
| 140 |
- # needed for new eselect-opengl, bug #541232 |
| 141 |
- "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
| 142 |
-) |
| 143 |
- |
| 144 |
-src_configure() { |
| 145 |
- # bug #835653 |
| 146 |
- use x86 && replace-flags -Os -O2 |
| 147 |
- |
| 148 |
- # localstatedir is used for the log location; we need to override the default |
| 149 |
- # from ebuild.sh |
| 150 |
- # sysconfdir is used for the xorg.conf location; same applies |
| 151 |
- local emesonargs=( |
| 152 |
- --localstatedir "${EPREFIX}/var" |
| 153 |
- --sysconfdir "${EPREFIX}/etc/X11" |
| 154 |
- --buildtype $(usex debug debug plain) |
| 155 |
- -Db_ndebug=$(usex debug false true) |
| 156 |
- $(meson_use !minimal dri1) |
| 157 |
- $(meson_use !minimal dri2) |
| 158 |
- $(meson_use !minimal dri3) |
| 159 |
- $(meson_use !minimal glamor) |
| 160 |
- $(meson_use !minimal glx) |
| 161 |
- $(meson_use udev) |
| 162 |
- $(meson_use udev udev_kms) |
| 163 |
- $(meson_use unwind libunwind) |
| 164 |
- $(meson_use xcsecurity) |
| 165 |
- $(meson_use selinux xselinux) |
| 166 |
- $(meson_use xephyr) |
| 167 |
- $(meson_use xnest) |
| 168 |
- $(meson_use xorg) |
| 169 |
- $(meson_use xvfb) |
| 170 |
- -Ddocs=false |
| 171 |
- -Ddrm=true |
| 172 |
- -Ddtrace=false |
| 173 |
- -Dipv6=true |
| 174 |
- -Dhal=false |
| 175 |
- -Dlinux_acpi=false |
| 176 |
- -Dlinux_apm=false |
| 177 |
- -Dsecure-rpc=false |
| 178 |
- -Dsha1=libcrypto |
| 179 |
- -Dxkb_output_dir="${EPREFIX}/var/lib/xkb" |
| 180 |
- ) |
| 181 |
- |
| 182 |
- if [[ ${PV} == 9999 ]] ; then |
| 183 |
- # Gone in 21.1.x, but not in master. |
| 184 |
- emesonargs+=( -Dxwayland=false ) |
| 185 |
- fi |
| 186 |
- |
| 187 |
- if use systemd || use elogind; then |
| 188 |
- emesonargs+=( |
| 189 |
- -Dsystemd_logind=true |
| 190 |
- $(meson_use suid suid_wrapper) |
| 191 |
- ) |
| 192 |
- else |
| 193 |
- emesonargs+=( |
| 194 |
- -Dsystemd_logind=false |
| 195 |
- -Dsuid_wrapper=false |
| 196 |
- ) |
| 197 |
- fi |
| 198 |
- |
| 199 |
- meson_src_configure |
| 200 |
-} |
| 201 |
- |
| 202 |
-src_install() { |
| 203 |
- meson_src_install |
| 204 |
- |
| 205 |
- # The meson build system does not support install-setuid |
| 206 |
- if ! use systemd && ! use elogind; then |
| 207 |
- if use suid; then |
| 208 |
- chmod u+s "${ED}"/usr/bin/Xorg |
| 209 |
- fi |
| 210 |
- fi |
| 211 |
- |
| 212 |
- if ! use xorg; then |
| 213 |
- rm -f "${ED}"/usr/share/man/man1/Xserver.1x \ |
| 214 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
| 215 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
| 216 |
- "${ED}"/usr/share/man/man1/Xserver.1x || die |
| 217 |
- fi |
| 218 |
- |
| 219 |
- # install the @x11-module-rebuild set for Portage |
| 220 |
- insinto /usr/share/portage/config/sets |
| 221 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
| 222 |
-} |
| 223 |
- |
| 224 |
-pkg_postrm() { |
| 225 |
- # Get rid of module dir to ensure opengl-update works properly |
| 226 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
| 227 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
| 228 |
- fi |
| 229 |
-} |
| 230 |
|
| 231 |
diff --git a/x11-base/xorg-server/xorg-server-21.1.4.ebuild b/x11-base/xorg-server/xorg-server-21.1.4.ebuild |
| 232 |
deleted file mode 100644 |
| 233 |
index c43a56374d07..000000000000 |
| 234 |
--- a/x11-base/xorg-server/xorg-server-21.1.4.ebuild |
| 235 |
+++ /dev/null |
| 236 |
@@ -1,190 +0,0 @@ |
| 237 |
-# Copyright 1999-2022 Gentoo Authors |
| 238 |
-# Distributed under the terms of the GNU General Public License v2 |
| 239 |
- |
| 240 |
-EAPI=8 |
| 241 |
- |
| 242 |
-XORG_TARBALL_SUFFIX="xz" |
| 243 |
-XORG_EAUTORECONF="no" |
| 244 |
-inherit flag-o-matic xorg-3 meson |
| 245 |
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" |
| 246 |
- |
| 247 |
-DESCRIPTION="X.Org X servers" |
| 248 |
-SLOT="0/${PV}" |
| 249 |
-if [[ ${PV} != 9999* ]]; then |
| 250 |
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" |
| 251 |
-fi |
| 252 |
- |
| 253 |
-IUSE_SERVERS="xephyr xnest xorg xvfb" |
| 254 |
-IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity" |
| 255 |
-RESTRICT="!test? ( test )" |
| 256 |
- |
| 257 |
-CDEPEND=" |
| 258 |
- media-libs/libglvnd[X] |
| 259 |
- dev-libs/libbsd |
| 260 |
- dev-libs/openssl:0= |
| 261 |
- >=x11-apps/iceauth-1.0.2 |
| 262 |
- >=x11-apps/rgb-1.0.3 |
| 263 |
- >=x11-apps/xauth-1.0.3 |
| 264 |
- x11-apps/xkbcomp |
| 265 |
- >=x11-libs/libdrm-2.4.89 |
| 266 |
- >=x11-libs/libpciaccess-0.12.901 |
| 267 |
- >=x11-libs/libXau-1.0.4 |
| 268 |
- >=x11-libs/libXdmcp-1.0.2 |
| 269 |
- >=x11-libs/libXfont2-2.0.1 |
| 270 |
- >=x11-libs/libxkbfile-1.0.4 |
| 271 |
- >=x11-libs/libxshmfence-1.1 |
| 272 |
- >=x11-libs/pixman-0.27.2 |
| 273 |
- >=x11-misc/xbitmaps-1.0.1 |
| 274 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
| 275 |
- xorg? ( |
| 276 |
- >=x11-libs/libxcvt-0.1.0 |
| 277 |
- ) |
| 278 |
- xnest? ( |
| 279 |
- >=x11-libs/libXext-1.0.99.4 |
| 280 |
- >=x11-libs/libX11-1.1.5 |
| 281 |
- ) |
| 282 |
- xephyr? ( |
| 283 |
- x11-libs/libxcb[xkb] |
| 284 |
- x11-libs/xcb-util |
| 285 |
- x11-libs/xcb-util-image |
| 286 |
- x11-libs/xcb-util-keysyms |
| 287 |
- x11-libs/xcb-util-renderutil |
| 288 |
- x11-libs/xcb-util-wm |
| 289 |
- ) |
| 290 |
- !minimal? ( |
| 291 |
- >=media-libs/mesa-18[X(+),egl(+),gbm(+)] |
| 292 |
- >=media-libs/libepoxy-1.5.4[X,egl(+)] |
| 293 |
- ) |
| 294 |
- udev? ( virtual/libudev:= ) |
| 295 |
- unwind? ( sys-libs/libunwind:= ) |
| 296 |
- selinux? ( |
| 297 |
- sys-process/audit |
| 298 |
- sys-libs/libselinux:= |
| 299 |
- ) |
| 300 |
- systemd? ( |
| 301 |
- sys-apps/dbus |
| 302 |
- sys-apps/systemd |
| 303 |
- ) |
| 304 |
- elogind? ( |
| 305 |
- sys-apps/dbus |
| 306 |
- sys-auth/elogind[pam] |
| 307 |
- sys-auth/pambase[elogind] |
| 308 |
- ) |
| 309 |
- !!x11-drivers/nvidia-drivers[-libglvnd(+)] |
| 310 |
-" |
| 311 |
-DEPEND="${CDEPEND} |
| 312 |
- >=x11-base/xorg-proto-2021.4.99.2 |
| 313 |
- >=x11-libs/xtrans-1.3.5 |
| 314 |
- media-fonts/font-util |
| 315 |
- test? ( >=x11-libs/libxcvt-0.1.0 ) |
| 316 |
-" |
| 317 |
-RDEPEND="${CDEPEND} |
| 318 |
- !systemd? ( gui-libs/display-manager-init ) |
| 319 |
- selinux? ( sec-policy/selinux-xserver ) |
| 320 |
- xorg? ( >=x11-apps/xinit-1.3.3-r1 ) |
| 321 |
-" |
| 322 |
-BDEPEND=" |
| 323 |
- sys-devel/flex |
| 324 |
-" |
| 325 |
-PDEPEND=" |
| 326 |
- xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" |
| 327 |
- |
| 328 |
-REQUIRED_USE="!minimal? ( |
| 329 |
- || ( ${IUSE_SERVERS} ) |
| 330 |
- ) |
| 331 |
- elogind? ( udev ) |
| 332 |
- ?? ( elogind systemd )" |
| 333 |
- |
| 334 |
-PATCHES=( |
| 335 |
- "${UPSTREAMED_PATCHES[@]}" |
| 336 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
| 337 |
- # needed for new eselect-opengl, bug #541232 |
| 338 |
- "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
| 339 |
-) |
| 340 |
- |
| 341 |
-src_configure() { |
| 342 |
- # bug #835653 |
| 343 |
- use x86 && replace-flags -Os -O2 |
| 344 |
- |
| 345 |
- # localstatedir is used for the log location; we need to override the default |
| 346 |
- # from ebuild.sh |
| 347 |
- # sysconfdir is used for the xorg.conf location; same applies |
| 348 |
- local emesonargs=( |
| 349 |
- --localstatedir "${EPREFIX}/var" |
| 350 |
- --sysconfdir "${EPREFIX}/etc/X11" |
| 351 |
- --buildtype $(usex debug debug plain) |
| 352 |
- -Db_ndebug=$(usex debug false true) |
| 353 |
- $(meson_use !minimal dri1) |
| 354 |
- $(meson_use !minimal dri2) |
| 355 |
- $(meson_use !minimal dri3) |
| 356 |
- $(meson_use !minimal glamor) |
| 357 |
- $(meson_use !minimal glx) |
| 358 |
- $(meson_use udev) |
| 359 |
- $(meson_use udev udev_kms) |
| 360 |
- $(meson_use unwind libunwind) |
| 361 |
- $(meson_use xcsecurity) |
| 362 |
- $(meson_use selinux xselinux) |
| 363 |
- $(meson_use xephyr) |
| 364 |
- $(meson_use xnest) |
| 365 |
- $(meson_use xorg) |
| 366 |
- $(meson_use xvfb) |
| 367 |
- -Ddocs=false |
| 368 |
- -Ddrm=true |
| 369 |
- -Ddtrace=false |
| 370 |
- -Dipv6=true |
| 371 |
- -Dhal=false |
| 372 |
- -Dlinux_acpi=false |
| 373 |
- -Dlinux_apm=false |
| 374 |
- -Dsecure-rpc=false |
| 375 |
- -Dsha1=libcrypto |
| 376 |
- -Dxkb_output_dir="${EPREFIX}/var/lib/xkb" |
| 377 |
- ) |
| 378 |
- |
| 379 |
- if [[ ${PV} == 9999 ]] ; then |
| 380 |
- # Gone in 21.1.x, but not in master. |
| 381 |
- emesonargs+=( -Dxwayland=false ) |
| 382 |
- fi |
| 383 |
- |
| 384 |
- if use systemd || use elogind; then |
| 385 |
- emesonargs+=( |
| 386 |
- -Dsystemd_logind=true |
| 387 |
- $(meson_use suid suid_wrapper) |
| 388 |
- ) |
| 389 |
- else |
| 390 |
- emesonargs+=( |
| 391 |
- -Dsystemd_logind=false |
| 392 |
- -Dsuid_wrapper=false |
| 393 |
- ) |
| 394 |
- fi |
| 395 |
- |
| 396 |
- meson_src_configure |
| 397 |
-} |
| 398 |
- |
| 399 |
-src_install() { |
| 400 |
- meson_src_install |
| 401 |
- |
| 402 |
- # The meson build system does not support install-setuid |
| 403 |
- if ! use systemd && ! use elogind; then |
| 404 |
- if use suid; then |
| 405 |
- chmod u+s "${ED}"/usr/bin/Xorg |
| 406 |
- fi |
| 407 |
- fi |
| 408 |
- |
| 409 |
- if ! use xorg; then |
| 410 |
- rm -f "${ED}"/usr/share/man/man1/Xserver.1x \ |
| 411 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
| 412 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
| 413 |
- "${ED}"/usr/share/man/man1/Xserver.1x || die |
| 414 |
- fi |
| 415 |
- |
| 416 |
- # install the @x11-module-rebuild set for Portage |
| 417 |
- insinto /usr/share/portage/config/sets |
| 418 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
| 419 |
-} |
| 420 |
- |
| 421 |
-pkg_postrm() { |
| 422 |
- # Get rid of module dir to ensure opengl-update works properly |
| 423 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
| 424 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
| 425 |
- fi |
| 426 |
-} |
| 427 |
|
| 428 |
diff --git a/x11-base/xorg-server/xorg-server-21.1.5.ebuild b/x11-base/xorg-server/xorg-server-21.1.5.ebuild |
| 429 |
deleted file mode 100644 |
| 430 |
index 85f83743b7ff..000000000000 |
| 431 |
--- a/x11-base/xorg-server/xorg-server-21.1.5.ebuild |
| 432 |
+++ /dev/null |
| 433 |
@@ -1,195 +0,0 @@ |
| 434 |
-# Copyright 1999-2022 Gentoo Authors |
| 435 |
-# Distributed under the terms of the GNU General Public License v2 |
| 436 |
- |
| 437 |
-EAPI=8 |
| 438 |
- |
| 439 |
-XORG_TARBALL_SUFFIX="xz" |
| 440 |
-XORG_EAUTORECONF="no" |
| 441 |
-inherit flag-o-matic xorg-3 meson |
| 442 |
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" |
| 443 |
- |
| 444 |
-DESCRIPTION="X.Org X servers" |
| 445 |
-SLOT="0/${PV}" |
| 446 |
-if [[ ${PV} != 9999* ]]; then |
| 447 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
| 448 |
-fi |
| 449 |
- |
| 450 |
-IUSE_SERVERS="xephyr xnest xorg xvfb" |
| 451 |
-IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity" |
| 452 |
-RESTRICT="!test? ( test )" |
| 453 |
- |
| 454 |
-CDEPEND=" |
| 455 |
- media-libs/libglvnd[X] |
| 456 |
- dev-libs/libbsd |
| 457 |
- dev-libs/openssl:0= |
| 458 |
- >=x11-apps/iceauth-1.0.2 |
| 459 |
- >=x11-apps/rgb-1.0.3 |
| 460 |
- >=x11-apps/xauth-1.0.3 |
| 461 |
- x11-apps/xkbcomp |
| 462 |
- >=x11-libs/libdrm-2.4.89 |
| 463 |
- >=x11-libs/libpciaccess-0.12.901 |
| 464 |
- >=x11-libs/libXau-1.0.4 |
| 465 |
- >=x11-libs/libXdmcp-1.0.2 |
| 466 |
- >=x11-libs/libXfont2-2.0.1 |
| 467 |
- >=x11-libs/libxkbfile-1.0.4 |
| 468 |
- >=x11-libs/libxshmfence-1.1 |
| 469 |
- >=x11-libs/pixman-0.27.2 |
| 470 |
- >=x11-misc/xbitmaps-1.0.1 |
| 471 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
| 472 |
- xorg? ( |
| 473 |
- >=x11-libs/libxcvt-0.1.0 |
| 474 |
- ) |
| 475 |
- xnest? ( |
| 476 |
- >=x11-libs/libXext-1.0.99.4 |
| 477 |
- >=x11-libs/libX11-1.1.5 |
| 478 |
- ) |
| 479 |
- xephyr? ( |
| 480 |
- x11-libs/libxcb |
| 481 |
- x11-libs/xcb-util |
| 482 |
- x11-libs/xcb-util-image |
| 483 |
- x11-libs/xcb-util-keysyms |
| 484 |
- x11-libs/xcb-util-renderutil |
| 485 |
- x11-libs/xcb-util-wm |
| 486 |
- ) |
| 487 |
- !minimal? ( |
| 488 |
- >=media-libs/mesa-18[X(+),egl(+),gbm(+)] |
| 489 |
- >=media-libs/libepoxy-1.5.4[X,egl(+)] |
| 490 |
- ) |
| 491 |
- udev? ( virtual/libudev:= ) |
| 492 |
- unwind? ( sys-libs/libunwind:= ) |
| 493 |
- selinux? ( |
| 494 |
- sys-process/audit |
| 495 |
- sys-libs/libselinux:= |
| 496 |
- ) |
| 497 |
- systemd? ( |
| 498 |
- sys-apps/dbus |
| 499 |
- sys-apps/systemd |
| 500 |
- ) |
| 501 |
- elogind? ( |
| 502 |
- sys-apps/dbus |
| 503 |
- sys-auth/elogind[pam] |
| 504 |
- sys-auth/pambase[elogind] |
| 505 |
- ) |
| 506 |
- !!x11-drivers/nvidia-drivers[-libglvnd(+)] |
| 507 |
-" |
| 508 |
-DEPEND="${CDEPEND} |
| 509 |
- >=x11-base/xorg-proto-2021.4.99.2 |
| 510 |
- >=x11-libs/xtrans-1.3.5 |
| 511 |
- media-fonts/font-util |
| 512 |
- test? ( >=x11-libs/libxcvt-0.1.0 ) |
| 513 |
-" |
| 514 |
-RDEPEND="${CDEPEND} |
| 515 |
- !systemd? ( gui-libs/display-manager-init ) |
| 516 |
- selinux? ( sec-policy/selinux-xserver ) |
| 517 |
- xorg? ( >=x11-apps/xinit-1.3.3-r1 ) |
| 518 |
-" |
| 519 |
-BDEPEND=" |
| 520 |
- sys-devel/flex |
| 521 |
-" |
| 522 |
-PDEPEND=" |
| 523 |
- xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" |
| 524 |
- |
| 525 |
-REQUIRED_USE="!minimal? ( |
| 526 |
- || ( ${IUSE_SERVERS} ) |
| 527 |
- ) |
| 528 |
- elogind? ( udev ) |
| 529 |
- ?? ( elogind systemd )" |
| 530 |
- |
| 531 |
-UPSTREAMED_PATCHES=( |
| 532 |
- # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/953 |
| 533 |
- "${FILESDIR}"/${PN}-21.1.4-BadIDChoice.patch |
| 534 |
-) |
| 535 |
- |
| 536 |
-PATCHES=( |
| 537 |
- "${UPSTREAMED_PATCHES[@]}" |
| 538 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
| 539 |
- # needed for new eselect-opengl, bug #541232 |
| 540 |
- "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
| 541 |
-) |
| 542 |
- |
| 543 |
-src_configure() { |
| 544 |
- # bug #835653 |
| 545 |
- use x86 && replace-flags -Os -O2 |
| 546 |
- |
| 547 |
- # localstatedir is used for the log location; we need to override the default |
| 548 |
- # from ebuild.sh |
| 549 |
- # sysconfdir is used for the xorg.conf location; same applies |
| 550 |
- local emesonargs=( |
| 551 |
- --localstatedir "${EPREFIX}/var" |
| 552 |
- --sysconfdir "${EPREFIX}/etc/X11" |
| 553 |
- --buildtype $(usex debug debug plain) |
| 554 |
- -Db_ndebug=$(usex debug false true) |
| 555 |
- $(meson_use !minimal dri1) |
| 556 |
- $(meson_use !minimal dri2) |
| 557 |
- $(meson_use !minimal dri3) |
| 558 |
- $(meson_use !minimal glamor) |
| 559 |
- $(meson_use !minimal glx) |
| 560 |
- $(meson_use udev) |
| 561 |
- $(meson_use udev udev_kms) |
| 562 |
- $(meson_use unwind libunwind) |
| 563 |
- $(meson_use xcsecurity) |
| 564 |
- $(meson_use selinux xselinux) |
| 565 |
- $(meson_use xephyr) |
| 566 |
- $(meson_use xnest) |
| 567 |
- $(meson_use xorg) |
| 568 |
- $(meson_use xvfb) |
| 569 |
- -Ddocs=false |
| 570 |
- -Ddrm=true |
| 571 |
- -Ddtrace=false |
| 572 |
- -Dipv6=true |
| 573 |
- -Dhal=false |
| 574 |
- -Dlinux_acpi=false |
| 575 |
- -Dlinux_apm=false |
| 576 |
- -Dsecure-rpc=false |
| 577 |
- -Dsha1=libcrypto |
| 578 |
- -Dxkb_output_dir="${EPREFIX}/var/lib/xkb" |
| 579 |
- ) |
| 580 |
- |
| 581 |
- if [[ ${PV} == 9999 ]] ; then |
| 582 |
- # Gone in 21.1.x, but not in master. |
| 583 |
- emesonargs+=( -Dxwayland=false ) |
| 584 |
- fi |
| 585 |
- |
| 586 |
- if use systemd || use elogind; then |
| 587 |
- emesonargs+=( |
| 588 |
- -Dsystemd_logind=true |
| 589 |
- $(meson_use suid suid_wrapper) |
| 590 |
- ) |
| 591 |
- else |
| 592 |
- emesonargs+=( |
| 593 |
- -Dsystemd_logind=false |
| 594 |
- -Dsuid_wrapper=false |
| 595 |
- ) |
| 596 |
- fi |
| 597 |
- |
| 598 |
- meson_src_configure |
| 599 |
-} |
| 600 |
- |
| 601 |
-src_install() { |
| 602 |
- meson_src_install |
| 603 |
- |
| 604 |
- # The meson build system does not support install-setuid |
| 605 |
- if ! use systemd && ! use elogind; then |
| 606 |
- if use suid; then |
| 607 |
- chmod u+s "${ED}"/usr/bin/Xorg |
| 608 |
- fi |
| 609 |
- fi |
| 610 |
- |
| 611 |
- if ! use xorg; then |
| 612 |
- rm -f "${ED}"/usr/share/man/man1/Xserver.1x \ |
| 613 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
| 614 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
| 615 |
- "${ED}"/usr/share/man/man1/Xserver.1x || die |
| 616 |
- fi |
| 617 |
- |
| 618 |
- # install the @x11-module-rebuild set for Portage |
| 619 |
- insinto /usr/share/portage/config/sets |
| 620 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
| 621 |
-} |
| 622 |
- |
| 623 |
-pkg_postrm() { |
| 624 |
- # Get rid of module dir to ensure opengl-update works properly |
| 625 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
| 626 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
| 627 |
- fi |
| 628 |
-} |
Archives