summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2022-01-24 12:49:33 -0800
committerMatt Turner <mattst88@gentoo.org>2022-01-24 14:42:46 -0800
commitb13921fbe101914185dce0687099b3481625aad3 (patch)
tree8b472749c63f8175d3f2563c99bc2b84a353809a
parentgames-board/tali: Drop old versions (diff)
downloadgentoo-b13921fbe101914185dce0687099b3481625aad3.tar.gz
gentoo-b13921fbe101914185dce0687099b3481625aad3.tar.bz2
gentoo-b13921fbe101914185dce0687099b3481625aad3.zip
gnome-base/gdm: Drop old versions
Signed-off-by: Matt Turner <mattst88@gentoo.org>
-rw-r--r--gnome-base/gdm/Manifest1
-rw-r--r--gnome-base/gdm/files/gdm-40.0-meson-Fix-libwrap-detection.patch28
-rw-r--r--gnome-base/gdm/gdm-40.0-r1.ebuild215
3 files changed, 0 insertions, 244 deletions
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 55705914eaf7..97e11a713bbd 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,4 +1,3 @@
-DIST gdm-40.0.tar.xz 800296 BLAKE2B 9c2038758cec09f13c18bd79d431e82a29fb1a2b8ab099498a0b8d920cb93896abceab9157edae8cc15312e03d21eb36b649c2cc8761f9af5fec387c5f28a261 SHA512 b20d02f8a80f6aff8909a69c6c621c20c5aa1b25cfedd68bf95faaaa56d5f7cd5d607d1a7388b97aa06510684f1e9e474248042a00203f496c39930e001bb64c
DIST gdm-40.1.tar.xz 803488 BLAKE2B a0f5349c15c281b666e2e1eb35b81bd4fe3561d7dfa48e43fab7b6ac5c6f9f187f3907fc88eb169ef5e7951c815dec849f64ff2a2b630742b47521bc5c33f618 SHA512 34e3d905195c9d44f3681fcf8170b67e739cef60fe3987802b7006e5063b9cdf5ca047470d0aebd6e9b47dbbb660040648a647ed8d3186a3099b8c6532c5ded7
DIST gdm-41.0-patchset.tar.xz 12076 BLAKE2B 900ad267bdbb0c189ba36c215aa4bd18f170efd4df02341b1b6f98bdb09b4bbcfcf795ec5a63b5364f47486767a347f60193168749f10823fa816f9500cd3073 SHA512 6c7940ec9c91d0e28f5e9d728abd49814d4d9c7b964e753436f0ceaa11f6c58a559ac3ef0d2e14bf5410a097abdf72cf16dad191017c9ee5c59e6f68de8f2ca8
DIST gdm-41.0.tar.xz 806668 BLAKE2B 12bd10ff4c5799683665127e5ff543e07f13cffde1d668213b43d6471812c727cb18e93c3305923019c3f522aa0484779dd861afc7ac939115b5f169657722e8 SHA512 b1dd99beb8339c6cf93f10e0aec1c946c615b4efaf1724392585985fb32cee156a9e44fd3041ab87ab9ba6a6bd6c9a9d0ecf8b40dc9c098b3c7ee47f7a7e9a97
diff --git a/gnome-base/gdm/files/gdm-40.0-meson-Fix-libwrap-detection.patch b/gnome-base/gdm/files/gdm-40.0-meson-Fix-libwrap-detection.patch
deleted file mode 100644
index 2742cf276413..000000000000
--- a/gnome-base/gdm/files/gdm-40.0-meson-Fix-libwrap-detection.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/142
-
-From c713ace4c71a6804734ba5b1bca4abde11ab90d1 Mon Sep 17 00:00:00 2001
-From: Bernd Feige <Bernd.Feige@gmx.net>
-Date: Wed, 19 May 2021 11:28:07 -0700
-Subject: [PATCH] meson: Fix libwrap detection
-
-Bug: https://bugs.gentoo.org/790671
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 0266a938..a490a725 100644
---- a/meson.build
-+++ b/meson.build
-@@ -90,7 +90,7 @@ else
- endif
- xdmcp_dep = cc.find_library('Xdmcp', required: get_option('xdmcp'))
- if xdmcp_dep.found() and get_option('tcp-wrappers')
-- libwrap_dep = cc.find_library('libwrap')
-+ libwrap_dep = cc.find_library('wrap')
- endif
- # systemd
- systemd_dep = dependency('systemd')
---
-2.26.3
-
diff --git a/gnome-base/gdm/gdm-40.0-r1.ebuild b/gnome-base/gdm/gdm-40.0-r1.ebuild
deleted file mode 100644
index 538537d7e0f5..000000000000
--- a/gnome-base/gdm/gdm-40.0-r1.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop gnome2 meson 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"
-
-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 ipv6 plymouth selinux systemd tcpd test wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="^^ ( elogind systemd )"
-
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-
-# dconf, dbus and g-s-d are needed at install time for dconf update
-# keyutils is automagic dep that makes autologin unlock login keyring when all the passwords match (disk encryption, user pw and login keyring)
-# dbus-run-session used at runtime
-COMMON_DEPEND="
- virtual/udev
- >=dev-libs/glib-2.56:2
- >=x11-libs/gtk+-2.91.1:3
- >=media-libs/libcanberra-0.4[gtk3]
- >=sys-apps/accountsservice-0.6.35
- x11-libs/libxcb
- sys-apps/keyutils:=
- selinux? ( sys-libs/libselinux )
-
- x11-libs/libX11
- x11-libs/libXau
- x11-base/xorg-server[-minimal]
- x11-libs/libXdmcp
- tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-
- systemd? ( >=sys-apps/systemd-186:0=[pam] )
- elogind? ( >=sys-auth/elogind-239.3[pam] )
-
- plymouth? ( sys-boot/plymouth )
- audit? ( sys-process/audit )
-
- sys-libs/pam
- sys-auth/pambase[elogind?,systemd?]
-
- >=gnome-base/dconf-0.20
- >=gnome-base/gnome-settings-daemon-3.1.4
- gnome-base/gsettings-desktop-schemas
- sys-apps/dbus
-
- >=x11-misc/xdg-utils-1.0.2-r3
-
- >=dev-libs/gobject-introspection-0.9.12:=
-"
-# XXX: These deps are from session and desktop files in data/ directory
-# fprintd is used via dbus by gdm-fingerprint-extension
-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
-
- accessibility? (
- >=app-accessibility/orca-3.10
- gnome-extra/mousetweaks
- )
- 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
- test? ( >=dev-libs/check-0.9.4 )
- app-text/yelp-tools
-"
-
-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
-"
-
-PATCHES=(
- # Gentoo does not have a fingerprint-auth pam stack
- "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
-
- # Add elogind support
- "${FILESDIR}/${P}-meson-allow-building-with-elogind.patch"
-
- # Support pam_elogind.so in gdm-launch-environment.pam
- "${FILESDIR}/pam-elogind.patch"
-
- "${FILESDIR}"/${P}-meson-Fix-libwrap-detection.patch
-)
-
-src_prepare() {
- default
-
- # Show logo when branding is enabled
- use branding && eapply "${FILESDIR}/${PN}-3.30.3-logo.patch"
-}
-
-src_configure() {
- # --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.
- local emesonargs=(
- --localstatedir /var
-
- -Ddefault-pam-config=exherbo
- -Dgdm-xsession=true
- -Dgroup=gdm
- $(meson_use ipv6)
- $(meson_feature audit libaudit)
- -Dlogind-provider=$(usex systemd systemd elogind)
- -Dpam-mod-dir=$(getpam_mod_dir)
- $(meson_feature plymouth)
- -Drun-dir=/run/gdm
- $(meson_feature selinux)
- $(meson_use systemd systemd-journal)
- $(meson_use tcpd tcp-wrappers)
- -Dudev-dir=$(get_udevdir)/rules.d
- -Duser=gdm
- -Duser-display-server=true
- $(meson_use wayland wayland-support)
- -Dxdmcp=enabled
- )
-
- if use elogind; then
- emesonargs+=(
- -Dinitial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility
- -Dsystemdsystemunitdir=no
- -Dsystemduserunitdir=no
- )
- else
- emesonargs+=(
- -Dinitial-vt=1
- -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
- -Dsystemduserunitdir="$(systemd_get_userunitdir)"
- )
- fi
-
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- if ! use accessibility ; then
- rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die
- fi
-
- 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
-}