commit:     95209f5bb985775383ab3474f1cc461671bd5dae
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 15 23:01:05 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 23:01:07 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95209f5b

x11-base/xorg-server: Drop old version

 x11-base/xorg-server/Manifest                      |   1 -
 .../xorg-server-1.19.99.901-randr-fix-crash.patch  |  44 -----
 .../xorg-server/xorg-server-1.19.99.901-r1.ebuild  | 220 ---------------------
 3 files changed, 265 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 866e6b9393e..b262359d335 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,3 +1,2 @@
 DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 
23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3
 SHA512 
928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
-DIST xorg-server-1.19.99.901.tar.bz2 6131851 BLAKE2B 
5b3588fe7c42d10eb89fa4ebea5ab6f2c7fb25f876ec6a5c5b523062f5c712c52c20767aa60b607847b50aa12ec75307b8715d63aa92331b70a1971c8d740670
 SHA512 
c2fbe4868788cd0d6d5fe546acb8c2ddec39ac3e851f352ee438a785a248a048a87073972f51ff98ef36a35a6753f8c2f22c2ecfc719d47dd9bb3c453fdb3ae5
 DIST xorg-server-1.19.99.904.tar.bz2 6083787 BLAKE2B 
7b5ba4601494ab7714a977e6fcced12e373f5aaf30d433560a899d4446116cc4a5e22ae21378fea6ab07b68bad1a2544e065fd1d449b3b155b2c0e8a6787e479
 SHA512 
b9dccc777d0a30c6b40bddffe1f359dde4103539c6598f04bf8cf5f59e6770229221a199c1866b4eba0cf8d2d87fe878985bbd2e3c6ec5b65e3f16195ea8d57e

