Gentoo Archives: gentoo-commits

From: "Robin H. Johnson (robbat2)" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-apps/xinit: xinit-1.3.1-r1.ebuild ChangeLog
Date: Wed, 30 Nov 2011 20:11:09
Message-Id: 20111130201050.A36CD2004B@flycatcher.gentoo.org
1 robbat2 11/11/30 20:10:50
2
3 Modified: ChangeLog
4 Added: xinit-1.3.1-r1.ebuild
5 Log:
6 GDM3 looks for .desktop files for the list of possible sessions, whereas GDM2 looked at /etc/X11/Sessions/, so put in a .desktop wrapper file pointing to the Xsession script.
7
8 (Portage version: 2.2.0_alpha70/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.219 x11-apps/xinit/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xinit/ChangeLog?rev=1.219&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xinit/ChangeLog?rev=1.219&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xinit/ChangeLog?r1=1.218&r2=1.219
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v
20 retrieving revision 1.218
21 retrieving revision 1.219
22 diff -p -w -b -B -u -u -r1.218 -r1.219
23 --- ChangeLog 3 Oct 2011 17:55:53 -0000 1.218
24 +++ ChangeLog 30 Nov 2011 20:10:50 -0000 1.219
25 @@ -1,6 +1,14 @@
26 # ChangeLog for x11-apps/xinit
27 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.218 2011/10/03 17:55:53 josejx Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.219 2011/11/30 20:10:50 robbat2 Exp $
30 +
31 +*xinit-1.3.1-r1 (30 Nov 2011)
32 +
33 + 30 Nov 2011; Robin H. Johnson <robbat2@g.o> +xinit-1.3.1-r1.ebuild,
34 + +files/Xsession.desktop:
35 + GDM3 looks for .desktop files for the list of possible sessions, whereas GDM2
36 + looked at /etc/X11/Sessions/, so put in a .desktop wrapper file pointing to
37 + the Xsession script.
38
39 03 Oct 2011; Joseph Jezak <josejx@g.o> xinit-1.3.1.ebuild:
40 Marked ppc ppc64 stable for bug #380421.
41
42
43
44 1.1 x11-apps/xinit/xinit-1.3.1-r1.ebuild
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xinit/xinit-1.3.1-r1.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xinit/xinit-1.3.1-r1.ebuild?rev=1.1&content-type=text/plain
48
49 Index: xinit-1.3.1-r1.ebuild
50 ===================================================================
51 # Copyright 1999-2011 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.1-r1.ebuild,v 1.1 2011/11/30 20:10:50 robbat2 Exp $
54
55 EAPI=4
56
57 inherit xorg-2
58
59 DESCRIPTION="X Window System initializer"
60
61 LICENSE="${LICENSE} GPL-2"
62 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
63 IUSE="+minimal"
64
65 RDEPEND="
66 !<x11-base/xorg-server-1.8.0
67 x11-apps/xauth
68 x11-libs/libX11
69 "
70 DEPEND="${RDEPEND}"
71 PDEPEND="x11-apps/xrdb
72 !minimal? (
73 x11-apps/xclock
74 x11-apps/xsm
75 x11-terms/xterm
76 x11-wm/twm
77 )
78 "
79
80 PATCHES=(
81 "${FILESDIR}/0001-Gentoo-customizations.patch"
82 "${FILESDIR}/${P}-prio-process.patch"
83 )
84
85 pkg_setup() {
86 xorg-2_pkg_setup
87
88 XORG_CONFIGURE_OPTIONS=(
89 --with-xinitdir=/etc/X11/xinit
90 )
91 }
92
93 src_install() {
94 xorg-2_src_install
95
96 exeinto /etc/X11
97 doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh
98 exeinto /etc/X11/Sessions
99 doexe "${FILESDIR}"/Xsession
100 exeinto /etc/X11/xinit
101 doexe "${FILESDIR}"/xserverrc
102 exeinto /etc/X11/xinit/xinitrc.d/
103 doexe "${FILESDIR}/00-xhost"
104
105 insinto /usr/share/xsessions
106 doins "${FILESDIR}/Xsession.desktop"
107 }
108
109 pkg_postinst() {
110 xorg-2_pkg_postinst
111 ewarn "If you use startx to start X instead of a login manager like gdm/kdm,"
112 ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or"
113 ewarn "any executable. When you run startx, it will run this as the login session."
114 ewarn "You can set this in a file in /etc/env.d/ for the entire system,"
115 ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)."
116 ewarn "Here's an example of setting it for the whole system:"
117 ewarn " echo XSESSION=\"Gnome\" > /etc/env.d/90xsession"
118 ewarn " env-update && source /etc/profile"
119 }