[gentoo-commits] repo/gentoo:master commit in: dev-haskell/x11-xft/

2022-10-06 Thread Jakov Smolić
commit: 7f735ef4fdec29c487061f20b382ff9e3aa70f04
Author: matoro  users  noreply  github  com>
AuthorDate: Wed Sep 21 22:00:43 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Oct  6 06:11:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f735ef4

dev-haskell/x11-xft: keyword 0.3.4 for ~riscv

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

 dev-haskell/x11-xft/x11-xft-0.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-haskell/x11-xft/x11-xft-0.3.4.ebuild 
b/dev-haskell/x11-xft/x11-xft-0.3.4.ebuild
index f829930741dc..48b0754a3a1f 100644
--- a/dev-haskell/x11-xft/x11-xft-0.3.4.ebuild
+++ b/dev-haskell/x11-xft/x11-xft-0.3.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://hackage.haskell.org/package/X11-xft;
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND=">=dev-haskell/utf8-string-0.1:=[profile?]
>=dev-haskell/x11-1.2.1:=[xinerama,profile?]



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/x11-xft/

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

dev-haskell/x11-xft: keyword 0.3.4 for ~arm64

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

 dev-haskell/x11-xft/x11-xft-0.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-haskell/x11-xft/x11-xft-0.3.4.ebuild 
b/dev-haskell/x11-xft/x11-xft-0.3.4.ebuild
index 960039f8db85..f829930741dc 100644
--- a/dev-haskell/x11-xft/x11-xft-0.3.4.ebuild
+++ b/dev-haskell/x11-xft/x11-xft-0.3.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://hackage.haskell.org/package/X11-xft;
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 RDEPEND=">=dev-haskell/utf8-string-0.1:=[profile?]
>=dev-haskell/x11-1.2.1:=[xinerama,profile?]



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/x11/

2022-08-18 Thread Sam James
commit: 4576dd863af5e506f8ecfb065cb5c070d7c335c8
Author: matoro  users  noreply  github  com>
AuthorDate: Mon Aug 15 05:22:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 18 18:44:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4576dd86

dev-haskell/x11: keyword 1.10.2 for ~ppc64

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

 dev-haskell/x11/x11-1.10.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-haskell/x11/x11-1.10.2.ebuild 
b/dev-haskell/x11/x11-1.10.2.ebuild
index 794d6d454c07..6256f196587b 100644
--- a/dev-haskell/x11/x11-1.10.2.ebuild
+++ b/dev-haskell/x11/x11-1.10.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/xmonad/X11;
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+xinerama"
 
 # add +xinerama to IUSE and RDEPEND on libXScrnSaver and libXinerama below



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/x11-xft/

2022-08-18 Thread Sam James
commit: 0a0df430bb831bddf6f37ff9021397e508c6d7ea
Author: matoro  users  noreply  github  com>
AuthorDate: Mon Aug 15 05:35:55 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 18 18:44:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a0df430

dev-haskell/x11-xft: keyword 0.3.4 for ~ppc64

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

 dev-haskell/x11-xft/x11-xft-0.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-haskell/x11-xft/x11-xft-0.3.4.ebuild 
b/dev-haskell/x11-xft/x11-xft-0.3.4.ebuild
index 5967f57c6db3..960039f8db85 100644
--- a/dev-haskell/x11-xft/x11-xft-0.3.4.ebuild
+++ b/dev-haskell/x11-xft/x11-xft-0.3.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://hackage.haskell.org/package/X11-xft;
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND=">=dev-haskell/utf8-string-0.1:=[profile?]
>=dev-haskell/x11-1.2.1:=[xinerama,profile?]



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/x11/files/

2022-07-26 Thread Sam James
commit: 1d22bc0aea0e245d471a337a9ef10cd1bbbe4264
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue Jul 26 16:48:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 27 03:49:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d22bc0a

dev-haskell/x11: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Portage 3.0.34 / pkgdev 0.2.1 / pkgcheck 0.10.11
Closes: https://github.com/gentoo/gentoo/pull/26591
Signed-off-by: Sam James  gentoo.org>

 dev-haskell/x11/files/x11-1.9-no-LDFLAGS.patch | 10 --
 1 file changed, 10 deletions(-)

diff --git a/dev-haskell/x11/files/x11-1.9-no-LDFLAGS.patch 
b/dev-haskell/x11/files/x11-1.9-no-LDFLAGS.patch
deleted file mode 100644
index 69bc33c0d21e..
--- a/dev-haskell/x11/files/x11-1.9-no-LDFLAGS.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Don't persist LDFLAGS into package database.
-
-https://bugs.gentoo.org/609624
 a/X11.buildinfo.in
-+++ b/X11.buildinfo.in
-@@ -5,3 +5,3 @@ buildable: @BUILD_PACKAGE_BOOL@
- cc-options: @X_CFLAGS@ @CPPFLAGS@
--ld-options: @X_LIBS@ @LDFLAGS@
-+ld-options: @X_LIBS@
- extra-libraries: @EXTRA_LIBRARIES@



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/x11-xft/

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

dev-haskell/x11-xft: drop 0.3.1-r1

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

 dev-haskell/x11-xft/Manifest|  1 -
 dev-haskell/x11-xft/x11-xft-0.3.1-r1.ebuild | 31 -
 2 files changed, 32 deletions(-)

