commit: 024a727b2db862ff122216a324c3ca4177e2785b Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sat Jan 6 22:40:58 2018 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat Jan 6 22:42:21 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=024a727b
x11-apps/xinit: apply vt patch unconditionally Our xserverrc file already takes care of passing the correct vt, so we don't need startx to do it too. Closes: https://bugs.gentoo.org/620896 Package-Manager: Portage-2.3.19_p3, Repoman-2.3.6_p37 x11-apps/xinit/xinit-1.3.4-r4.ebuild | 67 ++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/x11-apps/xinit/xinit-1.3.4-r4.ebuild b/x11-apps/xinit/xinit-1.3.4-r4.ebuild new file mode 100644 index 00000000000..ea3e115f959 --- /dev/null +++ b/x11-apps/xinit/xinit-1.3.4-r4.ebuild @@ -0,0 +1,67 @@ +# 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 ~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.3.4-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" +}
