gentoo new year resync : 01.01.2021

9 files changed, 38 insertions, 38 deletions

diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 0d174b2cad6b..d18428859fb8 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/cpphs/Manifest b/dev-haskell/cpphs/Manifest
index cde07920debe..a4362f7716df 100644
--- a/dev-haskell/cpphs/Manifest
+++ b/dev-haskell/cpphs/Manifest
@@ -1,5 +1,3 @@
-DIST cpphs-1.20.8.tar.gz 45108 BLAKE2B 8e373db64d0d2a21e123eb136aadfd45cb373411e0684c445e25eb6062ecf4c29ccce3214986680ab886a71bccade3ac381f8f82916002388af3103bc38e797d SHA512 ec9323f9e1cb6de450d8af6b6b98005bf46427c2926694e1cba942fd54a03d9d36a7e8f2541eb095949110ddaf6317597699b7c4472942a509d496cb9b4da747
 DIST cpphs-1.20.9.1.tar.gz 45496 BLAKE2B 1a964c011628f260d1c7ad6653c03776a36a014ff6717f877796de0d0139dcd3454bd8d935e3fffda2d6dd9823fd5fc5be58b73bb9590de248381755b446148e SHA512 bc5cd86c1e42061ae5c940612542dbea420344fb8596495d71ff2dc724bc1a3785f830e51c3ae99394488a122deabacd6433a5c919e3682c4129f3b296b7931f
-EBUILD cpphs-1.20.8.ebuild 673 BLAKE2B c205975691d2d6f7aad241a50b17935703861669a2c8fa679ac9cd36fe8b17fdd09d4c26a72cf4815255d000c95040a1e6b7f0411e73f756bc9bda78c29754e1 SHA512 97d1974d04c80c43cac995a6e324dd96cf992c7a24fe827edbccf8dcbd6fc894e905302af515df60ca0c4bc728e86c52ab7f514e551b27d16b40e24912871513
 EBUILD cpphs-1.20.9.1.ebuild 730 BLAKE2B 69402ad22c90e8a13bf0b3af94d6cb8cf49eef4c28b0a322c70d98716b00784996bfb8faac510f243c68df8422578cee42e24267b7aa7446ddb8128564431423 SHA512 ffd0cf05f07645cf5b1d8e2e0b71194f9b81787b191920e962f02f7bd0780b871c823180e98f30b4148aaa22de653b94ff73ec83c0c5c12c512b160adfcc74df
 MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/cpphs/cpphs-1.20.8.ebuild b/dev-haskell/cpphs/cpphs-1.20.8.ebuild
deleted file mode 100644
index 95b8effa927d..000000000000
--- a/dev-haskell/cpphs/cpphs-1.20.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A liberalised re-implementation of cpp, the C pre-processor"
-HOMEPAGE="http://projects.haskell.org/cpphs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/old-locale:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-haskell/polyparse-1.9:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/hscolour/Manifest b/dev-haskell/hscolour/Manifest
index 85425d6f42cc..77d695157a22 100644
--- a/dev-haskell/hscolour/Manifest
+++ b/dev-haskell/hscolour/Manifest
@@ -1,3 +1,3 @@
 DIST hscolour-1.24.4.tar.gz 28729 BLAKE2B fdda7f784e35ff165981de53df5535b3294f5dbd5d1f484bcd34a20bfde014ddc9a916f20fae639420eca8cd4577f683d0e799459e846aabcc7cb4290b7035d2 SHA512 39b631c0a8346beff1c2e02ca8e72c1b1e3f7dafcedad7dc9de274e6750501de2bc553fe72a7d3459d4f9797e916f27e28ff96f705c2c0f9d3e0eec0ac6182c7
-EBUILD hscolour-1.24.4.ebuild 809 BLAKE2B 6d3e40d2ff4857ee5f70bfa81065ca7dff6921c557783759c6b116efc85095ad625f4c2470a4faa35719c68cf2b5304324f8f085e0daa6a7c3894be26d70aece SHA512 6eaa8c84674cbbb1fa2b3d635cebbac99811efed341bc2a1b16f9f58739c126303f91e3e0cbaf7bf298997241db4e25cd43062451eb8c4797e06771bd5bdae76
-MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
+EBUILD hscolour-1.24.4.ebuild 823 BLAKE2B 5290b778eb43af57cbd61b0af844cfa34db330dd8f7b9618ba7169cad18736aa7aae3c17f5776eb4a5df2f13f1c2d6d8fc9f2b64992c3f32bf6e7d5cd90905ab SHA512 ac5a677783dd0c952de74b5bb95ce39c199b71b8b1aa1c16d045503c8c16c3f77652e194651e40006a2595ef52509a1f29f6f776f7a39bfb3407d6f978a0f32b
+MISC metadata.xml 623 BLAKE2B b1a59b69df9fd28e8eebda6ab905676bb884c3f27b2c27a5783f4ce1717e3b631824f1c78ebc3dc0a5df4664c7a762c8b77909f0b5a8bb6f51c71463f53bbdd0 SHA512 d1cd52e4187b6955c98bc76b1ff98d4b437c6d69a064e95e1a944dc064cc1100b134e5b55d9e625d53eb2aaaf38e5c88b2af29d615c6b578a6cfb646088858f2
diff --git a/dev-haskell/hscolour/hscolour-1.24.4.ebuild b/dev-haskell/hscolour/hscolour-1.24.4.ebuild
index bc3802e68d53..6d3897e87d2e 100644
--- a/dev-haskell/hscolour/hscolour-1.24.4.ebuild
+++ b/dev-haskell/hscolour/hscolour-1.24.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 # ebuild generated by hackport 0.5.5.9999
 
