Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-haskell/encoding/files/, dev-haskell/encoding/
Date: Sat, 14 Dec 2019 23:47:33
Message-Id: 1576367241.9d48bfe76b896e8352664d88c601ec6cc9e2d020.slyfox@gentoo
1 commit: 9d48bfe76b896e8352664d88c601ec6cc9e2d020
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 14 23:06:19 2019 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 14 23:47:21 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d48bfe7
7
8 dev-haskell/encoding: bump up to 0.8.2
9
10 Package-Manager: Portage-2.3.81, Repoman-2.3.20
11 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
12
13 dev-haskell/encoding/Manifest | 1 +
14 dev-haskell/encoding/encoding-0.8.2.ebuild | 47 ++++++++++++++++++++++
15 .../encoding/files/encoding-0.8.2-cabal22.patch | 22 ++++++++++
16 3 files changed, 70 insertions(+)
17
18 diff --git a/dev-haskell/encoding/Manifest b/dev-haskell/encoding/Manifest
19 index eb635a224b0..cc09d809b16 100644
20 --- a/dev-haskell/encoding/Manifest
21 +++ b/dev-haskell/encoding/Manifest
22 @@ -1,4 +1,5 @@
23 DIST encoding-0.6.7.2.tar.gz 832564 BLAKE2B b61a113be8ac4d26c85343d5e459c35a4cdf35ceea734370b12816e3c16b748b7c47d4720db2263f74952006802be2d735a15a9e8cd8709a925d58ad6ea87945 SHA512 2a258cb20d49ddc3f1c78f7392e4440d503774680f0da0d297ce27466bace8303b1364e9b4fc5937ca6b1753d0648a6ff8cfc99dd77d52d851dfe9e0481a3cb2
24 DIST encoding-0.7.0.2.tar.gz 320988 BLAKE2B f1fdef3e4b9d247c03f9669b7506cbd9082acdd85bd2d96e988c8731b3e9c774bb498717e49089cf4030d50a94e24bc461d65ef3923a14a0212d4e8741547c91 SHA512 60ede0397d68bcea292ed9fb09fe2bafcbc0afdd7d374b098049afe9a7146cc4be5615a83dbfb13c1a44db2e52a77f231fbac3ab2249398d3fb9921041aadd04
25 DIST encoding-0.8.1.tar.gz 1034198 BLAKE2B 67bcc5c36698e21eeb827d19585bafe4a8ce599703863295097c83b1c6908bec82bcf98c2d9b9c4ea492bfd79435d064330a7d1d1e57f7d7ea27f587145bcbbb SHA512 f77088138888673f0802b57cba3f14cf84a1bee15ad013a1335d8a9e8d7206d716078c3b2ab299545f49174d9de9db4c67089f1b01664c86337c31ec91c5cf46
26 +DIST encoding-0.8.2.tar.gz 412630 BLAKE2B 2e6fd3599d4c1062c85389a1d12d332e982beecfb4f98b92ee8b1618e50ed1f91ec65b94273a325995bcbaa8fc6f41878870069c6400365e899b946592b740da SHA512 e8cbb1b64f3555945c185485688bfb7e73ca7104cbbbf5bec8ec55937656df1e3b99bae24aa1513c0c690d3521bca9c111f0258f2245637c7c8d706709cdcd62
27 DIST encoding-0.8.tar.gz 321410 BLAKE2B ee87c14457c3474c571ebe25b5f98d50713b85666aeb5e099767d787bfaa9b10d03feb0e596c6c93ddf68bfc583285971f30d8e526cdc12d7570ae63b9b80f77 SHA512 c1f05333fa34eb0dc9ed1e1c82bc4d84e9fb3d0252a45519998a199ef1eafd49e9dea7ad60e8ae855b4efdaf4977f8a9aa6324d7b73bfd122bdef60341dea1e0
28
29 diff --git a/dev-haskell/encoding/encoding-0.8.2.ebuild b/dev-haskell/encoding/encoding-0.8.2.ebuild
30 new file mode 100644
31 index 00000000000..695bd93c439
32 --- /dev/null
33 +++ b/dev-haskell/encoding/encoding-0.8.2.ebuild
34 @@ -0,0 +1,47 @@
35 +# Copyright 1999-2019 Gentoo Authors
36 +# Distributed under the terms of the GNU General Public License v2
37 +
38 +EAPI=6
39 +
40 +# ebuild generated by hackport 0.5.3.9999
41 +
42 +CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
43 +inherit haskell-cabal
44 +
45 +DESCRIPTION="A library for various character encodings"
46 +HOMEPAGE="http://code.haskell.org/encoding/"
47 +SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
48 +
49 +LICENSE="BSD"
50 +SLOT="0/${PV}"
51 +KEYWORDS="~amd64 ~x86"
52 +IUSE="+systemencoding"
53 +
54 +RDEPEND=">=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
55 + >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
56 + >=dev-haskell/regex-compat-0.71:=[profile?]
57 + >=dev-lang/ghc-7.8.2:=
58 +"
59 +DEPEND="${RDEPEND}
60 + >=dev-haskell/cabal-1.24
61 + >=dev-haskell/haxml-1.22 <dev-haskell/haxml-1.26
62 + test? ( dev-haskell/hunit
63 + dev-haskell/quickcheck )
64 +"
65 +
66 +PATCHES=(
67 + "${FILESDIR}"/${P}-cabal22.patch
68 +)
69 +
70 +src_prepare() {
71 + default
72 +
73 + cabal_chdeps \
74 + 'regex-compat >=0.71 && <0.95' 'regex-compat >=0.71' \
75 + 'containers >=0.4 && <0.6' 'containers >=0.4 && <0.7'
76 +}
77 +
78 +src_configure() {
79 + haskell-cabal_src_configure \
80 + $(cabal_flag systemencoding systemencoding)
81 +}
82
83 diff --git a/dev-haskell/encoding/files/encoding-0.8.2-cabal22.patch b/dev-haskell/encoding/files/encoding-0.8.2-cabal22.patch
84 new file mode 100644
85 index 00000000000..bc1614deb71
86 --- /dev/null
87 +++ b/dev-haskell/encoding/files/encoding-0.8.2-cabal22.patch
88 @@ -0,0 +1,22 @@
89 +diff --git a/Setup.hs b/Setup.hs
90 +index de719e6..e58a316 100644
91 +--- a/Setup.hs
92 ++++ b/Setup.hs
93 +@@ -1 +1,2 @@
94 ++{-# LANGUAGE CPP #-}
95 + module Main where
96 +@@ -6,2 +7,11 @@ import Data.Encoding.Preprocessor.XMLMappingBuilder
97 +
98 ++#if MIN_VERSION_Cabal(2,2,0)
99 ++main = defaultMainWithHooks (simpleUserHooks
100 ++ {hookedPreProcessors = (("mapping",\_ _ _ -> mappingPreprocessor)
101 ++ :("mapping2",\_ _ _ -> mappingPreprocessor)
102 ++ :("xml",\_ _ _ -> xmlPreprocessor)
103 ++ :(hookedPreProcessors simpleUserHooks)
104 ++ )
105 ++ })
106 ++#else
107 + main = defaultMainWithHooks (simpleUserHooks
108 +@@ -13 +23,2 @@ main = defaultMainWithHooks (simpleUserHooks
109 + })
110 ++#endif