commit: 93c364c66e48287e168fa5b9904d958bb05d1a27 Author: Mark Wright <gienah <AT> gentoo <DOT> org> AuthorDate: Wed May 21 12:50:06 2025 +0000 Commit: Mark Wright <gienah <AT> gentoo <DOT> org> CommitDate: Wed May 21 12:51:20 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93c364c6
x11-xm/xmonad: Sync changes from 0.17.2 to 0.18.0 Signed-off-by: Mark Wright <gienah <AT> gentoo.org> x11-wm/xmonad/xmonad-0.18.0.ebuild | 54 +++++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/x11-wm/xmonad/xmonad-0.18.0.ebuild b/x11-wm/xmonad/xmonad-0.18.0.ebuild index 49ba66b6cd2b..9e3c4e840fb5 100644 --- a/x11-wm/xmonad/xmonad-0.18.0.ebuild +++ b/x11-wm/xmonad/xmonad-0.18.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ EAPI=8 #hackport: flags: -pedantic,quickcheck-classes:test CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" -inherit haskell-cabal +inherit haskell-cabal ghc-package DESCRIPTION="A tiling window manager" HOMEPAGE="https://xmonad.org"; @@ -15,6 +15,7 @@ HOMEPAGE="https://xmonad.org"; LICENSE="BSD" SLOT="0/${PV}" KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="no-autorepeat-keys" RDEPEND="dev-haskell/data-default-class:=[profile?] dev-haskell/setlocale:=[profile?] @@ -27,7 +28,54 @@ DEPEND="${RDEPEND} >=dev-haskell/quickcheck-classes-0.4.3 ) " +DOCS=( README.md CHANGES.md ) +HTML_DOCS=( man/${PN}.1.html ) + +SAMPLE_CONFIG="${PN}.hs" + +src_prepare() { + default + use no-autorepeat-keys && eapply "${FILESDIR}"/${PN}-0.14-check-repeat.patch +} + src_configure() { haskell-cabal_src_configure \ - --flag=-pedantic + --flag=-pedantic \ + $(cabal_flag test quickcheck-classes) +} + +src_install() { + default + + cabal_src_install + + echo -e "#!/bin/sh\n/usr/bin/${PN}" > "${T}/${PN}" + exeinto /etc/X11/Sessions + doexe "${T}/${PN}" + + insinto /usr/share/xsessions + doins "${FILESDIR}/${PN}.desktop" + + insinto /usr/share/${PF}/ghc-$(ghc-version)/man + doins man/${SAMPLE_CONFIG} + + doman man/${PN}.1 +} + +pkg_postinst() { + haskell-cabal_pkg_postinst + + elog "A sample ${SAMPLE_CONFIG} configuration file can be found here:" + elog " /usr/share/${PF}/ghc-$(ghc-version)/man/${SAMPLE_CONFIG}" + elog "The parameters in this file are the defaults used by ${PN}." + elog "To customize ${PN}, copy this file to:" + elog " ~/.${PN}/${SAMPLE_CONFIG}" + elog "After editing, use 'mod-q' to dynamically restart ${PN} " + elog "(where the 'mod' key defaults to 'Alt')." + elog "" + elog "Read the README or man page for more information, and to see " + elog "other possible configurations go to:" + elog " http://haskell.org/haskellwiki/Xmonad/Config_archive"; + elog "Please note that many of these configurations will require the " + elog "x11-wm/xmonad-contrib package to be installed." }