diff --git 
a/x11-base/xorg-server/files/xorg-server-1.19.99.901-randr-fix-crash.patch 
b/x11-base/xorg-server/files/xorg-server-1.19.99.901-randr-fix-crash.patch
deleted file mode 100644
index bcaaf867c7a..00000000000
--- a/x11-base/xorg-server/files/xorg-server-1.19.99.901-randr-fix-crash.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 2af0a50a4bb9be9f58681d417ceb9a7029caaf3b Mon Sep 17 00:00:00 2001
-From: Adam Jackson <a...@redhat.com>
-Date: Wed, 28 Feb 2018 11:23:41 -0500
-Subject: [PATCH] randr: Fix a crash on initialization with GPU screens
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RRSetChanged (immediately above) was immune to screens with no master,
-but RRTellChanged was not:
-
-    Thread 1 "X" received signal SIGSEGV, Segmentation fault.
-    RRTellChanged (pScreen=<optimized out>) at ../../randr/randr.c:576
-    576             mastersp = rrGetScrPriv(master);
-    (gdb) bt
-    #0  RRTellChanged (pScreen=<optimized out>) at ../../randr/randr.c:576
-    #1  0x000055555566f1e9 in RRNoticePropertyChange (value=0x555555bfbf28, 
property=70, output=0x555555bfef10) at ../../randr/rrproperty.c:153
-    #2  RRChangeOutputProperty (output=output@entry=0x555555bfef10, 
property=<optimized out>, type=type@entry=19, format=format@entry=32, 
mode=<optimized out>, mode@entry=0, len=len@entry=1, value=0x7fffffffe77c, 
sendevent=1, pending=0)
-        at ../../randr/rrproperty.c:263
-    #3  0x000055555566dba5 in RROutputSetNonDesktop 
(output=output@entry=0x555555bfef10, nonDesktop=nonDesktop@entry=0) at 
../../randr/rroutput.c:333
-    ...
-
-Reported-by: Michel Dänzer <mic...@daenzer.net>
-Signed-off-by: Adam Jackson <a...@redhat.com>
----
- randr/randr.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/randr/randr.c b/randr/randr.c
-index 339ad3ece..feb54bcc8 100644
---- a/randr/randr.c
-+++ b/randr/randr.c
-@@ -602,6 +602,8 @@ RRTellChanged(ScreenPtr pScreen)
- 
-     if (pScreen->isGPU) {
-         master = pScreen->current_master;
-+        if (!master)
-+            return;
-         mastersp = rrGetScrPriv(master);
-     }
-     else {
--- 
-2.16.1
-

diff --git a/x11-base/xorg-server/xorg-server-1.19.99.901-r1.ebuild 
b/x11-base/xorg-server/xorg-server-1.19.99.901-r1.ebuild
deleted file mode 100644
index 19c536df784..00000000000
--- a/x11-base/xorg-server/xorg-server-1.19.99.901-r1.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-inherit xorg-2 multilib versionator flag-o-matic
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git";
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-if [[ ${PV} != 9999* ]]; then
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-fi
-
-IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux systemd 
+udev unwind xcsecurity"
-
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl )
-       >=x11-apps/iceauth-1.0.2
-       >=x11-apps/rgb-1.0.3
-       >=x11-apps/xauth-1.0.3
-       x11-apps/xkbcomp
-       >=x11-libs/libdrm-2.4.89
-       >=x11-libs/libpciaccess-0.12.901
-       >=x11-libs/libXau-1.0.4
-       >=x11-libs/libXdmcp-1.0.2
-       >=x11-libs/libXfont2-2.0.1
-       >=x11-libs/libxkbfile-1.0.4
-       >=x11-libs/libxshmfence-1.1
-       >=x11-libs/pixman-0.27.2
-       >=x11-libs/xtrans-1.3.5
-       >=x11-misc/xbitmaps-1.0.1
-       >=x11-misc/xkeyboard-config-2.4.1-r3
-       dmx? (
-               x11-libs/libXt
-               >=x11-libs/libdmx-1.0.99.1
-               >=x11-libs/libX11-1.1.5
-               >=x11-libs/libXaw-1.0.4
-               >=x11-libs/libXext-1.0.99.4
-               >=x11-libs/libXfixes-5.0
-               >=x11-libs/libXi-1.2.99.1
-               >=x11-libs/libXmu-1.0.3
-               x11-libs/libXrender
-               >=x11-libs/libXres-1.0.3
-               >=x11-libs/libXtst-1.0.99.2
-       )
-       glamor? (
-               media-libs/libepoxy[X]
-               >=media-libs/mesa-10.3.4-r1[egl,gbm]
-               !x11-libs/glamor
-       )
-       kdrive? (
-               >=x11-libs/libXext-1.0.5
-               x11-libs/libXv
-       )
-       xephyr? (
-               x11-libs/libxcb[xkb]
-               x11-libs/xcb-util
-               x11-libs/xcb-util-image
-               x11-libs/xcb-util-keysyms
-               x11-libs/xcb-util-renderutil
-               x11-libs/xcb-util-wm
-       )
-       !minimal? (
-               >=x11-libs/libX11-1.1.5
-               >=x11-libs/libXext-1.0.5
-               >=media-libs/mesa-10.3.4-r1
-       )
-       udev? ( >=virtual/udev-150 )
-       unwind? ( sys-libs/libunwind )
-       wayland? (
-               >=dev-libs/wayland-1.3.0
-               media-libs/libepoxy
-               >=dev-libs/wayland-protocols-1.1
-       )
-       >=x11-apps/xinit-1.3.3-r1
-       systemd? (
-               sys-apps/dbus
-               sys-apps/systemd
-       )"
-
-DEPEND="${CDEPEND}
-       sys-devel/flex
-       >=x11-base/xorg-proto-2018.3
-       dmx? (
-               doc? (
-                       || (
-                               www-client/links
-                               www-client/lynx
-                               www-client/w3m
-                       )
-               )
-       )"
-
-RDEPEND="${CDEPEND}
-       selinux? ( sec-policy/selinux-xserver )
-       !x11-drivers/xf86-video-modesetting
-"
-
-PDEPEND="
-       xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-REQUIRED_USE="!minimal? (
-               || ( ${IUSE_SERVERS} )
-       )
-       xephyr? ( kdrive )"
-
-#UPSTREAMED_PATCHES=(
-#      "${WORKDIR}/patches/"
-#)
-
-PATCHES=(
-       "${UPSTREAMED_PATCHES[@]}"
-       "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
-       # needed for new eselect-opengl, bug #541232
-       "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
-       "${FILESDIR}"/${P}-randr-fix-crash.patch
-)
-
-pkg_pretend() {
-       # older gcc is not supported
-       [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
-               die "Sorry, but gcc earlier than 4.0 will not work for 
xorg-server."
-}
-
-pkg_setup() {
-       if use wayland && ! use glamor; then
-               ewarn "glamor is necessary for acceleration under Xwayland."
-               ewarn "Performance may be unacceptable without it."
-       fi
-}
-
-src_configure() {
-       # localstatedir is used for the log location; we need to override the 
default
-       #       from ebuild.sh
-       # sysconfdir is used for the xorg.conf location; same applies
-       # NOTE: fop is used for doc generating; and I have no idea if Gentoo
-       #       package it somewhere
-       XORG_CONFIGURE_OPTIONS=(
-               $(use_enable ipv6)
-               $(use_enable debug)
-               $(use_enable dmx)
-               $(use_enable glamor)
-               $(use_enable kdrive)
-               $(use_enable unwind libunwind)
-               $(use_enable wayland xwayland)
-               $(use_enable !minimal record)
-               $(use_enable !minimal xfree86-utils)
-               $(use_enable !minimal dri)
-               $(use_enable !minimal dri2)
-               $(use_enable !minimal glx)
-               $(use_enable xcsecurity)
-               $(use_enable xephyr)
-               $(use_enable xnest)
-               $(use_enable xorg)
-               $(use_enable xvfb)
-               $(use_enable udev config-udev)
-               $(use_with doc doxygen)
-               $(use_with doc xmlto)
-               $(use_with systemd systemd-daemon)
-               $(use_enable systemd systemd-logind)
-               --enable-libdrm
-               --enable-suid-wrapper
-               --sysconfdir="${EPREFIX}"/etc/X11
-               --localstatedir="${EPREFIX}"/var
-               --with-fontrootdir="${EPREFIX}"/usr/share/fonts
-               --with-xkb-output="${EPREFIX}"/var/lib/xkb
-               --disable-config-hal
-               --disable-linux-acpi
-               --without-dtrace
-               --without-fop
-               --with-os-vendor=Gentoo
-               --with-sha1=libcrypto
-       )
-
-       xorg-2_src_configure
-}
-
-src_install() {
-       xorg-2_src_install
-
-       server_based_install
-
-       if ! use minimal && use xorg; then
-               # Install xorg.conf.example into docs
-               dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
-       fi
-
-       newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
-       newinitd "${FILESDIR}"/xdm.initd-11 xdm
-       newconfd "${FILESDIR}"/xdm.confd-4 xdm
-
-       # install the @x11-module-rebuild set for Portage
-       insinto /usr/share/portage/config/sets
-       newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postinst() {
-       # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-       eselect opengl set xorg-x11 --use-old
-}
-
-pkg_postrm() {
-       # Get rid of module dir to ensure opengl-update works properly
-       if [[ -z ${REPLACED_BY_VERSION} && -e 
${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-               rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
-       fi
-}
-
-server_based_install() {
-       if ! use xorg; then
-               rm "${ED}"/usr/share/man/man1/Xserver.1x \
-                       "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-                       "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-                       "${ED}"/usr/share/man/man1/Xserver.1x
-       fi
-}

Reply via email to