5 files changed, 247 insertions, 0 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 9b9adc172326..dbeeda75f432 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 7bf0173069af..698d340b35b1 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -1,12 +1,15 @@
 AUX README.gentoo 494 BLAKE2B 8a92171cbc9e8a93cc5e73101bf478b27945e85f843ef244daea881f0aa061820645c425e52dd6a75adc0bd09c95126a059694bc7d5f6084e4f0222fc5e8ab85 SHA512 07e35ef0ac603b2b817c33fd2bc06b9b254a2e3fee16e7ec8fc0c86d27330c795b8d1eae660c42c414de4d721faea2cab1d41c5950ca7a1032d758626011ae3c
 AUX Xsession 1921 BLAKE2B 9127e95c28d2a22f6a1d5f2997edf5997315667d20522c7a8b839fe492d576e0e69cf280ce2fea1fb8d4df61e3b254a38782dbd3c78fdc4ef79924b224311306 SHA512 efa046db5445464e7deb3c5aa43b1a2e1abb7ec0537d4040567d4d9932f15b954866cdd9c3a2bd703de9d7818d4fccff76008426061bc97dc342f7805cb645c1
+AUX Xsession-r1 1962 BLAKE2B 4c682f727d03c7b98e565c0e2f42d8f11407990fd0956f4b58dd0c74821fc698aff7458a7becdfa32c132ba74a96a62a11703633b55950ad2c3b2bbdb09c2cf4 SHA512 99d879850fe537a070cdf373b8f6e3ec9b65152c7cc0897dcd824cfee65bb47f51f01bf956311dbec4f17e5cdab0c103fc989aad8a3a2c40e771e730e1fe1d59
 AUX lightdm-1.30.0-musl-locale.patch 1479 BLAKE2B 9187e6837820f14be86cd302cd2e76e11bca1c3256289c9c8bcd63640203d71d1f09fe1c8a9b35f6e34176130bc885b805901df17fc90d6869f095da5cb9dad9 SHA512 effa56b8b4716d92c33c1e64755ff735de8899c9781259759c03ea81e8e9e751de63ff867346ec72a739661932cb99990a73371875477fb0230f19f1567bea44
 AUX lightdm-1.30.0-musl-updwtmpx.patch 950 BLAKE2B aaf6169707e0fd98e24b893c0b8602a1ccf982e7506f85e584b2623bb645eeb8c13b36cda1662085e01735e0472f6d279c02fe34b1b5cbea2b9e351f277898b2 SHA512 fe41980da22a0aac067ef1c0ef4a1cba8dc5523a0436b6f264f065bcf83264d2f900c0a0d71aae2f24ccd23a87e34b4015e350046253285f150be5b13df4c4bd
 AUX lightdm-autologin 157 BLAKE2B 54ce42f09f88c793e90f5f21743e17a0184227b83c11192e766d6f3c1020fe0dc4227da0eb8e404c8d67d6a5bcfe9b55075820fb911f1611347e99cd5c99493f SHA512 35bfeee42d2e4e34a42f5cd645c2b7aac801d8a8396b42ec7725179827ec8a52b3db106dcddaa100c3d5d6d19a2df5e462f121a18c848bd898dcce3e43fa791f
 AUX lightdm.service 279 BLAKE2B 92a9602d1d1c10fedfabd58b0794a68a278939d905f4d790ea9c2a0632abe8238a6187b3e01b4296a1187349864b30291853889ceaa519f5a12a98b2aecbb1ea SHA512 5b60788e35ebd7918b21ab52dc3f5cc29dd3aa45ddf6cfe75a72d1c541620f0438378a9bd681e2c151a465cf981e803b399f61b48ff5d0f2e1a3cc950c30d23a
