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

2022-08-20 Thread Sam James
commit: 17648a71cb9e23515d1d77c75103b3264cd95d29
Author: hololeap  users  noreply  github  com>
AuthorDate: Sat Aug  6 16:21:10 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 21 02:21:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17648a71

dev-haskell/haskell-src-exts: add 1.23.1, drop 1.21.1

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

 dev-haskell/haskell-src-exts/Manifest  |  2 +-
 21.1.ebuild => haskell-src-exts-1.23.1.ebuild} | 17 ++---
 dev-haskell/haskell-src-exts/metadata.xml  | 22 --
 3 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/dev-haskell/haskell-src-exts/Manifest 
b/dev-haskell/haskell-src-exts/Manifest
index 4926b17618c8..4c2cdbcbf8e4 100644
--- a/dev-haskell/haskell-src-exts/Manifest
+++ b/dev-haskell/haskell-src-exts/Manifest
@@ -1 +1 @@
-DIST haskell-src-exts-1.21.1.tar.gz 1248986 BLAKE2B 
f76d5e5ca978aec46a0f2e5f2442cb3960ffb3008ad11955e5f04cfce38613b6073af59b6e8eb32975664d3f22ee31334166daafc5d935f18e7a008b3d28332b
 SHA512 
1349d419a13343fdf5579bf1f4027a3906de67ac257d0663fb6d10cf96e8312e08beec81d91044421f1202675a8c9381d280104d95c1ffea2e746f378d683e61
+DIST haskell-src-exts-1.23.1.tar.gz 1264319 BLAKE2B 
4ad6fe7e2cd70523b5169569f57493e595e2700866f5c44e8044c84bcafc17f98efc57302beb0e3a7ed385c23e204dd79bb63a30bcf0ae414e66696a832038c0
 SHA512 
c9e6e4d93c2b4ee84d57707aed526291b5c4e297f06a3921257feb0c1df3bb095addd4b1d9bb187650490364647385ab6322e4fc54f9a7648da439a34329d734

diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.21.1.ebuild 
b/dev-haskell/haskell-src-exts/haskell-src-exts-1.23.1.ebuild
similarity index 64%
rename from dev-haskell/haskell-src-exts/haskell-src-exts-1.21.1.ebuild
rename to dev-haskell/haskell-src-exts/haskell-src-exts-1.23.1.ebuild
index e51345e310a5..b25383d74849 100644
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.21.1.ebuild
+++ b/dev-haskell/haskell-src-exts/haskell-src-exts-1.23.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.4
+# ebuild generated by hackport 0.7.2.1.
 #hackport: flags: +base4
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
@@ -11,22 +11,17 @@ inherit haskell-cabal
 
 DESCRIPTION="Manipulating Haskell source: abstract syntax, lexer, parser, and 
pretty-printer"
 HOMEPAGE="https://github.com/haskell-suite/haskell-src-exts;
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
 
 LICENSE="BSD"