diff --git a/dev-haskell/x11-xft/Manifest b/dev-haskell/x11-xft/Manifest
index b376e89ce7f6..0c742bb66dd8 100644
--- a/dev-haskell/x11-xft/Manifest
+++ b/dev-haskell/x11-xft/Manifest
@@ -1,2 +1 @@
-DIST X11-xft-0.3.1.tar.gz 13621 BLAKE2B 
a8b7f1d042e4cc10707a8d38b570cf4af8041b978afb75eddd8ce65c7ad20a4b13de384aab51a46d298ffc4be73912381d9c8cc1d8d987069259e1dfb163f7d6
 SHA512 
8f40db25453227ef9ce53b05a0c6af869e3a2efdb1d9b9ad683baf52601f320c85b09f0e514bb6ffeb17516d9b75c6772aa49613bb96272d56f06788118b7cfe
 DIST x11-xft-0.3.4.tar.gz 6648 BLAKE2B 
c83d8cc4c8a01b923342a1dd1dab007f9bfb3d6c9040edc2b48f48f903189e8ceb09ad233492150ec50bf37c2944e2350ac728e2ef61afc9516cad75f3323c24
 SHA512 
cd7c10bbe21f096814ebbf1015f4492ee60e73032bbb114f8fa5684e46f96239814f6986d44955642509c06b790112a38194661754e23c874dfe9446b0c13eef

diff --git a/dev-haskell/x11-xft/x11-xft-0.3.1-r1.ebuild 
b/dev-haskell/x11-xft/x11-xft-0.3.1-r1.ebuild
deleted file mode 100644
index 22e82ae5438a..
--- a/dev-haskell/x11-xft/x11-xft-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,31 +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.3.2.
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="X11-xft"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Bindings to the Xft, X Free Type interface library, and some 
Xrender parts"
-HOMEPAGE="https://hackage.haskell.org/package/X11-xft;
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz;
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/utf8-string-0.1:=[profile?]
-   >=dev-haskell/x11-1.2.1:=[profile?]
-   >=dev-lang/ghc-6.10.4:=
-   x11-libs/libXft"
-DEPEND="${RDEPEND}
-   >=dev-haskell/cabal-0
-   virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/x11/

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

dev-haskell/x11: add 1.10.2

May close the below bug. The previous version 1.10-r1
dropped xinerama handling, while the version prior to
that had retained it. This restores the xinerama handling.

Bug: https://bugs.gentoo.org/860393
Signed-off-by: Jack Todaro  posteo.org>
Signed-off-by: Sam James  gentoo.org>

 dev-haskell/x11/Manifest  |  1 +
 dev-haskell/x11/x11-1.10.2.ebuild | 39 +++
 2 files changed, 40 insertions(+)

diff --git a/dev-haskell/x11/Manifest b/dev-haskell/x11/Manifest
index 9875a838ab0a..5f5d5e5beee2 100644
--- a/dev-haskell/x11/Manifest
+++ b/dev-haskell/x11/Manifest
@@ -1,2 +1,3 @@
 DIST X11-1.10.tar.gz 192493 BLAKE2B 
7c951eaf3a009302b2b7d3a9aeb866b908e99f60b408aaae75375e0fbdd12254c283ad27a0e2354cc0c6be745fa507c0bf64a763c548037a640eb8927923246e
 SHA512 
7976a151edf9a54e4278f65903ec6b177211f8209039c4e2747abddd9ed86db51a6e65c5359297443b5ade513d9ca8e452cff033d9d0261f3fb027113765bb89
 DIST X11-1.9.2.tar.gz 190757 BLAKE2B 
cae5bd1e689bec914d612f59070ab5da3f604d33991ba885d83257337ca6d53089374e427f8bcfee2dd7504687b49b830ac98ab5947021c6c2d6e500123203ec
 SHA512 
e9658c33b6dcbb6a42f1cc4a8976365506af94ddc15c32f73205b453934ef3232f3b383f8365b6aa6e69b51acfda4a0f3a8038f3164523b33781139a80582a41
+DIST x11-1.10.2.tar.gz 192634 BLAKE2B 
a42e24aea6287a0af7f1b96fd9603d494fc010c9659a69ffcc46bb8670993271fb67061f5026f201bf730dbe0670d485f2a4197cdba5fc6bbd4f36fca4d6dd8e
 SHA512 
5013dc359e081900193efd201c38c41ca73bc8dae3610e8e3b46e42aad7ae4a5917ecd3219d77e40141be7179963aaa2454032c820945e93ff4310ef359b2df4

diff --git a/dev-haskell/x11/x11-1.10.2.ebuild 
b/dev-haskell/x11/x11-1.10.2.ebuild
new file mode 100644
index ..794d6d454c07
--- /dev/null
+++ b/dev-haskell/x11/x11-1.10.2.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.2.1.
+#hackport: flags: -pedantic
+CABAL_PN="X11"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A binding to the X11 graphics library"
+HOMEPAGE="https://github.com/xmonad/X11;
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="+xinerama"
+
+# add +xinerama to IUSE and RDEPEND on libXScrnSaver and libXinerama below
+RDEPEND=">=dev-haskell/data-default-class-0.1:=[profile?] 
=dev-lang/ghc-8.4.3:=
+   x11-libs/libX11
+   x11-libs/libXext
+   x11-libs/libXrandr
+   x11-libs/libXScrnSaver
+   xinerama? ( x11-libs/libXinerama )
+
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+   haskell-cabal_src_configure \
+   --flag=-pedantic \
+   --configure-option=$(use_with xinerama)
+}



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/x11-xft/

