From 39591a05cc4a578be316bc50625577ae117a5edc 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 | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild index 0217d56bc..81f880f5c 100644 --- a/x11-misc/sddm/sddm-9999.ebuild +++ b/x11-misc/sddm/sddm-9999.ebuild @@ -19,7 +19,7 @@ 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 systemd test +X" +IUSE="+elogind systemd test" REQUIRED_USE="^^ ( elogind systemd )" RESTRICT="!test? ( test )" @@ -43,7 +43,7 @@ DEPEND="${COMMON_DEPEND} test? ( >=dev-qt/qttest-${QTMIN}:5 ) " RDEPEND="${COMMON_DEPEND} - X? ( x11-base/xorg-server ) + gui-apps/sddm-gentoo-config !systemd? ( gui-libs/display-manager-init ) " BDEPEND=" @@ -68,14 +68,6 @@ pkg_setup() { } 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 @@ -96,13 +88,6 @@ src_configure() { cmake_src_configure } -src_install() { - cmake_src_install - - insinto /etc/sddm.conf.d/ - doins "${S}"/01gentoo.conf -} - pkg_postinst() { tmpfiles_process "${PN}.conf"