From d70ddb38d381069fb1c489ef4b1f12251de581fa Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Wed, 22 Mar 2023 20:59:11 +0100 Subject: [PATCH] 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 --- x11-misc/sddm/sddm-9999.ebuild | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild index 7f2ae1870..df2121370 100644 --- a/x11-misc/sddm/sddm-9999.ebuild +++ b/x11-misc/sddm/sddm-9999.ebuild @@ -21,7 +21,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 +qt5 systemd test +X" +IUSE="+elogind +qt5 systemd test" REQUIRED_USE="^^ ( elogind systemd )" RESTRICT="!test? ( test )" @@ -54,7 +54,7 @@ DEPEND="${COMMON_DEPEND} ) " RDEPEND="${COMMON_DEPEND} - X? ( x11-base/xorg-server ) + gui-apps/sddm-gentoo-config !systemd? ( gui-libs/display-manager-init ) " BDEPEND=" @@ -83,14 +83,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 @@ -120,9 +112,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