gentoo resync : 20.03.2021

5 files changed, 45 insertions, 92 deletions

diff --git a/dev-haskell/haddock-library/Manifest b/dev-haskell/haddock-library/Manifest
index 7f768b46ac93..f26679d873e5 100644
--- a/dev-haskell/haddock-library/Manifest
+++ b/dev-haskell/haddock-library/Manifest
@@ -1,9 +1,5 @@
-DIST haddock-library-1.1.1.tar.gz 35641 BLAKE2B 1754ce1088c34629f8523a80c9ee142471b8e7f53f5a77e89265211588cc80719e7fec49e35142b8288b4632a0548def65f9f2966d6838d79e75ec1574588336 SHA512 5f1a592af66a054482fc06ca8d974db0ebd4e42b383ec6b3fd7d44d155bd89c567013af1266e697b76a96b4d39486bc22eac7eb4b1d6842ec0f842533ac8dffb
-DIST haddock-library-1.2.1.tar.gz 38606 BLAKE2B 1896a098a4858796feb9ded26914a7cfc9f6478f3993485a9c61be1a3b1aee1e32accafadaa5b1e030d17f78555b1f4c731b76c09bb83c7a7cb8132c8e25e792 SHA512 7ac9dfc648e6e59e1dbaafc7fdf26acb378997506c353dedadf89a729223cdb518edd59642e81758fd898cda163258e5e4150fc84369c3e011e59acd827a037a
-DIST haddock-library-1.4.2.tar.gz 38701 BLAKE2B 56c0f1c46100fcf8afa88ce8c44f989da9561109bf74473d5ef65962cc057cf7a54f87786171ad2f57895000e610663f1b2711f231adc7d85442e9028bd9729b SHA512 0ea02f4ac898e6d4349f3c8d3997d66c35866350bfd661b6030a0b59c609eaae3647c8898bb5142afb0235b2eb785059356f6eb2031e6e93615d1d4e3c4cce82
 DIST haddock-library-1.8.0.tar.gz 30918 BLAKE2B a8bcf9e08f6596375186930cf4a98ae547c40d85eb0bd00b7aaf8212c3738e32cd51cea044206f3746d10d228b1e8b8a2ccdb28ae7c7957006f518d090a6ceed SHA512 f84672b67dd4b18402efb8b40eb0e2cb912ecf894cfdedf61b0ada87392e63609cf1101d4fc793686cc4af354665661bf4dc902313bb466efee683a7c64bbe2b
-EBUILD haddock-library-1.1.1.ebuild 664 BLAKE2B 94b5fb56dea2859cbd27f2bfdef9eba77b0e3c1d0e6085fda4d054788560c847748ab160585a02cd99de9b301d9a84483033c2e1feb9e806bf9ac7043e33ccdb SHA512 f455d52e5873b98bd051a4af099e01611f3dad910e48accfa786073b9723fe24c03c51d10c41e0483eddc52d08d80c12b0baf6957b744bd0bbabc0570e867242
-EBUILD haddock-library-1.2.1.ebuild 788 BLAKE2B 6689b94bc4291968a9b03d5778386e42a532537ce1a777a3f70f8befe1252c5e2933302c42ce1f5b3776f215a779bd8c3df078d13c488a72f3784f9217fae612 SHA512 385574c9cfd9106f5d815f438461c4a3cc0cb3fde763e8274757d6c05afa34b08824f779dc538d56df4e516e480459bdaa49148e4b2fc8af90a4297c04da45ea
-EBUILD haddock-library-1.4.2.ebuild 803 BLAKE2B c79dc51e3bb499e40127ead0cea5c873ea52442bae3b5c2b9d7e8837c5e7ed2db842a2bc52bd955e060c7d19d51c900d1cf7cbf1a849f71bfe8fe6ab0a87727f SHA512 9fa9237bd3befd6cbfee8b146cccf0e06327736ce985a2758813d38b1967bc36dc4a80273d373412fcbe38b5c060f51f3f7d3ea27cd79f21b0bd223c4da7c5cc
+DIST haddock-library-1.9.0.tar.gz 31465 BLAKE2B 785935a7f80831c000db796ed9d0071309de86d36c68d5677b6c948aa914c09a00582af500a25d2d751d96ef6ebb30696fba51a2ed84fa1b4850e5795ae5f55d SHA512 ec41df15a849a59fc41a443ce233dfa6293f0d201ed1847bd8a7732bc0e2138bab2305c127bd60f51919d8eeeb6808eec7a0add38edacd059956d852167477b5
 EBUILD haddock-library-1.8.0.ebuild 1269 BLAKE2B 746fc2165ee259ef53bbe513028b2eee7dcf1b676f34d8916e8365a7fbc68155b8d5a576cde611d7c4989aee8d84a6979c70731c919b41cdb7eb27f12fdbfd13 SHA512 ed721288d65543cdb488e30d64912725fe67bfb493259e536127ee4eb5f529c4a26a6b08e59d6fefad6df2efe2379af1aa0297e18250b92aaaf6dafa3cf63542
