gentoo auto-resync : 24:07:2022 - 08:52:43

8 files changed, 173 insertions, 28 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 36d857f2cccc..31869cfaf55c 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/xmonad-contrib/Manifest b/x11-wm/xmonad-contrib/Manifest
index 105cff0102f9..a18bc0aa0f8e 100644
--- a/x11-wm/xmonad-contrib/Manifest
+++ b/x11-wm/xmonad-contrib/Manifest
@@ -1,3 +1,5 @@
 DIST xmonad-contrib-0.16.tar.gz 540237 BLAKE2B 7ddf8730481c39e9b5e40a548f3cbe36f301901656c57cc5ffdd11e05ad516019dc0b82c7dcf77665c152c390f7b7ae49c04ec6ae39347565b11a23aef23cce3 SHA512 22a18b4045cbfca0229cbf6c0bf1dfa595cbffbe6b82fd58b1fcf941cbfd306642160995b55859cead3cf574df696d2a3cea6507cac4d5c7c58cf09b3a86bc25
+DIST xmonad-contrib-0.17.0.tar.gz 615173 BLAKE2B d2e2724a3103502cafeddfdafe5b19cd3f2eb66fe26d49afe4b64c0c78bb3b18432e44fc8233aac951b20969013fa580f0af36d4da627f3c03145b647bff5a44 SHA512 357ef80565690a1e652f79c877964181134c7f02a5d325dbf3890246588ce8a545e91126041bcc2af3d9ebf5b3be28f4866ee9ede76ddbf0fc0387871319a900
 EBUILD xmonad-contrib-0.16.ebuild 1130 BLAKE2B 1b213d6d84eb8a90eb3d74d1d349435d86aa282150cf2103f15abd1605d75a9347e3c86735be937f5850b874b712a3f58529bb720b89640f3ddef31437733da2 SHA512 7ba168951bb75a94c513342863fa8062c6111c555194e013aa400f4b9fb2932053d8d5ee1fdee74558da1baa21918da567471953710369e92f1ecd366f7ca44c
-MISC metadata.xml 709 BLAKE2B bb0a6d1c8e858c57ded4631ab6746f58fa4168c050e533571489b451f3e037146bdde8dca51c815206ea79a4f9ffbce48463dc316ebb690f5fb117c4a4fc2199 SHA512 295ba2befe7c06e95cf6a707a3a071e2e8cf0454ee1b3ff549a1828a7f5afb95c7108f3287f9814b09269326b836f9139d8418a666deafed6e7355223e5ae9fc
+EBUILD xmonad-contrib-0.17.0.ebuild 1104 BLAKE2B 0edaff8979168643e33a417211f94a87fdd2c18f4999fec8aa3cf13d24fbaa4043efc43bb98bf230cf75b3f1cb528ab9ab37bfe7b691919fd8bc830121dcd05d SHA512 4dd359ecbde77367a32dfc6f623bb1ae7294f32b5b6253716e9effd756df3b3b56f9a6993b99266f450837726e643272e150ae7e953e73dd35cb2556a94f0414
+MISC metadata.xml 314 BLAKE2B 084325dca1938417865f1f78007268ba96214e5013f37e57f0b5845ac0cb5e999bc08ece023a052c12229c2439d468b4f0a48f43cd358c31fefbe28549e5b38c SHA512 e7c8067ccab9351ec1ea41fa77caf36abd0dcf946bb4dc435475d90005aeb152843af64575bf64ddf32eafac0fdff4c72628895588564132995f5b5e69913efe
diff --git a/x11-wm/xmonad-contrib/metadata.xml b/x11-wm/xmonad-contrib/metadata.xml
index ab6877a60b10..bb4b8043b4ab 100644
--- a/x11-wm/xmonad-contrib/metadata.xml
+++ b/x11-wm/xmonad-contrib/metadata.xml
@@ -3,20 +3,9 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Third party tiling algorithms, configurations and scripts to xmonad,
-		a tiling window manager for X.
-		
-		For an introduction to building, configuring and using xmonad
-		extensions, see "XMonad.Doc". In particular:
-		
-		"XMonad.Doc.Configuring", a guide to configuring xmonad
-		
-		"XMonad.Doc.Extending", using the contributed extensions library
-		
-		"XMonad.Doc.Developing", introduction to xmonad internals and writing
-		your own extensions.
-		
-	</longdescription>
+	<use>
+		<flag name="xft">Use Xft to render text</flag>
+	</use>
 </pkgmetadata>
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.17.0.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.17.0.ebuild
new file mode 100644
index 000000000000..f24bc78559a4
--- /dev/null
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.17.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+#hackport: flags: -pedantic,use_xft:xft
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Community-maintained extensions extensions for xmonad"
+HOMEPAGE="https://xmonad.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+xft"
+
+RDEPEND=">=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
+	dev-haskell/random:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	>=dev-haskell/x11-1.10:=[profile?] <dev-haskell/x11-1.11:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	>=x11-wm/xmonad-0.16.99999:=[profile?] <x11-wm/xmonad-0.18:=[profile?]
+	xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/hspec-2.4.0 <dev-haskell/hspec-3
+		>=dev-haskell/quickcheck-2 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-pedantic \
+		$(cabal_flag xft use_xft)
+}
diff --git a/x11-wm/xmonad/Manifest b/x11-wm/xmonad/Manifest
index 37f3c6149832..d52b28df87c6 100644
--- a/x11-wm/xmonad/Manifest
+++ b/x11-wm/xmonad/Manifest
@@ -1,6 +1,9 @@
+AUX xmonad-0.12-check-repeat.patch 1882 BLAKE2B 37567d70c4ec194fd16c0bee5fce4952c03ae0c7dc03de457e2d4f06d2bbc6a98fef5de87502ff030c12fb4a4f55451b72f2df81707d4be53be24b229a3c3649 SHA512 cca001f3fc644e0454d30161d9643acadd3e17f0071633379866c00709423734c17e1f32ea118da72ff3679cf079604a8b6c3bbe9b97f3e61ab2475222855861
 AUX xmonad-0.14-check-repeat.patch 2393 BLAKE2B 1b173ab0598c650645af4286c5c6f7ed536f201bbab51f4f515fdf8c0433ea355e5836b9d63353cf7bc8aedba23e15b661bfc02ec94519e43b4a49e8818b569f SHA512 ff9341e4e7f065e9354cb723470ed88d9f8fb3858c0a529590d14c2bcb65672494c0df49b9678e502a812d36035f255780d3e50dd303e41ac96d52e1d946b731
 AUX xmonad.desktop 270 BLAKE2B dce8e606b7b1008dd77c74feb0ce96f7d7d59de299adc4b61b164cdcf9057eb2a4119bfd97c5f67a660d0810cd7a43d5ee580d9935b623c9dd877543de2adffe SHA512 b858edfb6fd6004f8ca0f95e97f298140ab489e246f7f09b1fdab3fe899dba66f3f150fe67981f7b5fd8f3a268df7dab2ee60db6d3f96bd874fab2b670435b4e
 DIST xmonad-0.15.tar.gz 68822 BLAKE2B 9ee9a070f6743fbab2cffe05ee9e60b64fded0b4916fdec03a550f5d5ec5a34102ab2d4e9586b9a0ca534db284a8058f11ee248072f3f3b312ae30c09873feff SHA512 f881f3faa4f5a0de7a5a37118cd7041083ae3a7569c7094b55dedb9aa858176789aff459d426b237ebae5cc4598b06de790938775a7ac968c2d76be3f0efc8ba
