Gentoo Archives: gentoo-commits

From: Piotr Karbowski <slashbeast@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-apps/xinit/
Date: Sat, 30 Jan 2021 19:21:19
Message-Id: 1612034262.79da973a405180e9084c61af12962e87a9677d0c.slashbeast@gentoo
1 commit: 79da973a405180e9084c61af12962e87a9677d0c
2 Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
3 AuthorDate: Thu Sep 10 01:35:47 2020 +0000
4 Commit: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 30 19:17:42 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79da973a
7
8 x11-apps/xinit: refactor startDM.sh to display-manager-init
9
10 Package-Manager: Portage-3.0.5, Repoman-3.0.1
11 Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
12 Closes: https://github.com/gentoo/gentoo/pull/16554
13 Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>
14
15 x11-apps/xinit/xinit-1.4.1-r1.ebuild | 75 ++++++++++++++++++++++++++++++++++++
16 1 file changed, 75 insertions(+)
17
18 diff --git a/x11-apps/xinit/xinit-1.4.1-r1.ebuild b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
19 new file mode 100644
20 index 00000000000..36ce2267f5c
21 --- /dev/null
22 +++ b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
23 @@ -0,0 +1,75 @@
24 +# Copyright 1999-2020 Gentoo Authors
25 +# Distributed under the terms of the GNU General Public License v2
26 +
27 +EAPI=7
28 +
29 +inherit xorg-3
30 +
31 +DESCRIPTION="X Window System initializer"
32 +
33 +LICENSE="${LICENSE} GPL-2"
34 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~arm-linux ~x86-linux"
35 +IUSE="twm"
36 +
37 +RDEPEND="
38 + x11-apps/xauth
39 + x11-libs/libX11
40 +"
41 +DEPEND="${RDEPEND}"
42 +PDEPEND="x11-apps/xrdb
43 + twm? (
44 + x11-apps/xclock
45 + x11-apps/xsm
46 + x11-terms/xterm
47 + x11-wm/twm
48 + )
49 +"
50 +
51 +PATCHES=(
52 + "${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch"
53 + "${FILESDIR}/${PN}-1.4.0-startx-current-vt.patch"
54 + "${FILESDIR}/${PN}-1.4.1-move-serverauthfile-into-tmp.patch"
55 +)
56 +
57 +XORG_CONFIGURE_OPTIONS=(
58 + --with-xinitdir="${EPREFIX}"/etc/X11/xinit
59 +)
60 +
61 +src_install() {
62 + xorg-3_src_install
63 +
64 + exeinto /etc/X11
65 + doexe "${FILESDIR}"/chooser.sh
66 + exeinto /etc/X11/Sessions
67 + doexe "${FILESDIR}"/Xsession
68 + exeinto /etc/X11/xinit
69 + newexe "${FILESDIR}"/xserverrc.2 xserverrc
70 + exeinto /etc/X11/xinit/xinitrc.d/
71 + doexe "${FILESDIR}"/00-xhost
72 +
73 + insinto /usr/share/xsessions
74 + doins "${FILESDIR}"/Xsession.desktop
75 +}
76 +
77 +pkg_postinst() {
78 + if [[ -z "${REPLACING_VERSIONS}" ]]; then
79 + ewarn "If you use startx to start X instead of a login manager like gdm/kdm,"
80 + ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or"
81 + ewarn "any executable. When you run startx, it will run this as the login session."
82 + ewarn "You can set this in a file in /etc/env.d/ for the entire system,"
83 + ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)."
84 + ewarn "Here's an example of setting it for the whole system:"
85 + ewarn " echo XSESSION=\"Gnome\" > /etc/env.d/90xsession"
86 + ewarn " env-update && source /etc/profile"
87 + fi
88 +
89 + for v in ${REPLACING_VERSIONS}; do
90 + if ver_test "$v" "-lt" "1.4.1"; then
91 + ewarn "Starting with ${CATEGORY}/${PN}-1.4.1 serverauth files are no longer kept in the"
92 + ewarn "home directory but rather are created in \$TMPDIR (typically /tmp). The change"
93 + ewarn "is transparent for most of users, however those that use runtime temporary"
94 + ewarn "directories cleaning tools, like app-admin/tmpreaper, may need to adjust them"
95 + ewarn "not to remove the 'serverauth.*' files."
96 + fi
97 + done
98 +}