x11-base/xorg-server: Drop old versions
authorMatt Turner <mattst88@gentoo.org>
Mon, 9 Mar 2020 00:06:58 +0000 (17:06 -0700)
committerMatt Turner <mattst88@gentoo.org>
Mon, 9 Mar 2020 00:07:23 +0000 (17:07 -0700)
Signed-off-by: Matt Turner <mattst88@gentoo.org>
x11-base/xorg-server/Manifest
x11-base/xorg-server/xorg-server-1.20.6.ebuild [deleted file]

index 3cdea5a75a076292a342e26000648d1ec20a8e11..4997e1cac5e48fbf4499de62bfc049e4239c3508 100644 (file)
@@ -1,2 +1 @@
-DIST xorg-server-1.20.6.tar.bz2 6298697 BLAKE2B 30e505cf83bb2b20e17533b89b81521d029412ea6bd804ecf20458af20364172eb7b21561f14c885d5e16597e6d09985b255b6cec2beb30662658d9e316bc953 SHA512 9aa0ba4aee92fe628f2b8c41e4fe0134dc86154bb8787f907884ef2fd970e18e68e72ea8a1beb706d11ecf155b2abc9731f1abadff251ed592f8cca3b1240dd6
 DIST xorg-server-1.20.7.tar.bz2 6303005 BLAKE2B 343ebc1ff45fc1cd459b204d92eabdd0629c94d4338d2d7cb635f73642080d07ef174cfbd83e5b7f253f2918af2d1efbe99d7c75720b88857f69093ee0be1b65 SHA512 c67612e379111c28c68941c0a660abf72be7669591b41ccaa3b3474c4540a03822a28d892831b12ce08bac6e5e7e33504c2d19ef2a0c2298f83bd083459f96f5
diff --git a/x11-base/xorg-server/xorg-server-1.20.6.ebuild b/x11-base/xorg-server/xorg-server-1.20.6.ebuild
deleted file mode 100644 (file)
index 55a55f5..0000000
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DOC=doc
-inherit xorg-3 multilib flag-o-matic
-EGIT_REPO_URI="https://gitlab.freedesktop.org/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 ~amd64-linux ~x86-linux"
-fi
-
-IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl libglvnd minimal selinux +suid systemd +udev unwind xcsecurity"
-
-CDEPEND="libglvnd? (
-               media-libs/libglvnd
-               !app-eselect/eselect-opengl
-       )
-       !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 )
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl:0= )
-       >=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
-       )
-       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-18[X(+),egl,gbm]
-               media-libs/libepoxy[X,egl(+)]
-       )
-       udev? ( virtual/libudev:= )
-       unwind? ( sys-libs/libunwind )
-       wayland? (
-               >=dev-libs/wayland-1.3.0
-               media-libs/libepoxy[egl(+)]
-               >=dev-libs/wayland-protocols-1.1
-       )
-       >=x11-apps/xinit-1.3.3-r1
-       systemd? (
-               sys-apps/dbus
-               sys-apps/systemd
-       )
-       elogind? (
-               sys-apps/dbus
-               sys-auth/elogind
-               sys-auth/pambase[elogind]
-       )
-       "
-
-DEPEND="${CDEPEND}
-       sys-devel/flex
-       >=x11-base/xorg-proto-2018.4
-       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-$(ver_cut 1-2) )"
-
-REQUIRED_USE="!minimal? (
-               || ( ${IUSE_SERVERS} )
-       )
-       elogind? ( udev )
-       ?? ( elogind systemd )
-       minimal? ( !wayland )
-       xephyr? ( kdrive )"
-
-UPSTREAMED_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
-)
-
-pkg_setup() {
-       if use wayland && use minimal; then
-               ewarn "glamor is necessary for acceleration under Xwayland."
-               ewarn "Performance may be unacceptable without it."
-               ewarn "Build with USE=-minimal to enable glamor."
-       fi
-
-       # 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 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 dri3)
-               $(use_enable !minimal glamor)
-               $(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)
-               $(usex !elogind $(use_enable systemd systemd-logind) '--enable-systemd-logind')
-               $(use_with systemd systemd-daemon)
-               $(usex suid $(use_enable systemd suid-wrapper) '--disable-suid-wrapper')
-               $(usex suid $(use_enable !systemd install-setuid) '--disable-install-setuid')
-               --enable-libdrm
-               --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
-       )
-}
-
-src_install() {
-       xorg-3_src_install
-
-       server_based_install
-
-       if ! use minimal && use xorg; then
-               # Install xorg.conf.example into docs
-               dodoc "${S}"/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
-
-       find "${ED}"/var -type d -empty -delete || die
-}
-
-pkg_postinst() {
-       if ! use minimal; then
-               # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-               if ! use libglvnd; then
-                       eselect opengl set xorg-x11 --use-old
-               fi
-       fi
-}
-
-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
-}