From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9CBF815A7D9 for ; Wed, 22 Mar 2023 19:24:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 889DCE085E; Wed, 22 Mar 2023 19:24:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6A6CDE085E for ; Wed, 22 Mar 2023 19:24:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E59DB33BEF8 for ; Wed, 22 Mar 2023 19:24:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 222728DA for ; Wed, 22 Mar 2023 19:24:03 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1679512619.f99237635f0e12ee1b2ed039fb25182315c7b877.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/ X-VCS-Repository: proj/qt X-VCS-Files: x11-misc/sddm/sddm-9999.ebuild X-VCS-Directories: x11-misc/sddm/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f99237635f0e12ee1b2ed039fb25182315c7b877 X-VCS-Branch: master Date: Wed, 22 Mar 2023 19:24:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ad4d5913-88ce-491d-a699-ab8ca451b7f5 X-Archives-Hash: 0e7570b4e13d409661cf720b9c1691fe commit: f99237635f0e12ee1b2ed039fb25182315c7b877 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Mar 22 19:16:59 2023 +0000 Commit: Andreas Sturmlechner gentoo 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 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) )