chithanh 15/02/08 18:26:50 Modified: ChangeLog Added: xinit-1.3.4-r1.ebuild Log: conditionally revert upstream patch that broke startx on non-systemd systems, bug #526802. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x2324E7B566DF2611!)
Revision Changes Path 1.258 x11-apps/xinit/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xinit/ChangeLog?rev=1.258&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xinit/ChangeLog?rev=1.258&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xinit/ChangeLog?r1=1.257&r2=1.258 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v retrieving revision 1.257 retrieving revision 1.258 diff -u -r1.257 -r1.258 --- ChangeLog 3 Jan 2015 14:49:32 -0000 1.257 +++ ChangeLog 8 Feb 2015 18:26:50 -0000 1.258 @@ -1,6 +1,13 @@ # ChangeLog for x11-apps/xinit # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.257 2015/01/03 14:49:32 heroxbd Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.258 2015/02/08 18:26:50 chithanh Exp $ + +*xinit-1.3.4-r1 (08 Feb 2015) + + 08 Feb 2015; Chí-Thanh Christopher Nguyễn <chith...@gentoo.org> + +files/xinit-1.3.4-startx-current-vt.patch, +xinit-1.3.4-r1.ebuild: + conditionally revert upstream patch that broke startx on non-systemd systems, + bug #526802. 03 Jan 2015; Benda Xu <hero...@gentoo.org> xinit-1.3.3-r1.ebuild: xinitdir handling for Prefix. 1.1 x11-apps/xinit/xinit-1.3.4-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xinit/xinit-1.3.4-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xinit/xinit-1.3.4-r1.ebuild?rev=1.1&content-type=text/plain Index: xinit-1.3.4-r1.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.4-r1.ebuild,v 1.1 2015/02/08 18:26:50 chithanh Exp $ 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 systemd" 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_prepare() { # this patch breaks startx on non-systemd systems, bug #526802 if use !systemd; then PATCHES+=( "${FILESDIR}"/${PN}-1.3.4-startx-current-vt.patch ) fi xorg-2_src_prepare } 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" }