+AUX lightdm.service-r1 257 BLAKE2B e6f684f6449552601073e50bad64d0c67c6c896ee0551ae3ec4dd222c9d28bf17a6167114da804a74880a26202ab1eb3047168d75a34d680584de24a7bbf1254 SHA512 c20888298c8722c7562b36987a11c0dd978738795043bab2fa2fe28e4c20a5d64e25a7a26bb5345df8cb0f6b13adc9528c853016ece9eb75ee90bf65ed9ebe9c
 DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c4cd946aaaac0b5fa13aa27805fa17297112bfaabb1c5a34bd83d2ecdef2033b622dbd5e63914baacb8f6edf488a7396d26d9 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be
 DIST lightdm-1.30.0.tar.xz 509220 BLAKE2B 5b6fcc6b955d7a7eb3a810a7e28707a812810d7f2568d6985a4411b1bf6f06b35ff721bd8a9388a85a4e4a64a39f5e30e86a9dbaa6d344e898ae49e9f39785ff SHA512 bca25a0aa73caf7d51e5882889a1707d2527470a170658c1be98ecfb96c8f85fd616494fc5bed658e744f91b9f8b0a98d2a0cf42f9c030242ae470c8a27145ce
 DIST lightdm-1.32.0.tar.xz 518168 BLAKE2B 90191559895a58e2c5892705ea95766aaaaa87d3470f1372ab90fcf3991d27f9280d5bbabe0cfce70e25f960d63c1e7eab7beeeb501341996afd155788cbe1c7 SHA512 81497fb25904bc2e8687dc99992628eb534f7418f72e1908c4766e917fc1221714210d998739417e1cae2ee15e3197a2eb8d4981cb944cfeb0334dc9e356e716
 EBUILD lightdm-1.30.0-r3.ebuild 4139 BLAKE2B bb436a18ccb2e229b57ec10be9524542fc81dae8034b802b00dee64b69f704723a9d79b270c2a46ac056edb837c47827c7fab9fe36efe78ce4015f0cda886d20 SHA512 c004da29823aa0dd3db06c22a0bb36548d6d25a593636cff79511c1972b695f1b7920e17f23f4a7b911b7bfd45e0bc1cfea81986bf7d92c463536ca3549740f7
+EBUILD lightdm-1.32.0-r1.ebuild 4149 BLAKE2B edd5a25a4e718ceada3141f90596b5d2478edd6fc108bc220649b0ef9e208c016256fede45838721906a861ae71d593cf9cd128edeb7cb2baf28220e6846de2f SHA512 cabd38cb3d53644ccedf14af220eceb0ceb5b750cc3fe8d7e346b8cf85c67cdfe99ae04e669bd5f95315dc6d2f2007fdae63de99b58d3e326ead611d5a8f41b7
 EBUILD lightdm-1.32.0.ebuild 4094 BLAKE2B bf75edebcf6b8da393be5d4aaa50c6768d792c1a4431d1e80b7e81f606d1df47baec7c2a58af713997b10f6145db826d404dd26141c6b81fa6a8f23876d86f2f SHA512 4ca285fb16cc7b7d5c496f2994fbcb23e46953e65ddfd699016bafe144cc5904817fcf4356192413f6b6e0253e1bddc232d56e13aea478b8a36fb867db296594
 MISC metadata.xml 454 BLAKE2B 66c069f7c5e3b820059e67736ebd898389a8243bce08fd364c8d0a1704f484a13a935bc2a7a31ad975535f8df5a091cbc337c48ea65f45a1cebdcb2c0888b8dc SHA512 f5e5c7467eef552ac808daa8289f803438fc72c81028b48cb20f4f18ff2462216520312294eeff8fffc1357a4330e1e264da70dd35ef3c20baff2c5c26bc654e
