gentoo resync : 28.07.2021

3 files changed, 8 insertions, 52 deletions

diff --git a/dev-haskell/semigroupoids/Manifest b/dev-haskell/semigroupoids/Manifest
index 14c856ff9cb0..8ebcceb85aa7 100644
--- a/dev-haskell/semigroupoids/Manifest
+++ b/dev-haskell/semigroupoids/Manifest
@@ -1,3 +1,3 @@
 DIST semigroupoids-5.3.4.tar.gz 26307 BLAKE2B ad22d061c6b5773c6717d00226a41f3b765513a50034d7a805605630314fd4d284b80d1eeb0f85829877ae9a51c8b5e0408e53c27d8dd206216d7eab893885ee SHA512 b4053a856e1c2d3f20f984216f008ff264cedd2ccc3cc39ca3b70bc296d81ea8c1e6dd655bb8a6d1b9a44084e02d74a26cd4eb7264e4732e98be3ec351dc6e3a
-EBUILD semigroupoids-5.3.4.ebuild 2088 BLAKE2B 146312bb4b99df7dd4d712d78c8b2a3c298e1d23bdde688edd7bd96b33381258603464d95719409111462e04ffacdf39ce22307206b425fed5fd3e52e54825f6 SHA512 384ec45f3ff07b6594e569ab9e938fb85b7aad76841ed93094d111169c4848eab47a91c0f2e4970a5ccf2a831eb02f1ec0cf1d6196c5c894bbd26d1da55480f4
-MISC metadata.xml 4173 BLAKE2B fe35f3e632947e3e9478ba3b75e288c9533fcff318eba867c3c6855ad0273e2ba240f070c2e21c2b507097ccef5559651f4f0599f5ef78439539856bb0f27bab SHA512 669478711f4fa21c65fe8975c966f123f541345f45567ad723d16fd3de17005a8f6c765bc2f03131ab60cdf5fc1d5990833941ab8b10a5a14146d5c258338404
+EBUILD semigroupoids-5.3.4.ebuild 1959 BLAKE2B cce6f1b896b40312b284f5889ad7adf1106417131255b445e33b2cbbb70919bf7b8d4ee183d0975e07a6d97554db8d011da26f2bd49c38c1b814e5b997caa66d SHA512 9a88ad9a3fbd304724668081cdffd53b3ceb1af0c6ad80cfe7b76a632184ddcd298866e756a491eec0a0bc56a7578e074b363c62ee9895e848993bb13362fb9b
+MISC metadata.xml 1486 BLAKE2B 216c4baf77c8094e6677421096bf19a94f44385570439152bc0ca6279efb9bf8ef6b9cd7c03861d21783a1e98fc9782805dce79ceb14653de64471233ebfc9ea SHA512 810171b35dfe01eeeba3e802e8cc3faa8dc32249f1a8fac162e2f4e0310c352c8815bd6e8db98cbe6c2189ea07c92fdc6233e674b5c9beb555ecd7618234bebf
diff --git a/dev-haskell/semigroupoids/metadata.xml b/dev-haskell/semigroupoids/metadata.xml
index 97b788ac85df..acffd55986b3 100644
--- a/dev-haskell/semigroupoids/metadata.xml
+++ b/dev-haskell/semigroupoids/metadata.xml
@@ -5,50 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Provides a wide array of semigroupoids and operations for working with semigroupds.
-
-		A Semigroupoid is a Category without the requirement of identity arrows for every object in the category.
-
-		When working with comonads you often have the @\&lt;*\&gt;@ portion of an @Applicative@, but
-		not the @pure@. This was captured in Uustalu and Vene's \"Essence of Dataflow Programming\"
-		in the form of the @ComonadZip@ class in the days before @Applicative@. Apply provides a weaker invariant, but for the comonads used for data flow programming (found in the streams package), this invariant is preserved. Applicative function composition forms a semigroupoid.
-
-		Similarly many structures are nearly a comonad, but not quite, for instance lists provide a reasonable 'extend' operation in the form of 'tails', but do not always contain a value.
-
-
-		Ideally the following relationships would hold:
-
-		&gt; Traversable &lt;---- Foldable &lt;--- Functor ------&gt; Alt ---------&gt; Plus           Semigroupoid
-		&gt;      |               |            |                              |                  |
-		&gt;      v               v            v                              v                  v
-		&gt; Traversable1 &lt;--- Foldable1     Apply --------&gt; Applicative -&gt; Alternative      Category
-		&gt;                                   |               |              |                  |
-		&gt;                                   v               v              v                  v
-		&gt;                                 Bind ---------&gt; Monad -------&gt; MonadPlus          Arrow
-		&gt;
-
-		Apply, Bind, and Extract give rise the Static, Kleisli and Cokleisli semigroupoids respectively.
-
-		This lets us remove many of the restrictions from various monad transformers
-		as in many cases the binding operation or @\&lt;*\&gt;@ operation does not require them.
-
-		Finally, to work with these weaker structures it is beneficial to have containers
-		that can provide stronger guarantees about their contents, so versions of 'Traversable'
-		and 'Foldable' that can be folded with just a 'Semigroup' are added.
-	</longdescription>
 	<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="containers">
-			You can disable the use of the `containers` package
-			using `-f-containers`. Disabing this is an unsupported configuration, but it
-			may be useful for accelerating builds in sandboxes for expert users.
-		</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 9ac5ac13aff1..bb93a243b594 100644
--- a/dev-haskell/semigroupoids/semigroupoids-5.3.4.ebuild
+++ b/dev-haskell/semigroupoids/semigroupoids-5.3.4.ebuild
@@ -1,10 +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.6.1.9999
-#hackport: flags: +doctests
+#hackport: flags: +doctests,+containers,+comonad
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -16,16 +16,15 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="+comonad +containers +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/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[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?] )
@@ -40,8 +39,8 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag comonad comonad) \
-		$(cabal_flag containers containers) \
+		--flag=comonad \
+		--flag=containers \
 		$(cabal_flag contravariant contravariant) \
 		$(cabal_flag distributive distributive) \
 		--flag=doctests \