2022-07-24 Thread Sam James
commit: 0844be1f72d049d6886473a95ece5013b41ada56
Author: Jack Todaro  posteo  org>
AuthorDate: Mon Jul 25 01:15:45 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 25 03:02:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0844be1f

dev-haskell/x11-xft: add 0.3.4

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

 dev-haskell/x11-xft/Manifest |  1 +
 dev-haskell/x11-xft/x11-xft-0.3.4.ebuild | 34 
 2 files changed, 35 insertions(+)

diff --git a/dev-haskell/x11-xft/Manifest b/dev-haskell/x11-xft/Manifest
index fff53ad6af68..b376e89ce7f6 100644
--- a/dev-haskell/x11-xft/Manifest
+++ b/dev-haskell/x11-xft/Manifest
@@ -1 +1,2 @@
 DIST X11-xft-0.3.1.tar.gz 13621 BLAKE2B 
a8b7f1d042e4cc10707a8d38b570cf4af8041b978afb75eddd8ce65c7ad20a4b13de384aab51a46d298ffc4be73912381d9c8cc1d8d987069259e1dfb163f7d6
 SHA512 
8f40db25453227ef9ce53b05a0c6af869e3a2efdb1d9b9ad683baf52601f320c85b09f0e514bb6ffeb17516d9b75c6772aa49613bb96272d56f06788118b7cfe
+DIST x11-xft-0.3.4.tar.gz 6648 BLAKE2B 
c83d8cc4c8a01b923342a1dd1dab007f9bfb3d6c9040edc2b48f48f903189e8ceb09ad233492150ec50bf37c2944e2350ac728e2ef61afc9516cad75f3323c24
 SHA512 
cd7c10bbe21f096814ebbf1015f4492ee60e73032bbb114f8fa5684e46f96239814f6986d44955642509c06b790112a38194661754e23c874dfe9446b0c13eef

diff --git a/dev-haskell/x11-xft/x11-xft-0.3.4.ebuild 
b/dev-haskell/x11-xft/x11-xft-0.3.4.ebuild
new file mode 100644
index ..5967f57c6db3
--- /dev/null
+++ b/dev-haskell/x11-xft/x11-xft-0.3.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.1.
+#hackport: flags: -pedantic
+CABAL_PN="X11-xft"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Bindings to the Xft and some Xrender parts"
+HOMEPAGE="https://hackage.haskell.org/package/X11-xft;
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-haskell/utf8-string-0.1:=[profile?]
+   >=dev-haskell/x11-1.2.1:=[xinerama,profile?]
+   >=dev-lang/ghc-8.4.3:=
+   x11-libs/libXft
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-2.2.0.1
+"
+BDEPEND="virtual/pkgconfig
+"
+
+src_configure() {
+   haskell-cabal_src_configure \
+   --flag=-pedantic
+}



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/x11/

2022-07-24 Thread Sam James
commit: de1969de135856fb8c580c184c87461e50140e49
Author: Jack Todaro  posteo  org>
AuthorDate: Mon Jul 25 01:13:55 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 25 03:02:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de1969de

dev-haskell/x11: drop 1.9.2, 1.10-r1

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

 dev-haskell/x11/Manifest   |  2 --
 dev-haskell/x11/x11-1.10-r1.ebuild | 38 
 dev-haskell/x11/x11-1.9.2.ebuild   | 44 --
 3 files changed, 84 deletions(-)

diff --git a/dev-haskell/x11/Manifest b/dev-haskell/x11/Manifest
index 5f5d5e5beee2..3fb40abbdb7f 100644
--- a/dev-haskell/x11/Manifest
+++ b/dev-haskell/x11/Manifest
@@ -1,3 +1 @@
-DIST X11-1.10.tar.gz 192493 BLAKE2B 
7c951eaf3a009302b2b7d3a9aeb866b908e99f60b408aaae75375e0fbdd12254c283ad27a0e2354cc0c6be745fa507c0bf64a763c548037a640eb8927923246e
 SHA512 
7976a151edf9a54e4278f65903ec6b177211f8209039c4e2747abddd9ed86db51a6e65c5359297443b5ade513d9ca8e452cff033d9d0261f3fb027113765bb89
-DIST X11-1.9.2.tar.gz 190757 BLAKE2B 
cae5bd1e689bec914d612f59070ab5da3f604d33991ba885d83257337ca6d53089374e427f8bcfee2dd7504687b49b830ac98ab5947021c6c2d6e500123203ec
 SHA512 
e9658c33b6dcbb6a42f1cc4a8976365506af94ddc15c32f73205b453934ef3232f3b383f8365b6aa6e69b51acfda4a0f3a8038f3164523b33781139a80582a41
 DIST x11-1.10.2.tar.gz 192634 BLAKE2B 
a42e24aea6287a0af7f1b96fd9603d494fc010c9659a69ffcc46bb8670993271fb67061f5026f201bf730dbe0670d485f2a4197cdba5fc6bbd4f36fca4d6dd8e
 SHA512 