+DIST xmonad-0.17.0.tar.gz 93489 BLAKE2B 6990bc408194c99378f949b28f2115b7096e6474b5305f935be2c8af1eba4bff3e3c05477af9f833d1b52422e4fb95f857398b05f7f1081e3a2cc5dd8c50fc3a SHA512 1ec46ee61f4bf1879ea638e9be83378273050670ed2ee0f00e7d43b188cc29a874aa5b40076162a1ef0038802cc43f675773951f9b7d1f26329f9d105c28b3f7
 DIST xmonad-259.patch 1452 BLAKE2B 869d11ae762c43b9e749169d6b691fdee52e9fc17848fc4ee494e075501528d4c0c040deea617f8fbeab003dd7bc277254498b0089b60f8e6e47b6b96430eb69 SHA512 9edb155a74d170e612cd84aad4fb004176fe5e5fc7017f1985aa2b4628b2cc995b157ba42ab6f7b546d5e3467358292234b3926254e1e831cc7ef38844e14c6d
 EBUILD xmonad-0.15-r1.ebuild 2471 BLAKE2B b972a8799e198777e8cfb1c3c0e84b38a3aa86fd8249d0bdff81859c99385054f23ccf0d4877291a165bb13263e9e01d6c61a2f76dae92563fdd6c289a8c7928 SHA512 34ce510725c4fedfc33b4b00781cbc4e49135bd9b26e7323a727b58a3b18436eee157f00fd13b7894407f9916eadac7451c08ef92cfd436bb988fcb659bd8cba
