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

["Sergei Trofimovich" <slyfox@gentoo.org>]

commit:     a20f1e0752cd19279e2e2cefbcb7bab124b552d6
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 27 07:09:46 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Jan 27 07:09:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a20f1e07

dev-haskell/icalendar: drop USE=network-uri

Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/767316
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-haskell/icalendar/icalendar-0.4.0.5-r1.ebuild | 18 ++++++++----------
 dev-haskell/icalendar/metadata.xml                |  6 ------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/dev-haskell/icalendar/icalendar-0.4.0.5-r1.ebuild b/dev-haskell/icalendar/icalendar-0.4.0.5-r1.ebuild
index 0a3044a8a29..16848e1417b 100644
--- a/dev-haskell/icalendar/icalendar-0.4.0.5-r1.ebuild
+++ b/dev-haskell/icalendar/icalendar-0.4.0.5-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-# ebuild generated by hackport 0.5.6.9999
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: +network-uri
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -18,24 +19,21 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
 
 RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
 	>=dev-haskell/case-insensitive-0.4:=[profile?]
 	>=dev-haskell/data-default-0.3:=[profile?]
 	>=dev-haskell/mime-0.4.0.2:=[profile?]
 	>=dev-haskell/mtl-2.1.0:=[profile?]
+	>=dev-haskell/network-2.6:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?]
 	dev-haskell/old-locale:=[profile?]
 	>=dev-haskell/parsec-3.1.0:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
 	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.4:=[profile?] )
+	>=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
+	>=dev-haskell/cabal-2.2.0.1
 "
 
 S="${WORKDIR}/${MY_P}"
@@ -50,5 +48,5 @@ src_prepare() {
 
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
+		--flag=network-uri
 }

diff --git a/dev-haskell/icalendar/metadata.xml b/dev-haskell/icalendar/metadata.xml
index 299773cd51f..b7878815d80 100644
--- a/dev-haskell/icalendar/metadata.xml
+++ b/dev-haskell/icalendar/metadata.xml
@@ -5,10 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-		<flag name="network-uri">use network-uri package</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">chrra/iCalendar</remote-id>
-	</upstream>
 </pkgmetadata>