From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- gnome-base/gdm/Manifest | 4 +- gnome-base/gdm/gdm-3.32.0.ebuild | 245 --------------------------------------- gnome-base/gdm/gdm-3.34.1.ebuild | 2 +- 3 files changed, 2 insertions(+), 249 deletions(-) delete mode 100644 gnome-base/gdm/gdm-3.32.0.ebuild (limited to 'gnome-base/gdm') diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest index b9b22480ccda..a2563f0ed3d0 100644 --- a/gnome-base/gdm/Manifest +++ b/gnome-base/gdm/Manifest @@ -6,9 +6,7 @@ AUX gdm-3.30.3-logo.patch 846 BLAKE2B e99b6621191c509545bc36fe838bc467c3762f2726 AUX gdm-3.8.4-fingerprint-auth.patch 923 BLAKE2B e681da8518ed1d002c1205658bb35e472e9d130df5d70dfd9eef55f5361cffeee716ebe0eea23f4c19f9f6ec2f4118729616f7f4e2c758990cf7cde3271cc8b2 SHA512 3cf5f9c0eabdae3f767d9b9db6052d760e879c14b9304753cdda56a4f643a9ed97f3ea83f642bfe96d220c8e9e4f99fbbd47c6e99ddfebeb6322a3a033c296d5 AUX gdm-CanGraphical-wait.patch 5534 BLAKE2B 3be217b156ab6d486d7df98885934c5d1bedd6219a25a83cba687aa1ed59f6d0f2a16694a47050313e601355696095ccc738ac639f5958d9619db81d34efe068 SHA512 2152e800051473b8fd230c4b325d72229cfe91dce3e90ad6d8ace8e3278483ab05ce683e61c183f7c83e293873f69715740b1eccfdb34d6775140c635c73b5dd AUX pam-elogind.patch 835 BLAKE2B 1db26b690d631c152ae7fd84149c7ff3222e8bd258bff78e09cd6f00fe34a8bfdb2499b252a1f15e17d9e4ed315e02260357b57cd31cf8ada5a2705ba1ef4ee0 SHA512 4d2d65741a5bfd1dc686dc986708526161d15ace2d5396bef281a2192d95458a072764483e1422ed1f6eb594fc0caa6baa381371618f907a97f75566209fab7b -DIST gdm-3.32.0.tar.xz 1262344 BLAKE2B bbc580f788fe2ce8783f044eb8109ce0086b1bb078bafaeb6efd833689848ef6570bb0fd0e6e260a388e7c1a6d3cdccb36264a640151e9b6e5d81ca9c35f3be3 SHA512 88016d0f800030a561e0360c63fdcb8499a605126f99a5a9f89606e086d7a934afc091843b2acd9091c1c643e7468ee31ae9a5b6264ae38064618ad577ef7ac0 DIST gdm-3.34.1.tar.xz 1244960 BLAKE2B c6e53b37baa75f202725b21b58e22cc84d44d241cc3fa10dd466e1a766ce4081bf436e965dcd38f0c009b5145813c95d77c76ca31ef837e8d0251c6d65d06ca9 SHA512 71b71699e8e31643080d2af5dc54381592c0c6a2f7adbb0434a9957c8e59c67a20afaf48dce57139453157572c5bae617134420f36e8da68fbc74e95746d26fb DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 -EBUILD gdm-3.32.0.ebuild 7688 BLAKE2B fc7fa5e70365a28f14ec76eb81f78441ef8d836affbdf2f7dbf0ea3c4173215dd2b12a971e72b75ab82ee90adae51f51492884308c0e58d285472d06195b107f SHA512 e58bdbb63860540cce5a888911ef5adc90c9a13c4cd948b3a686b9cccef7f7ee923e45dde5fa294260bc2ee1f20d8e59f760c96fe45ef67b10027ed7314e6a67 -EBUILD gdm-3.34.1.ebuild 7694 BLAKE2B d278e953d3d87f209f6f20bb9ac9b88cee77c13acb5e98d87eb51c69baac31cd90a546640a2ca53c170377dba569cff1615998d3e11f593c2802f2358067e6d5 SHA512 fd3b252fba9832f2b306e1cf017b9529c9c3ddcf0fd2fb5ed51de2eb8e46609256b8b2bd1c9eff711746cd3332da1568b1c6b31b2c017372168dfe6a43698843 +EBUILD gdm-3.34.1.ebuild 7687 BLAKE2B 184f7e6088b72f974c07f82ea049a6d8c91d2312dafe67753694e1b9e1fee08162396d7aeb12691eee345bafe32aaecedaef1bf5350d6e20fc88628cfcfedfaa SHA512 507d1b05567c0ec34dc51c2f65cab1e4bdf63f8d33a79433c298e3aa33dd08e6daeff024777d311a31ea6283aa8ea737a06a9e0467dafe8574a46cea8ac051a9 MISC metadata.xml 759 BLAKE2B 13de28afc8fe81580a2aa28c5fdc17c77266595ffe95218cfbb5cbee4cbd6edab21e8cd06698e4a5feeb696fd9530ef8bf14209ecf3d03039b4e0562bb757375 SHA512 68cec6972bcabcb873fb314babbf9bdfacc7eaae40d662d11662fccd6cbf6630cd93b7322baa271081244c77fd1458c89ad785a0eb2a58b448ddff663381d98d diff --git a/gnome-base/gdm/gdm-3.32.0.ebuild b/gnome-base/gdm/gdm-3.32.0.ebuild deleted file mode 100644 index 05137ca53be8..000000000000 --- a/gnome-base/gdm/gdm-3.32.0.ebuild +++ /dev/null @@ -1,245 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -GNOME2_EAUTORECONF="yes" - -inherit eutils gnome2 pam readme.gentoo-r1 systemd udev user - -DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" -HOMEPAGE="https://wiki.gnome.org/Projects/GDM" - -SRC_URI="${SRC_URI} - branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz ) -" - -LICENSE=" - GPL-2+ - branding? ( CC-BY-SA-4.0 ) -" - -SLOT="0" - -IUSE="accessibility audit bluetooth-sound branding elogind fprint +introspection ipv6 plymouth selinux smartcard systemd tcpd test wayland xinerama" -RESTRICT="!test? ( test )" -REQUIRED_USE="^^ ( elogind systemd )" - -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 x86" - -# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 -# nspr used by smartcard extension -# dconf, dbus and g-s-d are needed at install time for dconf update -# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784 -COMMON_DEPEND=" - app-text/iso-codes - >=dev-libs/glib-2.44:2 - dev-libs/libgudev - >=x11-libs/gtk+-2.91.1:3 - >=gnome-base/dconf-0.20 - >=gnome-base/gnome-settings-daemon-3.1.4 - gnome-base/gsettings-desktop-schemas - >=media-libs/fontconfig-2.5.0:1.0 - >=media-libs/libcanberra-0.4[gtk3] - sys-apps/dbus - >=sys-apps/accountsservice-0.6.35 - - x11-base/xorg-server - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libxcb - >=x11-misc/xdg-utils-1.0.2-r3 - - sys-libs/pam - elogind? ( >=sys-auth/elogind-239.3[pam] ) - systemd? ( >=sys-apps/systemd-186:0=[pam] ) - - sys-auth/pambase[elogind?,systemd?] - - audit? ( sys-process/audit ) - introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) - plymouth? ( sys-boot/plymouth ) - selinux? ( sys-libs/libselinux ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - xinerama? ( x11-libs/libXinerama ) -" -# XXX: These deps are from session and desktop files in data/ directory -# fprintd is used via dbus by gdm-fingerprint-extension -# gnome-session-3.6 needed to avoid freezing with orca -RDEPEND="${COMMON_DEPEND} - >=gnome-base/gnome-session-3.6 - >=gnome-base/gnome-shell-3.1.90 - x11-apps/xhost - - accessibility? ( - >=app-accessibility/orca-3.10 - gnome-extra/mousetweaks ) - fprint? ( - sys-auth/fprintd - sys-auth/pam_fprint ) - - !gnome-extra/fast-user-switch-applet -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.1.2 - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/itstool - >=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) - -DOC_CONTENTS=" - To make GDM start at boot with systemd, run:\n - # systemctl enable gdm.service\n - \n - To make GDM start at boot with OpenRC, edit /etc/conf.d to have - DISPLAYMANAGER=\"gdm\" and enable the xdm service:\n - # rc-update add xdm - \n - For passwordless login to unlock your keyring, you need to install - sys-auth/pambase with USE=gnome-keyring and set an empty password - on your keyring. Use app-crypt/seahorse for that.\n - \n - You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11 - 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" - - # Gentoo does not have a fingerprint-auth pam stack - eapply "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch" - - # Support pam_elogind.so in gdm-launch-environment.pam - eapply "${FILESDIR}/pam-elogind.patch" - - # Wait 10 seconds for a DRM master with systemd. Workaround for gdm not waiting for CanGraphical=yes property on the seat. Bug #613222 - eapply "${FILESDIR}/gdm-CanGraphical-wait.patch" # needs eautoreconf - - # Show logo when branding is enabled - use branding && eapply "${FILESDIR}/${PN}-3.30.3-logo.patch" - - gnome2_src_prepare -} - -src_configure() { - # PAM is the only auth scheme supported - # even though configure lists shadow and crypt - # they don't have any corresponding code. - # --with-at-spi-registryd-directory= needs to be passed explicitly because - # of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4 - # Xevie is obsolete, bug #482304 - - # --with-initial-vt=7 conflicts with plymouth, bug #453392 - # gdm-3.30 now reaps (stops) the login screen when the login VT isn't active, which - # saves on memory. However this means if we don't start on VT1, gdm doesn't start up - # before user manually goes to VT7. Thus as-is we can not keep gdm away from VT1, - # so lets try always having it in VT1 and see if that is an issue for people before - # hacking up workarounds for the initial start case. - # ! use plymouth && myconf="${myconf} --with-initial-vt=7" - local myconf=( - --enable-gdm-xsession - --enable-user-display-server - --with-run-dir=/run/gdm - --localstatedir="${EPREFIX}"/var - --disable-static - --with-xdmcp=yes - --enable-authentication-scheme=pam - --with-default-pam-config=exherbo - --with-pam-mod-dir=$(getpam_mod_dir) - --with-udevdir=$(get_udevdir) - --with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec - --without-xevie - $(use_enable systemd systemd-journal) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - $(use_with audit libaudit) - $(use_enable ipv6) - $(use_with plymouth) - $(use_with selinux) - $(use_with tcpd tcp-wrappers) - $(use_enable wayland wayland-support) - $(use_with xinerama) - ) - - if use elogind; then - myconf+=( - --with-initial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility - SYSTEMD_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null` - SYSTEMD_LIBS=`pkg-config --libs "libelogind" 2>/dev/null` - ) - fi - - gnome2_src_configure "${myconf[@]}" -} - -src_install() { - gnome2_src_install - - if ! use accessibility ; then - rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die - fi - - exeinto /etc/X11/xinit/xinitrc.d - 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 - insinto /var/lib/gdm/.config/pulse - doins "${FILESDIR}"/default.pa - fi - - # install XDG_DATA_DIRS gdm changes - echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm - doenvd 99xdg-gdm - - use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg - - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - local d ret - - # 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 - [[ ! -e "${d}" ]] || chown --no-dereference -R gdm:gdm "${d}" || ret=1 - done - eend ${ret} - - systemd_reenable gdm.service - readme.gentoo_print_elog -} diff --git a/gnome-base/gdm/gdm-3.34.1.ebuild b/gnome-base/gdm/gdm-3.34.1.ebuild index 82b7e1698808..8f95ce48a07e 100644 --- a/gnome-base/gdm/gdm-3.34.1.ebuild +++ b/gnome-base/gdm/gdm-3.34.1.ebuild @@ -25,7 +25,7 @@ IUSE="accessibility audit bluetooth-sound branding elogind fprint +introspection RESTRICT="!test? ( test )" REQUIRED_USE="^^ ( elogind systemd )" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86" # NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 # nspr used by smartcard extension -- cgit v1.2.3