+EBUILD haddock-library-1.9.0.ebuild 1350 BLAKE2B 803ede5107f1c85c2113b78c5f7229726bab76665464dd33ce55716439071870eac145d80ca8789250afe365d09d6633154fb5cf6bae9646a288841497e363fc SHA512 41889bf7c0f9db230a7075512378b1c2567d05a1dd933f969011858bb3d6fb404e34870b52ca3d489e6a2a7748bc4afd3f5eedcfc8841f8fd0297044f5d98182
 MISC metadata.xml 649 BLAKE2B 3009fffda0bdf4a08fb7014a168578c8054cd7e701ca254b12debebf6aadf7a36d968d3d39a555767aef11646e2cc71707ab40f5ad77bc85923bdac3a3ac45a3 SHA512 316469b542dcc67cbf2c6f28a2cb7c3321fc13654349c59631c185ceeb2bc55b78d23b2bbb224ab7b19b1aa0d2d8237fb9ec98693e4420fe8e1556e5acd370cc
diff --git a/dev-haskell/haddock-library/haddock-library-1.1.1.ebuild b/dev-haskell/haddock-library/haddock-library-1.1.1.ebuild
deleted file mode 100644
index 0bd4c0f1af69..000000000000
--- a/dev-haskell/haddock-library/haddock-library-1.1.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Library exposing some functionality of Haddock"
-HOMEPAGE="https://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/base-compat
-		dev-haskell/hspec
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 )
-"
diff --git a/dev-haskell/haddock-library/haddock-library-1.2.1.ebuild b/dev-haskell/haddock-library/haddock-library-1.2.1.ebuild
deleted file mode 100644
index b1001acdcbff..000000000000
--- a/dev-haskell/haddock-library/haddock-library-1.2.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Library exposing some functionality of Haddock"
-HOMEPAGE="https://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # on ghc-7.6 Prelude collides with base-compat
-
-RDEPEND="dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/base-compat
-		dev-haskell/hspec
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 )
-"
diff --git a/dev-haskell/haddock-library/haddock-library-1.4.2.ebuild b/dev-haskell/haddock-library/haddock-library-1.4.2.ebuild
deleted file mode 100644
index ee68c2a4a112..000000000000
--- a/dev-haskell/haddock-library/haddock-library-1.4.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Library exposing some functionality of Haddock"
-HOMEPAGE="https://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.0.1, might not be required but needs porting revdeps
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/base-compat
-		dev-haskell/hspec
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 )
-"
diff --git a/dev-haskell/haddock-library/haddock-library-1.9.0.ebuild b/dev-haskell/haddock-library/haddock-library-1.9.0.ebuild
new file mode 100644
index 000000000000..59c2d563d118
--- /dev/null
+++ b/dev-haskell/haddock-library/haddock-library-1.9.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile test-suite" # haddock hoogle hscolour
+inherit haskell-cabal
+
+DESCRIPTION="Library exposing some functionality of Haddock"
+HOMEPAGE="https://www.haskell.org/haddock/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+# keep in sync with ghc-8.10
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2
+	test? ( >=dev-haskell/hspec-2.4.4
+		>=dev-haskell/optparse-applicative-0.15
+		>=dev-haskell/tree-diff-0.1
+		>=dev-haskell/base-compat-0.9.3
+		>=dev-haskell/quickcheck-2.11 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base-compat  ^>= 0.9.3 || ^>= 0.11.0' 'base-compat  >= 0.9.3' \
+		'hspec                          >= 2.4.4    && < 2.8' 'hspec                          >= 2.4.4' \
+		'optparse-applicative  ^>= 0.15' 'optparse-applicative  >= 0.15' \
+		'QuickCheck   ^>= 2.11  || ^>= 2.13.2' 'QuickCheck   >= 2.11' \
+		'tree-diff             ^>= 0.1' 'tree-diff             >= 0.1'
+}