summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConrad Kostecki <conikost@gentoo.org>2022-04-02 13:26:08 +0200
committerConrad Kostecki <conikost@gentoo.org>2022-05-14 00:49:53 +0200
commit4385185bd024aac89dcfb48c11ecce3bb556cf4e (patch)
tree5c9a276aec3b0f276d40fa46012e490c8eae94ac
parentacct-user/lightdm: initial import (diff)
downloadgentoo-4385185bd024aac89dcfb48c11ecce3bb556cf4e.tar.gz
gentoo-4385185bd024aac89dcfb48c11ecce3bb556cf4e.tar.bz2
gentoo-4385185bd024aac89dcfb48c11ecce3bb556cf4e.zip
x11-misc/lightdm: migrate to glep-81, change use flag
Use flag 'non_root' renamed to 'non-root', as underscore is not allowed any more. Closes: https://bugs.gentoo.org/781554 Signed-off-by: Conrad Kostecki <conikost@gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/24863 Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
-rw-r--r--x11-misc/lightdm/lightdm-1.30.0-r3.ebuild (renamed from x11-misc/lightdm/lightdm-1.30.0-r2.ebuild)17
-rw-r--r--x11-misc/lightdm/metadata.xml2
2 files changed, 8 insertions, 11 deletions
diff --git a/x11-misc/lightdm/lightdm-1.30.0-r2.ebuild b/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild
index bd8fd0cb9b0a..5f13b6bcc1a0 100644
--- a/x11-misc/lightdm/lightdm-1.30.0-r2.ebuild
+++ b/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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 user vala xdg-utils
+inherit autotools pam qmake-utils readme.gentoo-r1 systemd vala xdg-utils
DESCRIPTION="A lightweight display manager"
HOMEPAGE="https://github.com/CanonicalLtd/lightdm"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.ta
LICENSE="GPL-3 LGPL-3"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv x86"
-IUSE="audit +gnome +gtk +introspection non_root qt5 vala"
+IUSE="audit +gnome +gtk +introspection non-root qt5 vala"
COMMON_DEPEND="
>=dev-libs/glib-2.44.0:2
@@ -31,6 +31,9 @@ COMMON_DEPEND="
)
"
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 )
@@ -50,12 +53,6 @@ REQUIRED_USE="vala? ( introspection )"
pkg_setup() {
export LIGHTDM_USER=${LIGHTDM_USER:-lightdm}
- if use non_root ; then
- enewgroup ${LIGHTDM_USER}
- enewgroup video # Just in case it hasn't been created yet
- enewuser ${LIGHTDM_USER} -1 -1 /var/lib/${LIGHTDM_USER} ${LIGHTDM_USER},video
- esethome ${LIGHTDM_USER} /var/lib/${LIGHTDM_USER}
- fi
}
src_prepare() {
@@ -92,7 +89,7 @@ src_configure() {
local _greeter _session _user
_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
_session=${LIGHTDM_SESSION:=gnome}
- _user="$(usex non_root "${LIGHTDM_USER}" root)"
+ _user="$(usex non-root "${LIGHTDM_USER}" root)"
# Let user know how lightdm is configured
einfo "Gentoo configuration"
einfo "Default greeter: ${_greeter}"
diff --git a/x11-misc/lightdm/metadata.xml b/x11-misc/lightdm/metadata.xml
index eb41c0a7d705..0dbf6a9da96c 100644
--- a/x11-misc/lightdm/metadata.xml
+++ b/x11-misc/lightdm/metadata.xml
@@ -7,7 +7,7 @@
</maintainer>
<use>
<flag name="gtk">Pull in the gtk+ greeter</flag>
- <flag name="non_root">Use non-root user by default</flag>
+ <flag name="non-root">Use non-root user by default</flag>
</use>
<upstream>
<remote-id type="github">CanonicalLtd/lightdm</remote-id>