5013dc359e081900193efd201c38c41ca73bc8dae3610e8e3b46e42aad7ae4a5917ecd3219d77e40141be7179963aaa2454032c820945e93ff4310ef359b2df4

diff --git a/dev-haskell/x11/x11-1.10-r1.ebuild 
b/dev-haskell/x11/x11-1.10-r1.ebuild
deleted file mode 100644
index a9792bfb0016..
--- a/dev-haskell/x11/x11-1.10-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="X11"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A binding to the X11 graphics library"
-HOMEPAGE="https://github.com/xmonad/X11;
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-# remember to add libXScrnSaver manually on bumps, or src_configure will fail.
-RDEPEND=">=dev-haskell/data-default-class-0.1:=[profile?] 
=dev-lang/ghc-8.4.3:=
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libXrandr
-   x11-libs/libXScrnSaver
-"
-DEPEND="${RDEPEND}
-   >=dev-haskell/cabal-2.2.0.1
-"
-
-src_configure() {
-   haskell-cabal_src_configure \
-   --flag=-pedantic
-}

diff --git a/dev-haskell/x11/x11-1.9.2.ebuild b/dev-haskell/x11/x11-1.9.2.ebuild
deleted file mode 100644
index 9c2823eba68f..
--- a/dev-haskell/x11/x11-1.9.2.ebuild
+++ /dev/null
@@ -1,44 +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.6.
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="X11"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the X11 graphics library"
-HOMEPAGE="https://github.com/xmonad/X11;
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+xinerama"
-
-RDEPEND="dev-haskell/data-default:=[profile?]
-   >=dev-lang/ghc-7.4.1:=
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libXrandr
-   x11-libs/libXScrnSaver
-   xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-   >=dev-haskell/cabal-1.6
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.9-no-LDFLAGS.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-   haskell-cabal_src_configure \
-   --configure-option=$(use_with xinerama)
-}



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/x11/

2022-07-23 Thread Sam James
commit: 25e07a27aaf7f0eda2d1ec0b9f4c0b889e19643f
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 24 00:53:22 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 24 00:59:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25e07a27

dev-haskell/x11: add 1.10

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

 dev-haskell/x11/Manifest   |  1 +
 dev-haskell/x11/metadata.xml   |  6 --
 dev-haskell/x11/x11-1.10-r1.ebuild | 38 ++
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/dev-haskell/x11/Manifest b/dev-haskell/x11/Manifest
index a3548cf32d93..9875a838ab0a 100644
--- a/dev-haskell/x11/Manifest
+++ b/dev-haskell/x11/Manifest
@@ -1 +1,2 @@
+DIST X11-1.10.tar.gz 192493 BLAKE2B 
7c951eaf3a009302b2b7d3a9aeb866b908e99f60b408aaae75375e0fbdd12254c283ad27a0e2354cc0c6be745fa507c0bf64a763c548037a640eb8927923246e
 SHA512 
7976a151edf9a54e4278f65903ec6b177211f8209039c4e2747abddd9ed86db51a6e65c5359297443b5ade513d9ca8e452cff033d9d0261f3fb027113765bb89
 DIST X11-1.9.2.tar.gz 190757 BLAKE2B 
cae5bd1e689bec914d612f59070ab5da3f604d33991ba885d83257337ca6d53089374e427f8bcfee2dd7504687b49b830ac98ab5947021c6c2d6e500123203ec
 SHA512 
e9658c33b6dcbb6a42f1cc4a8976365506af94ddc15c32f73205b453934ef3232f3b383f8365b6aa6e69b51acfda4a0f3a8038f3164523b33781139a80582a41

diff --git a/dev-haskell/x11/metadata.xml b/dev-haskell/x11/metadata.xml
index a52b5e84e878..937381521944 100644
--- a/dev-haskell/x11/metadata.xml
+++ b/dev-haskell/x11/metadata.xml
@@ -5,10 +5,4 @@
hask...@gentoo.org
Gentoo Haskell

-   
-   A Haskell binding to the X11 graphics library. The binding is a 
direct
-   translation of the C binding; for documentation of these calls, 
refer
-   to \"The Xlib Programming Manual\", available online at
-   http://tronche.com/gui/x/xlib/;.
-   
 

diff --git a/dev-haskell/x11/x11-1.10-r1.ebuild 
b/dev-haskell/x11/x11-1.10-r1.ebuild
new file mode 100644
index ..a9792bfb0016
--- /dev/null
+++ b/dev-haskell/x11/x11-1.10-r1.ebuild
@@ -0,0 +1,38 @@
+# 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
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="X11"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A binding to the X11 graphics library"
+HOMEPAGE="https://github.com/xmonad/X11;
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+# remember to add libXScrnSaver manually on bumps, or src_configure will fail.
+RDEPEND=">=dev-haskell/data-default-class-0.1:=[profile?] 
=dev-lang/ghc-8.4.3:=
+   x11-libs/libX11
+   x11-libs/libXext
+   x11-libs/libXrandr
+   x11-libs/libXScrnSaver
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+   haskell-cabal_src_configure \
+   --flag=-pedantic
+}



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/x11-xft/

