commit: 9f0e4c4b0d34fc8d1f91f9233f94ba746ff1191a Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Mon Jan 11 18:49:30 2021 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Mon Jan 11 18:50:12 2021 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=9f0e4c4b
x11-misc/lightdm: drop old broken due to EAPI restrictions in the eclass Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> x11-misc/lightdm/Manifest | 2 - x11-misc/lightdm/files/README.gentoo | 11 -- x11-misc/lightdm/files/Xsession | 74 ----------- x11-misc/lightdm/files/lightdm | 8 -- .../files/lightdm-1.21.0-musl-is-linux.patch | 12 -- .../files/lightdm-1.21.0-musl-updwtmpx.patch | 13 -- .../files/lightdm-1.26.0-musl-language.patch | 36 ----- x11-misc/lightdm/files/lightdm-autologin | 6 - x11-misc/lightdm/files/lightdm.service | 14 -- x11-misc/lightdm/lightdm-1.26.0-r1.ebuild | 146 --------------------- x11-misc/lightdm/metadata.xml | 14 -- 11 files changed, 336 deletions(-) diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest deleted file mode 100644 index 0884e21..0000000 --- a/x11-misc/lightdm/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c4cd946aaaac0b5fa13aa27805fa17297112bfaabb1c5a34bd83d2ecdef2033b622dbd5e63914baacb8f6edf488a7396d26d9 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be -DIST lightdm-1.26.0.tar.xz 516092 BLAKE2B 0bbbe11959a2ea0c21e723d10e8831fc0d9e15475a415869634cfb41c6d576b77fd87720be33dae8456063947dd1b551e88c263ed76ef9b120c43df8c42513f3 SHA512 67c0671753587493ed064b66f94be58853028287c914d1101e66499bebf1408e14d33245887ce89d1c4931960225ea3984e5e625b22dc4e3020be34a3087d8e7 diff --git a/x11-misc/lightdm/files/README.gentoo b/x11-misc/lightdm/files/README.gentoo deleted file mode 100644 index 182f530..0000000 --- a/x11-misc/lightdm/files/README.gentoo +++ /dev/null @@ -1,11 +0,0 @@ - - * Even though the default /etc/lightdm/lightdm.conf will work for - * most users, make sure you configure it to suit your needs - * before using lightdm for the first time. - * You can test the configuration file using the following - * command: lightdm --test-mode -c /etc/lightdm/lightdm.conf. This - * requires xorg-server to be built with the 'kdrive' useflag. - * - * You can also set your own default values for LIGHTDM_GREETER, - * LIGHTDM_SESSION, and LIGHTDM_USER in /etc/portage/make.conf - diff --git a/x11-misc/lightdm/files/Xsession b/x11-misc/lightdm/files/Xsession deleted file mode 100644 index 50ce80f..0000000 --- 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 - echo "Loading xinit script $script" - if [ -x "$script" -a ! -d "$script" ]; then - . "$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" - echo "Loading X session script $script" - if [ -r "$script" -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then - . "$script" - fi - done -fi - -echo "X session wrapper complete, running session $@" - -exec $command diff --git a/x11-misc/lightdm/files/lightdm b/x11-misc/lightdm/files/lightdm deleted file mode 100644 index 6286d6a..0000000 --- a/x11-misc/lightdm/files/lightdm +++ /dev/null @@ -1,8 +0,0 @@ -#%PAM-1.0 -auth optional pam_env.so -auth include system-login -auth required pam_nologin.so -account include system-login -password include system-login -session optional pam_loginuid.so -session include system-auth diff --git a/x11-misc/lightdm/files/lightdm-1.21.0-musl-is-linux.patch b/x11-misc/lightdm/files/lightdm-1.21.0-musl-is-linux.patch deleted file mode 100644 index 14657d7..0000000 --- a/x11-misc/lightdm/files/lightdm-1.21.0-musl-is-linux.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur lightdm-1.21.3/tests/src/libsystem.c lightdm-1.21.3-musl/tests/src/libsystem.c ---- lightdm-1.21.3/tests/src/libsystem.c -+++ lightdm-1.21.3-musl/tests/src/libsystem.c -@@ -224,7 +224,7 @@ - return g_strdup (path); - } - --#ifdef __linux__ -+#ifdef __GLIBC__ - static int - open_wrapper (const char *func, const char *pathname, int flags, mode_t mode) - { diff --git a/x11-misc/lightdm/files/lightdm-1.21.0-musl-updwtmpx.patch b/x11-misc/lightdm/files/lightdm-1.21.0-musl-updwtmpx.patch deleted file mode 100644 index 8a5bbdb..0000000 --- a/x11-misc/lightdm/files/lightdm-1.21.0-musl-updwtmpx.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/session-child.c -+++ b/src/session-child.c -@@ -203,8 +203,8 @@ - } - - /* GNU provides this but we can't rely on that so let's make our own version */ --static void --updwtmpx (const gchar *wtmp_file, struct utmpx *ut) -+void -+updwtmpx (const char *wtmp_file, const struct utmpx *ut) - { - struct utmp u; - diff --git a/x11-misc/lightdm/files/lightdm-1.26.0-musl-language.patch b/x11-misc/lightdm/files/lightdm-1.26.0-musl-language.patch deleted file mode 100644 index 442e7fb..0000000 --- a/x11-misc/lightdm/files/lightdm-1.26.0-musl-language.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/liblightdm-gobject/language.c -+++ b/liblightdm-gobject/language.c -@@ -210,6 +210,7 @@ - - if (!priv->name) - { -+ #if HAVE_LC_IDENTIFICATION - g_autofree gchar *locale = get_locale_name (priv->code); - if (locale) - { -@@ -223,6 +224,8 @@ - - setlocale (LC_ALL, current); - } -+ #endif -+ - if (!priv->name) - { - g_auto(GStrv) tokens = g_strsplit_set (priv->code, "_.@", 2); -@@ -250,6 +253,7 @@ - - if (!priv->territory && strchr (priv->code, '_')) - { -+ #if HAVE_LC_IDENTITIFICATION - g_autofree gchar *locale = get_locale_name (priv->code); - if (locale) - { -@@ -263,6 +267,8 @@ - - setlocale (LC_ALL, current); - } -+ #endif -+ - if (!priv->territory) - { - g_auto(GStrv) tokens = g_strsplit_set (priv->code, "_.@", 3); diff --git a/x11-misc/lightdm/files/lightdm-autologin b/x11-misc/lightdm/files/lightdm-autologin deleted file mode 100644 index decfba3..0000000 --- a/x11-misc/lightdm/files/lightdm-autologin +++ /dev/null @@ -1,6 +0,0 @@ -auth optional pam_env.so -auth required pam_nologin.so -auth required pam_permit.so - -account include system-local-login -session include system-local-login diff --git a/x11-misc/lightdm/files/lightdm.service b/x11-misc/lightdm/files/lightdm.service deleted file mode 100644 index 7eb46ce..0000000 --- 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.26.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild deleted file mode 100644 index 16ae491..0000000 --- a/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils flag-o-matic pam qmake-utils readme.gentoo-r1 systemd vala xdg-utils - -DESCRIPTION="A lightweight display manager" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/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="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="audit +gnome +gtk +introspection 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} - >=sys-auth/pambase-20101024-r2" -DEPEND="${COMMON_DEPEND} - dev-util/gtk-doc-am - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig - gnome? ( gnome-base/gnome-common ) - vala? ( $(vala_depend) ) -" -PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )" - -DOCS=( NEWS ) -RESTRICT="test" - -src_prepare() { - epatch "${FILESDIR}/${PN}-1.21.0-musl-is-linux.patch" - epatch "${FILESDIR}/${PN}-1.26.0-musl-language.patch" - epatch "${FILESDIR}/${PN}-1.21.0-musl-updwtmpx.patch" - - 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=${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}" - - use qt5 && append-cxxflags -std=c++11 - - # 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 - dodir /var/lib/lightdm-data - - find "${ED}" \( -name '*.a' -o -name "*.la" \) -delete || die - rm -rf "${ED%/}"/etc/init - - # Remove existing pam file. We will build a new one. Bug #524792 - rm -rf "${ED%/}"/etc/pam.d/${PN}{,-greeter} - 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/metadata.xml b/x11-misc/lightdm/metadata.xml deleted file mode 100644 index 1ee43b1..0000000 --- a/x11-misc/lightdm/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>Lars Wendler</name> - </maintainer> - <use> - <flag name="gtk">Pull in the gtk+ greeter</flag> - </use> - <upstream> - <remote-id type="launchpad">lightdm</remote-id> - </upstream> -</pkgmetadata>
