| 1 |
commit: 7ea61cf437d63cee4fb62cfe3da1d2f2993f2696 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 1 18:01:58 2020 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 1 18:04:59 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ea61cf4 |
| 7 |
|
| 8 |
x11-base/xorg-server: Drop old versions |
| 9 |
|
| 10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 11 |
|
| 12 |
profiles/package.mask | 4 - |
| 13 |
x11-base/xorg-server/Manifest | 1 - |
| 14 |
x11-base/xorg-server/xorg-server-1.20.9.ebuild | 238 ------------------------- |
| 15 |
3 files changed, 243 deletions(-) |
| 16 |
|
| 17 |
diff --git a/profiles/package.mask b/profiles/package.mask |
| 18 |
index 9214771c144..fc77001eafc 100644 |
| 19 |
--- a/profiles/package.mask |
| 20 |
+++ b/profiles/package.mask |
| 21 |
@@ -644,10 +644,6 @@ games-strategy/0ad |
| 22 |
~app-i18n/scim-sunpinyin-3.0.0_rc1 |
| 23 |
~app-i18n/xsunpinyin-3.0.0_rc1 |
| 24 |
|
| 25 |
-# Piotr Karbowski <slashbeast@g.o> (2020-08-28) |
| 26 |
-# Temporary mask due to multiple reports of segfaults at startup, bug #739056 |
| 27 |
-=x11-base/xorg-server-1.20.9 |
| 28 |
- |
| 29 |
# Alfredo Tupone <tupone@g.o> (2020-08-23) |
| 30 |
# Ported to py3 but not yet released |
| 31 |
# Masked to allow py2.7 removal |
| 32 |
|
| 33 |
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest |
| 34 |
index adc51a5ba13..08a6911abe0 100644 |
| 35 |
--- a/x11-base/xorg-server/Manifest |
| 36 |
+++ b/x11-base/xorg-server/Manifest |
| 37 |
@@ -1,3 +1,2 @@ |
| 38 |
DIST xorg-server-1.20.10.tar.bz2 6307058 BLAKE2B 13306e5f4f7f2b4531f2af5103337defa1d441bff78f20ea4d564a7d046ee546406812b6836fe94ca9323189382754270989b2ac7ded8950ddb2b15562c6ff21 SHA512 a07bee380bb72f2117fe6f831a6e4aded19bea1f2b36e42a019a30348e98d6fe65c0617cf819be9c6b405502f88cafb829df30aab32393774b71f1418a4cefae |
| 39 |
DIST xorg-server-1.20.8.tar.bz2 6309640 BLAKE2B 0dadd3a7afdb768bcd79f99f3670f7efcb919c43ea88870c93df598b080fbbec48f88cfa996fb7bff2363cffe70d42d9b154855691a64ddb26156f1b378512a0 SHA512 ab0ec0fcbf490c61558b9297f61b58fd2dedb676c78bef6431dc9166054743b43a0091b88a8b3f4e81d1f539909440ee7e188a298cefabe13ea89159639cd805 |
| 40 |
-DIST xorg-server-1.20.9.tar.bz2 6302902 BLAKE2B b5d78f38dcf6a9af980a8d5caab751bd7b159a4af5503f176c5af87cce371ecc71572af67f99f08b5794410d2e9a32379ed0d70ceda9f9e2ed3eb6de3bb5fb72 SHA512 d9b5f93e1b9763a89187d8b272aa7d4ce9709641b8539f4536708af153310e5a4931bffd4229c51a3b0e3b12da7838750aa71b635751fb4c0bb27438cce4e5e6 |
| 41 |
|
| 42 |
diff --git a/x11-base/xorg-server/xorg-server-1.20.9.ebuild b/x11-base/xorg-server/xorg-server-1.20.9.ebuild |
| 43 |
deleted file mode 100644 |
| 44 |
index e7dc1b76401..00000000000 |
| 45 |
--- a/x11-base/xorg-server/xorg-server-1.20.9.ebuild |
| 46 |
+++ /dev/null |
| 47 |
@@ -1,238 +0,0 @@ |
| 48 |
-# Copyright 1999-2020 Gentoo Authors |
| 49 |
-# Distributed under the terms of the GNU General Public License v2 |
| 50 |
- |
| 51 |
-EAPI=7 |
| 52 |
- |
| 53 |
-XORG_DOC=doc |
| 54 |
-inherit xorg-3 multilib flag-o-matic toolchain-funcs |
| 55 |
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" |
| 56 |
- |
| 57 |
-DESCRIPTION="X.Org X servers" |
| 58 |
-SLOT="0/${PV}" |
| 59 |
-if [[ ${PV} != 9999* ]]; then |
| 60 |
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" |
| 61 |
-fi |
| 62 |
- |
| 63 |
-IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" |
| 64 |
-IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl +libglvnd minimal selinux suid systemd +udev unwind xcsecurity" |
| 65 |
- |
| 66 |
-CDEPEND="libglvnd? ( |
| 67 |
- media-libs/libglvnd[X] |
| 68 |
- !app-eselect/eselect-opengl |
| 69 |
- !!x11-drivers/nvidia-drivers[-libglvnd(-)] |
| 70 |
- ) |
| 71 |
- !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) |
| 72 |
- !libressl? ( dev-libs/openssl:0= ) |
| 73 |
- libressl? ( dev-libs/libressl:0= ) |
| 74 |
- >=x11-apps/iceauth-1.0.2 |
| 75 |
- >=x11-apps/rgb-1.0.3 |
| 76 |
- >=x11-apps/xauth-1.0.3 |
| 77 |
- x11-apps/xkbcomp |
| 78 |
- >=x11-libs/libdrm-2.4.89 |
| 79 |
- >=x11-libs/libpciaccess-0.12.901 |
| 80 |
- >=x11-libs/libXau-1.0.4 |
| 81 |
- >=x11-libs/libXdmcp-1.0.2 |
| 82 |
- >=x11-libs/libXfont2-2.0.1 |
| 83 |
- >=x11-libs/libxkbfile-1.0.4 |
| 84 |
- >=x11-libs/libxshmfence-1.1 |
| 85 |
- >=x11-libs/pixman-0.27.2 |
| 86 |
- >=x11-libs/xtrans-1.3.5 |
| 87 |
- >=x11-misc/xbitmaps-1.0.1 |
| 88 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
| 89 |
- dmx? ( |
| 90 |
- x11-libs/libXt |
| 91 |
- >=x11-libs/libdmx-1.0.99.1 |
| 92 |
- >=x11-libs/libX11-1.1.5 |
| 93 |
- >=x11-libs/libXaw-1.0.4 |
| 94 |
- >=x11-libs/libXext-1.0.99.4 |
| 95 |
- >=x11-libs/libXfixes-5.0 |
| 96 |
- >=x11-libs/libXi-1.2.99.1 |
| 97 |
- >=x11-libs/libXmu-1.0.3 |
| 98 |
- x11-libs/libXrender |
| 99 |
- >=x11-libs/libXres-1.0.3 |
| 100 |
- >=x11-libs/libXtst-1.0.99.2 |
| 101 |
- ) |
| 102 |
- kdrive? ( |
| 103 |
- >=x11-libs/libXext-1.0.5 |
| 104 |
- x11-libs/libXv |
| 105 |
- ) |
| 106 |
- xephyr? ( |
| 107 |
- x11-libs/libxcb[xkb] |
| 108 |
- x11-libs/xcb-util |
| 109 |
- x11-libs/xcb-util-image |
| 110 |
- x11-libs/xcb-util-keysyms |
| 111 |
- x11-libs/xcb-util-renderutil |
| 112 |
- x11-libs/xcb-util-wm |
| 113 |
- ) |
| 114 |
- !minimal? ( |
| 115 |
- >=x11-libs/libX11-1.1.5 |
| 116 |
- >=x11-libs/libXext-1.0.5 |
| 117 |
- >=media-libs/mesa-18[X(+),egl,gbm] |
| 118 |
- >=media-libs/libepoxy-1.5.4[X,egl(+)] |
| 119 |
- ) |
| 120 |
- udev? ( virtual/libudev:= ) |
| 121 |
- unwind? ( sys-libs/libunwind ) |
| 122 |
- wayland? ( |
| 123 |
- >=dev-libs/wayland-1.3.0 |
| 124 |
- >=media-libs/libepoxy-1.5.4[egl(+)] |
| 125 |
- >=dev-libs/wayland-protocols-1.18 |
| 126 |
- ) |
| 127 |
- >=x11-apps/xinit-1.3.3-r1 |
| 128 |
- systemd? ( |
| 129 |
- sys-apps/dbus |
| 130 |
- sys-apps/systemd |
| 131 |
- ) |
| 132 |
- elogind? ( |
| 133 |
- sys-apps/dbus |
| 134 |
- sys-auth/elogind[pam] |
| 135 |
- sys-auth/pambase[elogind] |
| 136 |
- ) |
| 137 |
- " |
| 138 |
- |
| 139 |
-DEPEND="${CDEPEND} |
| 140 |
- sys-devel/flex |
| 141 |
- >=x11-base/xorg-proto-2018.4 |
| 142 |
- dmx? ( |
| 143 |
- doc? ( |
| 144 |
- || ( |
| 145 |
- www-client/links |
| 146 |
- www-client/lynx |
| 147 |
- www-client/w3m |
| 148 |
- ) |
| 149 |
- ) |
| 150 |
- )" |
| 151 |
- |
| 152 |
-RDEPEND="${CDEPEND} |
| 153 |
- selinux? ( sec-policy/selinux-xserver ) |
| 154 |
-" |
| 155 |
- |
| 156 |
-PDEPEND=" |
| 157 |
- xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" |
| 158 |
- |
| 159 |
-REQUIRED_USE="!minimal? ( |
| 160 |
- || ( ${IUSE_SERVERS} ) |
| 161 |
- ) |
| 162 |
- elogind? ( udev ) |
| 163 |
- ?? ( elogind systemd ) |
| 164 |
- minimal? ( !wayland ) |
| 165 |
- xephyr? ( kdrive )" |
| 166 |
- |
| 167 |
-UPSTREAMED_PATCHES=( |
| 168 |
-) |
| 169 |
- |
| 170 |
-PATCHES=( |
| 171 |
- "${UPSTREAMED_PATCHES[@]}" |
| 172 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
| 173 |
- # needed for new eselect-opengl, bug #541232 |
| 174 |
- "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
| 175 |
-) |
| 176 |
- |
| 177 |
-pkg_setup() { |
| 178 |
- if use wayland && use minimal; then |
| 179 |
- ewarn "glamor is necessary for acceleration under Xwayland." |
| 180 |
- ewarn "Performance may be unacceptable without it." |
| 181 |
- ewarn "Build with USE=-minimal to enable glamor." |
| 182 |
- fi |
| 183 |
- |
| 184 |
- # localstatedir is used for the log location; we need to override the default |
| 185 |
- # from ebuild.sh |
| 186 |
- # sysconfdir is used for the xorg.conf location; same applies |
| 187 |
- # NOTE: fop is used for doc generating; and I have no idea if Gentoo |
| 188 |
- # package it somewhere |
| 189 |
- XORG_CONFIGURE_OPTIONS=( |
| 190 |
- $(use_enable ipv6) |
| 191 |
- $(use_enable debug) |
| 192 |
- $(use_enable dmx) |
| 193 |
- $(use_enable kdrive) |
| 194 |
- $(use_enable unwind libunwind) |
| 195 |
- $(use_enable wayland xwayland) |
| 196 |
- $(use_enable !minimal record) |
| 197 |
- $(use_enable !minimal xfree86-utils) |
| 198 |
- $(use_enable !minimal dri) |
| 199 |
- $(use_enable !minimal dri2) |
| 200 |
- $(use_enable !minimal dri3) |
| 201 |
- $(use_enable !minimal glamor) |
| 202 |
- $(use_enable !minimal glx) |
| 203 |
- $(use_enable xcsecurity) |
| 204 |
- $(use_enable xephyr) |
| 205 |
- $(use_enable xnest) |
| 206 |
- $(use_enable xorg) |
| 207 |
- $(use_enable xvfb) |
| 208 |
- $(use_enable udev config-udev) |
| 209 |
- $(use_with doc doxygen) |
| 210 |
- $(use_with doc xmlto) |
| 211 |
- $(use_with systemd systemd-daemon) |
| 212 |
- --enable-libdrm |
| 213 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
| 214 |
- --localstatedir="${EPREFIX}"/var |
| 215 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
| 216 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
| 217 |
- --disable-config-hal |
| 218 |
- --disable-linux-acpi |
| 219 |
- --without-dtrace |
| 220 |
- --without-fop |
| 221 |
- --with-os-vendor=Gentoo |
| 222 |
- --with-sha1=libcrypto |
| 223 |
- CPP="$(tc-getPROG CPP cpp)" |
| 224 |
- ) |
| 225 |
- |
| 226 |
- if use systemd || use elogind; then |
| 227 |
- XORG_CONFIGURE_OPTIONS+=( |
| 228 |
- "--enable-systemd-logind" |
| 229 |
- "--disable-install-setuid" |
| 230 |
- "$(use_enable suid suid-wrapper)" |
| 231 |
- ) |
| 232 |
- else |
| 233 |
- XORG_CONFIGURE_OPTIONS+=( |
| 234 |
- "--disable-systemd-logind" |
| 235 |
- "--disable-suid-wrapper" |
| 236 |
- "$(use_enable suid install-setuid)" |
| 237 |
- ) |
| 238 |
- fi |
| 239 |
-} |
| 240 |
- |
| 241 |
-src_install() { |
| 242 |
- xorg-3_src_install |
| 243 |
- |
| 244 |
- server_based_install |
| 245 |
- |
| 246 |
- if ! use minimal && use xorg; then |
| 247 |
- # Install xorg.conf.example into docs |
| 248 |
- dodoc "${S}"/hw/xfree86/xorg.conf.example |
| 249 |
- fi |
| 250 |
- |
| 251 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
| 252 |
- newinitd "${FILESDIR}"/xdm.initd-11 xdm |
| 253 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
| 254 |
- |
| 255 |
- # install the @x11-module-rebuild set for Portage |
| 256 |
- insinto /usr/share/portage/config/sets |
| 257 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
| 258 |
- |
| 259 |
- find "${ED}"/var -type d -empty -delete || die |
| 260 |
-} |
| 261 |
- |
| 262 |
-pkg_postinst() { |
| 263 |
- if ! use minimal; then |
| 264 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
| 265 |
- if ! use libglvnd; then |
| 266 |
- eselect opengl set xorg-x11 --use-old |
| 267 |
- fi |
| 268 |
- fi |
| 269 |
-} |
| 270 |
- |
| 271 |
-pkg_postrm() { |
| 272 |
- # Get rid of module dir to ensure opengl-update works properly |
| 273 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
| 274 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
| 275 |
- fi |
| 276 |
-} |
| 277 |
- |
| 278 |
-server_based_install() { |
| 279 |
- if ! use xorg; then |
| 280 |
- rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
| 281 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
| 282 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
| 283 |
- "${ED}"/usr/share/man/man1/Xserver.1x |
| 284 |
- fi |
| 285 |
-} |
Archives