commit:     f99237635f0e12ee1b2ed039fb25182315c7b877
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 22 19:16:59 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 22 19:16:59 2023 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=f9923763

x11-misc/sddm: Drop IUSE pam, require elogind or systemd

Upstream commit 346ab53f22b35c9d73b1264872bb7f6c42d7003d

Bug: https://bugs.gentoo.org/790713
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 x11-misc/sddm/sddm-9999.ebuild | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild
index 3716a8aa..0217d56b 100644
--- a/x11-misc/sddm/sddm-9999.ebuild
+++ b/x11-misc/sddm/sddm-9999.ebuild
@@ -19,9 +19,9 @@ HOMEPAGE="https://github.com/sddm/sddm";
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
-IUSE="+elogind +pam systemd test +X"
+IUSE="+elogind systemd test +X"
 
-REQUIRED_USE="?? ( elogind systemd )"
+REQUIRED_USE="^^ ( elogind systemd )"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
@@ -32,12 +32,11 @@ COMMON_DEPEND="
        >=dev-qt/qtdeclarative-${QTMIN}:5
        >=dev-qt/qtgui-${QTMIN}:5
        >=dev-qt/qtnetwork-${QTMIN}:5
+       sys-libs/pam
        x11-libs/libXau
        x11-libs/libxcb:=
-       elogind? ( sys-auth/elogind )
-       pam? ( sys-libs/pam )
-       !pam? ( virtual/libcrypt:= )
-       systemd? ( sys-apps/systemd:= )
+       elogind? ( sys-auth/elogind[pam] )
+       systemd? ( sys-apps/systemd:=[pam] )
        !systemd? ( sys-power/upower )
 "
 DEPEND="${COMMON_DEPEND}
@@ -91,7 +90,6 @@ src_configure() {
                -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
                -DRUNTIME_DIR=/run/sddm
                -DSYSTEMD_TMPFILES_DIR="/usr/lib/tmpfiles.d"
-               -DENABLE_PAM=$(usex pam)
                -DNO_SYSTEMD=$(usex !systemd)
                -DUSE_ELOGIND=$(usex elogind)
        )

Reply via email to