2020-11-01 Thread Sergei Trofimovich
commit: ab2d6fff51fe632f891683d698af489a9841d2dc
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Nov  1 13:30:16 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Nov  1 13:30:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab2d6fff

dev-haskell/x11-xft: update to EAPI=7

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

 dev-haskell/x11-xft/x11-xft-0.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-haskell/x11-xft/x11-xft-0.3.1-r1.ebuild 
b/dev-haskell/x11-xft/x11-xft-0.3.1-r1.ebuild
index a55c7498c3c..22e82ae5438 100644
--- a/dev-haskell/x11-xft/x11-xft-0.3.1-r1.ebuild
+++ b/dev-haskell/x11-xft/x11-xft-0.3.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 # ebuild generated by hackport 0.3.2.
 



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/x11-xft/

2020-09-02 Thread Sergei Trofimovich
commit: a6cf12355ddf33a29f36536f9595eb32294a4156
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Sep  2 07:40:47 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Sep  2 07:46:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6cf1235

dev-haskell/x11-xft: drop old

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

 dev-haskell/x11-xft/x11-xft-0.3.1.ebuild | 29 -
 1 file changed, 29 deletions(-)

diff --git a/dev-haskell/x11-xft/x11-xft-0.3.1.ebuild 
b/dev-haskell/x11-xft/x11-xft-0.3.1.ebuild
deleted file mode 100644
index 98b31928525..000
--- a/dev-haskell/x11-xft/x11-xft-0.3.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal
-
-MY_PN="X11-xft"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Bindings to the Xft, X Free Type interface library, and some 
Xrender parts"
-HOMEPAGE="https://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11-xft;
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz;
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.6.1
->=dev-haskell/utf8-string-0.1[profile?]
->=dev-haskell/x11-1.2.1[profile?]
-x11-libs/libXft"
-
-DEPEND="${RDEPEND}
-   dev-haskell/cabal"
-
-S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/x11/

2020-08-26 Thread Sergei Trofimovich
commit: b26ec2143070370f95dffa05bb41a46725f2a251
Author: Jack Todaro  posteo  org>
AuthorDate: Tue Aug 25 23:18:30 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Aug 26 23:25:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b26ec214

dev-haskell/x11: bump up to 1.9.2

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Jack Todaro  posteo.org>
Closes: https://github.com/gentoo/gentoo/pull/17261
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-haskell/x11/Manifest |  1 +
 dev-haskell/x11/x11-1.9.2.ebuild | 44 
 2 files changed, 45 insertions(+)

diff --git a/dev-haskell/x11/Manifest b/dev-haskell/x11/Manifest
index d36936af2a2..1e0d42edafb 100644
--- a/dev-haskell/x11/Manifest
+++ b/dev-haskell/x11/Manifest
@@ -2,3 +2,4 @@ DIST X11-1.6.1.1.tar.gz 188628 BLAKE2B 
8ce533c89812c1b1e5babd1025773919518f02139
 DIST X11-1.6.1.2.tar.gz 188612 BLAKE2B 
f75e1601fc28f899a008c547d6c7b3275f17eafface70f42cc9ef0542514090fccc42b69835df48f261b70f598e8484e99f563a41156b7613b555351292e
 SHA512 
f8d01c806f59a20ad6d6632367b80ca972ebc2df9ba65fe23338d5fa1b933049c08609d25be690d87ba6dbe9cd1ba0f5a95e491c8abaca9eaec078ca03e0e01b
 DIST X11-1.8.tar.gz 191331 BLAKE2B 
a539da2bb0231c4749a948574b99e7fa4d30e21b94d1eaa81f1d9f79885b16d5fa60578db868cceb842e27e6b84fa6e3c7a7d1cb757d4df26dfaf2786fc2f4e6
 SHA512 
bb647bcc7504b3e4267d6a8a6ec73766fe62d7f5b3966bfa037742849c4a1128ea22608dd8353a6035aedc2046c53fae65c8b54f2933a4b896297159f5c2e59c
 DIST X11-1.9.1.tar.gz 190698 BLAKE2B 
ba8ee8f26b6e7cacb2334248d3609863277817b2c06d5eb7d8491ee2804691bcc49bb1588e3f2308acacebb739d9d7920507969729ef651e9b0600aa5acbc1f4
 SHA512 
6fc3c8b71681ba45d14c4b709c58760d7bfcb3e6363ef6c79e3d3ecce8f5a30bda877141cea9de73094fc00fa064d23d36f1f8fa61aa65f2d9d75acd1808eaa7
+DIST X11-1.9.2.tar.gz 190757 BLAKE2B 
cae5bd1e689bec914d612f59070ab5da3f604d33991ba885d83257337ca6d53089374e427f8bcfee2dd7504687b49b830ac98ab5947021c6c2d6e500123203ec
 SHA512 
e9658c33b6dcbb6a42f1cc4a8976365506af94ddc15c32f73205b453934ef3232f3b383f8365b6aa6e69b51acfda4a0f3a8038f3164523b33781139a80582a41

