[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad-contrib/

2023-10-22 Thread Sam James
commit: f694392e5dcc675a297f020ff925e6b48f63f915
Author: hololeap  protonmail  com>
AuthorDate: Tue Oct  3 05:11:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 23 03:10:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f694392e

x11-wm/xmonad-contrib: add 0.17.1

Signed-off-by: hololeap  protonmail.com>
Signed-off-by: Sam James  gentoo.org>

 x11-wm/xmonad-contrib/Manifest |  1 +
 x11-wm/xmonad-contrib/metadata.xml |  4 +++
 x11-wm/xmonad-contrib/xmonad-contrib-0.17.1.ebuild | 37 ++
 3 files changed, 42 insertions(+)

diff --git a/x11-wm/xmonad-contrib/Manifest b/x11-wm/xmonad-contrib/Manifest
index 14142d7e3261..8b3baebdf739 100644
--- a/x11-wm/xmonad-contrib/Manifest
+++ b/x11-wm/xmonad-contrib/Manifest
@@ -1 +1,2 @@
 DIST xmonad-contrib-0.17.0.tar.gz 615173 BLAKE2B 
d2e2724a3103502cafeddfdafe5b19cd3f2eb66fe26d49afe4b64c0c78bb3b18432e44fc8233aac951b20969013fa580f0af36d4da627f3c03145b647bff5a44
 SHA512 
357ef80565690a1e652f79c877964181134c7f02a5d325dbf3890246588ce8a545e91126041bcc2af3d9ebf5b3be28f4866ee9ede76ddbf0fc0387871319a900
+DIST xmonad-contrib-0.17.1.tar.gz 646843 BLAKE2B 
0949a616f6c5aaac5d5ccb8eacaf743898b8da6d0c99605ce2f7a85f8ce7747f5442843b524470d51300539126f25066b50906a92952129a9e264f18f7aa9873
 SHA512 
07f989623f4d9affae564ba36a180721910c1a0acf3d23e0e548fc48bb4dcd9864987c521c28251f6443cdd5134ded8e8bb18c6f78d06cb00c386ff6ad59c97e

diff --git a/x11-wm/xmonad-contrib/metadata.xml 
b/x11-wm/xmonad-contrib/metadata.xml
index bb4b8043b4ab..d84502b753d3 100644
--- a/x11-wm/xmonad-contrib/metadata.xml
+++ b/x11-wm/xmonad-contrib/metadata.xml
@@ -8,4 +8,8 @@

Use Xft to render text

+   
+   xmonad-contrib
+   xmonad/xmonad-contrib
+   
 

diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.17.1.ebuild 
b/x11-wm/xmonad-contrib/xmonad-contrib-0.17.1.ebuild
new file mode 100644
index ..2ebdaef3628b
--- /dev/null
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.17.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+#hackport: flags: -pedantic,use_xft:xft
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Community-maintained extensions for xmonad"
+HOMEPAGE="https://xmonad.org/;
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+xft"
+
+RDEPEND="dev-haskell/random:=[profile?]
+   dev-haskell/utf8-string:=[profile?]
+   >=dev-haskell/x11-1.10:=[profile?] =dev-lang/ghc-8.4.3:=
+   >=x11-wm/xmonad-0.16.9:=[profile?] =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/quickcheck-2 )
+"
+
+src_configure() {
+   haskell-cabal_src_configure \
+   --flag=-pedantic \
+   $(cabal_flag xft use_xft)
+}



[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/

2023-10-22 Thread Sam James
commit: 1e173f1ead049fb9f663bbb137eaebbbe2660e93
Author: hololeap  protonmail  com>
AuthorDate: Tue Oct  3 05:11:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 23 03:10:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e173f1e

x11-wm/xmonad: add 0.17.2

Signed-off-by: hololeap  protonmail.com>
Signed-off-by: Sam James  gentoo.org>

 x11-wm/xmonad/Manifest |  1 +
 x11-wm/xmonad/metadata.xml |  4 ++
 x11-wm/xmonad/xmonad-0.17.2.ebuild | 81 ++
 3 files changed, 86 insertions(+)

diff --git a/x11-wm/xmonad/Manifest b/x11-wm/xmonad/Manifest
index ecf9a5947d34..057e65f36fc6 100644
--- a/x11-wm/xmonad/Manifest
+++ b/x11-wm/xmonad/Manifest
@@ -1 +1,2 @@
 DIST xmonad-0.17.0.tar.gz 93489 BLAKE2B 
6990bc408194c99378f949b28f2115b7096e6474b5305f935be2c8af1eba4bff3e3c05477af9f833d1b52422e4fb95f857398b05f7f1081e3a2cc5dd8c50fc3a
 SHA512 
1ec46ee61f4bf1879ea638e9be83378273050670ed2ee0f00e7d43b188cc29a874aa5b40076162a1ef0038802cc43f675773951f9b7d1f26329f9d105c28b3f7
+DIST xmonad-0.17.2.tar.gz 94730 BLAKE2B 
4e65472830694048d051394222ceb889b1997d1dec37b8d1773fecee9385292448acda3c5a9b7e99a7de1582e8a403d976ef357dc474531e6166905d1129c3a2
 SHA512 
8d02422f473499516acf3cfe920b15df1d24a1fbf47f8cded5eb465186427e82cd43d65a63936993016797680335e59380931e9bad82b2181ecdef6b63d9bfd9

diff --git a/x11-wm/xmonad/metadata.xml b/x11-wm/xmonad/metadata.xml
index b0337e3fc024..e2d24eac2abe 100644
--- a/x11-wm/xmonad/metadata.xml
+++ b/x11-wm/xmonad/metadata.xml
@@ -8,4 +8,8 @@

Allow ignoring of keyboard 
autorepeat.

+   
+   xmonad
+   xmonad/xmonad
+   
 

diff --git a/x11-wm/xmonad/xmonad-0.17.2.ebuild 
b/x11-wm/xmonad/xmonad-0.17.2.ebuild
new file mode 100644
index ..6b2df3bd3107
--- /dev/null
+++ b/x11-wm/xmonad/xmonad-0.17.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+#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;
+
+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?]
+   >=dev-haskell/x11-1.10:=[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."
+}