@@ -32,6 +32,7 @@ src_configure() {
 src_install() {
 	cabal_src_install
 	if use doc; then
-		dohtml hscolour.css
+		docinto html
+		dodoc hscolour.css
 	fi
 }
diff --git a/dev-haskell/hscolour/metadata.xml b/dev-haskell/hscolour/metadata.xml
index 522384de8446..7e8a131305cb 100644
--- a/dev-haskell/hscolour/metadata.xml
+++ b/dev-haskell/hscolour/metadata.xml
@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		hscolour is a small Haskell script to colourise Haskell code. It currently
+		has six output formats:
+		ANSI terminal codes (optionally XTerm-256colour codes),
+		HTML 3.2 with &lt;font&gt; tags,
+		HTML 4.01 with CSS,
+		HTML 4.01 with CSS and mouseover annotations,
+		XHTML 1.0 with inline CSS styling,
+		LaTeX,
+		and mIRC chat codes.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/linear/Manifest b/dev-haskell/linear/Manifest
index 5c47c92cc726..f034edfd1357 100644
--- a/dev-haskell/linear/Manifest
+++ b/dev-haskell/linear/Manifest
@@ -1,3 +1,4 @@
+AUX linear-1.20.9-base-orphans-0.8.3.patch 350 BLAKE2B 59f54e2808e4b67e83418f72c96995eacb610496a94fcbe8431be188181f562ddfda26de2a2883b3e621b73e172c92d9a849cc4419c826f60d145fbc48942acf SHA512 979bc685b09f5adb7bf40eaac9121f2d0fae0add1ac70770a10d99ee9a0711fb0a107d3831b1edf8791a3b9a005fb81bf13857fcc590686dce78c3a2aa52284e
 DIST linear-1.20.9.tar.gz 49250 BLAKE2B ae51a3d7c7570ffa2e43ba9c7170c53f010050ab83ffe5f99f6717c76c4b78e462919f3938a0b7db5f654d4a65241abe87dc167ac5dba78db0097d8a806ee33d SHA512 4b3fc0d1f0cfc79b67cb3c0fe823ca7f1f02b7b3deab98c32ec56b12f5764a6a18db9cbe2218e91b3efa5deea6675d4ddf166a1600a9aa8b7ad3f1da68cb6f52
-EBUILD linear-1.20.9.ebuild 2211 BLAKE2B 432075936c693e678a568f85155f0dc47b6e3e8fad104ee9d02ee81214ff1f44e348147b7053314cf91d56e8d8f47e2960860577c2afaae6a87fcac2c6bd0151 SHA512 2d81f87e5b427eb1904ce0d164b262776cfebcc24a1d04be22aadcb39ee83501eaf6f3af05b5c1d7a43cd6037dceb9dbd7868861773e6d74d048495789a339b4
+EBUILD linear-1.20.9.ebuild 2266 BLAKE2B 8e0a3e3b0b7fb41f5f61cf69dece6802db610bcb0c16514939060073f3e6ed8bc112a96e52506f46533f9d34aa9b7a6927fdb61b1354c4ef4994075f90c1eed2 SHA512 a69bbb2e17a82f7edb9d312d514fdc128606ae544a408ddc2c9da980612646b65bcbededf6dbc2b7623695a54780f9029f80e0d64297d92b2b9b9e8faff9db2a
 MISC metadata.xml 608 BLAKE2B 8ed930ec4abd2b09493c29bfeb3c29599f27e2082f7f627801800453ca89ddac037d5832f7995b1a65e81af5fa42ff091397dd762c7f614716b3a11512f75394 SHA512 69f2d315538225a3e43f805a857521803f1a68a928baad43a5197adf4cd2fcac36b1f44fd8714da7ae2c38ec973795689bf3859570b215b997483421b9c9ddbc
diff --git a/dev-haskell/linear/files/linear-1.20.9-base-orphans-0.8.3.patch b/dev-haskell/linear/files/linear-1.20.9-base-orphans-0.8.3.patch
new file mode 100644
index 000000000000..c497de0b36a4
--- /dev/null
+++ b/dev-haskell/linear/files/linear-1.20.9-base-orphans-0.8.3.patch
@@ -0,0 +1,13 @@
+--- a/src/Linear/Instances.hs
++++ b/src/Linear/Instances.hs
+@@ -21,8 +21,10 @@ import Control.Monad.Zip
+ import Data.Complex
+ import Data.Orphans ()
+ 
++#if ! MIN_VERSION_base_orphans(0,8,3)
+ instance MonadZip Complex where
+   mzipWith = liftA2
+ 
+ instance MonadFix Complex where
+   mfix f = (let a :+ _ = f a in a) :+ (let _ :+ a = f a in a)
++#endif
diff --git a/dev-haskell/linear/linear-1.20.9.ebuild b/dev-haskell/linear/linear-1.20.9.ebuild
index ebf29418bf02..2a04c9081129 100644
--- a/dev-haskell/linear/linear-1.20.9.ebuild
+++ b/dev-haskell/linear/linear-1.20.9.ebuild
@@ -47,6 +47,8 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/test-framework-hunit-0.3 )
 "
 
+PATCHES=("${FILESDIR}"/${P}-base-orphans-0.8.3.patch)
+
 src_configure() {
 	haskell-cabal_src_configure \
 		--flag=-herbie \