-SLOT="1.21/${PV}"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
 
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] =dev-haskell/semigroups-0.18.3:=[profile?]
-   >=dev-lang/ghc-7.4.1:=
+RDEPEND=">=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
-   >=dev-haskell/cabal-1.10
+   >=dev-haskell/cabal-2.2.0.1
dev-haskell/happy
-   test? ( dev-haskell/mtl
-   >=dev-haskell/pretty-show-1.6.16
+   test? ( >=dev-haskell/pretty-show-1.6.16
>=dev-haskell/smallcheck-1.0
>=dev-haskell/tasty-0.3
>=dev-haskell/tasty-golden-2.2.2

diff --git a/dev-haskell/haskell-src-exts/metadata.xml 
b/dev-haskell/haskell-src-exts/metadata.xml
index 1314698031a7..937381521944 100644
--- a/dev-haskell/haskell-src-exts/metadata.xml
+++ b/dev-haskell/haskell-src-exts/metadata.xml
@@ -1,22 +1,8 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-hask...@gentoo.org
-Gentoo Haskell
-  
-  
-Haskell-Source with eXtensions (HSX, haskell-src-exts) is an extension of the
-standard haskell-src package, and handles most common syntactic extensions to
-Haskell, including:
-
-  * Multi-parameter type classes with functional dependencies
-  * Empty data declarations
-  * GADTs
-  * Implicit parameters (ghc and hugs style)
-  * Template Haskell (broken for 6.4, needs redoing)
-
-  
-haskell-suite/haskell-src-exts
-  
+   
+   hask...@gentoo.org
+   Gentoo Haskell
+   
 



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

2022-07-30 Thread Sam James
commit: 59ab98dd828b429f29c189dff53cb2fecac98a4f
Author: matoro  users  noreply  github  com>
AuthorDate: Sun Jul 31 03:27:04 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 31 04:10:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59ab98dd

dev-haskell/haskell-src-exts: drop 1.17.1

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

 dev-haskell/haskell-src-exts/Manifest  |  1 -
 .../haskell-src-exts-1.17.1.ebuild | 48 --
 2 files changed, 49 deletions(-)

diff --git a/dev-haskell/haskell-src-exts/Manifest 
b/dev-haskell/haskell-src-exts/Manifest
index f86d6143b9f7..4926b17618c8 100644
--- a/dev-haskell/haskell-src-exts/Manifest
+++ b/dev-haskell/haskell-src-exts/Manifest
@@ -1,2 +1 @@
-DIST haskell-src-exts-1.17.1.tar.gz 2489624 BLAKE2B 
d98a54e9788fbc613d5843fb3886bdd44b20843978a71cdff5460390bc090504ce72191884f49ef35266c5167913ef1dbf53a19a25d235d12192dea1f3b01203
 SHA512 
e08bc31720640e595803ff33d454b717cd015cf8b70f0196f387e7ebaca4b3551aa41ce6c900370496a68e48e1a9c078235674f7050f6de42ffdfc9fce6544e2
 DIST haskell-src-exts-1.21.1.tar.gz 1248986 BLAKE2B 
f76d5e5ca978aec46a0f2e5f2442cb3960ffb3008ad11955e5f04cfce38613b6073af59b6e8eb32975664d3f22ee31334166daafc5d935f18e7a008b3d28332b
 SHA512 
1349d419a13343fdf5579bf1f4027a3906de67ac257d0663fb6d10cf96e8312e08beec81d91044421f1202675a8c9381d280104d95c1ffea2e746f378d683e61

diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild 
b/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild
deleted file mode 100644
index cc8b39436970..
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.6.
-#hackport: flags: +base4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Manipulating Haskell source: abstract syntax, lexer, parser, and 
pretty-printer"
-HOMEPAGE="https://github.com/haskell-suite/haskell-src-exts;
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # very slow
-
-RDEPEND=">=dev-haskell/cpphs-1.3:=[profile?]
-   >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-   >=dev-haskell/cabal-1.10
-   dev-haskell/happy
-   test? ( dev-haskell/mtl
-   dev-haskell/pretty-show
-   >=dev-haskell/smallcheck-1.0
-   dev-haskell/syb
-   >=dev-haskell/tasty-0.3
-   >=dev-haskell/tasty-golden-2.2.2
-   dev-haskell/tasty-smallcheck )
-"
-
-src_prepare() {
-   default
-
-   cabal_chdeps \
-   'tasty-golden >= 2.2.2 && < 2.3' 'tasty-golden >= 2.2.2'
-}
-
-src_configure() {
-   haskell-cabal_src_configure \
-   --flag=base4
-}



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

2021-04-10 Thread Sam James
commit: dbd578db00dcf0911a79062d37ee6005ccc244b1
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr 10 06:40:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 10 06:40:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbd578db

dev-haskell/haskell-src-exts: call 'default' in src_prepare

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

 dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild 
b/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild
index 6eec8f81420..cc8b3943697 100644
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild
+++ b/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,6 +36,8 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+   default
+
cabal_chdeps \
'tasty-golden >= 2.2.2 && < 2.3' 'tasty-golden >= 2.2.2'
 }



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

2020-11-01 Thread Sergei Trofimovich
commit: d46a4a534197922062c931b89dce0a0522da2794
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Nov  1 13:50:26 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Nov  1 13:50:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d46a4a53

dev-haskell/haskell-src-exts: update to EAPI=7

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

 dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild 
b/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild
index 021fe155b95..6eec8f81420 100644
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild
+++ b/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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.4.6.
 #hackport: flags: +base4



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

2020-08-01 Thread Sergei Trofimovich
commit: 458f3a6c8a2515ed6f0dadaff5fff996dd73e158
Author: Jack Todaro  posteo  org>
AuthorDate: Sat Aug  1 07:19:13 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Aug  1 08:04:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=458f3a6c

dev-haskell/haskell-src-exts: bump up to 1.21.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/haskell-src-exts/Manifest  |  1 +
 .../haskell-src-exts-1.21.1.ebuild | 39 ++
 2 files changed, 40 insertions(+)

diff --git a/dev-haskell/haskell-src-exts/Manifest 
b/dev-haskell/haskell-src-exts/Manifest
index 4922eecef60..95fa9f89aa5 100644
--- a/dev-haskell/haskell-src-exts/Manifest
+++ b/dev-haskell/haskell-src-exts/Manifest
@@ -3,3 +3,4 @@ DIST haskell-src-exts-1.14.0.tar.gz 291256 BLAKE2B 
e0ec5d12d8f5a0fb2fb0745fbf2db
 DIST haskell-src-exts-1.15.0.1.tar.gz 1605910 BLAKE2B 
47672c636ff8da5ef38ddf83a895a454667e1c34723cb339d3f665e3a5acf678b4b9c3b1e8c2887a99a3922a14e3d310439113ead871d5869ed51b3ae9b44eec
 SHA512 
d6fe854b2e7a13bb90815848517843ee67faad7e03d5abf6afc9e97252bcb9d915b51d94b757354a9e83b255f9b795e5c9fa2e3e962acd84772eaa9844d9b1d6
 DIST haskell-src-exts-1.16.0.1.tar.gz 1410081 BLAKE2B 
6fea8732c6ea264040eb4fec73147463a530f42fcb201190b393aac2461085770853dd0f7615cbe2f2aaf34f75921180565bc72c98dacdc3190c39a08866943f
 SHA512 
b74a824899cbf85a2bf58c7c14df33fac7e70bbb775b51d8a861172da88d1dc6db3644a6534c9076a9c5499023a347cdce7e24b3495045d11a905f31a51492d0
 DIST haskell-src-exts-1.17.1.tar.gz 2489624 BLAKE2B 
d98a54e9788fbc613d5843fb3886bdd44b20843978a71cdff5460390bc090504ce72191884f49ef35266c5167913ef1dbf53a19a25d235d12192dea1f3b01203
 SHA512 
e08bc31720640e595803ff33d454b717cd015cf8b70f0196f387e7ebaca4b3551aa41ce6c900370496a68e48e1a9c078235674f7050f6de42ffdfc9fce6544e2
+DIST haskell-src-exts-1.21.1.tar.gz 1248986 BLAKE2B 
f76d5e5ca978aec46a0f2e5f2442cb3960ffb3008ad11955e5f04cfce38613b6073af59b6e8eb32975664d3f22ee31334166daafc5d935f18e7a008b3d28332b
 SHA512 
1349d419a13343fdf5579bf1f4027a3906de67ac257d0663fb6d10cf96e8312e08beec81d91044421f1202675a8c9381d280104d95c1ffea2e746f378d683e61

diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.21.1.ebuild 
b/dev-haskell/haskell-src-exts/haskell-src-exts-1.21.1.ebuild
new file mode 100644
index 000..9f059879744
--- /dev/null
+++ b/dev-haskell/haskell-src-exts/haskell-src-exts-1.21.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+#hackport: flags: +base4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Manipulating Haskell source: abstract syntax, lexer, parser, and 
pretty-printer"
+HOMEPAGE="https://github.com/haskell-suite/haskell-src-exts;
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="1.21/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/fail-4.9:=[profile?] =dev-haskell/semigroups-0.18.3:=[profile?]
+   >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-1.10
+   dev-haskell/happy
+   test? ( dev-haskell/mtl
+   >=dev-haskell/pretty-show-1.6.16
+   >=dev-haskell/smallcheck-1.0
+   >=dev-haskell/tasty-0.3
+   >=dev-haskell/tasty-golden-2.2.2
+   dev-haskell/tasty-smallcheck )
+"
+
+src_configure() {
+   haskell-cabal_src_configure \
+   --flag=base4
+}



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/haskell-src-exts-util/

2020-08-01 Thread Sergei Trofimovich
commit: 2669dd71ba0269548e784e3ef60f56e59c996f5e
Author: Jack Todaro  posteo  org>
AuthorDate: Sat Aug  1 07:29:41 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Aug  1 08:04:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2669dd71

dev-haskell/haskell-src-exts-util: add package

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/haskell-src-exts-util/Manifest |  1 +
 .../haskell-src-exts-util-0.2.5.ebuild | 28 ++
 dev-haskell/haskell-src-exts-util/metadata.xml |  8 +++
 3 files changed, 37 insertions(+)

diff --git a/dev-haskell/haskell-src-exts-util/Manifest 
b/dev-haskell/haskell-src-exts-util/Manifest
new file mode 100644
index 000..0883a9994e0
--- /dev/null
+++ b/dev-haskell/haskell-src-exts-util/Manifest
@@ -0,0 +1 @@
+DIST haskell-src-exts-util-0.2.5.tar.gz 6428 BLAKE2B 
42211d72756d97e7761148b8cc0d7b2a548db38b007d506fc1cad3ef2e7003e352c225201e047683c82b4ec8561825170b6976f36a4d824d3595173023f2b76d
 SHA512 
0497d8e2206402cc295289b1893f326c8f5fa7fc00177279b7af389b3351a94a123d7eb754d8a245981bae51d1a978684791d9b111befca2888bc7fe22f07147

diff --git 
a/dev-haskell/haskell-src-exts-util/haskell-src-exts-util-0.2.5.ebuild 
b/dev-haskell/haskell-src-exts-util/haskell-src-exts-util-0.2.5.ebuild
new file mode 100644
index 000..ce057531edb
--- /dev/null
+++ b/dev-haskell/haskell-src-exts-util/haskell-src-exts-util-0.2.5.ebuild
@@ -0,0 +1,28 @@
+# 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
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Helper functions for working with haskell-src-exts trees"
+HOMEPAGE="https://github.com/pepeiborra/haskell-src-exts-util;
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/data-default:=[profile?]
+   >=dev-haskell/haskell-src-exts-1.20.0:=[profile?]
+   dev-haskell/semigroups:=[profile?]
+   dev-haskell/uniplate:=[profile?]
+   >=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-1.18.1.3
+"

diff --git a/dev-haskell/haskell-src-exts-util/metadata.xml 
b/dev-haskell/haskell-src-exts-util/metadata.xml
new file mode 100644
index 000..b7878815d80
--- /dev/null
+++ b/dev-haskell/haskell-src-exts-util/metadata.xml
@@ -0,0 +1,8 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   hask...@gentoo.org
+   Gentoo Haskell
+   
+



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

2017-08-08 Thread Sergei Trofimovich
commit: 4374ffb53aad9978c19f0d3007eb3478bf84f3bf
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Tue Aug  8 16:14:16 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Aug  8 19:57:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4374ffb5

dev-haskell/haskell-src-exts: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/5357

 .../haskell-src-exts-0.2-hiding-isSymbol.patch | 68 --
 1 file changed, 68 deletions(-)

diff --git 
a/dev-haskell/haskell-src-exts/files/haskell-src-exts-0.2-hiding-isSymbol.patch 
b/dev-haskell/haskell-src-exts/files/haskell-src-exts-0.2-hiding-isSymbol.patch
deleted file mode 100644
index df83e026fe0..000
--- 
a/dev-haskell/haskell-src-exts/files/haskell-src-exts-0.2-hiding-isSymbol.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -urwpN 
haskell-src-exts.org/src/haskell-src-exts/Language/Haskell/Hsx/Lexer.hs 
haskell-src-exts/src/haskell-src-exts/Language/Haskell/Hsx/Lexer.hs
 haskell-src-exts.org/src/haskell-src-exts/Language/Haskell/Hsx/Lexer.hs
2005-05-01 22:40:45.0 +0100
-+++ haskell-src-exts/src/haskell-src-exts/Language/Haskell/Hsx/Lexer.hs
2006-10-11 19:42:53.0 +0100
-@@ -207,9 +207,9 @@ special_varids = [
-  ( "hiding",  KW_Hiding )
-  ]
- 
--isIdent, isSymbol :: Char -> Bool
-+isIdent, isSymbol' :: Char -> Bool
- isIdent  c = isAlpha c || isDigit c || c == '\'' || c == '_'
--isSymbol c = elem c ":!#$%&*+./<=>?@\\^|-~"
-+isSymbol' c = elem c ":!#$%&*+./<=>?@\\^|-~"
- 
- matchChar :: Char -> String -> Lex a ()
- matchChar c msg = do
-@@ -242,7 +242,7 @@ lexWhiteSpace bol = do
-   bol <- lexNestedComment bol
-   (bol, _) <- lexWhiteSpace bol
-   return (bol, True)
--  '-':'-':s | all (== '-') (takeWhile isSymbol s) -> do
-+  '-':'-':s | all (== '-') (takeWhile isSymbol' s) -> do
-   lexWhile (== '-')
-   lexWhile (/= '\n')
-   lexNewline
-@@ -489,8 +489,8 @@ lexStdToken = do
-   Just keyword -> keyword
-   Nothing -> VarId ident
- 
--  | isSymbol c -> do
--  sym <- lexWhile isSymbol
-+  | isSymbol' c -> do
-+  sym <- lexWhile isSymbol'
-   return $ case lookup sym (reserved_ops ++ special_varops) of
-   Just t  -> t
-   Nothing -> case c of
-@@ -586,9 +586,9 @@ lexConIdOrQual qual = do
-   discard 1
-   lexConIdOrQual qual'
- 
--   | isSymbol c -> do -- qualified symbol?
-+   | isSymbol' c -> do-- qualified symbol?
-   discard 1
--  sym <- lexWhile isSymbol
-+  sym <- lexWhile isSymbol'
-   case lookup sym reserved_ops of
-   -- cannot qualify a reserved operator
-   Just _  -> just_a_conid
-diff -urwpN 
haskell-src-exts.org/src/haskell-src-exts/Language/Haskell/Hsx/Transform.hs 
haskell-src-exts/src/haskell-src-exts/Language/Haskell/Hsx/Transform.hs
 
haskell-src-exts.org/src/haskell-src-exts/Language/Haskell/Hsx/Transform.hs 
   2005-04-08 16:17:29.0 +0100
-+++ haskell-src-exts/src/haskell-src-exts/Language/Haskell/Hsx/Transform.hs
2006-10-11 19:40:49.0 +0100
-@@ -1270,7 +1270,7 @@ trRPat s linear rp = case rp of
-   HsIdent n -> fail $ "Attempting to bind variable "++n++
- " inside the context of a numerable 
regular pattern"
-   _ -> fail $ "This should never ever ever 
happen...\
--\ how the �#% did you do 
it??!?"
-+\ how the #% did you do 
it??!?"
- 
-   where -- | Generate a declaration for a @ binding.
-   mkAsDecl :: SrcLoc -> MFunMetaInfo -> Tr HsName
-@@ -1429,7 +1429,7 @@ trRPat s linear rp = case rp of
-   -- of transformations of optional patterns should be able to call it...)
-   mkOptDecl :: SrcLoc -> Bool -> MFunMetaInfo -> Tr MFunMetaInfo
-   mkOptDecl s greedy nvt@(_, vs, t) = do
--  -- Un nome, s'il vouz pla�t.
-+  -- Un nome, s'il vouz plaît.
-   n <- genMatchName
-   let -- Generate a generator for matching the subpattern
-   (g, val) = mkGenExp s nvt   -- (harp_valX, 
(foo, bar, ...)) <- harp_matchY



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

2015-09-05 Thread Mikle Kolyada
commit: 00992c5718faf7006f50bce5c0ad46a95048fd31
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Sep  5 18:17:38 2015 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Sep  5 18:17:38 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00992c57

dev-haskell/haskell-src-exts: x86 stable wrt bug #554014

Package-Manager: portage-2.2.20.1

 dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild 
b/dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild
index fd033cd..1a3a974 100644
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild
+++ b/dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cpphs-1.3:=[profile?]



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

2015-08-16 Thread Mikle Kolyada
commit: 1b96422d93652aff6e07f6463e20ba2b907e92e1
Author: Mikle Kolyada zlogene AT gentoo DOT org
AuthorDate: Sun Aug 16 21:58:48 2015 +
Commit: Mikle Kolyada zlogene AT gentoo DOT org
CommitDate: Sun Aug 16 22:10:55 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b96422d

dev-haskell/haskell-src-exts: amd64 stable wrt bug #554014

Package-Manager: portage-2.2.20.1

 dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild 
b/dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild
index 1142a07..fd033cd 100644
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild
+++ b/dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI=mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz
 
 LICENSE=BSD
 SLOT=0/${PV}
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc ~x86
 IUSE=
 
 RDEPEND==dev-haskell/cpphs-1.3:=[profile?]