commit: e24c82b2dbf27372108ac3a93d977cd762bb044a
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 22 17:21:22 2019 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 16:40:25 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e24c82b2
x11-apps/xinit: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-apps/xinit/Manifest | 1 -
x11-apps/xinit/files/startDM.sh.1 | 30 ---------------
x11-apps/xinit/xinit-1.4.0-r1.ebuild | 71 ------------------------------------
3 files changed, 102 deletions(-)
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 8b2e86bb882..ede67dd7492 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -1,2 +1 @@
-DIST xinit-1.4.0.tar.bz2 174491 BLAKE2B
5a613a244a22f3bb4de43ae23b8f590b41a6af2c3adb282d2a089f4b94117220d86654c16cbb20ad0a50b6aab1be65512a7a42850e9047cfca96f25af964d081
SHA512
53a29081130c1e195eb441ee77ccaa044b18b4cca3d2d5da3a6d67aa421dfd9718fa18b6be6232a41e40cf260c8190064c4d8d9ab771177bd5cd12e77a8fa79e
DIST xinit-1.4.1.tar.bz2 176206 BLAKE2B
1c20f34db344eb967ac230a0cd61ad07d0089668aea32973e9b8b9749e5260ad5d93a7f6642a4f2c8d6b01870696e4e1e422790c2954320039aa85e6dba8870a
SHA512
6cbc5d025a891c419f3f4493381b2fca57a67d78df866d2f16a83426f86bad6eca7f240fac12b25cbcc63df0fec41f625407184e044898602d66483715315340
diff --git a/x11-apps/xinit/files/startDM.sh.1
b/x11-apps/xinit/files/startDM.sh.1
deleted file mode 100644
index e2da6098d6a..00000000000
--- a/x11-apps/xinit/files/startDM.sh.1
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2
-
-# We need to source /etc/profile for stuff like $LANG to work
-# bug #10190.
-. /etc/profile
-
-. /etc/init.d/functions.sh
-
-# baselayout-1 compat
-if ! type get_options >/dev/null 2>/dev/null ; then
- [ -r "${svclib}"/sh/rc-services.sh ] && . "${svclib}"/sh/rc-services.sh
-fi
-
-# Great new Gnome2 feature, AA
-# We enable this by default
-export GDK_USE_XFT=1
-
-export RC_SVCNAME=xdm
-EXEC="$(get_options service)"
-NAME="$(get_options name)"
-PIDFILE="$(get_options pidfile)"
-START_STOP_ARGS="$(get_options start_stop_args)"
-
-start-stop-daemon --start --exec ${EXEC} \
-${NAME:+--name} ${NAME} ${PIDFILE:+--pidfile} ${PIDFILE} ${START_STOP_ARGS} ||
\
-eerror "ERROR: could not start the Display Manager"
-
-# vim:ts=4
diff --git a/x11-apps/xinit/xinit-1.4.0-r1.ebuild
b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
deleted file mode 100644
index e069d3d3c92..00000000000
--- a/x11-apps/xinit/xinit-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 ~arm-linux ~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
- newexe "${FILESDIR}"/startDM.sh.1 startDM.sh
- exeinto /etc/X11/Sessions
- doexe "${FILESDIR}"/Xsession
- exeinto /etc/X11/xinit
- newexe "${FILESDIR}"/xserverrc.2 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
-
- if ! has_version 'x11-apps/xinit'; then
- 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"
- fi
-}
