Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gdm/
Date: Sun, 13 Oct 2019 10:32:57
Message-Id: 1570962754.0e76179dc7d3da45c3e8d0d5bc239e9bdc7d9bf2.leio@gentoo
1 commit: 0e76179dc7d3da45c3e8d0d5bc239e9bdc7d9bf2
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 13 08:33:05 2019 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 13 10:32:34 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e76179d
7
8 gnome-base/gdm: bump to 3.32.0
9
10 Package-Manager: Portage-2.3.69, Repoman-2.3.12
11 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
12
13 gnome-base/gdm/Manifest | 1 +
14 gnome-base/gdm/gdm-3.32.0.ebuild | 244 +++++++++++++++++++++++++++++++++++++++
15 2 files changed, 245 insertions(+)
16
17 diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
18 index 255498fa2a5..00246602fc6 100644
19 --- a/gnome-base/gdm/Manifest
20 +++ b/gnome-base/gdm/Manifest
21 @@ -1,2 +1,3 @@
22 DIST gdm-3.30.3.tar.xz 1261224 BLAKE2B 338f946a24d2a7e4b3cf34ac6accff01f8e7ce5032ee4ce79a96b1a755693e09788c6225e45de9a91ae4afea595a0562511104a467e561ec179c3ad61810468f SHA512 17aed5bf7d27b07553703873cda28a711d6135497d36e4c241bcf1ab3552b31007cc241dab394dccf8a4f1daccf7d55ba39edf91f4b22bdea5c2aa1ea17404b8
23 +DIST gdm-3.32.0.tar.xz 1262344 BLAKE2B bbc580f788fe2ce8783f044eb8109ce0086b1bb078bafaeb6efd833689848ef6570bb0fd0e6e260a388e7c1a6d3cdccb36264a640151e9b6e5d81ca9c35f3be3 SHA512 88016d0f800030a561e0360c63fdcb8499a605126f99a5a9f89606e086d7a934afc091843b2acd9091c1c643e7468ee31ae9a5b6264ae38064618ad577ef7ac0
24 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
25
26 diff --git a/gnome-base/gdm/gdm-3.32.0.ebuild b/gnome-base/gdm/gdm-3.32.0.ebuild
27 new file mode 100644
28 index 00000000000..9ee9ae70dc7
29 --- /dev/null
30 +++ b/gnome-base/gdm/gdm-3.32.0.ebuild
31 @@ -0,0 +1,244 @@
32 +# Copyright 1999-2019 Gentoo Authors
33 +# Distributed under the terms of the GNU General Public License v2
34 +
35 +EAPI=6
36 +GNOME2_LA_PUNT="yes"
37 +GNOME2_EAUTORECONF="yes"
38 +
39 +inherit eutils gnome2 pam readme.gentoo-r1 systemd udev user
40 +
41 +DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
42 +HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
43 +
44 +SRC_URI="${SRC_URI}
45 + branding? ( https://www.mail-archive.com/tango-artists@×××××××××××××××××.org/msg00043/tango-gentoo-v1.1.tar.gz )
46 +"
47 +
48 +LICENSE="
49 + GPL-2+
50 + branding? ( CC-BY-SA-4.0 )
51 +"
52 +
53 +SLOT="0"
54 +
55 +IUSE="accessibility audit bluetooth-sound branding elogind fprint +introspection ipv6 plymouth selinux smartcard systemd tcpd test wayland xinerama"
56 +REQUIRED_USE="^^ ( elogind systemd )"
57 +
58 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~x86"
59 +
60 +# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
61 +# nspr used by smartcard extension
62 +# dconf, dbus and g-s-d are needed at install time for dconf update
63 +# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784
64 +COMMON_DEPEND="
65 + app-text/iso-codes
66 + >=dev-libs/glib-2.44:2
67 + dev-libs/libgudev
68 + >=x11-libs/gtk+-2.91.1:3
69 + >=gnome-base/dconf-0.20
70 + >=gnome-base/gnome-settings-daemon-3.1.4
71 + gnome-base/gsettings-desktop-schemas
72 + >=media-libs/fontconfig-2.5.0:1.0
73 + >=media-libs/libcanberra-0.4[gtk3]
74 + sys-apps/dbus
75 + >=sys-apps/accountsservice-0.6.35
76 +
77 + x11-base/xorg-server
78 + x11-libs/libXau
79 + x11-libs/libX11
80 + x11-libs/libXdmcp
81 + x11-libs/libXext
82 + x11-libs/libxcb
83 + >=x11-misc/xdg-utils-1.0.2-r3
84 +
85 + sys-libs/pam
86 + elogind? ( >=sys-auth/elogind-239.3[pam] )
87 + systemd? ( >=sys-apps/systemd-186:0=[pam] )
88 +
89 + sys-auth/pambase[elogind?,systemd?]
90 +
91 + audit? ( sys-process/audit )
92 + introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
93 + plymouth? ( sys-boot/plymouth )
94 + selinux? ( sys-libs/libselinux )
95 + tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
96 + xinerama? ( x11-libs/libXinerama )
97 +"
98 +# XXX: These deps are from session and desktop files in data/ directory
99 +# fprintd is used via dbus by gdm-fingerprint-extension
100 +# gnome-session-3.6 needed to avoid freezing with orca
101 +RDEPEND="${COMMON_DEPEND}
102 + >=gnome-base/gnome-session-3.6
103 + >=gnome-base/gnome-shell-3.1.90
104 + x11-apps/xhost
105 +
106 + accessibility? (
107 + >=app-accessibility/orca-3.10
108 + gnome-extra/mousetweaks )
109 + fprint? (
110 + sys-auth/fprintd
111 + sys-auth/pam_fprint )
112 +
113 + !gnome-extra/fast-user-switch-applet
114 +"
115 +DEPEND="${COMMON_DEPEND}
116 + app-text/docbook-xml-dtd:4.1.2
117 + dev-util/gdbus-codegen
118 + dev-util/glib-utils
119 + dev-util/itstool
120 + >=sys-devel/gettext-0.19.8
121 + virtual/pkgconfig
122 + x11-base/xorg-proto
123 + test? ( >=dev-libs/check-0.9.4 )
124 + app-text/yelp-tools
125 +" # yelp-tools needed for eautoreconf to not lose help docs (m4_ifdeffed YELP_HELP_INIT call and setup)
126 +
127 +DOC_CONTENTS="
128 + To make GDM start at boot with systemd, run:\n
129 + # systemctl enable gdm.service\n
130 + \n
131 + To make GDM start at boot with OpenRC, edit /etc/conf.d to have
132 + DISPLAYMANAGER=\"gdm\" and enable the xdm service:\n
133 + # rc-update add xdm
134 + \n
135 + For passwordless login to unlock your keyring, you need to install
136 + sys-auth/pambase with USE=gnome-keyring and set an empty password
137 + on your keyring. Use app-crypt/seahorse for that.\n
138 + \n
139 + You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11
140 + for smartcard support
141 +"
142 +
143 +pkg_setup() {
144 + enewgroup gdm
145 + enewgroup video # Just in case it hasn't been created yet
146 + enewuser gdm -1 -1 /var/lib/gdm gdm,video
147 +
148 + # For compatibility with certain versions of nvidia-drivers, etc., need to
149 + # ensure that gdm user is in the video group
150 + if ! egetent group video | grep -q gdm; then
151 + # FIXME XXX: is this at all portable, ldap-safe, etc.?
152 + # XXX: egetent does not have a 1-argument form, so we can't use it to
153 + # get the list of gdm's groups
154 + local g=$(groups gdm)
155 + elog "Adding user gdm to video group"
156 + usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed"
157 + fi
158 +}
159 +
160 +src_prepare() {
161 + # ssh-agent handling must be done at xinitrc.d, bug #220603
162 + eapply "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
163 +
164 + # Gentoo does not have a fingerprint-auth pam stack
165 + eapply "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
166 +
167 + # Support pam_elogind.so in gdm-launch-environment.pam
168 + eapply "${FILESDIR}/pam-elogind.patch"
169 +
170 + # Wait 10 seconds for a DRM master with systemd. Workaround for gdm not waiting for CanGraphical=yes property on the seat. Bug #613222
171 + eapply "${FILESDIR}/gdm-CanGraphical-wait.patch" # needs eautoreconf
172 +
173 + # Show logo when branding is enabled
174 + use branding && eapply "${FILESDIR}/${PN}-3.30.3-logo.patch"
175 +
176 + gnome2_src_prepare
177 +}
178 +
179 +src_configure() {
180 + # PAM is the only auth scheme supported
181 + # even though configure lists shadow and crypt
182 + # they don't have any corresponding code.
183 + # --with-at-spi-registryd-directory= needs to be passed explicitly because
184 + # of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
185 + # Xevie is obsolete, bug #482304
186 +
187 + # --with-initial-vt=7 conflicts with plymouth, bug #453392
188 + # gdm-3.30 now reaps (stops) the login screen when the login VT isn't active, which
189 + # saves on memory. However this means if we don't start on VT1, gdm doesn't start up
190 + # before user manually goes to VT7. Thus as-is we can not keep gdm away from VT1,
191 + # so lets try always having it in VT1 and see if that is an issue for people before
192 + # hacking up workarounds for the initial start case.
193 + # ! use plymouth && myconf="${myconf} --with-initial-vt=7"
194 + local myconf=(
195 + --enable-gdm-xsession
196 + --enable-user-display-server
197 + --with-run-dir=/run/gdm
198 + --localstatedir="${EPREFIX}"/var
199 + --disable-static
200 + --with-xdmcp=yes
201 + --enable-authentication-scheme=pam
202 + --with-default-pam-config=exherbo
203 + --with-pam-mod-dir=$(getpam_mod_dir)
204 + --with-udevdir=$(get_udevdir)
205 + --with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec
206 + --without-xevie
207 + $(use_enable systemd systemd-journal)
208 + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
209 + $(use_with audit libaudit)
210 + $(use_enable ipv6)
211 + $(use_with plymouth)
212 + $(use_with selinux)
213 + $(use_with tcpd tcp-wrappers)
214 + $(use_enable wayland wayland-support)
215 + $(use_with xinerama)
216 + )
217 +
218 + if use elogind; then
219 + myconf+=(
220 + --with-initial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility
221 + SYSTEMD_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
222 + SYSTEMD_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
223 + )
224 + fi
225 +
226 + gnome2_src_configure "${myconf[@]}"
227 +}
228 +
229 +src_install() {
230 + gnome2_src_install
231 +
232 + if ! use accessibility ; then
233 + rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die
234 + fi
235 +
236 + exeinto /etc/X11/xinit/xinitrc.d
237 + newexe "${FILESDIR}/49-keychain-r1" 49-keychain
238 + newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent
239 +
240 + # gdm user's home directory
241 + keepdir /var/lib/gdm
242 + fowners gdm:gdm /var/lib/gdm
243 +
244 + if ! use bluetooth-sound ; then
245 + # Workaround https://gitlab.freedesktop.org/pulseaudio/pulseaudio/merge_requests/10
246 + # bug #679526
247 + insinto /var/lib/gdm/.config/pulse
248 + doins "${FILESDIR}"/default.pa
249 + fi
250 +
251 + # install XDG_DATA_DIRS gdm changes
252 + echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
253 + doenvd 99xdg-gdm
254 +
255 + use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg
256 +
257 + readme.gentoo_create_doc
258 +}
259 +
260 +pkg_postinst() {
261 + gnome2_pkg_postinst
262 + local d ret
263 +
264 + # bug #669146; gdm may crash if /var/lib/gdm subdirs are not owned by gdm:gdm
265 + ret=0
266 + ebegin "Fixing "${EROOT}"var/lib/gdm ownership"
267 + chown --no-dereference gdm:gdm "${EROOT}var/lib/gdm" || ret=1
268 + for d in "${EROOT}var/lib/gdm/"{.cache,.color,.config,.dbus,.local}; do
269 + [[ ! -e "${d}" ]] || chown --no-dereference -R gdm:gdm "${d}" || ret=1
270 + done
271 + eend ${ret}
272 +
273 + systemd_reenable gdm.service
274 + readme.gentoo_print_elog
275 +}