commit: cefe728d56663e1a16263a29ec3c1bed8953c70c Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Thu Jan 31 18:09:29 2019 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Thu Jan 31 18:11:48 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cefe728d
x11-apps/xinit: Drop old versions Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> x11-apps/xinit/files/xserverrc.1 | 6 ---- x11-apps/xinit/xinit-1.4.0.ebuild | 67 --------------------------------------- 2 files changed, 73 deletions(-) diff --git a/x11-apps/xinit/files/xserverrc.1 b/x11-apps/xinit/files/xserverrc.1 deleted file mode 100644 index 6b57eeba6da..00000000000 --- a/x11-apps/xinit/files/xserverrc.1 +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -if [ -z "$XDG_VTNR" ]; then - exec /usr/bin/X -nolisten tcp "$@" -else - exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR -fi diff --git a/x11-apps/xinit/xinit-1.4.0.ebuild b/x11-apps/xinit/xinit-1.4.0.ebuild deleted file mode 100644 index bc9cc6ade50..00000000000 --- a/x11-apps/xinit/xinit-1.4.0.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit xorg-2 - -DESCRIPTION="X Window System initializer" - -LICENSE="${LICENSE} GPL-2" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux" -IUSE="+minimal" - -RDEPEND=" - !<x11-base/xorg-server-1.8.0 - x11-apps/xauth - x11-libs/libX11 -" -DEPEND="${RDEPEND}" -PDEPEND="x11-apps/xrdb - !minimal? ( - x11-apps/xclock - x11-apps/xsm - x11-terms/xterm - x11-wm/twm - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch" - "${FILESDIR}/${PN}-1.4.0-startx-current-vt.patch" -) - -src_configure() { - XORG_CONFIGURE_OPTIONS=( - --with-xinitdir="${EPREFIX}"/etc/X11/xinit - ) - xorg-2_src_configure -} - -src_install() { - xorg-2_src_install - - exeinto /etc/X11 - doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh - exeinto /etc/X11/Sessions - doexe "${FILESDIR}"/Xsession - exeinto /etc/X11/xinit - newexe "${FILESDIR}"/xserverrc.1 xserverrc - exeinto /etc/X11/xinit/xinitrc.d/ - doexe "${FILESDIR}"/00-xhost - - insinto /usr/share/xsessions - doins "${FILESDIR}"/Xsession.desktop -} - -pkg_postinst() { - xorg-2_pkg_postinst - ewarn "If you use startx to start X instead of a login manager like gdm/kdm," - ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or" - ewarn "any executable. When you run startx, it will run this as the login session." - ewarn "You can set this in a file in /etc/env.d/ for the entire system," - ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)." - ewarn "Here's an example of setting it for the whole system:" - ewarn " echo XSESSION=\"Gnome\" > /etc/env.d/90xsession" - ewarn " env-update && source /etc/profile" -}