commit: 461a73f6072994fe533f623b33bdea8a483daff8
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue May 9 13:36:49 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue May 9 13:36:49 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=461a73f6
x11-misc/lightdm: drop 1.30.0-r3, 1.32.0-r1
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
x11-misc/lightdm/Manifest | 1 -
x11-misc/lightdm/files/Xsession | 74 --------------
x11-misc/lightdm/files/lightdm.service | 14 ---
x11-misc/lightdm/lightdm-1.30.0-r3.ebuild | 155 -----------------------------
x11-misc/lightdm/lightdm-1.32.0-r1.ebuild | 156 ------------------------------
5 files changed, 400 deletions(-)
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 599ecb3f3678..d830b4edeb81 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -1,3 +1,2 @@
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
diff --git a/x11-misc/lightdm/files/Xsession b/x11-misc/lightdm/files/Xsession
deleted file mode 100644
index 1fe0110c9d9b..000000000000
--- a/x11-misc/lightdm/files/Xsession
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/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 i in $(ls ${xsessionddir}) ; do
- 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
b/x11-misc/lightdm/files/lightdm.service
deleted file mode 100644
index 7eb46cebaa10..000000000000
--- a/x11-misc/lightdm/files/lightdm.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Light Display Manager
-Documentation=man:lightdm(1)
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=/usr/sbin/lightdm
-StandardOutput=syslog
-Restart=always
-IgnoreSIGPIPE=no
-BusName=org.freedesktop.DisplayManager
-
-[Install]
-Alias=display-manager.service
diff --git a/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild
b/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild
deleted file mode 100644
index 5f23bb293fae..000000000000
--- a/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools pam qmake-utils readme.gentoo-r1 systemd vala xdg-utils
-
-DESCRIPTION="A lightweight display manager"
-HOMEPAGE="https://github.com/CanonicalLtd/lightdm";
-SRC_URI="https://github.com/CanonicalLtd/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"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.44.0:2
- 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 )"
-
-DOCS=( NEWS )
-RESTRICT="test"
-REQUIRED_USE="vala? ( introspection )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.30.0-musl-locale.patch
- "${FILESDIR}"/${PN}-1.30.0-musl-updwtmpx.patch
-)
-
-pkg_setup() {
- export LIGHTDM_USER=${LIGHTDM_USER:-lightdm}
-}
-
-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
-
- use vala && vala_src_prepare
-}
-
-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)
- --disable-liblightdm-qt
- $(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
- doins "${FILESDIR}"/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_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
- systemd_reenable "${PN}.service"
-}
diff --git a/x11-misc/lightdm/lightdm-1.32.0-r1.ebuild
b/x11-misc/lightdm/lightdm-1.32.0-r1.ebuild
deleted file mode 100644
index 3573551b00d3..000000000000
--- a/x11-misc/lightdm/lightdm-1.32.0-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# 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.30.0-musl-locale.patch
- "${FILESDIR}"/${PN}-1.30.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"
-}
