commit: 60592bdcdbd2232c858074c5e89882460b6daba4 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Mon Feb 13 17:14:27 2017 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Mon Feb 13 17:14:27 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60592bdc
x11-apps/xinit: remove version 1.3.4 profiles/base/package.mask | 5 --- profiles/targets/systemd/package.mask | 4 --- x11-apps/xinit/xinit-1.3.4.ebuild | 67 ----------------------------------- 3 files changed, 76 deletions(-) diff --git a/profiles/base/package.mask b/profiles/base/package.mask index d4fa5d45b0..81c39241bd 100644 --- a/profiles/base/package.mask +++ b/profiles/base/package.mask @@ -5,8 +5,3 @@ # Johannes Huber <j...@gentoo.org> (23 Jul 2015) # Needs sys-apps/systemd. Masked for non systemd profiles. app-admin/calamares - -# Chí-Thanh Christopher Nguyễn <chith...@gentoo.org> (26 Oct 2014) -# Changes in vt allocation break startx on non-systemd, bugs #526762 and -# #526802. -=x11-apps/xinit-1.3.4 diff --git a/profiles/targets/systemd/package.mask b/profiles/targets/systemd/package.mask index 61d23562a3..2a0153dffb 100644 --- a/profiles/targets/systemd/package.mask +++ b/profiles/targets/systemd/package.mask @@ -13,10 +13,6 @@ sys-fs/eudev sys-fs/udev -# Chí-Thanh Christopher Nguyễn <chith...@gentoo.org> (26 Oct 2014) -# package is masked for bugs #526762 and #526802 on non-systemd systems. --=x11-apps/xinit-1.3.4 - # sys-kernel/genkernel is not compatible with Systemd, you need # to use sys-kernel/genkernel-next instead sys-kernel/genkernel diff --git a/x11-apps/xinit/xinit-1.3.4.ebuild b/x11-apps/xinit/xinit-1.3.4.ebuild deleted file mode 100644 index ee3430fb04..0000000000 --- a/x11-apps/xinit/xinit-1.3.4.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit xorg-2 - -DESCRIPTION="X Window System initializer" - -LICENSE="${LICENSE} GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~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" -) - -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" -}