diff --git a/dev-haskell/x11/x11-1.9.2.ebuild b/dev-haskell/x11/x11-1.9.2.ebuild
new file mode 100644
index 000..9c2823eba68
--- /dev/null
+++ b/dev-haskell/x11/x11-1.9.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.6.
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="X11"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A binding to the X11 graphics library"
+HOMEPAGE="https://github.com/xmonad/X11;
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="+xinerama"
+
+RDEPEND="dev-haskell/data-default:=[profile?]
+   >=dev-lang/ghc-7.4.1:=
+   x11-libs/libX11
+   x11-libs/libXext
+   x11-libs/libXrandr
+   x11-libs/libXScrnSaver
+   xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-1.6
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.9-no-LDFLAGS.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+   haskell-cabal_src_configure \
+   --configure-option=$(use_with xinerama)
+}



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/x11/, dev-haskell/x11/files/

2020-08-26 Thread Sergei Trofimovich
commit: e73f93f7990c0785ab693f649571dd87e1d85638
Author: Jack Todaro  posteo  org>
AuthorDate: Tue Aug 25 23:20:15 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Aug 26 23:25:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e73f93f7

dev-haskell/x11: remove old

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Jack Todaro  posteo.org>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-haskell/x11/Manifest   |  4 ---
 dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch | 12 ---
 dev-haskell/x11/metadata.xml   | 14 +++-
 dev-haskell/x11/x11-1.6.1.1.ebuild | 40 ---
 dev-haskell/x11/x11-1.6.1.2.ebuild | 41 
 dev-haskell/x11/x11-1.8-r1.ebuild  | 43 -
 dev-haskell/x11/x11-1.9.1.ebuild   | 44 --
 7 files changed, 4 insertions(+), 194 deletions(-)

diff --git a/dev-haskell/x11/Manifest b/dev-haskell/x11/Manifest
index 1e0d42edafb..a3548cf32d9 100644
--- a/dev-haskell/x11/Manifest
+++ b/dev-haskell/x11/Manifest
@@ -1,5 +1 @@
-DIST X11-1.6.1.1.tar.gz 188628 BLAKE2B 
8ce533c89812c1b1e5babd1025773919518f021396d67bda3cc87b0ec61b241ebe27ca40ff4ae9fca9562a73263b71b64ceda098ff809a9a688230d5a71efcde
 SHA512 
d5f58a7ab2450e145e890187e8dc7b43e286d2a95414a605e549cbf48568ef0d89f662870b2010eecba3b8fdd2a3a57214d33fc8775426e7e23ffad727b4e144
-DIST X11-1.6.1.2.tar.gz 188612 BLAKE2B 
f75e1601fc28f899a008c547d6c7b3275f17eafface70f42cc9ef0542514090fccc42b69835df48f261b70f598e8484e99f563a41156b7613b555351292e
 SHA512 
f8d01c806f59a20ad6d6632367b80ca972ebc2df9ba65fe23338d5fa1b933049c08609d25be690d87ba6dbe9cd1ba0f5a95e491c8abaca9eaec078ca03e0e01b
-DIST X11-1.8.tar.gz 191331 BLAKE2B 
a539da2bb0231c4749a948574b99e7fa4d30e21b94d1eaa81f1d9f79885b16d5fa60578db868cceb842e27e6b84fa6e3c7a7d1cb757d4df26dfaf2786fc2f4e6
 SHA512 
bb647bcc7504b3e4267d6a8a6ec73766fe62d7f5b3966bfa037742849c4a1128ea22608dd8353a6035aedc2046c53fae65c8b54f2933a4b896297159f5c2e59c
-DIST X11-1.9.1.tar.gz 190698 BLAKE2B 
ba8ee8f26b6e7cacb2334248d3609863277817b2c06d5eb7d8491ee2804691bcc49bb1588e3f2308acacebb739d9d7920507969729ef651e9b0600aa5acbc1f4
 SHA512 
6fc3c8b71681ba45d14c4b709c58760d7bfcb3e6363ef6c79e3d3ecce8f5a30bda877141cea9de73094fc00fa064d23d36f1f8fa61aa65f2d9d75acd1808eaa7
 DIST X11-1.9.2.tar.gz 190757 BLAKE2B 
cae5bd1e689bec914d612f59070ab5da3f604d33991ba885d83257337ca6d53089374e427f8bcfee2dd7504687b49b830ac98ab5947021c6c2d6e500123203ec
 SHA512 
e9658c33b6dcbb6a42f1cc4a8976365506af94ddc15c32f73205b453934ef3232f3b383f8365b6aa6e69b51acfda4a0f3a8038f3164523b33781139a80582a41

diff --git a/dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch 
b/dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch
deleted file mode 100644
index f1d5c179036..000
--- a/dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Don't persist LDFLAGS into package database.
-
-https://bugs.gentoo.org/609624
-diff --git a/X11.buildinfo.in b/X11.buildinfo.in
-index 6925939..6a18b58 100644
 a/X11.buildinfo.in
-+++ b/X11.buildinfo.in
-@@ -5,3 +5,3 @@ buildable: @BUILD_PACKAGE_BOOL@
- cc-options: @X_CFLAGS@ @CPPFLAGS@
--ld-options: @X_LIBS@ @LDFLAGS@
-+ld-options: @X_LIBS@
- extra-libraries: @EXTRA_LIBRARIES@

diff --git a/dev-haskell/x11/metadata.xml b/dev-haskell/x11/metadata.xml
index 4c6b85a8182..e9eac3ea967 100644
--- a/dev-haskell/x11/metadata.xml
+++ b/dev-haskell/x11/metadata.xml
@@ -6,15 +6,9 @@
Gentoo Haskell


