From abaa75b10f899ada8dd05b23cc03205064394bc6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 22 Jan 2021 20:28:19 +0000 Subject: gentoo resync : 22.01.2021 --- gnome-base/gdm/Manifest | 2 +- gnome-base/gdm/gdm-3.36.4.ebuild | 43 +++++++++++----------------------------- 2 files changed, 13 insertions(+), 32 deletions(-) (limited to 'gnome-base/gdm') diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest index 506c67ecba12..60318bd94085 100644 --- a/gnome-base/gdm/Manifest +++ b/gnome-base/gdm/Manifest @@ -10,5 +10,5 @@ DIST gdm-3.36.3.tar.xz 1218972 BLAKE2B 8e4d3dcd1dc84de276a6426feae206d43cfcbd8c8 DIST gdm-3.36.4.tar.xz 1235796 BLAKE2B eeac6c3c95993d7a75eecd03b51f0519b2f899eaecce8767dbab01eead68bddde21edc999eaf6b7ce747084ac9f88ab71cd7bf602e3bdc5bfe09038e3b01ad3a SHA512 ee8a4ae4a1c4846e4d52fda0b115dfc79ef76b78a2349977767e4212910b5ad331b908601f252292a8a944973372d1dce3124d9ccb8a2519a98d0e4813a6ec61 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 EBUILD gdm-3.36.3.ebuild 7890 BLAKE2B 85a72c96ec7a8ca887e62c08dc6de3155750cdd0f7c991177d59e624f5a1f671eea74bd658d91a04e29627320b84adfa225f854b554385df7475812dbcd872d3 SHA512 03311a54858c5184eb9ded700a3302ca1f9eef6a35b7ade2b3b3d0d004c620ff99d53568f6c56ff34f6f2f91652f6fbc6250f7471f33f8f5a059a1e7e676602c -EBUILD gdm-3.36.4.ebuild 7892 BLAKE2B d0bc4d82f8582bc86b41555f9c3d214e3c6c8da4ebebf085f991538e6c7b643f92f7b136fb8e9aad45e0981244532814fd6a281e4a32445cde7ce7d7bf97de1e SHA512 f9e2ce355ac24b17fca48d8f1fe80e4d0393d5d23a5b4dfbe687cb2eefe2e7a69abbb43efdb4fcbe365521647f4a429bad7809cd9bfbc99542dd627ae9c2be95 +EBUILD gdm-3.36.4.ebuild 7216 BLAKE2B 616d7e0e5a87180e53ed7a48356029d464ad072879b7c4949e18662ef0217e102d275af78f4336cc0a41dbb24e7eb7e18c8e5a3884a56431618e5736d4651b07 SHA512 7955211e0fe7e63e9622f457a5fd970015c6ad128f40b1c43968432054e26f4dedec5da8680112d50673c0810d67a8aa3150d5e17d1ecf690bb0575facc6871d MISC metadata.xml 759 BLAKE2B 13de28afc8fe81580a2aa28c5fdc17c77266595ffe95218cfbb5cbee4cbd6edab21e8cd06698e4a5feeb696fd9530ef8bf14209ecf3d03039b4e0562bb757375 SHA512 68cec6972bcabcb873fb314babbf9bdfacc7eaae40d662d11662fccd6cbf6630cd93b7322baa271081244c77fd1458c89ad785a0eb2a58b448ddff663381d98d diff --git a/gnome-base/gdm/gdm-3.36.4.ebuild b/gnome-base/gdm/gdm-3.36.4.ebuild index 8a86e224747e..484f7ecbf18c 100644 --- a/gnome-base/gdm/gdm-3.36.4.ebuild +++ b/gnome-base/gdm/gdm-3.36.4.ebuild @@ -1,11 +1,10 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -GNOME2_LA_PUNT="yes" +EAPI=7 GNOME2_EAUTORECONF="yes" -inherit eutils gnome2 pam readme.gentoo-r1 systemd toolchain-funcs udev user +inherit gnome2 pam readme.gentoo-r1 systemd toolchain-funcs udev DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" HOMEPAGE="https://wiki.gnome.org/Projects/GDM" @@ -72,6 +71,8 @@ COMMON_DEPEND=" # fprintd is used via dbus by gdm-fingerprint-extension # gnome-session-3.6 needed to avoid freezing with orca RDEPEND="${COMMON_DEPEND} + acct-group/gdm + acct-user/gdm >=gnome-base/gnome-session-3.6 >=gnome-base/gnome-shell-3.1.90 x11-apps/xhost @@ -79,18 +80,19 @@ RDEPEND="${COMMON_DEPEND} accessibility? ( >=app-accessibility/orca-3.10 gnome-extra/mousetweaks ) - fprint? ( - sys-auth/fprintd - sys-auth/pam_fprint ) + fprint? ( sys-auth/fprintd[pam] ) " DEPEND="${COMMON_DEPEND} + x11-base/xorg-proto +" +BDEPEND=" app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool + >=gnome-base/dconf-0.20 >=sys-devel/gettext-0.19.8 virtual/pkgconfig - x11-base/xorg-proto test? ( >=dev-libs/check-0.9.4 ) app-text/yelp-tools " # yelp-tools needed for eautoreconf to not lose help docs (m4_ifdeffed YELP_HELP_INIT call and setup) @@ -111,23 +113,6 @@ DOC_CONTENTS=" for smartcard support " -pkg_setup() { - enewgroup gdm - enewgroup video # Just in case it hasn't been created yet - enewuser gdm -1 -1 /var/lib/gdm gdm,video - - # For compatibility with certain versions of nvidia-drivers, etc., need to - # ensure that gdm user is in the video group - if ! egetent group video | grep -q gdm; then - # FIXME XXX: is this at all portable, ldap-safe, etc.? - # XXX: egetent does not have a 1-argument form, so we can't use it to - # get the list of gdm's groups - local g=$(groups gdm) - elog "Adding user gdm to video group" - usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed" - fi -} - src_prepare() { # ssh-agent handling must be done at xinitrc.d, bug #220603 eapply "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch" @@ -209,10 +194,6 @@ src_install() { newexe "${FILESDIR}/49-keychain-r1" 49-keychain newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent - # gdm user's home directory - keepdir /var/lib/gdm - fowners gdm:gdm /var/lib/gdm - if ! use bluetooth-sound ; then # Workaround https://gitlab.freedesktop.org/pulseaudio/pulseaudio/merge_requests/10 # bug #679526 @@ -235,9 +216,9 @@ pkg_postinst() { # bug #669146; gdm may crash if /var/lib/gdm subdirs are not owned by gdm:gdm ret=0 - ebegin "Fixing "${EROOT}"var/lib/gdm ownership" - chown --no-dereference gdm:gdm "${EROOT}var/lib/gdm" || ret=1 - for d in "${EROOT}var/lib/gdm/"{.cache,.color,.config,.dbus,.local}; do + ebegin "Fixing "${EROOT}"/var/lib/gdm ownership" + chown --no-dereference gdm:gdm "${EROOT}/var/lib/gdm" || ret=1 + for d in "${EROOT}/var/lib/gdm/"{.cache,.color,.config,.dbus,.local}; do [[ ! -e "${d}" ]] || chown --no-dereference -R gdm:gdm "${d}" || ret=1 done eend ${ret} -- cgit v1.2.3