commit: 4ca064049f407015654474d14eade119dd851d11 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Mar 22 19:59:11 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Jan 9 20:50:44 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ca06404
x11-misc/sddm: Drop IUSE X, config moved to gui-apps/sddm-gentoo-config SDDM may use xorg-server or weston as DisplayServer at runtime, since we can't have optional runtime dependencies, our newly created defaults config package will settle that. Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> x11-misc/sddm/sddm-0.21.0_p20251101.ebuild | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/x11-misc/sddm/sddm-0.21.0_p20251101.ebuild b/x11-misc/sddm/sddm-0.21.0_p20251101.ebuild index 1601ac42a03c..136d491944e6 100644 --- a/x11-misc/sddm/sddm-0.21.0_p20251101.ebuild +++ b/x11-misc/sddm/sddm-0.21.0_p20251101.ebuild @@ -15,7 +15,7 @@ else fi QTMIN=6.7.2 -inherit cmake linux-info optfeature pam systemd tmpfiles +inherit cmake linux-info pam systemd tmpfiles DESCRIPTION="Simple Desktop Display Manager" HOMEPAGE="https://github.com/sddm/sddm"; @@ -23,7 +23,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PAM_TAR}.tar.xz"; LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" SLOT="0" -IUSE="+elogind systemd test +X" +IUSE="+elogind systemd test" REQUIRED_USE="^^ ( elogind systemd )" RESTRICT="!test? ( test )" @@ -43,7 +43,7 @@ DEPEND=" systemd? ( sys-apps/systemd:=[pam] ) " RDEPEND="${DEPEND} - X? ( x11-base/xorg-server ) + gui-apps/sddm-gentoo-config !systemd? ( gui-libs/display-manager-init ) " BDEPEND=" @@ -71,14 +71,6 @@ src_unpack() { } src_prepare() { - touch 01gentoo.conf || die - -cat <<-EOF >> 01gentoo.conf -[General] -# Remove qtvirtualkeyboard as InputMethod default -InputMethod= -EOF - cmake_src_prepare if ! use test; then @@ -117,9 +109,6 @@ src_configure() { src_install() { cmake_src_install - insinto /etc/sddm.conf.d/ - doins "${S}"/01gentoo.conf - # with systemd logs are sent to journald, so no point to bother in that case if ! use systemd; then insinto /etc/logrotate.d @@ -152,8 +141,5 @@ pkg_postinst() { elog " to the troubleshooting section." fi - optfeature "Weston DisplayServer support (EXPERIMENTAL)" "dev-libs/weston[kiosk]" - optfeature "KWin DisplayServer support (EXPERIMENTAL)" "kde-plasma/kwin" - systemd_reenable sddm.service }