-   A Haskell binding to the X11 graphics library.
-   The binding is a direct translation of the C binding; for
-   documentation of these calls, refer to "The Xlib Programming
-   Manual", available online at 
http://tronche.com/gui/x/xlib/;.
+   A Haskell binding to the X11 graphics library. The binding is a 
direct
+   translation of the C binding; for documentation of these calls, 
refer
+   to \The Xlib Programming Manual\, available online 
at
+   http://tronche.com/gui/x/xlib/;.

-   
-   whether to build XScreenSaver.
-   
-   
-   haskell-pkg-janitors/X11
-   
 

diff --git a/dev-haskell/x11/x11-1.6.1.1.ebuild 
b/dev-haskell/x11/x11-1.6.1.1.ebuild
deleted file mode 100644
index 248061d6054..000
--- a/dev-haskell/x11/x11-1.6.1.1.ebuild
+++ /dev/null
@@ -1,40 +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.2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="X11"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the X11 graphics library"
-HOMEPAGE="https://github.com/haskell-pkg-janitors/X11;
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz;
-

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/x11/files/

2020-08-03 Thread Sergei Trofimovich
commit: bd1172d3757a1e0f989312e9c7e246373bb30abe
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Aug  2 11:56:18 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Aug  3 06:35:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd1172d3

dev-haskell/x11: remove unused patch

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

 dev-haskell/x11/files/x11-1.9-cabal-3.patch | 8 
 1 file changed, 8 deletions(-)

diff --git a/dev-haskell/x11/files/x11-1.9-cabal-3.patch 
b/dev-haskell/x11/files/x11-1.9-cabal-3.patch
deleted file mode 100644
index fc4ea175de0..000
--- a/dev-haskell/x11/files/x11-1.9-cabal-3.patch
+++ /dev/null
@@ -1,8 +0,0 @@
 a/Setup.hs
-+++ b/Setup.hs
-@@ -3,4 +3,4 @@ module Main (main) where
- import Distribution.Simple
- 
- main :: IO ()
--main = defaultMainWithHooks defaultUserHooks
-+main = defaultMainWithHooks autoconfUserHooks



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/x11/files/, dev-haskell/x11/

2020-08-01 Thread Sergei Trofimovich
commit: 37954b06d82a931048a60c2e4d6d2d9730f154f5
Author: Jack Todaro  posteo  org>
AuthorDate: Sat Aug  1 03:46:18 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Aug  1 08:04:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37954b06

dev-haskell/x11: bump up to 1.9.1

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Jack Todaro  posteo.org>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-haskell/x11/Manifest   |  1 +
 dev-haskell/x11/files/x11-1.9-cabal-3.patch|  8 +
 dev-haskell/x11/files/x11-1.9-no-LDFLAGS.patch | 10 ++
 dev-haskell/x11/x11-1.9.1.ebuild   | 44 ++
 4 files changed, 63 insertions(+)

diff --git a/dev-haskell/x11/Manifest b/dev-haskell/x11/Manifest
index 1917fa8c8d7..d36936af2a2 100644
--- a/dev-haskell/x11/Manifest
+++ b/dev-haskell/x11/Manifest
@@ -1,3 +1,4 @@
 DIST X11-1.6.1.1.tar.gz 188628 BLAKE2B 
8ce533c89812c1b1e5babd1025773919518f021396d67bda3cc87b0ec61b241ebe27ca40ff4ae9fca9562a73263b71b64ceda098ff809a9a688230d5a71efcde
 SHA512 
d5f58a7ab2450e145e890187e8dc7b43e286d2a95414a605e549cbf48568ef0d89f662870b2010eecba3b8fdd2a3a57214d33fc8775426e7e23ffad727b4e144
 DIST X11-1.6.1.2.tar.gz 188612 BLAKE2B 
f75e1601fc28f899a008c547d6c7b3275f17eafface70f42cc9ef0542514090fccc42b69835df48f261b70f598e8484e99f563a41156b7613b555351292e
 SHA512 
f8d01c806f59a20ad6d6632367b80ca972ebc2df9ba65fe23338d5fa1b933049c08609d25be690d87ba6dbe9cd1ba0f5a95e491c8abaca9eaec078ca03e0e01b
 DIST X11-1.8.tar.gz 191331 BLAKE2B 
a539da2bb0231c4749a948574b99e7fa4d30e21b94d1eaa81f1d9f79885b16d5fa60578db868cceb842e27e6b84fa6e3c7a7d1cb757d4df26dfaf2786fc2f4e6
 SHA512 
bb647bcc7504b3e4267d6a8a6ec73766fe62d7f5b3966bfa037742849c4a1128ea22608dd8353a6035aedc2046c53fae65c8b54f2933a4b896297159f5c2e59c
+DIST X11-1.9.1.tar.gz 190698 BLAKE2B 
ba8ee8f26b6e7cacb2334248d3609863277817b2c06d5eb7d8491ee2804691bcc49bb1588e3f2308acacebb739d9d7920507969729ef651e9b0600aa5acbc1f4
 SHA512 
6fc3c8b71681ba45d14c4b709c58760d7bfcb3e6363ef6c79e3d3ecce8f5a30bda877141cea9de73094fc00fa064d23d36f1f8fa61aa65f2d9d75acd1808eaa7

