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

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

commit:     b803a634a927c0434b5dfc7492155e6a9f5de93d
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 27 09:21:26 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Jul 27 09:21:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b803a634

dev-haskell/semigroupoids: unconditionally enable IUSE=comonad

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

 dev-haskell/semigroupoids/metadata.xml               | 6 ------
 dev-haskell/semigroupoids/semigroupoids-5.3.4.ebuild | 8 ++++----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/dev-haskell/semigroupoids/metadata.xml b/dev-haskell/semigroupoids/metadata.xml
index c1f941bd846..acffd55986b 100644
--- a/dev-haskell/semigroupoids/metadata.xml
+++ b/dev-haskell/semigroupoids/metadata.xml
@@ -6,12 +6,6 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name="comonad">
-			You can disable the use of the `comonad` package using
-			`-f-comonad`. Disabling this is an unsupported configuration, but it may be
-			useful for accelerating builds in sandboxes for expert users. If disabled we
-			will not supply instances of `Comonad`
-		</flag>
 		<flag name="contravariant">
 			You can disable the use of the `contravariant`
 			package using `-f-contravariant`. Disabling this is an unsupported

diff --git a/dev-haskell/semigroupoids/semigroupoids-5.3.4.ebuild b/dev-haskell/semigroupoids/semigroupoids-5.3.4.ebuild
index f213497d45c..bb93a243b59 100644
--- a/dev-haskell/semigroupoids/semigroupoids-5.3.4.ebuild
+++ b/dev-haskell/semigroupoids/semigroupoids-5.3.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # ebuild generated by hackport 0.6.1.9999
-#hackport: flags: +doctests,+containers
+#hackport: flags: +doctests,+containers,+comonad
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -16,15 +16,15 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="+comonad +contravariant +distributive +tagged +unordered-containers"
+IUSE="+contravariant +distributive +tagged +unordered-containers"
 
 RESTRICT=test # broken on USE=doc
 
 RDEPEND=">=dev-haskell/base-orphans-0.8:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
 	>=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
+	>=dev-haskell/comonad-4.2.6:=[profile?] <dev-haskell/comonad-6:=[profile?]
 	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
 	>=dev-lang/ghc-7.8.2:=
-	comonad? ( >=dev-haskell/comonad-4.2.6:=[profile?] <dev-haskell/comonad-6:=[profile?] )
 	contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] )
 	distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
 	tagged? ( >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-1:=[profile?] )
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag comonad comonad) \
+		--flag=comonad \
 		--flag=containers \
 		$(cabal_flag contravariant contravariant) \
 		$(cabal_flag distributive distributive) \