Skip to content

Commit

Permalink
x11-misc/sddm: Drop IUSE X, config moved to gui-apps/sddm-gentoo-config
Browse files Browse the repository at this point in the history
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@gentoo.org>
  • Loading branch information
a17r committed Mar 8, 2024
1 parent 7180620 commit d70ddb3
Showing 1 changed file with 2 additions and 13 deletions.
15 changes: 2 additions & 13 deletions x11-misc/sddm/sddm-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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 )"
Expand Down Expand Up @@ -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="
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit d70ddb3

Please sign in to comment.