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/tls/
Date: Tue, 04 Aug 2020 08:41:53
Message-Id: 1596530495.65070e7b60d2a707cf6b89d0c6d3910fa1a7c3f8.slyfox@gentoo
1 commit: 65070e7b60d2a707cf6b89d0c6d3910fa1a7c3f8
2 Author: Jack Todaro <solpeth <AT> posteo <DOT> org>
3 AuthorDate: Tue Aug 4 07:42:29 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 4 08:41:35 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65070e7b
7
8 dev-haskell/tls: disable building against dev-haskell/hans
9
10 Package-Manager: Portage-3.0.1, Repoman-2.3.23
11 Signed-off-by: Jack Todaro <solpeth <AT> posteo.org>
12 Closes: https://github.com/gentoo/gentoo/pull/16996
13 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
14
15 dev-haskell/tls/metadata.xml | 1 -
16 dev-haskell/tls/tls-1.5.4.ebuild | 7 +++----
17 2 files changed, 3 insertions(+), 5 deletions(-)
18
19 diff --git a/dev-haskell/tls/metadata.xml b/dev-haskell/tls/metadata.xml
20 index 5e8b0cfbd3f..b95ef7b625d 100644
21 --- a/dev-haskell/tls/metadata.xml
22 +++ b/dev-haskell/tls/metadata.xml
23 @@ -22,7 +22,6 @@
24 <use>
25 <flag name="compat">Accept SSLv2 compatible handshake.</flag>
26 <flag name="network">Use the base network library.</flag>
27 - <flag name="hans">Use the Haskell Network Stack (HaNS).</flag>
28 </use>
29 <upstream>
30 <remote-id type="github">vincenthz/hs-tls</remote-id>
31
32 diff --git a/dev-haskell/tls/tls-1.5.4.ebuild b/dev-haskell/tls/tls-1.5.4.ebuild
33 index e3524550f22..e8454a5db2c 100644
34 --- a/dev-haskell/tls/tls-1.5.4.ebuild
35 +++ b/dev-haskell/tls/tls-1.5.4.ebuild
36 @@ -4,7 +4,7 @@
37 EAPI=7
38
39 # ebuild generated by hackport 0.6.4
40 -
41 +#hackport: flags: -hans
42 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
43 inherit haskell-cabal
44
45 @@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
46 LICENSE="BSD"
47 SLOT="0/${PV}"
48 KEYWORDS="~amd64 ~x86"
49 -IUSE="+compat hans +network"
50 +IUSE="+compat +network"
51
52 RDEPEND="dev-haskell/asn1-encoding:=[profile?]
53 >=dev-haskell/asn1-types-0.2.0:=[profile?]
54 @@ -30,7 +30,6 @@ RDEPEND="dev-haskell/asn1-encoding:=[profile?]
55 >=dev-haskell/x509-store-1.6:=[profile?]
56 >=dev-haskell/x509-validation-1.6.5:=[profile?]
57 >=dev-lang/ghc-8.0.1:=
58 - hans? ( dev-haskell/hans:=[profile?] )
59 network? ( >=dev-haskell/network-2.4.0.0:=[profile?] )
60 "
61 DEPEND="${RDEPEND}
62 @@ -43,6 +42,6 @@ DEPEND="${RDEPEND}
63 src_configure() {
64 haskell-cabal_src_configure \
65 $(cabal_flag compat compat) \
66 - $(cabal_flag hans hans) \
67 + --flag=-hans \
68 $(cabal_flag network network)
69 }