-MISC metadata.xml 945 BLAKE2B b837db972e2bb0fb9298dd3e961dad24f542f4e7fcc7c373173d92a1c1ee1c1816e882c8a9c7283a6fa4e636f40141d56bee4c733299f4c6fa6d974ba15cb509 SHA512 afef3b68127033035734017963a20426199896b1e8bb5c08aa7a323b4a78d1699723fdef23fbd3b84c75ce377cbda2aa6b14c1af0fe2e77232024467385a6d50
+EBUILD xmonad-0.17.0.ebuild 2251 BLAKE2B 50d5d4bdc7a3c17b0453ca149f6bacf72fb88b55e5ed1964b02d009903021141ffbab20b74a750ca1599795b0ad395873e9e44ef942170f83bd46d3abe5fc262 SHA512 ed2b5368868d838f4ecb860365655ede2017cf032fa8e7d37b2ee073490f62bc41cae0903041b1548c6afdd00baf62cca154e64bdfbda9fe984011dea45ed7fd
+MISC metadata.xml 345 BLAKE2B b3c79f4b0e7e502024dac3fe48634bba4920cdcec396595e4af4e535a544ed878b36c45f94a034b1acbf7dfbce7266bc8de078adbbd7d3483ffcd73ca32f95fb SHA512 e49f674b39cf8950930f1221cf588bb6479557fdb11f1fd9edcd5abbf9bb2f976a12d9a83cd88cf73e3a8eed60f3fc3f9f24f68d5913254073df6b912c4b3da7
diff --git a/x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch b/x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch
new file mode 100644
index 000000000000..79bd2c2d21fa
--- /dev/null
+++ b/x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch
@@ -0,0 +1,40 @@
+--- xmonad/src/XMonad/Core.hs	2010-09-05 05:11:42.000000000 +0400
++++ xmonad/src/XMonad/Core.hs	2010-09-18 07:59:14.000000000 +0400
+@@ -65,6 +65,7 @@
+     , waitingUnmap     :: !(M.Map Window Int)            -- ^ the number of expected UnmapEvents
+     , dragging         :: !(Maybe (Position -> Position -> X (), X ()))
+     , numberlockMask   :: !KeyMask                       -- ^ The numlock modifier
++    , keyPressed       :: !KeyCode                       -- ^ keycode of the key being pressed if any
+     , extensibleState  :: !(M.Map String (Either String StateExtension))
+     -- ^ stores custom state information.
+     --
+--- xmonad/src/XMonad/Main.hs	2010-09-05 05:11:42.000000000 +0400
++++ xmonad/src/XMonad/Main.hs	2010-09-18 08:03:11.000000000 +0400
+@@ -129,6 +129,7 @@
+             , mapped          = S.empty
+             , waitingUnmap    = M.empty
+             , dragging        = Nothing
++            , keyPressed      = 0
+             , extensibleState = extState
+             }
+     allocaXEvent $ \e ->
+@@ -190,10 +191,15 @@
+ -- run window manager command
+ handle (KeyEvent {ev_event_type = t, ev_state = m, ev_keycode = code})
+     | t == keyPress = withDisplay $ \dpy -> do
+-        s  <- io $ keycodeToKeysym dpy code 0
+-        mClean <- cleanMask m
+-        ks <- asks keyActions
+-        userCodeDef () $ whenJust (M.lookup (mClean, s) ks) id
++        kp <- gets keyPressed
++        if kp /= code then do
++                modify $ \s -> s { keyPressed = code }
++                s  <- io $ keycodeToKeysym dpy code 0
++                mClean <- cleanMask m
++                ks <- asks keyActions
++                userCodeDef () $ whenJust (M.lookup (mClean, s) ks) id
++            else return ()
++    | t == keyRelease = modify $ \s -> s { keyPressed = 0 }
+ 
+ -- manage a new window
+ handle (MapRequestEvent    {ev_window = w}) = withDisplay $ \dpy -> do
diff --git a/x11-wm/xmonad/metadata.xml b/x11-wm/xmonad/metadata.xml
index 7cabda6e3341..b0337e3fc024 100644
--- a/x11-wm/xmonad/metadata.xml
+++ b/x11-wm/xmonad/metadata.xml
@@ -8,15 +8,4 @@
 	<use>
 		<flag name="no-autorepeat-keys">Allow ignoring of keyboard autorepeat.</flag>
 	</use>
-	<longdescription>
-		xmonad is a tiling window manager for X. Windows are arranged
-		automatically to tile the screen without gaps or overlap, maximising
-		screen use. All features of the window manager are accessible from
-		the keyboard: a mouse is strictly optional. xmonad is written and
-		extensible in Haskell. Custom layout algorithms, and other
-		extensions, may be written by the user in config files. Layouts are
-		applied dynamically, and different layouts may be used on each
-		workspace. Xinerama is fully supported, allowing windows to be tiled
-		on several screens.
-	</longdescription>
 </pkgmetadata>
diff --git a/x11-wm/xmonad/xmonad-0.17.0.ebuild b/x11-wm/xmonad/xmonad-0.17.0.ebuild
new file mode 100644
index 000000000000..5f05d98685d2
--- /dev/null
+++ b/x11-wm/xmonad/xmonad-0.17.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+#hackport: flags: -pedantic,quickcheck-classes:test
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal ghc-package
+
+DESCRIPTION="A tiling window manager"
+HOMEPAGE="https://xmonad.org"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="no-autorepeat-keys"
+
+RDEPEND="dev-haskell/data-default-class:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/setlocale:=[profile?]
+	>=dev-haskell/x11-1.10:=[profile?] <dev-haskell/x11-1.11:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/quickcheck-2
+		  >=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 \
+		$(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."
+}