diff --git a/x11-misc/lightdm/files/Xsession-r1 b/x11-misc/lightdm/files/Xsession-r1
new file mode 100644
index 000000000000..c0968ea2803f
--- /dev/null
+++ b/x11-misc/lightdm/files/Xsession-r1
@@ -0,0 +1,75 @@
+#!/bin/sh
+#
+# LightDM wrapper to run around X sessions.
+
+echo "Running X session wrapper"
+
+# Load profile
+for file in "/etc/profile" "${HOME}/.profile" "/etc/xprofile" "${HOME}/.xprofile" ; do
+    if [ -f "${file}" ] ; then
+        echo "Loading profile from ${file}";
+        . "${file}"
+    fi
+done
+
+# Load resources
+for file in "/etc/X11/Xresources" "${HOME}/.Xresources" ; do
+    if [ -f "${file}" ] ; then
+        echo "Loading resource: ${file}"
+        xrdb -nocpp -merge "${file}"
+    fi
+done
+
+# Load keymaps
+for file in "/etc/X11/Xkbmap" "${HOME}/.Xkbmap" ; do
+    if [ -f "${file}" ] ; then
+        echo "Loading keymap: ${file}"
+        setxkbmap $(cat "${file}")
+        XKB_IN_USE=yes
+    fi
+done
+
+# Load xmodmap if not using XKB
+if [ -z "${XKB_IN_USE}" ] ; then
+    for file in "/etc/X11/Xmodmap" "${HOME}/.Xmodmap" ; do
+        if [ -f "${file}" ] ; then
+           echo "Loading modmap: ${file}"
+           xmodmap "${file}"
+        fi
+    done
+fi
+
+unset XKB_IN_USE
+
+# /etc/X11/xinit/xinitrc.d/80-dbus expects $command to be
+# set to the Xsession arguments. So make it happy. See
+# https://bugs.gentoo.org/show_bug.cgi?id=533456
+command="$@"
+
+# Run all system xinitrc shell scripts.
+xinitdir="/etc/X11/xinit/xinitrc.d"
+if [ -d "${xinitdir}" ] ; then
+    for script in ${xinitdir}/* ; do
+        if [ -x "${script}" ] && [ ! -d "${script}" ] ; then
+            echo "Loading xinit script ${script}"
+            . "${script}"
+        fi
+    done
+fi
+
+# Load Xsession scripts
+xsessionddir="/etc/X11/Xsession.d"
+if [ -d "${xsessionddir}" ] ; then
+    for script in "${xsessionddir}"/* ; do
+        local i=$(basename ${script})
+        script="${xsessionddir}/${i}"
+        if [ -r "${script}" ] && [ -f "${script}" ] && expr "${i}" : '^[[:alnum:]_-]\+$' > /dev/null ; then
+            echo "Loading X session script ${script}"
+            . "${script}"
+        fi
+    done
+fi
+
+echo "X session wrapper complete, running session ${@}"
+
+exec ${command}
diff --git a/x11-misc/lightdm/files/lightdm.service-r1 b/x11-misc/lightdm/files/lightdm.service-r1
new file mode 100644
index 000000000000..d843cac90a7f
--- /dev/null
+++ b/x11-misc/lightdm/files/lightdm.service-r1
@@ -0,0 +1,13 @@
+[Unit]
+Description=Light Display Manager
+Documentation=man:lightdm(1)
+After=systemd-user-sessions.service
+
+[Service]
+ExecStart=/usr/sbin/lightdm
+Restart=always
+IgnoreSIGPIPE=no
+BusName=org.freedesktop.DisplayManager
+
+[Install]
+Alias=display-manager.service
diff --git a/x11-misc/lightdm/lightdm-1.32.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.32.0-r1.ebuild
new file mode 100644
index 000000000000..be0c88f7c389
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.32.0-r1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools pam qmake-utils readme.gentoo-r1 systemd vala xdg-utils
+
+DESCRIPTION="A lightweight display manager"
+HOMEPAGE="https://github.com/canonical/lightdm"
+SRC_URI="https://github.com/canonical/lightdm/releases/download/${PV}/${P}.tar.xz
+	mirror://gentoo/introspection-20110205.m4.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="audit +gnome +gtk +introspection non-root qt5 vala"
+
+REQUIRED_USE="vala? ( introspection )"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.44.0:2
+	dev-libs/libgcrypt:=
+	dev-libs/libxml2
+	sys-libs/pam
+	x11-libs/libX11
+	>=x11-libs/libxklavier-5
+	audit? ( sys-process/audit )
+	gnome? ( sys-apps/accountsservice )
+	introspection? ( >=dev-libs/gobject-introspection-1 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/lightdm
+	acct-group/video
+	acct-user/lightdm
+	>=sys-auth/pambase-20101024-r2"
+DEPEND="${COMMON_DEPEND}
+	gnome? ( gnome-base/gnome-common )
+"
+BDEPEND="
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.32.0-musl-locale.patch
+	"${FILESDIR}"/${PN}-1.32.0-musl-updwtmpx.patch
+)
+
+DOCS=( NEWS )
+
+pkg_setup() {
+	export LIGHTDM_USER=${LIGHTDM_USER:-lightdm}
+	vala_setup
+}
+
+src_prepare() {
+	xdg_environment_reset
+
+	sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
+	sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
+
+	einfo "Fixing the session-wrapper variable in lightdm.conf"
+	sed -i -e \
+		"/^#session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
+		data/lightdm.conf || die "Failed to fix lightdm.conf"
+
+	# use correct version of qmake. bug #566950
+	sed \
+		-e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" \
+		-i configure.ac || die
+
+	default
+
+	# Remove bogus Makefile statement. This needs to go upstream
+	sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
+	if has_version dev-libs/gobject-introspection; then
+		eautoreconf
+	else
+		AT_M4DIR=${WORKDIR} eautoreconf
+	fi
+}
+
+src_configure() {
+	# Set default values if global vars unset
+	local _greeter _session _user
+	_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
+	_session=${LIGHTDM_SESSION:=gnome}
+	_user="$(usex non-root "${LIGHTDM_USER}" root)"
+	# Let user know how lightdm is configured
+	einfo "Gentoo configuration"
+	einfo "Default greeter: ${_greeter}"
+	einfo "Default session: ${_session}"
+	einfo "Greeter user: ${_user}"
+
+	# also disable tests because libsystem.c does not build. Tests are
+	# restricted so it does not matter anyway.
+	local myeconfargs=(
+		--localstatedir=/var
+		--disable-static
+		--disable-tests
+		$(use_enable audit libaudit)
+		$(use_enable introspection)
+		$(use_enable qt5 liblightdm-qt5)
+		$(use_enable vala)
+		--with-user-session=${_session}
+		--with-greeter-session=${_greeter}
+		--with-greeter-user=${_user}
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# Delete apparmor profiles because they only work with Ubuntu's
+	# apparmor package. Bug #494426
+	if [[ -d ${ED}/etc/apparmor.d ]]; then
+		rm -r "${ED}/etc/apparmor.d" || die \
+			"Failed to remove apparmor profiles"
+	fi
+
+	insinto /etc/${PN}
+	doins data/{${PN},keys}.conf
+	newins "${FILESDIR}"/Xsession-r1 Xsession
+	fperms +x /etc/${PN}/Xsession
+	# /var/lib/lightdm-data could be useful. Bug #522228
+	keepdir /var/lib/${PN}-data
+
+	find "${ED}" -type f \( -name '*.a' -o -name "*.la" \) -delete || die
+	rm -r "${ED}"/etc/init || die
+
+	# Remove existing pam file. We will build a new one. Bug #524792
+	rm -r "${ED}"/etc/pam.d/${PN}{,-greeter} || die
+	pamd_mimic system-local-login ${PN} auth account password session #372229
+	pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
+	dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
+
+	readme.gentoo_create_doc
+
+	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
+}
+
+pkg_postinst() {
+	systemd_reenable "${PN}.service"
+}