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/icalendar/
Date: Wed, 27 Jan 2021 07:10:14
Message-Id: 1611731397.a20f1e0752cd19279e2e2cefbcb7bab124b552d6.slyfox@gentoo
1 commit: a20f1e0752cd19279e2e2cefbcb7bab124b552d6
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 27 07:09:46 2021 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 27 07:09:57 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a20f1e07
7
8 dev-haskell/icalendar: drop USE=network-uri
9
10 Reported-by: Toralf Förster
11 Closes: https://bugs.gentoo.org/767316
12 Package-Manager: Portage-3.0.14, Repoman-3.0.2
13 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
14
15 dev-haskell/icalendar/icalendar-0.4.0.5-r1.ebuild | 18 ++++++++----------
16 dev-haskell/icalendar/metadata.xml | 6 ------
17 2 files changed, 8 insertions(+), 16 deletions(-)
18
19 diff --git a/dev-haskell/icalendar/icalendar-0.4.0.5-r1.ebuild b/dev-haskell/icalendar/icalendar-0.4.0.5-r1.ebuild
20 index 0a3044a8a29..16848e1417b 100644
21 --- a/dev-haskell/icalendar/icalendar-0.4.0.5-r1.ebuild
22 +++ b/dev-haskell/icalendar/icalendar-0.4.0.5-r1.ebuild
23 @@ -1,9 +1,10 @@
24 -# Copyright 1999-2020 Gentoo Authors
25 +# Copyright 1999-2021 Gentoo Authors
26 # Distributed under the terms of the GNU General Public License v2
27
28 EAPI=7
29
30 -# ebuild generated by hackport 0.5.6.9999
31 +# ebuild generated by hackport 0.6.7.9999
32 +#hackport: flags: +network-uri
33
34 CABAL_FEATURES="lib profile haddock hoogle hscolour"
35 inherit haskell-cabal
36 @@ -18,24 +19,21 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
37 LICENSE="BSD"
38 SLOT="0/${PV}"
39 KEYWORDS="~amd64 ~x86"
40 -IUSE="+network-uri"
41
42 RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
43 >=dev-haskell/case-insensitive-0.4:=[profile?]
44 >=dev-haskell/data-default-0.3:=[profile?]
45 >=dev-haskell/mime-0.4.0.2:=[profile?]
46 >=dev-haskell/mtl-2.1.0:=[profile?]
47 + >=dev-haskell/network-2.6:=[profile?]
48 + >=dev-haskell/network-uri-2.6:=[profile?]
49 dev-haskell/old-locale:=[profile?]
50 >=dev-haskell/parsec-3.1.0:=[profile?]
51 - >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
52 dev-haskell/text:=[profile?]
53 - >=dev-lang/ghc-7.10.1:=
54 - network-uri? ( >=dev-haskell/network-2.6:=[profile?]
55 - >=dev-haskell/network-uri-2.6:=[profile?] )
56 - !network-uri? ( >=dev-haskell/network-2.4:=[profile?] )
57 + >=dev-lang/ghc-8.4.3:=
58 "
59 DEPEND="${RDEPEND}
60 - >=dev-haskell/cabal-1.22.2.0
61 + >=dev-haskell/cabal-2.2.0.1
62 "
63
64 S="${WORKDIR}/${MY_P}"
65 @@ -50,5 +48,5 @@ src_prepare() {
66
67 src_configure() {
68 haskell-cabal_src_configure \
69 - $(cabal_flag network-uri network-uri)
70 + --flag=network-uri
71 }
72
73 diff --git a/dev-haskell/icalendar/metadata.xml b/dev-haskell/icalendar/metadata.xml
74 index 299773cd51f..b7878815d80 100644
75 --- a/dev-haskell/icalendar/metadata.xml
76 +++ b/dev-haskell/icalendar/metadata.xml
77 @@ -5,10 +5,4 @@
78 <email>haskell@g.o</email>
79 <name>Gentoo Haskell</name>
80 </maintainer>
81 - <use>
82 - <flag name="network-uri">use network-uri package</flag>
83 - </use>
84 - <upstream>
85 - <remote-id type="github">chrra/iCalendar</remote-id>
86 - </upstream>
87 </pkgmetadata>