| 1 |
commit: a131fae8ab65018816e6e5f284a2cd508be9bf17 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 1 19:28:49 2018 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 1 19:56:55 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a131fae8 |
| 7 |
|
| 8 |
x11-base/xorg-server: Remove version 1.19.6 |
| 9 |
|
| 10 |
1.19.6 contains various regressions vs 1.19.5. Now that 1.20-rc1 is |
| 11 |
in-tree, get rid of this version. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/646390 |
| 14 |
Closes: https://bugs.gentoo.org/646450 |
| 15 |
Closes: https://bugs.gentoo.org/647288 |
| 16 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 17 |
|
| 18 |
x11-base/xorg-server/Manifest | 1 - |
| 19 |
x11-base/xorg-server/xorg-server-1.19.6-r1.ebuild | 250 ---------------------- |
| 20 |
2 files changed, 251 deletions(-) |
| 21 |
|
| 22 |
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest |
| 23 |
index 843e283419d..86480bf8201 100644 |
| 24 |
--- a/x11-base/xorg-server/Manifest |
| 25 |
+++ b/x11-base/xorg-server/Manifest |
| 26 |
@@ -1,3 +1,2 @@ |
| 27 |
DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c |
| 28 |
-DIST xorg-server-1.19.6.tar.bz2 5984528 BLAKE2B 7aaef0bccbfef669ea5e78faabf736e8ab4f460079b7b12b58a642dd9cb42ad4b6c662a6e8671bfc41e697561c856cb663dfbe9cbdf3a4e67d800f2e98c253f6 SHA512 38519a8d0af9dd034045fc346959496dd718fa59b6188307974797a1cd9c349deb54987f6232ea8396baf810dcc710c0ff191f76ed2186cae4d44921b3680412 |
| 29 |
DIST xorg-server-1.19.99.901.tar.bz2 6131851 BLAKE2B 5b3588fe7c42d10eb89fa4ebea5ab6f2c7fb25f876ec6a5c5b523062f5c712c52c20767aa60b607847b50aa12ec75307b8715d63aa92331b70a1971c8d740670 SHA512 c2fbe4868788cd0d6d5fe546acb8c2ddec39ac3e851f352ee438a785a248a048a87073972f51ff98ef36a35a6753f8c2f22c2ecfc719d47dd9bb3c453fdb3ae5 |
| 30 |
|
| 31 |
diff --git a/x11-base/xorg-server/xorg-server-1.19.6-r1.ebuild b/x11-base/xorg-server/xorg-server-1.19.6-r1.ebuild |
| 32 |
deleted file mode 100644 |
| 33 |
index 85e42243693..00000000000 |
| 34 |
--- a/x11-base/xorg-server/xorg-server-1.19.6-r1.ebuild |
| 35 |
+++ /dev/null |
| 36 |
@@ -1,250 +0,0 @@ |
| 37 |
-# Copyright 1999-2018 Gentoo Foundation |
| 38 |
-# Distributed under the terms of the GNU General Public License v2 |
| 39 |
- |
| 40 |
-EAPI=5 |
| 41 |
- |
| 42 |
-XORG_DOC=doc |
| 43 |
-inherit xorg-2 multilib versionator flag-o-matic |
| 44 |
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git" |
| 45 |
- |
| 46 |
-DESCRIPTION="X.Org X servers" |
| 47 |
-SLOT="0/${PV}" |
| 48 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
| 49 |
- |
| 50 |
-IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" |
| 51 |
-IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind xcsecurity" |
| 52 |
- |
| 53 |
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
| 54 |
- !libressl? ( dev-libs/openssl:0= ) |
| 55 |
- libressl? ( dev-libs/libressl ) |
| 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.46 |
| 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-libs/xtrans-1.3.5 |
| 69 |
- >=x11-misc/xbitmaps-1.0.1 |
| 70 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
| 71 |
- dmx? ( |
| 72 |
- x11-libs/libXt |
| 73 |
- >=x11-libs/libdmx-1.0.99.1 |
| 74 |
- >=x11-libs/libX11-1.1.5 |
| 75 |
- >=x11-libs/libXaw-1.0.4 |
| 76 |
- >=x11-libs/libXext-1.0.99.4 |
| 77 |
- >=x11-libs/libXfixes-5.0 |
| 78 |
- >=x11-libs/libXi-1.2.99.1 |
| 79 |
- >=x11-libs/libXmu-1.0.3 |
| 80 |
- x11-libs/libXrender |
| 81 |
- >=x11-libs/libXres-1.0.3 |
| 82 |
- >=x11-libs/libXtst-1.0.99.2 |
| 83 |
- ) |
| 84 |
- glamor? ( |
| 85 |
- media-libs/libepoxy[X] |
| 86 |
- >=media-libs/mesa-10.3.4-r1[egl,gbm] |
| 87 |
- !x11-libs/glamor |
| 88 |
- ) |
| 89 |
- kdrive? ( |
| 90 |
- >=x11-libs/libXext-1.0.5 |
| 91 |
- x11-libs/libXv |
| 92 |
- ) |
| 93 |
- xephyr? ( |
| 94 |
- x11-libs/libxcb[xkb] |
| 95 |
- x11-libs/xcb-util |
| 96 |
- x11-libs/xcb-util-image |
| 97 |
- x11-libs/xcb-util-keysyms |
| 98 |
- x11-libs/xcb-util-renderutil |
| 99 |
- x11-libs/xcb-util-wm |
| 100 |
- ) |
| 101 |
- !minimal? ( |
| 102 |
- >=x11-libs/libX11-1.1.5 |
| 103 |
- >=x11-libs/libXext-1.0.5 |
| 104 |
- >=media-libs/mesa-10.3.4-r1 |
| 105 |
- ) |
| 106 |
- tslib? ( >=x11-libs/tslib-1.0 ) |
| 107 |
- udev? ( >=virtual/udev-150 ) |
| 108 |
- unwind? ( sys-libs/libunwind ) |
| 109 |
- wayland? ( |
| 110 |
- >=dev-libs/wayland-1.3.0 |
| 111 |
- media-libs/libepoxy |
| 112 |
- >=dev-libs/wayland-protocols-1.1 |
| 113 |
- ) |
| 114 |
- >=x11-apps/xinit-1.3.3-r1 |
| 115 |
- systemd? ( |
| 116 |
- sys-apps/dbus |
| 117 |
- sys-apps/systemd |
| 118 |
- )" |
| 119 |
- |
| 120 |
-DEPEND="${CDEPEND} |
| 121 |
- sys-devel/flex |
| 122 |
- >=x11-proto/bigreqsproto-1.1.0 |
| 123 |
- >=x11-proto/compositeproto-0.4 |
| 124 |
- >=x11-proto/damageproto-1.1 |
| 125 |
- >=x11-proto/fixesproto-5.0 |
| 126 |
- >=x11-proto/fontsproto-2.1.3 |
| 127 |
- >=x11-proto/glproto-1.4.17-r1 |
| 128 |
- >=x11-proto/inputproto-2.3 |
| 129 |
- >=x11-proto/kbproto-1.0.3 |
| 130 |
- >=x11-proto/randrproto-1.5.0 |
| 131 |
- >=x11-proto/recordproto-1.13.99.1 |
| 132 |
- >=x11-proto/renderproto-0.11 |
| 133 |
- >=x11-proto/resourceproto-1.2.0 |
| 134 |
- >=x11-proto/scrnsaverproto-1.1 |
| 135 |
- >=x11-proto/trapproto-3.4.3 |
| 136 |
- >=x11-proto/videoproto-2.2.2 |
| 137 |
- >=x11-proto/xcmiscproto-1.2.0 |
| 138 |
- >=x11-proto/xextproto-7.2.99.901 |
| 139 |
- >=x11-proto/xf86dgaproto-2.0.99.1 |
| 140 |
- >=x11-proto/xf86vidmodeproto-2.2.99.1 |
| 141 |
- >=x11-proto/xineramaproto-1.1.3 |
| 142 |
- >=x11-proto/xproto-7.0.31 |
| 143 |
- >=x11-proto/presentproto-1.0 |
| 144 |
- >=x11-proto/dri2proto-2.8 |
| 145 |
- >=x11-proto/dri3proto-1.0 |
| 146 |
- dmx? ( |
| 147 |
- >=x11-proto/dmxproto-2.2.99.1 |
| 148 |
- doc? ( |
| 149 |
- || ( |
| 150 |
- www-client/links |
| 151 |
- www-client/lynx |
| 152 |
- www-client/w3m |
| 153 |
- ) |
| 154 |
- ) |
| 155 |
- ) |
| 156 |
- !minimal? ( |
| 157 |
- >=x11-proto/xf86driproto-2.1.0 |
| 158 |
- )" |
| 159 |
- |
| 160 |
-RDEPEND="${CDEPEND} |
| 161 |
- selinux? ( sec-policy/selinux-xserver ) |
| 162 |
- !x11-drivers/xf86-video-modesetting |
| 163 |
-" |
| 164 |
- |
| 165 |
-PDEPEND=" |
| 166 |
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
| 167 |
- |
| 168 |
-REQUIRED_USE="!minimal? ( |
| 169 |
- || ( ${IUSE_SERVERS} ) |
| 170 |
- ) |
| 171 |
- xephyr? ( kdrive )" |
| 172 |
- |
| 173 |
-#UPSTREAMED_PATCHES=( |
| 174 |
-# "${WORKDIR}/patches/" |
| 175 |
-#) |
| 176 |
- |
| 177 |
-PATCHES=( |
| 178 |
- "${UPSTREAMED_PATCHES[@]}" |
| 179 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
| 180 |
- # needed for new eselect-opengl, bug #541232 |
| 181 |
- "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
| 182 |
- "${FILESDIR}"/${PN}-1.19.4-sysmacros.patch #633530 |
| 183 |
-) |
| 184 |
- |
| 185 |
-pkg_pretend() { |
| 186 |
- # older gcc is not supported |
| 187 |
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
| 188 |
- die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." |
| 189 |
-} |
| 190 |
- |
| 191 |
-pkg_setup() { |
| 192 |
- if use wayland && ! use glamor; then |
| 193 |
- ewarn "glamor is necessary for acceleration under Xwayland." |
| 194 |
- ewarn "Performance may be unacceptable without it." |
| 195 |
- fi |
| 196 |
-} |
| 197 |
- |
| 198 |
-src_configure() { |
| 199 |
- # localstatedir is used for the log location; we need to override the default |
| 200 |
- # from ebuild.sh |
| 201 |
- # sysconfdir is used for the xorg.conf location; same applies |
| 202 |
- # NOTE: fop is used for doc generating; and I have no idea if Gentoo |
| 203 |
- # package it somewhere |
| 204 |
- XORG_CONFIGURE_OPTIONS=( |
| 205 |
- $(use_enable ipv6) |
| 206 |
- $(use_enable debug) |
| 207 |
- $(use_enable dmx) |
| 208 |
- $(use_enable glamor) |
| 209 |
- $(use_enable kdrive) |
| 210 |
- $(use_enable kdrive kdrive-kbd) |
| 211 |
- $(use_enable kdrive kdrive-mouse) |
| 212 |
- $(use_enable kdrive kdrive-evdev) |
| 213 |
- $(use_enable suid install-setuid) |
| 214 |
- $(use_enable tslib) |
| 215 |
- $(use_enable unwind libunwind) |
| 216 |
- $(use_enable wayland xwayland) |
| 217 |
- $(use_enable !minimal record) |
| 218 |
- $(use_enable !minimal xfree86-utils) |
| 219 |
- $(use_enable !minimal dri) |
| 220 |
- $(use_enable !minimal dri2) |
| 221 |
- $(use_enable !minimal glx) |
| 222 |
- $(use_enable xcsecurity) |
| 223 |
- $(use_enable xephyr) |
| 224 |
- $(use_enable xnest) |
| 225 |
- $(use_enable xorg) |
| 226 |
- $(use_enable xvfb) |
| 227 |
- $(use_enable udev config-udev) |
| 228 |
- $(use_with doc doxygen) |
| 229 |
- $(use_with doc xmlto) |
| 230 |
- $(use_with systemd systemd-daemon) |
| 231 |
- $(use_enable systemd systemd-logind) |
| 232 |
- --enable-libdrm |
| 233 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
| 234 |
- --localstatedir="${EPREFIX}"/var |
| 235 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
| 236 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
| 237 |
- --disable-config-hal |
| 238 |
- --disable-linux-acpi |
| 239 |
- --without-dtrace |
| 240 |
- --without-fop |
| 241 |
- --with-os-vendor=Gentoo |
| 242 |
- --with-sha1=libcrypto |
| 243 |
- ) |
| 244 |
- |
| 245 |
- xorg-2_src_configure |
| 246 |
-} |
| 247 |
- |
| 248 |
-src_install() { |
| 249 |
- xorg-2_src_install |
| 250 |
- |
| 251 |
- server_based_install |
| 252 |
- |
| 253 |
- if ! use minimal && use xorg; then |
| 254 |
- # Install xorg.conf.example into docs |
| 255 |
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
| 256 |
- fi |
| 257 |
- |
| 258 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
| 259 |
- newinitd "${FILESDIR}"/xdm.initd-11 xdm |
| 260 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
| 261 |
- |
| 262 |
- # install the @x11-module-rebuild set for Portage |
| 263 |
- insinto /usr/share/portage/config/sets |
| 264 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
| 265 |
-} |
| 266 |
- |
| 267 |
-pkg_postinst() { |
| 268 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
| 269 |
- eselect opengl set xorg-x11 --use-old |
| 270 |
-} |
| 271 |
- |
| 272 |
-pkg_postrm() { |
| 273 |
- # Get rid of module dir to ensure opengl-update works properly |
| 274 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
| 275 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
| 276 |
- fi |
| 277 |
-} |
| 278 |
- |
| 279 |
-server_based_install() { |
| 280 |
- if ! use xorg; then |
| 281 |
- rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
| 282 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
| 283 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
| 284 |
- "${ED}"/usr/share/man/man1/Xserver.1x |
| 285 |
- fi |
| 286 |
-} |
Archives