[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad-contrib/

2023-03-17 Thread Sam James
commit: 14c9492f4588c43cbc3f61d389d8bfd39e7660ec
Author: hololeap  users  noreply  github  com>
AuthorDate: Wed Mar 15 23:45:50 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 17 18:22:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14c9492f

x11-wm/xmonad-contrib: Stabilize for amd64

Signed-off-by: hololeap  users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/29961
Signed-off-by: Sam James  gentoo.org>

 x11-wm/xmonad-contrib/xmonad-contrib-0.17.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.17.0.ebuild 
b/x11-wm/xmonad-contrib/xmonad-contrib-0.17.0.ebuild
index 1e605d44ef94..880dcc26bd9f 100644
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.17.0.ebuild
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+xft"
 
 RDEPEND=">=dev-haskell/mtl-1:=[profile?] 

[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/

2023-03-17 Thread Sam James
commit: 253a82b807e79b27a859a6a565559d4fd3c4efdd
Author: hololeap  users  noreply  github  com>
AuthorDate: Wed Mar 15 23:45:48 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 17 18:22:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=253a82b8

x11-wm/xmonad: Stabilize for amd64

Signed-off-by: hololeap  users.noreply.github.com>
Signed-off-by: Sam James  gentoo.org>

 x11-wm/xmonad/xmonad-0.17.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-wm/xmonad/xmonad-0.17.0.ebuild 
b/x11-wm/xmonad/xmonad-0.17.0.ebuild
index bafb20e3b632..f1e68a065661 100644
--- a/x11-wm/xmonad/xmonad-0.17.0.ebuild
+++ b/x11-wm/xmonad/xmonad-0.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="no-autorepeat-keys"
 
 RDEPEND="dev-haskell/data-default-class:=[profile?]



[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad-contrib/

2022-10-06 Thread Jakov Smolić
commit: aa26f88e6b3c08419fd1059ea0d6cfc634884584
Author: matoro  users  noreply  github  com>
AuthorDate: Thu Sep 22 00:24:14 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Oct  6 06:11:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa26f88e

x11-wm/xmonad-contrib: keyword 0.17.0 for ~riscv

Signed-off-by: Jakov Smolić  gentoo.org>

 x11-wm/xmonad-contrib/xmonad-contrib-0.17.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.17.0.ebuild 
b/x11-wm/xmonad-contrib/xmonad-contrib-0.17.0.ebuild
index 445857960aac..1e605d44ef94 100644
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.17.0.ebuild
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.17.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+xft"
 
 RDEPEND=">=dev-haskell/mtl-1:=[profile?] 

[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/

2022-10-06 Thread Jakov Smolić
commit: 3c5f75b4eeba9436fcc429bd8087c3110f662bc6
Author: matoro  users  noreply  github  com>
AuthorDate: Wed Sep 21 23:13:09 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Oct  6 06:11:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c5f75b4

x11-wm/xmonad: keyword 0.17.0 for ~riscv

Signed-off-by: Jakov Smolić  gentoo.org>

 x11-wm/xmonad/xmonad-0.17.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/xmonad/xmonad-0.17.0.ebuild 
b/x11-wm/xmonad/xmonad-0.17.0.ebuild
index 12ac7299f711..bafb20e3b632 100644
--- a/x11-wm/xmonad/xmonad-0.17.0.ebuild
+++ b/x11-wm/xmonad/xmonad-0.17.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="no-autorepeat-keys"
 
 RDEPEND="dev-haskell/data-default-class:=[profile?]



[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad-contrib/

2022-08-31 Thread Sam James
commit: b2337d656c632693f5fe4e3fa12e56b81f2f6178
Author: matoro  users  noreply  github  com>
AuthorDate: Sun Aug 28 17:58:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 31 21:31:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2337d65

x11-wm/xmonad-contrib: keyword 0.17.0 for ~arm64

Thanks-to: Marcus Comstedt  mc.pp.se>
Signed-off-by: Sam James  gentoo.org>

 x11-wm/xmonad-contrib/xmonad-contrib-0.17.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.17.0.ebuild 
b/x11-wm/xmonad-contrib/xmonad-contrib-0.17.0.ebuild
index 910038aeab0c..445857960aac 100644
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.17.0.ebuild
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.17.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+xft"
 
 RDEPEND=">=dev-haskell/mtl-1:=[profile?] 

[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/

2022-08-31 Thread Sam James
commit: 2a5262eeddd192f42cf86708af8a1edd8fa4e312
Author: matoro  users  noreply  github  com>
AuthorDate: Sun Aug 28 17:47:11 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 31 21:31:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a5262ee

x11-wm/xmonad: keyword 0.17.0 for ~arm64

Thanks-to: Marcus Comstedt  mc.pp.se>
Signed-off-by: Sam James  gentoo.org>

 x11-wm/xmonad/xmonad-0.17.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/xmonad/xmonad-0.17.0.ebuild 
b/x11-wm/xmonad/xmonad-0.17.0.ebuild
index 331c83719c84..12ac7299f711 100644
--- a/x11-wm/xmonad/xmonad-0.17.0.ebuild
+++ b/x11-wm/xmonad/xmonad-0.17.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="no-autorepeat-keys"
 
 RDEPEND="dev-haskell/data-default-class:=[profile?]



[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad-contrib/

2022-08-18 Thread Sam James
commit: 9dc3d3bb5a9ac08548c6df6dc391d04d57941479
Author: matoro  users  noreply  github  com>
AuthorDate: Mon Aug 15 05:45:58 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 18 18:44:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dc3d3bb

x11-wm/xmonad-contrib: keyword 0.17.0 for ~ppc64

Signed-off-by: Sam James  gentoo.org>

 x11-wm/xmonad-contrib/xmonad-contrib-0.17.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.17.0.ebuild 
b/x11-wm/xmonad-contrib/xmonad-contrib-0.17.0.ebuild
index f24bc78559a4..910038aeab0c 100644
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.17.0.ebuild
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.17.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="+xft"
 
 RDEPEND=">=dev-haskell/mtl-1:=[profile?] 

[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/

2022-08-18 Thread Sam James
commit: 0621771aa81ef03a8e882ffc629c718f3ee0550f
Author: matoro  users  noreply  github  com>
AuthorDate: Mon Aug 15 05:30:12 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 18 18:44:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0621771a

x11-wm/xmonad: keyword 0.17.0 for ~ppc64

Signed-off-by: Sam James  gentoo.org>

 x11-wm/xmonad/xmonad-0.17.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/xmonad/xmonad-0.17.0.ebuild 
b/x11-wm/xmonad/xmonad-0.17.0.ebuild
index 5f05d98685d2..331c83719c84 100644
--- a/x11-wm/xmonad/xmonad-0.17.0.ebuild
+++ b/x11-wm/xmonad/xmonad-0.17.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="no-autorepeat-keys"
 
 RDEPEND="dev-haskell/data-default-class:=[profile?]



[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/files/

2022-07-26 Thread Sam James
commit: 7ab41be7bf6cd60125443735148049be9f6c384e
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Jul 25 17:20:28 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 27 03:49:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ab41be7

x11-wm/xmonad: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Portage 3.0.34 / pkgdev 0.2.1 / pkgcheck 0.10.11
Signed-off-by: Sam James  gentoo.org>

 x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch | 40 --
 1 file changed, 40 deletions(-)

diff --git a/x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch 
b/x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch
deleted file mode 100644
index 79bd2c2d21fa..
--- a/x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch
+++ /dev/null
@@ -1,40 +0,0 @@
 xmonad/src/XMonad/Core.hs  2010-09-05 05:11:42.0 +0400
-+++ xmonad/src/XMonad/Core.hs  2010-09-18 07:59:14.0 +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.0 +0400
-+++ xmonad/src/XMonad/Main.hs  2010-09-18 08:03:11.0 +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



[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/

2022-07-24 Thread Sam James
commit: d60e258411b67f3549aae986729225a6b25bd871
Author: Jack Todaro  posteo  org>
AuthorDate: Mon Jul 25 01:50:12 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 25 03:02:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d60e2584

x11-wm/xmonad: drop 0.15-r1

Signed-off-by: Jack Todaro  posteo.org>
Signed-off-by: Sam James  gentoo.org>

 x11-wm/xmonad/Manifest  |  2 -
 x11-wm/xmonad/xmonad-0.15-r1.ebuild | 87 -
 2 files changed, 89 deletions(-)

diff --git a/x11-wm/xmonad/Manifest b/x11-wm/xmonad/Manifest
index 9f82b629abe1..ecf9a5947d34 100644
--- a/x11-wm/xmonad/Manifest
+++ b/x11-wm/xmonad/Manifest
@@ -1,3 +1 @@
-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

diff --git a/x11-wm/xmonad/xmonad-0.15-r1.ebuild 
b/x11-wm/xmonad/xmonad-0.15-r1.ebuild
deleted file mode 100644
index 0d981be7a180..
--- a/x11-wm/xmonad/xmonad-0.15-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.6.
-#hackport: flags: -generatemanpage,-testing,-profiling
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A tiling window manager"
-HOMEPAGE="https://xmonad.org;
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
-   
https://patch-diff.githubusercontent.com/raw/xmonad/xmonad/pull/259.patch -> 
${PN}-259.patch"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="no-autorepeat-keys"
-
-RDEPEND="dev-haskell/data-default:=[profile?]
-   dev-haskell/extensible-exceptions:=[profile?]
-   dev-haskell/mtl:=[profile?]
-   dev-haskell/setlocale:=[profile?]
-   >=dev-haskell/utf8-string-0.3:=[profile?] 
=dev-haskell/x11-1.8:=[profile?] =dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-   >=dev-haskell/cabal-1.24.0.0
-   test? ( >=dev-haskell/quickcheck-2 )
-"
-
-DOCS=( CONFIG 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
-   eapply "${DISTDIR}/${PN}-259.patch"
-}
-
-src_configure() {
-   haskell-cabal_src_configure \
-   --flag=-generatemanpage \
-   --flag=-profiling \
-   --flag=-testing
-}
-
-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."
-}



[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad-contrib/

2022-07-24 Thread Sam James
commit: 49f450f1e754205f7bf8f5350d1f930decbfd669
Author: Jack Todaro  posteo  org>
AuthorDate: Mon Jul 25 01:50:45 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 25 03:02:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49f450f1

x11-wm/xmonad-contrib: drop 0.16

Signed-off-by: Jack Todaro  posteo.org>
Closes: https://github.com/gentoo/gentoo/pull/26579
Signed-off-by: Sam James  gentoo.org>

 x11-wm/xmonad-contrib/Manifest   |  1 -
 x11-wm/xmonad-contrib/xmonad-contrib-0.16.ebuild | 41 
 2 files changed, 42 deletions(-)

diff --git a/x11-wm/xmonad-contrib/Manifest b/x11-wm/xmonad-contrib/Manifest
index bcd158efb5c4..14142d7e3261 100644
--- a/x11-wm/xmonad-contrib/Manifest
+++ b/x11-wm/xmonad-contrib/Manifest
@@ -1,2 +1 @@
-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

diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.16.ebuild 
b/x11-wm/xmonad-contrib/xmonad-contrib-0.16.ebuild
deleted file mode 100644
index 6f76b2aba064..
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.16.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-#hackport: flags: -testing,use_xft:xft
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Third party 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/extensible-exceptions:=[profile?]
-   >=dev-haskell/mtl-1:=[profile?] =dev-haskell/x11-1.6.1:=[profile?] =dev-lang/ghc-8.0.1:=
-   >=x11-wm/xmonad-0.15:=[profile?] =dev-haskell/x11-xft-0.2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-   >=dev-haskell/cabal-1.24.0.0
-"
-
-src_configure() {
-   haskell-cabal_src_configure \
-   --flag=-testing \
-   $(cabal_flag xft use_xft)
-}



[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad-contrib/

2022-07-23 Thread Sam James
commit: ed17538a769ec1f20c0907bd77f186f1eb47abb3
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 24 00:52:21 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 24 00:59:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed17538a

x11-wm/xmonad-contrib: add 0.17.0

Closes: https://bugs.gentoo.org/821148
Signed-off-by: Sam James  gentoo.org>

 x11-wm/xmonad-contrib/Manifest |  1 +
 x11-wm/xmonad-contrib/metadata.xml | 19 +++
 x11-wm/xmonad-contrib/xmonad-contrib-0.17.0.ebuild | 39 ++
 3 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/x11-wm/xmonad-contrib/Manifest b/x11-wm/xmonad-contrib/Manifest
index 4020cb455c4a..bcd158efb5c4 100644
--- a/x11-wm/xmonad-contrib/Manifest
+++ b/x11-wm/xmonad-contrib/Manifest
@@ -1 +1,2 @@
 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

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 @@
 

hask...@gentoo.org
+   Gentoo Haskell

-   
-   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.
-   
-   
+   
+   Use Xft to render text
+   
 

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 ..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.
+#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/x11-1.10:=[profile?] =dev-lang/ghc-8.4.3:=
+   >=x11-wm/xmonad-0.16.9:=[profile?] =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/quickcheck-2 )
+"
+
+src_configure() {
+   haskell-cabal_src_configure \
+   --flag=-pedantic \
+   $(cabal_flag xft use_xft)
+}



[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/, x11-wm/xmonad/files/

2022-07-23 Thread Sam James
commit: 77d26a1adc79d30f8c0b634d7e3bcb77489d5678
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 24 00:50:44 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 24 00:59:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77d26a1a

x11-wm/xmonad: add 0.17.0 (sync w/ ::haskell)

Bug: https://bugs.gentoo.org/821148
Closes: https://github.com/gentoo/gentoo/pull/23597
Closes: https://bugs.gentoo.org/821145
Signed-off-by: Sam James  gentoo.org>

 x11-wm/xmonad/Manifest |  1 +
 x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch | 40 +++
 x11-wm/xmonad/metadata.xml | 11 ---
 x11-wm/xmonad/xmonad-0.17.0.ebuild | 83 ++
 4 files changed, 124 insertions(+), 11 deletions(-)

diff --git a/x11-wm/xmonad/Manifest b/x11-wm/xmonad/Manifest
index de7acaf13f0b..9f82b629abe1 100644
--- a/x11-wm/xmonad/Manifest
+++ b/x11-wm/xmonad/Manifest
@@ -1,2 +1,3 @@
 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

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 ..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.0 +0400
 xmonad/src/XMonad/Core.hs  2010-09-18 07:59:14.0 +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.0 +0400
 xmonad/src/XMonad/Main.hs  2010-09-18 08:03:11.0 +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 @@

Allow ignoring of keyboard 
autorepeat.

-   
-   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 

[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/

2022-07-22 Thread Sam James
commit: c4b56c65ec4063054f4cc96c8f4d4383cd4c0b91
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 23 02:52:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 23 02:52:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4b56c65

x11-wm/xmonad: drop 0.15

Signed-off-by: Sam James  gentoo.org>

 x11-wm/xmonad/xmonad-0.15.ebuild | 85 
 1 file changed, 85 deletions(-)

diff --git a/x11-wm/xmonad/xmonad-0.15.ebuild b/x11-wm/xmonad/xmonad-0.15.ebuild
deleted file mode 100644
index fbda12b17d62..
--- a/x11-wm/xmonad/xmonad-0.15.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6.
-#hackport: flags: -generatemanpage,-testing,-profiling
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-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:=[profile?]
-   dev-haskell/extensible-exceptions:=[profile?]
-   dev-haskell/mtl:=[profile?]
-   dev-haskell/setlocale:=[profile?]
-   >=dev-haskell/utf8-string-0.3:=[profile?] 
=dev-haskell/x11-1.8:=[profile?] =dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-   >=dev-haskell/cabal-1.24.0.0
-   test? ( >=dev-haskell/quickcheck-2 )
-"
-
-DOCS=( CONFIG 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=-generatemanpage \
-   --flag=-profiling \
-   --flag=-testing
-}
-
-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."
-}



[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/

2021-07-24 Thread Sergei Trofimovich
commit: 8f0980b9442d88c469d2392cbb7a371b77febff5
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jul 24 08:54:04 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jul 24 08:54:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f0980b9

x11-wm/xmonad: update to EAPI=8

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich  gentoo.org>

 x11-wm/xmonad/Manifest  |  1 +
 x11-wm/xmonad/xmonad-0.15-r1.ebuild | 87 +
 2 files changed, 88 insertions(+)

diff --git a/x11-wm/xmonad/Manifest b/x11-wm/xmonad/Manifest
index 41cf1312cbb..de7acaf13f0 100644
--- a/x11-wm/xmonad/Manifest
+++ b/x11-wm/xmonad/Manifest
@@ -1 +1,2 @@
 DIST xmonad-0.15.tar.gz 68822 BLAKE2B 
9ee9a070f6743fbab2cffe05ee9e60b64fded0b4916fdec03a550f5d5ec5a34102ab2d4e9586b9a0ca534db284a8058f11ee248072f3f3b312ae30c09873feff
 SHA512 
f881f3faa4f5a0de7a5a37118cd7041083ae3a7569c7094b55dedb9aa858176789aff459d426b237ebae5cc4598b06de790938775a7ac968c2d76be3f0efc8ba
+DIST xmonad-259.patch 1452 BLAKE2B 
869d11ae762c43b9e749169d6b691fdee52e9fc17848fc4ee494e075501528d4c0c040deea617f8fbeab003dd7bc277254498b0089b60f8e6e47b6b96430eb69
 SHA512 
9edb155a74d170e612cd84aad4fb004176fe5e5fc7017f1985aa2b4628b2cc995b157ba42ab6f7b546d5e3467358292234b3926254e1e831cc7ef38844e14c6d

diff --git a/x11-wm/xmonad/xmonad-0.15-r1.ebuild 
b/x11-wm/xmonad/xmonad-0.15-r1.ebuild
new file mode 100644
index 000..0d981be7a18
--- /dev/null
+++ b/x11-wm/xmonad/xmonad-0.15-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.5.6.
+#hackport: flags: -generatemanpage,-testing,-profiling
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A tiling window manager"
+HOMEPAGE="https://xmonad.org;
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+   
https://patch-diff.githubusercontent.com/raw/xmonad/xmonad/pull/259.patch -> 
${PN}-259.patch"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="no-autorepeat-keys"
+
+RDEPEND="dev-haskell/data-default:=[profile?]
+   dev-haskell/extensible-exceptions:=[profile?]
+   dev-haskell/mtl:=[profile?]
+   dev-haskell/setlocale:=[profile?]
+   >=dev-haskell/utf8-string-0.3:=[profile?] 
=dev-haskell/x11-1.8:=[profile?] =dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-1.24.0.0
+   test? ( >=dev-haskell/quickcheck-2 )
+"
+
+DOCS=( CONFIG 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
+   eapply "${DISTDIR}/${PN}-259.patch"
+}
+
+src_configure() {
+   haskell-cabal_src_configure \
+   --flag=-generatemanpage \
+   --flag=-profiling \
+   --flag=-testing
+}
+
+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."
+}



[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad-contrib/

2020-09-04 Thread Sergei Trofimovich
commit: 0c82700e457d78449a3147bd86cf5e4390c07f02
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri Sep  4 18:49:19 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Sep  4 19:44:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c82700e

x11-wm/xmonad-contrib: use HTTPS

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 x11-wm/xmonad-contrib/xmonad-contrib-0.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.16.ebuild 
b/x11-wm/xmonad-contrib/xmonad-contrib-0.16.ebuild
index 5156c063509..6f76b2aba06 100644
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.16.ebuild
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.16.ebuild
@@ -10,7 +10,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Third party extensions for xmonad"
-HOMEPAGE="http://xmonad.org/;
+HOMEPAGE="https://xmonad.org/;
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/files/

2020-08-20 Thread Sergei Trofimovich
commit: be39bb5a578867782266ae3cfb6cc604d3458fa9
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Aug 19 17:39:09 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Aug 20 06:37:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be39bb5a

x11-wm/xmonad: remove unused patches

Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17173
Signed-off-by: Sergei Trofimovich  gentoo.org>

 x11-wm/xmonad/files/xmonad-0.11-ghc-7.10.patch | 14 
 x11-wm/xmonad/files/xmonad-0.11-sample.patch   | 74 --
 x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch | 40 
 x11-wm/xmonad/files/xmonad-check-repeat.patch  | 40 
 4 files changed, 168 deletions(-)

diff --git a/x11-wm/xmonad/files/xmonad-0.11-ghc-7.10.patch 
b/x11-wm/xmonad/files/xmonad-0.11-ghc-7.10.patch
deleted file mode 100644
index e92a31ec704..000
--- a/x11-wm/xmonad/files/xmonad-0.11-ghc-7.10.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fri May  2 06:57:43 BST 2014  Adam Vogt 
-  * derive Applicative instance for Query
-diff -rN -u old-xmonad/XMonad/Core.hs new-xmonad/XMonad/Core.hs
 old-xmonad/XMonad/Core.hs  2015-01-08 21:40:45.320979242 +
-+++ new-xmonad/XMonad/Core.hs  2015-01-08 21:40:45.367979193 +
-@@ -155,7 +155,7 @@
- 
- type ManageHook = Query (Endo WindowSet)
- newtype Query a = Query (ReaderT Window X a)
--deriving (Functor, Monad, MonadReader Window, MonadIO)
-+deriving (Functor, Applicative, Monad, MonadReader Window, MonadIO)
- 
- runQuery :: Query a -> Window -> X a
- runQuery (Query m) w = runReaderT m w

diff --git a/x11-wm/xmonad/files/xmonad-0.11-sample.patch 
b/x11-wm/xmonad/files/xmonad-0.11-sample.patch
deleted file mode 100644
index 0780af8c18d..000
--- a/x11-wm/xmonad/files/xmonad-0.11-sample.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Sun Jan  6 17:42:54 GMT 2013  Daniel Wagner 
-  * define the "help" string in the sample configuration bundled with xmonad
-diff -rN -u old-xmonad/man/xmonad.hs new-xmonad/man/xmonad.hs
 old-xmonad/man/xmonad.hs   2015-02-27 08:38:26.993365307 +
-+++ new-xmonad/man/xmonad.hs   2015-02-27 08:38:27.046365303 +
-@@ -280,3 +280,54 @@
- logHook= myLogHook,
- startupHook= myStartupHook
- }
-+
-+-- | Finally, a copy of the default bindings in simple textual tabular format.
-+help :: String
-+help = unlines ["The default modifier key is 'alt'. Default keybindings:",
-+"",
-+"-- launching and killing programs",
-+"mod-Shift-Enter  Launch xterminal",
-+"mod-pLaunch dmenu",
-+"mod-Shift-p  Launch gmrun",
-+"mod-Shift-c  Close/kill the focused window",
-+"mod-SpaceRotate through the available layout algorithms",
-+"mod-Shift-Space  Reset the layouts on the current workSpace to default",
-+"mod-nResize/refresh viewed windows to the correct size",
-+"",
-+"-- move focus up or down the window stack",
-+"mod-TabMove focus to the next window",
-+"mod-Shift-Tab  Move focus to the previous window",
-+"mod-j  Move focus to the next window",
-+"mod-k  Move focus to the previous window",
-+"mod-m  Move focus to the master window",
-+"",
-+"-- modifying the window order",
-+"mod-Return   Swap the focused window and the master window",
-+"mod-Shift-j  Swap the focused window with the next window",
-+"mod-Shift-k  Swap the focused window with the previous window",
-+"",
-+"-- resizing the master/slave ratio",
-+"mod-h  Shrink the master area",
-+"mod-l  Expand the master area",
-+"",
-+"-- floating layer support",
-+"mod-t  Push window back into tiling; unfloat and re-tile it",
-+"",
-+"-- increase or decrease number of windows in the master area",
-+"mod-comma  (mod-,)   Increment the number of windows in the master area",
-+"mod-period (mod-.)   Deincrement the number of windows in the master 
area",
-+"",
-+"-- quit, or restart",
-+"mod-Shift-q  Quit xmonad",
-+"mod-qRestart xmonad",
-+"mod-[1..9]   Switch to workSpace N",
-+"",
-+"-- Workspaces & screens",
-+"mod-Shift-[1..9]   Move client to workspace N",
-+"mod-{w,e,r}Switch to physical/Xinerama screens 1, 2, or 3",
-+"mod-Shift-{w,e,r}  Move client to screen 1, 2, or 3",
-+"",
-+"-- Mouse bindings: default actions bound to mouse events",
-+"mod-button1  Set the window to floating mode and move by dragging",
-+"mod-button2  Raise the window to the top of the stack",
-+"mod-button3  Set the window to floating mode and resize by dragging"]
-Sun Jan  6 17:44:14 GMT 2013  Daniel Wagner 
-  * use "modm" instead of "modMask" in the sample config
-diff -rN -u old-xmonad/man/xmonad.hs new-xmonad/man/xmonad.hs
 

[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad-contrib/, x11-wm/xmonad-contrib/files/

2020-08-15 Thread Sergei Trofimovich
commit: 2116b13999c99d9e7154e7dfed309634ec7a74da
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Aug 15 11:47:16 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Aug 15 11:47:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2116b139

x11-wm/xmonad-contrib: drop old

Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich  gentoo.org>

 x11-wm/xmonad-contrib/Manifest |  5 ---
 .../files/xmonad-contrib-0.11.2-ghc-7.8.patch  | 23 --
 .../xmonad-contrib-0.11.4-import-Applicative.patch | 21 -
 x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild | 41 --
 x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild | 50 --
 x11-wm/xmonad-contrib/xmonad-contrib-0.12.ebuild   | 40 -
 x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild   | 40 -
 x11-wm/xmonad-contrib/xmonad-contrib-0.15.ebuild   | 41 --
 8 files changed, 261 deletions(-)

diff --git a/x11-wm/xmonad-contrib/Manifest b/x11-wm/xmonad-contrib/Manifest
index 727c07591c4..4020cb455c4 100644
--- a/x11-wm/xmonad-contrib/Manifest
+++ b/x11-wm/xmonad-contrib/Manifest
@@ -1,6 +1 @@
-DIST xmonad-contrib-0.11.2.tar.gz 401758 BLAKE2B 
06697bac621dabbbc3e066c38efbfc819087569c18cf7064820a826e0a28f48257b84f54659bc64db062b187129df899f694bb2ea8fa375b5dfb49afce1c170c
 SHA512 
373e1ed1744cbdf26902402d74b4efafa043a4ccf1953c26ec55a03ef8de31818b0c4cfced08b43e664e5f052e52923c6dfb08d68be86726e9f0ed1d96ad7910
-DIST xmonad-contrib-0.11.4.tar.gz 401743 BLAKE2B 
f6962bcb88e88ebf620ef037c08de8c21ebbb10cb863852f60b5f3ba03d72d00dfb737b57ca0bb5f2fa3364a120fe00377d6c27735abbc8f7eb0b1992ec705b7
 SHA512 
3d747988baa497475255be4cc96f7eba5cf6fc81658f8f877ca92148fb9a154423ee98ebeb23690de00b186d2e34ad13d94cf1fe332d4ca4f1f4a64790e46ed7
-DIST xmonad-contrib-0.12.tar.gz 464978 BLAKE2B 
72b08d01a24e1a878bc1d7175755b45d0751236f01c276f3b5baaf332f3baf5c81b2c75c8ab88e221f1cabde0f3ed3f7a613b672b038da95de0ef4d69f249307
 SHA512 
5bb145fc7d07ebc8e4dde5ba83b5340913fb089581d22e993663402fc6728eab9f6939466b7a262827c0098599073a928700e0acb8245b943b23e6cd01e63056
-DIST xmonad-contrib-0.13.tar.gz 485351 BLAKE2B 
ef42ad08bf5878046abfbc0c2cbb79853c01e2e0ba0e6ab0723e575531dc106c32dce58fe9e6e35b5e84f18b04456aec03ef838a9cb6fc34396415a311e1b2d5
 SHA512 
40b8a8fc8a1fa134f2726c273ff75eee26a43c9f18095bad9251e4b37b0cca5ee6c32eec5c42aa00c9e0c5c90ae54e6414739a2cee5b5d2917814358449d55f5
-DIST xmonad-contrib-0.15.tar.gz 524285 BLAKE2B 
e34b32a4899e98b00ae5ea4539a8566f056f794adb672df035d140532faf0996ef4bcf078998a1a6bd93320c5ebd41d51babf98a5332142c3a8644d3eb0e007d
 SHA512 
c4669a51f6c1fbb50f5d484ae4a24b608d2b03c2e6814fa2ae079fe57a4b599e3072ae23c29b22fe2cf86a04840b4262a646ee4c7ba7c9a859ee78a31f99bc8a
 DIST xmonad-contrib-0.16.tar.gz 540237 BLAKE2B 
7ddf8730481c39e9b5e40a548f3cbe36f301901656c57cc5ffdd11e05ad516019dc0b82c7dcf77665c152c390f7b7ae49c04ec6ae39347565b11a23aef23cce3
 SHA512 
22a18b4045cbfca0229cbf6c0bf1dfa595cbffbe6b82fd58b1fcf941cbfd306642160995b55859cead3cf574df696d2a3cea6507cac4d5c7c58cf09b3a86bc25

diff --git a/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.2-ghc-7.8.patch 
b/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.2-ghc-7.8.patch
deleted file mode 100644
index 67e1f8cd8de..000
--- a/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.2-ghc-7.8.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Sun Feb 17 19:33:56 FET 2013  Adam Vogt 
-  * Remove unnecessary contexts from L.MultiToggle
-diff -rN -u old-XMonadContrib/XMonad/Layout/MultiToggle.hs 
new-XMonadContrib/XMonad/Layout/MultiToggle.hs
 old-XMonadContrib/XMonad/Layout/MultiToggle.hs 2014-02-06 
00:58:32.422844682 +0300
-+++ new-XMonadContrib/XMonad/Layout/MultiToggle.hs 2014-02-06 
00:58:32.462844684 +0300
-@@ -99,7 +99,7 @@
- transform :: (LayoutClass l a) => t -> l a ->
- (forall l'. (LayoutClass l' a) => l' a -> (l' a -> l a) -> b) -> b
- 
--data (LayoutClass l a) => EL l a = forall l'. (LayoutClass l' a) => EL (l' a) 
(l' a -> l a)
-+data  EL l a = forall l'. (LayoutClass l' a) => EL (l' a) (l' a -> l a)
- 
- unEL :: (LayoutClass l a) => EL l a -> (forall l'. (LayoutClass l' a) => l' a 
-> b) -> b
- unEL (EL x _) k = k x
-@@ -159,7 +159,7 @@
- infixr 0 ??
- -- | Prepend an element to a heterogeneous list. Used to build transformer
- -- tables for 'mkToggle'.
--(??) :: (HList b w) => a -> b -> HCons a b
-+(??) ::  a -> b -> HCons a b
- (??) = HCons
- 
- -- | Construct a singleton transformer table.

diff --git 
a/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.4-import-Applicative.patch 
b/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.4-import-Applicative.patch
deleted file mode 100644
index d887e857da0..000
--- a/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.4-import-Applicative.patch
+++ /dev/null
@@ -1,21 +0,0 @@
 xmonad-contrib-0.11.4-orig/XMonad/Util/Invisible.hs2015-03-28 
05:00:21.0 +1100

[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/

2020-08-15 Thread Sergei Trofimovich
commit: 3a496d45bd739b36b5297929d03315f6544c65ef
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Aug 15 11:47:59 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Aug 15 11:47:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a496d45

x11-wm/xmonad: drop old

Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich  gentoo.org>

 x11-wm/xmonad/Manifest  |  4 --
 x11-wm/xmonad/metadata.xml  |  2 -
 x11-wm/xmonad/xmonad-0.11-r1.ebuild | 72 --
 x11-wm/xmonad/xmonad-0.11-r3.ebuild | 79 -
 x11-wm/xmonad/xmonad-0.11.1.ebuild  | 79 -
 x11-wm/xmonad/xmonad-0.12.ebuild| 87 -
 x11-wm/xmonad/xmonad-0.13.ebuild| 78 -
 7 files changed, 401 deletions(-)

diff --git a/x11-wm/xmonad/Manifest b/x11-wm/xmonad/Manifest
index 906195a5a50..41cf1312cbb 100644
--- a/x11-wm/xmonad/Manifest
+++ b/x11-wm/xmonad/Manifest
@@ -1,5 +1 @@
-DIST xmonad-0.11.1.tar.gz 59307 BLAKE2B 
98dc31dd53e933f68dbf00121c6a0b4e4a24a19ce46410a7b1d7a21977b2c980de623187a59b097dec46944163b1685472902d8df4b47f0d0ac47db93844ee13
 SHA512 
4916451d81d359dbbf508f3b20f649f956255f526f14b1eb6c0d32bc789474db30d7acac768663ca32784c7fe361195a50f45a7cb7371ee9a29c9b8f1c64d528
-DIST xmonad-0.11.tar.gz 59119 BLAKE2B 
75ae39e2e54d4b5ed14f99d0144d4ee7741c611f18b5692aedce49b0a4dc07a17f613280d93fd715b812a2c22e27ad9f7fe8693dba38739ccf6dde9742fe03b9
 SHA512 
34740f032508584f34f6b138d21394eca17e8020bccc4d8c6e8b3cb6b7ca64b153077cfd16636a6130768ebd145fe993569f8a229862d7816d0c89c905ee08bc
-DIST xmonad-0.12.tar.gz 61436 BLAKE2B 
ea42fc105e30be59a2cb0180c05ef88024e51a1a224bdd6bb910d45cddabc2709411e2f0c7aa6c5723f54653db242bda80ab92249204106955be75a4a077f1ea
 SHA512 
e519c038d90db037bc81e7baf7b07cfa53922509e98ffddacfc4a6cc2c7376383be1e721f613057a5febbfcc661807b6382124eb673ac7a7cda23c738d3539ab
-DIST xmonad-0.13.tar.gz 72034 BLAKE2B 
c95b24ae406268da642168defcc633cf8185f0f2dbcede1122c48c3812bf250df69d917c479f328cca450dec362ae0614d2acaf09d62123d15d646dcae8d98ec
 SHA512 
9d9436f36fe0f6a9732502b0211fc41a224b1320b843d266b6d2dd201e4329b688f7eed5b08597b2edd713cc25f2b88a2a1f1ee43e18615c0a78e97e4716b122
 DIST xmonad-0.15.tar.gz 68822 BLAKE2B 
9ee9a070f6743fbab2cffe05ee9e60b64fded0b4916fdec03a550f5d5ec5a34102ab2d4e9586b9a0ca534db284a8058f11ee248072f3f3b312ae30c09873feff
 SHA512 
f881f3faa4f5a0de7a5a37118cd7041083ae3a7569c7094b55dedb9aa858176789aff459d426b237ebae5cc4598b06de790938775a7ac968c2d76be3f0efc8ba

diff --git a/x11-wm/xmonad/metadata.xml b/x11-wm/xmonad/metadata.xml
index 7ec6ab24184..e366d8236ca 100644
--- a/x11-wm/xmonad/metadata.xml
+++ b/x11-wm/xmonad/metadata.xml
@@ -6,8 +6,6 @@
Gentoo Haskell


-   Pull terminal specified in default 
xmonad config
-   to be a bit less hostile by default.
Allow ignoring of keyboard 
autorepeat.



diff --git a/x11-wm/xmonad/xmonad-0.11-r1.ebuild 
b/x11-wm/xmonad/xmonad-0.11-r1.ebuild
deleted file mode 100644
index e5ca5742639..000
--- a/x11-wm/xmonad/xmonad-0.11-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1
-
-CABAL_FEATURES="bin lib profile haddock hscolour hoogle"
-inherit haskell-cabal
-
-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="+default-term"
-
-RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
-   dev-haskell/mtl:=[profile?]
-   =dev-haskell/utf8-string-0.3*:=[profile?]
-   >=dev-haskell/x11-1.5:=[profile?]
-   =dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-   >=dev-haskell/cabal-1.6"
-PDEPEND="default-term? ( x11-terms/xterm )
-   x11-apps/xmessage
-"
-
-SAMPLE_CONFIG="xmonad.hs"
-SAMPLE_CONFIG_LOC="man"
-
-src_prepare() {
-   # allow user patches
-   epatch_user
-}
-
-src_install() {
-   cabal_src_install
-
-   echo -e "#!/bin/sh\n/usr/bin/xmonad" > "${T}/${PN}"
-   exeinto /etc/X11/Sessions
-   doexe "${T}/${PN}"
-
-   insinto /usr/share/xsessions
-   doins "${FILESDIR}/${PN}.desktop"
-
-   doman man/xmonad.1
-   dohtml man/xmonad.1.html
-
-   dodoc CONFIG README
-}
-
-pkg_postinst() {
-   haskell-cabal_pkg_postinst
-
-   elog "A sample ${SAMPLE_CONFIG} configuration file can be found here:"
-   elog "
/usr/share/${PF}/ghc-$(ghc-version)/${SAMPLE_CONFIG_LOC}/${SAMPLE_CONFIG}"
-   elog "The parameters in this file are the defaults used by xmonad."
-   elog "To customize xmonad, copy this file to:"
-   elog "

[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad-contrib/

2020-08-03 Thread Sergei Trofimovich
commit: 097f64a08ba2624d893bef4019c33ae7806b84bf
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Aug  3 18:10:04 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Aug  3 18:10:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=097f64a0

x11-wm/xmonad-contrib: bump up to 0.16 (ghc-8.8 compatible)

Reported-by: Dima Pasechnik
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich  gentoo.org>

 x11-wm/xmonad-contrib/Manifest   |  1 +
 x11-wm/xmonad-contrib/xmonad-contrib-0.16.ebuild | 41 
 2 files changed, 42 insertions(+)

diff --git a/x11-wm/xmonad-contrib/Manifest b/x11-wm/xmonad-contrib/Manifest
index 057faa6bca6..727c07591c4 100644
--- a/x11-wm/xmonad-contrib/Manifest
+++ b/x11-wm/xmonad-contrib/Manifest
@@ -3,3 +3,4 @@ DIST xmonad-contrib-0.11.4.tar.gz 401743 BLAKE2B 
f6962bcb88e88ebf620ef037c08de8c
 DIST xmonad-contrib-0.12.tar.gz 464978 BLAKE2B 
72b08d01a24e1a878bc1d7175755b45d0751236f01c276f3b5baaf332f3baf5c81b2c75c8ab88e221f1cabde0f3ed3f7a613b672b038da95de0ef4d69f249307
 SHA512 
5bb145fc7d07ebc8e4dde5ba83b5340913fb089581d22e993663402fc6728eab9f6939466b7a262827c0098599073a928700e0acb8245b943b23e6cd01e63056
 DIST xmonad-contrib-0.13.tar.gz 485351 BLAKE2B 
ef42ad08bf5878046abfbc0c2cbb79853c01e2e0ba0e6ab0723e575531dc106c32dce58fe9e6e35b5e84f18b04456aec03ef838a9cb6fc34396415a311e1b2d5
 SHA512 
40b8a8fc8a1fa134f2726c273ff75eee26a43c9f18095bad9251e4b37b0cca5ee6c32eec5c42aa00c9e0c5c90ae54e6414739a2cee5b5d2917814358449d55f5
 DIST xmonad-contrib-0.15.tar.gz 524285 BLAKE2B 
e34b32a4899e98b00ae5ea4539a8566f056f794adb672df035d140532faf0996ef4bcf078998a1a6bd93320c5ebd41d51babf98a5332142c3a8644d3eb0e007d
 SHA512 
c4669a51f6c1fbb50f5d484ae4a24b608d2b03c2e6814fa2ae079fe57a4b599e3072ae23c29b22fe2cf86a04840b4262a646ee4c7ba7c9a859ee78a31f99bc8a
+DIST xmonad-contrib-0.16.tar.gz 540237 BLAKE2B 
7ddf8730481c39e9b5e40a548f3cbe36f301901656c57cc5ffdd11e05ad516019dc0b82c7dcf77665c152c390f7b7ae49c04ec6ae39347565b11a23aef23cce3
 SHA512 
22a18b4045cbfca0229cbf6c0bf1dfa595cbffbe6b82fd58b1fcf941cbfd306642160995b55859cead3cf574df696d2a3cea6507cac4d5c7c58cf09b3a86bc25

diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.16.ebuild 
b/x11-wm/xmonad-contrib/xmonad-contrib-0.16.ebuild
new file mode 100644
index 000..5156c063509
--- /dev/null
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.16.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+#hackport: flags: -testing,use_xft:xft
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Third party extensions for xmonad"
+HOMEPAGE="http://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/extensible-exceptions:=[profile?]
+   >=dev-haskell/mtl-1:=[profile?] =dev-haskell/x11-1.6.1:=[profile?] =dev-lang/ghc-8.0.1:=
+   >=x11-wm/xmonad-0.15:=[profile?] =dev-haskell/x11-xft-0.2:=[profile?] )
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-1.24.0.0
+"
+
+src_configure() {
+   haskell-cabal_src_configure \
+   --flag=-testing \
+   $(cabal_flag xft use_xft)
+}



[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/

2020-04-07 Thread Sergei Trofimovich
commit: e5c233b2d0e7384d550658415f89645180676001
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Apr  7 20:54:46 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Apr  7 21:29:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5c233b2

x11-wm/xmonad: drop sparc, deps don't build at all

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 x11-wm/xmonad/xmonad-0.11-r1.ebuild | 2 +-
 x11-wm/xmonad/xmonad-0.11-r3.ebuild | 2 +-
 x11-wm/xmonad/xmonad-0.11.1.ebuild  | 2 +-
 x11-wm/xmonad/xmonad-0.12.ebuild| 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11-wm/xmonad/xmonad-0.11-r1.ebuild 
b/x11-wm/xmonad/xmonad-0.11-r1.ebuild
index 0ac630861cc..a45aa0b4aab 100644
--- a/x11-wm/xmonad/xmonad-0.11-r1.ebuild
+++ b/x11-wm/xmonad/xmonad-0.11-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="+default-term"
 
 RDEPEND="dev-haskell/extensible-exceptions:=[profile?]

diff --git a/x11-wm/xmonad/xmonad-0.11-r3.ebuild 
b/x11-wm/xmonad/xmonad-0.11-r3.ebuild
index 67cb46bdbd7..fbe3e95182a 100644
--- a/x11-wm/xmonad/xmonad-0.11-r3.ebuild
+++ b/x11-wm/xmonad/xmonad-0.11-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="+default-term no-autorepeat-keys"
 
 RDEPEND="dev-haskell/extensible-exceptions:=[profile?]

diff --git a/x11-wm/xmonad/xmonad-0.11.1.ebuild 
b/x11-wm/xmonad/xmonad-0.11.1.ebuild
index ff10cb0d1e5..588cc05d6bc 100644
--- a/x11-wm/xmonad/xmonad-0.11.1.ebuild
+++ b/x11-wm/xmonad/xmonad-0.11.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="+default-term no-autorepeat-keys"
 
 RDEPEND="dev-haskell/extensible-exceptions:=[profile?]

diff --git a/x11-wm/xmonad/xmonad-0.12.ebuild b/x11-wm/xmonad/xmonad-0.12.ebuild
index 288a2bf6fe8..c9bbcad8c31 100644
--- a/x11-wm/xmonad/xmonad-0.12.ebuild
+++ b/x11-wm/xmonad/xmonad-0.12.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="+default-term no-autorepeat-keys"
 
 RESTRICT=test # fails test on ghc-8 (assert has different text of exception)



[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/files/

2019-11-11 Thread Sergei Trofimovich
commit: b751dbba1e6ef386bc5b2eab9e425475b6ae5f58
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Nov 11 22:34:08 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Nov 11 22:34:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b751dbba

x11-wm/xmonad: add missing xmonad-0.14-check-repeat.patch

Reported-by:  Toralf Förster
Closes: https://bugs.gentoo.org/699810
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Sergei Trofimovich  gentoo.org>

 x11-wm/xmonad/files/xmonad-0.14-check-repeat.patch | 56 ++
 1 file changed, 56 insertions(+)

diff --git a/x11-wm/xmonad/files/xmonad-0.14-check-repeat.patch 
b/x11-wm/xmonad/files/xmonad-0.14-check-repeat.patch
new file mode 100644
index 000..5fb25660158
--- /dev/null
+++ b/x11-wm/xmonad/files/xmonad-0.14-check-repeat.patch
@@ -0,0 +1,56 @@
+diff --git a/src/XMonad/Core.hs b/src/XMonad/Core.hs
+index c79b992..29c7f77 100644
+--- a/src/XMonad/Core.hs
 b/src/XMonad/Core.hs
+@@ -68,6 +68,7 @@ data XState = XState
+ , 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.
+ --
+diff --git a/src/XMonad/Main.hs b/src/XMonad/Main.hs
+index 3b6ace1..bdcab3a 100644
+--- a/src/XMonad/Main.hs
 b/src/XMonad/Main.hs
+@@ -219,6 +219,7 @@ launch initxmc = do
+ , mapped  = S.empty
+ , waitingUnmap= M.empty
+ , dragging= Nothing
++, keyPressed  = 0
+ , extensibleState = M.empty
+ }
+ 
+@@ -291,10 +292,15 @@ handle :: Event -> X ()
+ -- 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/src/XMonad/Operations.hs b/src/XMonad/Operations.hs
+index aa44dcd..747cbf7 100644
+--- a/src/XMonad/Operations.hs
 b/src/XMonad/Operations.hs
+@@ -482,6 +482,7 @@ readStateFile xmc = do
+ , mapped  = S.empty
+ , waitingUnmap= M.empty
+ , dragging= Nothing
++, keyPressed  = 0
+ , extensibleState = extState
+ }
+   where



[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/

2019-08-24 Thread Sergei Trofimovich
commit: 49e88fe8e930b6ff2b8bc70d99518a4c275ff8fc
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Aug 24 08:27:28 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Aug 24 08:34:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49e88fe8

x11-wm/xmonad: bump up to 0.15, bug #680504

Reported-by: yuLya
Bug: https://bugs.gentoo.org/680504
Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich  gentoo.org>

 x11-wm/xmonad/Manifest   |  1 +
 x11-wm/xmonad/xmonad-0.15.ebuild | 85 
 2 files changed, 86 insertions(+)

diff --git a/x11-wm/xmonad/Manifest b/x11-wm/xmonad/Manifest
index 06dd3bafa23..906195a5a50 100644
--- a/x11-wm/xmonad/Manifest
+++ b/x11-wm/xmonad/Manifest
@@ -2,3 +2,4 @@ DIST xmonad-0.11.1.tar.gz 59307 BLAKE2B 
98dc31dd53e933f68dbf00121c6a0b4e4a24a19c
 DIST xmonad-0.11.tar.gz 59119 BLAKE2B 
75ae39e2e54d4b5ed14f99d0144d4ee7741c611f18b5692aedce49b0a4dc07a17f613280d93fd715b812a2c22e27ad9f7fe8693dba38739ccf6dde9742fe03b9
 SHA512 
34740f032508584f34f6b138d21394eca17e8020bccc4d8c6e8b3cb6b7ca64b153077cfd16636a6130768ebd145fe993569f8a229862d7816d0c89c905ee08bc
 DIST xmonad-0.12.tar.gz 61436 BLAKE2B 
ea42fc105e30be59a2cb0180c05ef88024e51a1a224bdd6bb910d45cddabc2709411e2f0c7aa6c5723f54653db242bda80ab92249204106955be75a4a077f1ea
 SHA512 
e519c038d90db037bc81e7baf7b07cfa53922509e98ffddacfc4a6cc2c7376383be1e721f613057a5febbfcc661807b6382124eb673ac7a7cda23c738d3539ab
 DIST xmonad-0.13.tar.gz 72034 BLAKE2B 
c95b24ae406268da642168defcc633cf8185f0f2dbcede1122c48c3812bf250df69d917c479f328cca450dec362ae0614d2acaf09d62123d15d646dcae8d98ec
 SHA512 
9d9436f36fe0f6a9732502b0211fc41a224b1320b843d266b6d2dd201e4329b688f7eed5b08597b2edd713cc25f2b88a2a1f1ee43e18615c0a78e97e4716b122
+DIST xmonad-0.15.tar.gz 68822 BLAKE2B 
9ee9a070f6743fbab2cffe05ee9e60b64fded0b4916fdec03a550f5d5ec5a34102ab2d4e9586b9a0ca534db284a8058f11ee248072f3f3b312ae30c09873feff
 SHA512 
f881f3faa4f5a0de7a5a37118cd7041083ae3a7569c7094b55dedb9aa858176789aff459d426b237ebae5cc4598b06de790938775a7ac968c2d76be3f0efc8ba

diff --git a/x11-wm/xmonad/xmonad-0.15.ebuild b/x11-wm/xmonad/xmonad-0.15.ebuild
new file mode 100644
index 000..a65b517e395
--- /dev/null
+++ b/x11-wm/xmonad/xmonad-0.15.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.
+#hackport: flags: -generatemanpage,-testing,-profiling
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A tiling window manager"
+HOMEPAGE="http://xmonad.org;
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="no-autorepeat-keys"
+
+RDEPEND="dev-haskell/data-default:=[profile?]
+   dev-haskell/extensible-exceptions:=[profile?]
+   dev-haskell/mtl:=[profile?]
+   dev-haskell/setlocale:=[profile?]
+   >=dev-haskell/utf8-string-0.3:=[profile?] 
=dev-haskell/x11-1.8:=[profile?] =dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-1.24.0.0
+   test? ( >=dev-haskell/quickcheck-2 )
+"
+
+DOCS=( CONFIG 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=-generatemanpage \
+   --flag=-profiling \
+   --flag=-testing
+}
+
+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."
+}



[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad-contrib/

2019-08-24 Thread Sergei Trofimovich
commit: 01550e4b841cea68414c782773cda9eb8519a8b9
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Aug 24 08:33:54 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Aug 24 08:34:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01550e4b

x11-wm/xmonad-contrib: bump up to 0.15, bug #680504

Reported-by: yuLya
Closes: https://bugs.gentoo.org/680504
Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich  gentoo.org>

 x11-wm/xmonad-contrib/Manifest   |  1 +
 x11-wm/xmonad-contrib/xmonad-contrib-0.15.ebuild | 41 
 2 files changed, 42 insertions(+)

diff --git a/x11-wm/xmonad-contrib/Manifest b/x11-wm/xmonad-contrib/Manifest
index 9cb9bf3cf67..057faa6bca6 100644
--- a/x11-wm/xmonad-contrib/Manifest
+++ b/x11-wm/xmonad-contrib/Manifest
@@ -2,3 +2,4 @@ DIST xmonad-contrib-0.11.2.tar.gz 401758 BLAKE2B 
06697bac621dabbbc3e066c38efbfc8
 DIST xmonad-contrib-0.11.4.tar.gz 401743 BLAKE2B 
f6962bcb88e88ebf620ef037c08de8c21ebbb10cb863852f60b5f3ba03d72d00dfb737b57ca0bb5f2fa3364a120fe00377d6c27735abbc8f7eb0b1992ec705b7
 SHA512 
3d747988baa497475255be4cc96f7eba5cf6fc81658f8f877ca92148fb9a154423ee98ebeb23690de00b186d2e34ad13d94cf1fe332d4ca4f1f4a64790e46ed7
 DIST xmonad-contrib-0.12.tar.gz 464978 BLAKE2B 
72b08d01a24e1a878bc1d7175755b45d0751236f01c276f3b5baaf332f3baf5c81b2c75c8ab88e221f1cabde0f3ed3f7a613b672b038da95de0ef4d69f249307
 SHA512 
5bb145fc7d07ebc8e4dde5ba83b5340913fb089581d22e993663402fc6728eab9f6939466b7a262827c0098599073a928700e0acb8245b943b23e6cd01e63056
 DIST xmonad-contrib-0.13.tar.gz 485351 BLAKE2B 
ef42ad08bf5878046abfbc0c2cbb79853c01e2e0ba0e6ab0723e575531dc106c32dce58fe9e6e35b5e84f18b04456aec03ef838a9cb6fc34396415a311e1b2d5
 SHA512 
40b8a8fc8a1fa134f2726c273ff75eee26a43c9f18095bad9251e4b37b0cca5ee6c32eec5c42aa00c9e0c5c90ae54e6414739a2cee5b5d2917814358449d55f5
+DIST xmonad-contrib-0.15.tar.gz 524285 BLAKE2B 
e34b32a4899e98b00ae5ea4539a8566f056f794adb672df035d140532faf0996ef4bcf078998a1a6bd93320c5ebd41d51babf98a5332142c3a8644d3eb0e007d
 SHA512 
c4669a51f6c1fbb50f5d484ae4a24b608d2b03c2e6814fa2ae079fe57a4b599e3072ae23c29b22fe2cf86a04840b4262a646ee4c7ba7c9a859ee78a31f99bc8a

diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.15.ebuild 
b/x11-wm/xmonad-contrib/xmonad-contrib-0.15.ebuild
new file mode 100644
index 000..4d0d9737f40
--- /dev/null
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.15.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.
+#hackport: flags: -testing,use_xft:xft
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Third party extensions for xmonad"
+HOMEPAGE="http://xmonad.org/;
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+xft"
+
+RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
+   >=dev-haskell/mtl-1:=[profile?] =dev-haskell/x11-1.6.1:=[profile?] =dev-lang/ghc-7.6.1:=
+   >=x11-wm/xmonad-0.15:=[profile?] =dev-haskell/x11-xft-0.2:=[profile?] )
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-1.16.0
+"
+
+src_configure() {
+   haskell-cabal_src_configure \
+   --flag=-testing \
+   $(cabal_flag xft use_xft)
+}



[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/

2018-11-18 Thread Sergei Trofimovich
commit: 6ba97d712db34aecf98d0d6766433e82527ab7aa
Author: Francesco Turco  fastmail  fm>
AuthorDate: Fri Nov 16 21:13:25 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Nov 18 22:07:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ba97d71

x11-wm/xmonad: use HTTPS for HOMEPAGE

Signed-off-by: Francesco Turco  fastmail.fm>
Closes: https://github.com/gentoo/gentoo/pull/10435
Signed-off-by: Sergei Trofimovich  gentoo.org>

 x11-wm/xmonad/xmonad-0.11-r1.ebuild | 4 ++--
 x11-wm/xmonad/xmonad-0.11-r3.ebuild | 4 ++--
 x11-wm/xmonad/xmonad-0.11.1.ebuild  | 4 ++--
 x11-wm/xmonad/xmonad-0.12.ebuild| 4 ++--
 x11-wm/xmonad/xmonad-0.13.ebuild| 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/x11-wm/xmonad/xmonad-0.11-r1.ebuild 
b/x11-wm/xmonad/xmonad-0.11-r1.ebuild
index bbd2c9e330c..8fc61639af9 100644
--- a/x11-wm/xmonad/xmonad-0.11-r1.ebuild
+++ b/x11-wm/xmonad/xmonad-0.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ CABAL_FEATURES="bin lib profile haddock hscolour hoogle"
 inherit haskell-cabal
 
 DESCRIPTION="A tiling window manager"
-HOMEPAGE="http://xmonad.org;
+HOMEPAGE="https://xmonad.org/;
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"

diff --git a/x11-wm/xmonad/xmonad-0.11-r3.ebuild 
b/x11-wm/xmonad/xmonad-0.11-r3.ebuild
index a929e260e88..553f65f4e8a 100644
--- a/x11-wm/xmonad/xmonad-0.11-r3.ebuild
+++ b/x11-wm/xmonad/xmonad-0.11-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ CABAL_FEATURES="bin lib profile haddock hscolour hoogle"
 inherit haskell-cabal
 
 DESCRIPTION="A tiling window manager"
-HOMEPAGE="http://xmonad.org;
+HOMEPAGE="https://xmonad.org/;
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"

diff --git a/x11-wm/xmonad/xmonad-0.11.1.ebuild 
b/x11-wm/xmonad/xmonad-0.11.1.ebuild
index 74f0a815225..f603490c0c0 100644
--- a/x11-wm/xmonad/xmonad-0.11.1.ebuild
+++ b/x11-wm/xmonad/xmonad-0.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="A tiling window manager"
-HOMEPAGE="http://xmonad.org;
+HOMEPAGE="https://xmonad.org/;
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"

diff --git a/x11-wm/xmonad/xmonad-0.12.ebuild b/x11-wm/xmonad/xmonad-0.12.ebuild
index 8745eba3fd8..9b93f9fb473 100644
--- a/x11-wm/xmonad/xmonad-0.12.ebuild
+++ b/x11-wm/xmonad/xmonad-0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ CABAL_FEATURES="bin lib profile haddock hoogle hscolour 
test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="A tiling window manager"
-HOMEPAGE="http://xmonad.org;
+HOMEPAGE="https://xmonad.org/;
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"

diff --git a/x11-wm/xmonad/xmonad-0.13.ebuild b/x11-wm/xmonad/xmonad-0.13.ebuild
index 141d10f46d5..3dcc815ebc3 100644
--- a/x11-wm/xmonad/xmonad-0.13.ebuild
+++ b/x11-wm/xmonad/xmonad-0.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour 
test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="A tiling window manager"
-HOMEPAGE="http://xmonad.org;
+HOMEPAGE="https://xmonad.org/;
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/files/

2018-08-02 Thread Sergei Trofimovich
commit: f5f6797eaa74d00812095d4056f64d49fb63083b
Author: A. D  protonmail  com>
AuthorDate: Wed Aug  1 02:06:12 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Aug  2 19:42:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5f6797e

x11-wm/xmonad: Remove NoDisplay

Newer versions of sddm display manager do not add entries from 
/usr/share/xsessions/ files with "NoDisplay=true".
https://github.com/sddm/sddm/commit/cf4c3caf058ea81d0e61c2087493623faac56a3f
After updating to new sddm the entry for xmonad session is missing.
Closes: https://github.com/gentoo/gentoo/pull/9403

 x11-wm/xmonad/files/xmonad.desktop | 1 -
 1 file changed, 1 deletion(-)

diff --git a/x11-wm/xmonad/files/xmonad.desktop 
b/x11-wm/xmonad/files/xmonad.desktop
index 9c0bf6e44f5..0198fb18026 100644
--- a/x11-wm/xmonad/files/xmonad.desktop
+++ b/x11-wm/xmonad/files/xmonad.desktop
@@ -5,7 +5,6 @@ Name=xmonad
 Comment=A lightweight window manager
 Exec=/etc/X11/Sessions/xmonad
 TryExec=xmonad
-NoDisplay=true
 Icon=
 X-GNOME-WMName=Xmonad
 X-GNOME-Autostart-Phase=WindowManager



[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad-contrib/

2017-09-23 Thread Sergei Trofimovich
commit: b5584c9a7760382c4b23b571cfe9f4d6d9132105
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Sep 23 17:56:29 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Sep 23 18:40:54 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5584c9a

x11-wm/xmonad-contrib: stable 0.13 for x86/amd64, bug #631138

Package-Manager: Portage-2.3.10, Repoman-2.3.3
RepoMan-Options: --include-arches="amd64 x86"

 x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild 
b/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild
index 53a441f8f8b..602d8d66986 100644
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+xft"
 
 RDEPEND="dev-haskell/extensible-exceptions:=[profile?]



[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/

2017-09-23 Thread Sergei Trofimovich
commit: 0ca309a1921e021343663b3cda55eecf55f93edc
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Sep 23 17:56:36 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Sep 23 18:40:54 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ca309a1

x11-wm/xmonad: stable 0.13 for x86/amd64, bug #631138

Package-Manager: Portage-2.3.10, Repoman-2.3.3
RepoMan-Options: --include-arches="amd64 x86"

 x11-wm/xmonad/xmonad-0.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/xmonad/xmonad-0.13.ebuild b/x11-wm/xmonad/xmonad-0.13.ebuild
index 8b2d278e5be..141d10f46d5 100644
--- a/x11-wm/xmonad/xmonad-0.13.ebuild
+++ b/x11-wm/xmonad/xmonad-0.13.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+default-term"
 
 RDEPEND="dev-haskell/data-default:=[profile?]



[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/

2016-11-06 Thread Sergei Trofimovich
commit: 2efbc898a0fe0fa9dd09c39abbc71fa3b64b1e28
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Nov  6 10:36:03 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Nov  6 10:36:34 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2efbc898

x11-wm/xmonad: disable tests

ghc-8 changed exception text to contain backtrace.
Some tests rely on exact text shape. Needs to be
fixed upstream.

Package-Manager: portage-2.3.2

 x11-wm/xmonad/xmonad-0.12.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/x11-wm/xmonad/xmonad-0.12.ebuild b/x11-wm/xmonad/xmonad-0.12.ebuild
index 64fb663..bab6538 100644
--- a/x11-wm/xmonad/xmonad-0.12.ebuild
+++ b/x11-wm/xmonad/xmonad-0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,6 +19,8 @@ SLOT="0/${PV}"
 KEYWORDS="amd64 ~ppc64 ~sparc x86"
 IUSE="+default-term no-autorepeat-keys"
 
+RESTRICT=test # fails test on ghc-8 (assert has different text of exception)
+
 RDEPEND="dev-haskell/data-default:=[profile?]
dev-haskell/extensible-exceptions:=[profile?]
dev-haskell/mtl:=[profile?]



[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/, x11-wm/xmonad/files/

2016-04-03 Thread Sergei Trofimovich
commit: 963885db33cd5c7cbf3a4d096c7cb381bf6f745f
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Apr  3 21:05:11 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Apr  3 21:24:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=963885db

x11-wm/xmonad: use pkg_postinst from directly inherited eclass

Package-Manager: portage-2.2.28

 x11-wm/xmonad/files/xmonad.desktop  | 8 +++-
 x11-wm/xmonad/xmonad-0.11-r1.ebuild | 2 +-
 x11-wm/xmonad/xmonad-0.11-r3.ebuild | 2 +-
 x11-wm/xmonad/xmonad-0.11.1.ebuild  | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/x11-wm/xmonad/files/xmonad.desktop 
b/x11-wm/xmonad/files/xmonad.desktop
index d72fc71..9c0bf6e 100644
--- a/x11-wm/xmonad/files/xmonad.desktop
+++ b/x11-wm/xmonad/files/xmonad.desktop
@@ -1,7 +1,13 @@
 [Desktop Entry]
+Type=Application
+Encoding=UTF-8
 Name=xmonad
 Comment=A lightweight window manager
 Exec=/etc/X11/Sessions/xmonad
 TryExec=xmonad
+NoDisplay=true
 Icon=
-Type=Application
+X-GNOME-WMName=Xmonad
+X-GNOME-Autostart-Phase=WindowManager
+X-GNOME-Provides=windowmanager
+X-GNOME-Autostart-Notify=false

diff --git a/x11-wm/xmonad/xmonad-0.11-r1.ebuild 
b/x11-wm/xmonad/xmonad-0.11-r1.ebuild
index e7ae14b..6ef460d 100644
--- a/x11-wm/xmonad/xmonad-0.11-r1.ebuild
+++ b/x11-wm/xmonad/xmonad-0.11-r1.ebuild
@@ -55,7 +55,7 @@ src_install() {
 }
 
 pkg_postinst() {
-   ghc-package_pkg_postinst
+   haskell-cabal_pkg_postinst
 
elog "A sample ${SAMPLE_CONFIG} configuration file can be found here:"
elog "
/usr/share/${PF}/ghc-$(ghc-version)/${SAMPLE_CONFIG_LOC}/${SAMPLE_CONFIG}"

diff --git a/x11-wm/xmonad/xmonad-0.11-r3.ebuild 
b/x11-wm/xmonad/xmonad-0.11-r3.ebuild
index e94fa77..ba8f130 100644
--- a/x11-wm/xmonad/xmonad-0.11-r3.ebuild
+++ b/x11-wm/xmonad/xmonad-0.11-r3.ebuild
@@ -62,7 +62,7 @@ src_install() {
 }
 
 pkg_postinst() {
-   ghc-package_pkg_postinst
+   haskell-cabal_pkg_postinst
 
elog "A sample ${SAMPLE_CONFIG} configuration file can be found here:"
elog "
/usr/share/${PF}/ghc-$(ghc-version)/${SAMPLE_CONFIG_LOC}/${SAMPLE_CONFIG}"

diff --git a/x11-wm/xmonad/xmonad-0.11.1.ebuild 
b/x11-wm/xmonad/xmonad-0.11.1.ebuild
index 97e3725..a9bd1a5 100644
--- a/x11-wm/xmonad/xmonad-0.11.1.ebuild
+++ b/x11-wm/xmonad/xmonad-0.11.1.ebuild
@@ -62,7 +62,7 @@ src_install() {
 }
 
 pkg_postinst() {
-   ghc-package_pkg_postinst
+   haskell-cabal_pkg_postinst
 
elog "A sample ${SAMPLE_CONFIG} configuration file can be found here:"
elog "
/usr/share/${PF}/ghc-$(ghc-version)/${SAMPLE_CONFIG_LOC}/${SAMPLE_CONFIG}"



[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad-contrib/

2016-01-16 Thread Sergei Trofimovich
commit: 5d95e5c3af215ea30c7758911f638063d1a16aec
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jan 16 09:47:54 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jan 16 09:48:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d95e5c3

x11-wm/xmonad-contrib: bump up to 0.12, bug #572018

Reported-by: Mike Limansky

Package-Manager: portage-2.2.26

 x11-wm/xmonad-contrib/Manifest   |  1 +
 x11-wm/xmonad-contrib/xmonad-contrib-0.12.ebuild | 41 
 2 files changed, 42 insertions(+)

diff --git a/x11-wm/xmonad-contrib/Manifest b/x11-wm/xmonad-contrib/Manifest
index 655e928..5a163ac 100644
--- a/x11-wm/xmonad-contrib/Manifest
+++ b/x11-wm/xmonad-contrib/Manifest
@@ -1,2 +1,3 @@
 DIST xmonad-contrib-0.11.2.tar.gz 401758 SHA256 
515d87838ad1f9622d0b491390c5961318d2cb84c96410dee91b5653c5388c62 SHA512 
373e1ed1744cbdf26902402d74b4efafa043a4ccf1953c26ec55a03ef8de31818b0c4cfced08b43e664e5f052e52923c6dfb08d68be86726e9f0ed1d96ad7910
 WHIRLPOOL 
8356462938d9565ee010335c90646d5f23adf3b830bbf7727ef8fa89ff6c027ff94be44b99260ae3c57f9773b6cf985029ba2f183cc7b8c9e18d18fd260f90a9
 DIST xmonad-contrib-0.11.4.tar.gz 401743 SHA256 
a379b3d4f2d3d8793d6c76812e90cbb055fa0598cfba944af47139bb77e2acbc SHA512 
3d747988baa497475255be4cc96f7eba5cf6fc81658f8f877ca92148fb9a154423ee98ebeb23690de00b186d2e34ad13d94cf1fe332d4ca4f1f4a64790e46ed7
 WHIRLPOOL 
1f25fff0088f15942bddd6a8e285fcf283f723527cc10b120c81cbb9a74a56106d5f7c5f676cf6b3fcd118bc3843e510169161898267f160c73b35c0fba458df
+DIST xmonad-contrib-0.12.tar.gz 464978 SHA256 
131d31c471ac02ece9c7e920497b4839a45df786a2096f56adb1f2de1221f311 SHA512 
5bb145fc7d07ebc8e4dde5ba83b5340913fb089581d22e993663402fc6728eab9f6939466b7a262827c0098599073a928700e0acb8245b943b23e6cd01e63056
 WHIRLPOOL 
6618b4afafa8961745dda180c6375b9afdf48211eec93e561f450a3cb4d13a163dbc5175edc297cd324a9f3866a45d3b74cef59001a62bc0141908967d4b9688

diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.12.ebuild 
b/x11-wm/xmonad-contrib/xmonad-contrib-0.12.ebuild
new file mode 100644
index 000..929d372
--- /dev/null
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.12.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.
+#hackport: flags: -testing,use_xft:xft
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Third party extensions for xmonad"
+HOMEPAGE="http://xmonad.org/;
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="+xft"
+
+RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
+   >=dev-haskell/mtl-1:=[profile?] =dev-haskell/x11-1.6.1:=[profile?] =dev-lang/ghc-7.6.1:=
+   >=x11-wm/xmonad-0.12:=[profile?] =dev-haskell/x11-xft-0.2:=[profile?] )
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-1.16.0
+"
+
+src_configure() {
+   haskell-cabal_src_configure \
+   --flag=-testing \
+   $(cabal_flag xft use_xft)
+}



[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/files/, x11-wm/xmonad/

2016-01-16 Thread Sergei Trofimovich
commit: 362565644aee9b855b257b26de4234799fe8445d
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jan 16 09:46:35 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jan 16 09:48:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36256564

x11-wm/xmonad: bump up to 0.12, bug #572018

Reported-by: Mike Limansky
Bug: https://bugs.gentoo.org/show_bug.cgi?id=572018

Package-Manager: portage-2.2.26

 x11-wm/xmonad/Manifest |  1 +
 x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch | 40 ++
 x11-wm/xmonad/xmonad-0.12.ebuild   | 86 ++
 3 files changed, 127 insertions(+)

diff --git a/x11-wm/xmonad/Manifest b/x11-wm/xmonad/Manifest
index e2d8ead..b0d1946 100644
--- a/x11-wm/xmonad/Manifest
+++ b/x11-wm/xmonad/Manifest
@@ -1,2 +1,3 @@
 DIST xmonad-0.11.1.tar.gz 59307 SHA256 
39e0bf227df782d7a5799c811ad0d8b70c9d6eaaa94e8cc395fcf25895d6d2dd SHA512 
4916451d81d359dbbf508f3b20f649f956255f526f14b1eb6c0d32bc789474db30d7acac768663ca32784c7fe361195a50f45a7cb7371ee9a29c9b8f1c64d528
 WHIRLPOOL 
5707bd5763f525b196deea6ead806af74707e2bbd31ff67039b292f3b97f607c2351ef45e57373f0f7313e5c307335cb5f4a84820d8e658b7d864927f109891c
 DIST xmonad-0.11.tar.gz 59119 SHA256 
e5bd36d5184facad66acf2688b02922bfc6de32b576758f4b00688253c425bdb SHA512 
34740f032508584f34f6b138d21394eca17e8020bccc4d8c6e8b3cb6b7ca64b153077cfd16636a6130768ebd145fe993569f8a229862d7816d0c89c905ee08bc
 WHIRLPOOL 
9bab495c4094f21427afa797f97b6af13d9c156484b33087b6378191b0d99255f070adc09df3da9eba3ff55a59a8f03830110a4ab2aa9ad9d93d2f1a35d5dc54
+DIST xmonad-0.12.tar.gz 61436 SHA256 
e8f649dbd4a8d5f75fdac9ceb5ee38b64fd351910ade81c188f5dd7bc21dfdd7 SHA512 
e519c038d90db037bc81e7baf7b07cfa53922509e98ffddacfc4a6cc2c7376383be1e721f613057a5febbfcc661807b6382124eb673ac7a7cda23c738d3539ab
 WHIRLPOOL 
f0d37d35a9730b68b38c46ec7694ccd922b2fab96b3e8d99d007ccb887a06b3f88e6f1ea818124d427378246caab1f7d3ec4338eab1007431cdf5a19fc1cc3b9

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 000..79bd2c2
--- /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.0 +0400
 xmonad/src/XMonad/Core.hs  2010-09-18 07:59:14.0 +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.0 +0400
 xmonad/src/XMonad/Main.hs  2010-09-18 08:03:11.0 +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/xmonad-0.12.ebuild b/x11-wm/xmonad/xmonad-0.12.ebuild
new file mode 100644
index 000..305a0c7
--- /dev/null
+++ b/x11-wm/xmonad/xmonad-0.12.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.
+#hackport: flags: -generatemanpage,-testing
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A tiling window manager"
+HOMEPAGE="http://xmonad.org;
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE="+default-term no-autorepeat-keys"
+