diff --git a/dev-haskell/x11/files/x11-1.9-cabal-3.patch 
b/dev-haskell/x11/files/x11-1.9-cabal-3.patch
new file mode 100644
index 000..fc4ea175de0
--- /dev/null
+++ b/dev-haskell/x11/files/x11-1.9-cabal-3.patch
@@ -0,0 +1,8 @@
+--- a/Setup.hs
 b/Setup.hs
+@@ -3,4 +3,4 @@ module Main (main) where
+ import Distribution.Simple
+ 
+ main :: IO ()
+-main = defaultMainWithHooks defaultUserHooks
++main = defaultMainWithHooks autoconfUserHooks

diff --git a/dev-haskell/x11/files/x11-1.9-no-LDFLAGS.patch 
b/dev-haskell/x11/files/x11-1.9-no-LDFLAGS.patch
new file mode 100644
index 000..69bc33c0d21
--- /dev/null
+++ b/dev-haskell/x11/files/x11-1.9-no-LDFLAGS.patch
@@ -0,0 +1,10 @@
+Don't persist LDFLAGS into package database.
+
+https://bugs.gentoo.org/609624
+--- a/X11.buildinfo.in
 b/X11.buildinfo.in
+@@ -5,3 +5,3 @@ buildable: @BUILD_PACKAGE_BOOL@
+ cc-options: @X_CFLAGS@ @CPPFLAGS@
+-ld-options: @X_LIBS@ @LDFLAGS@
++ld-options: @X_LIBS@
+ extra-libraries: @EXTRA_LIBRARIES@

diff --git a/dev-haskell/x11/x11-1.9.1.ebuild b/dev-haskell/x11/x11-1.9.1.ebuild
new file mode 100644
index 000..cb805ed19d6
--- /dev/null
+++ b/dev-haskell/x11/x11-1.9.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="X11"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A binding to the X11 graphics library"
+HOMEPAGE="https://github.com/xmonad/X11;
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="+xinerama"
+
+RDEPEND="dev-haskell/data-default:=[profile?]
+   >=dev-lang/ghc-7.4.1:=
+   x11-libs/libX11
+   x11-libs/libXext
+   x11-libs/libXrandr
+   x11-libs/libXScrnSaver
+   xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-1.6
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.9-no-LDFLAGS.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+   haskell-cabal_src_configure \
+   --configure-option=$(use_with xinerama)
+}



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/x11/

2017-09-23 Thread Sergei Trofimovich
commit: 8675a1edf62948ee6d9c5f5acaf5fa4ab072a5c7
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Sep 23 17:38:06 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Sep 23 18:40:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8675a1ed

dev-haskell/x11: stable 1.8-r1 for x86/amd64, bug #631138

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

 dev-haskell/x11/x11-1.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-haskell/x11/x11-1.8-r1.ebuild 
b/dev-haskell/x11/x11-1.8-r1.ebuild
index 3ed71a37f41..a5010fb8e28 100644
--- a/dev-haskell/x11/x11-1.8-r1.ebuild
+++ b/dev-haskell/x11/x11-1.8-r1.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+screensaver +xinerama"
 
 RDEPEND="dev-haskell/data-default:=[profile?]



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/x11/files/, dev-haskell/x11/

2017-02-19 Thread Sergei Trofimovich
commit: eb5ff9547395e9e40536474fa8005ade25528684
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Feb 19 12:48:37 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Feb 19 12:52:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb5ff954

dev-haskell/x11: don't persist LDFLAGS into package db, bug #609624

Reported-by: Helmut Jarausch
Bug: https://bugs.gentoo.org/609624

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch| 12 
 dev-haskell/x11/{x11-1.8.ebuild => x11-1.8-r1.ebuild} |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch 
b/dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch
new file mode 100644
index 00..f1d5c17903
--- /dev/null
+++ b/dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch
@@ -0,0 +1,12 @@
+Don't persist LDFLAGS into package database.
+
+https://bugs.gentoo.org/609624
+diff --git a/X11.buildinfo.in b/X11.buildinfo.in
+index 6925939..6a18b58 100644
+--- a/X11.buildinfo.in
 b/X11.buildinfo.in
+@@ -5,3 +5,3 @@ buildable: @BUILD_PACKAGE_BOOL@
+ cc-options: @X_CFLAGS@ @CPPFLAGS@
+-ld-options: @X_LIBS@ @LDFLAGS@
++ld-options: @X_LIBS@
+ extra-libraries: @EXTRA_LIBRARIES@

diff --git a/dev-haskell/x11/x11-1.8.ebuild b/dev-haskell/x11/x11-1.8-r1.ebuild
similarity index 95%
rename from dev-haskell/x11/x11-1.8.ebuild
rename to dev-haskell/x11/x11-1.8-r1.ebuild
index 50622790aa..13059094fd 100644
--- a/dev-haskell/x11/x11-1.8.ebuild
+++ b/dev-haskell/x11/x11-1.8-r1.ebuild
@@ -33,6 +33,8 @@ DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.6
 "
 
+PATCHES=("${FILESDIR}"/${P}-no-LDFLAGS.patch)
+
 S="${WORKDIR}/${MY_P}"
 
 src_configure() {