gentoo resync : 18.12.2020

3 files changed, 17 insertions, 30 deletions

diff --git a/dev-haskell/comonad/Manifest b/dev-haskell/comonad/Manifest
index 27a56e0b6a80..1fb3128d1f7e 100644
--- a/dev-haskell/comonad/Manifest
+++ b/dev-haskell/comonad/Manifest
@@ -1,3 +1,3 @@
-DIST comonad-5.0.6.tar.gz 18154 BLAKE2B 4654a76ccc51c1cb1f7a96db54dd211148b8afcada19d0153356f203ea93cd0b914f6771f4407f5a81e312a7060cf11d9720a9eb96760b35c38567a34ac1a44a SHA512 0b7fc727a2b972203d1651049a4f4c371a8f134d64d36409d60fbc4d11b7eb9650c79cf917abaa3f66084d7c5e9f32b288862a5e93c3d93c16c11533a446cfa5
-EBUILD comonad-5.0.6.ebuild 1303 BLAKE2B 0a561e6b58aef3d9c3ad4371a07b61a2de76bc8b4016a28b5f2b921ddcb8933b0eb9be5cfc2d911e5fa424e94a29b360eb1a4143d28d2425a00830f435639ae0 SHA512 c07f01b14525fae0b2678a6a6601e0779c3a14179a2db15b0661566bf4c72ea5618c279149c6aea57b2803cddf9d9428e537f78e1b4fb153ff4d268d86a83794
-MISC metadata.xml 971 BLAKE2B 7c93a2a5f46470f854849bc69ce7bf737bb853f5fbe7d83a3a3bf93e7db484cc22917518fb6ad79e102464b96f41d3ad3d029a84f90da53a2eecb540669ccd04 SHA512 0d491b3a8aa8812e264f9f6946a939048560c20679cc10850b701c769ae3e37218d2075aed02bca11dcfd01030da8aeae5d884d0244448a56b2dd46abb560860
+DIST comonad-5.0.7.tar.gz 18108 BLAKE2B b7d415a2b7eb48f53727fa9ada77078de538d5cf477997a2953095d7410dff1a82f7ab2f53b2bf01b21671a6e5e938962a2ae2a6d50351d77a4dd8b3ae18a9e1 SHA512 6377f13b651c30aaba1f68448394a4048b15c4f8e97fe714281d15a51190b8ec6e1157a6fb332abfb75060bb2f4948db22fb35c537bf01836ed94ece99fdccce
+EBUILD comonad-5.0.7.ebuild 1448 BLAKE2B 27a498b27e7dbeb84a37c6e428de4afdc92e4f958f4976a9eb4edc4c016f2ca51959d8f278b9e665ce189f114b5db8f2668c9351b0455ebf5c067b04a7e7f3fc SHA512 5e7a19291c8336d3a3e266abff528d14f9296295c9fd3c921f648e0209c4e943e70ab74d05786bfc07c9d6d54f6c9ff6b86a68de6bcfbac303ca6daa3ba21a1e
+MISC metadata.xml 588 BLAKE2B eca11a9b96f2d0a128b79b5ee3d0df7bfd204845fb6be99a596a11ccdccb7d49800fb92c97e43478e5c337cf6281fb48c90b8314995cfe6bf8f4d0cbe54db73a SHA512 bb9cb0e3c2b9c135f6413549f3853ea75d26313e7032fe7564ce2aba22523f980d65c93ddac4c566f04a9af2c7f48d627c18a870e955019e77a6d9dcad06c662
diff --git a/dev-haskell/comonad/comonad-5.0.6.ebuild b/dev-haskell/comonad/comonad-5.0.7.ebuild
index 553ea56cb38e..3480cf6e57e2 100644
--- a/dev-haskell/comonad/comonad-5.0.6.ebuild
+++ b/dev-haskell/comonad/comonad-5.0.7.ebuild
@@ -3,37 +3,40 @@
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.1.9999
+# ebuild generated by hackport 0.6.6.9999
+#hackport: flags: +distributive,+containers,test-doctests:test
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
-DESCRIPTION="Haskell 98 compatible comonads"
+DESCRIPTION="Haskell package providing comonads"
 HOMEPAGE="https://github.com/ekmett/comonad/"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="+containers +distributive +test-doctests"
+IUSE="+indexed-traversable"
 
-RESTRICT=test # broken on USE=doc
+RESTRICT=test # fails on USE=doc
 
-RDEPEND=">=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+RDEPEND=">=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
+	>=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?]
 	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?]
 	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
 	>=dev-lang/ghc-7.8.2:=
-	distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
+	indexed-traversable? ( >=dev-haskell/indexed-traversable-0.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?] )
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.18.1.3
 	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
-	test? ( test-doctests? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17 ) )
+	test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.18 )
 "
 
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag containers containers) \
-		$(cabal_flag distributive distributive) \
-		$(cabal_flag test-doctests test-doctests)
+		--flag=containers \
+		--flag=distributive \
+		$(cabal_flag indexed-traversable indexed-traversable) \
+		$(cabal_flag test test-doctests)
 }
diff --git a/dev-haskell/comonad/metadata.xml b/dev-haskell/comonad/metadata.xml
index 6dc7bb65e52c..a8afd1054366 100644
--- a/dev-haskell/comonad/metadata.xml
+++ b/dev-haskell/comonad/metadata.xml
@@ -6,22 +6,6 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name="test-doctests">
-			Run the doctests test suite
-		</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="distributive">
-			You can disable the use of the `distributive`
-			package using `-f-distributive`. 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 `Distributive`
-		</flag>
+		<flag name="indexed-traversable">You can disable the use of the `indexed-traversable` package using `-f-indexed-traversable`.  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 `FunctorWithIndex`</flag>
 	</use>
-	<upstream>
-		<remote-id type="github">ekmett/comonad</remote-id>
-	</upstream>
 </pkgmetadata>