gentoo resync : 15.01.2020

20 files changed, 52 insertions, 109 deletions

diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index d8426e5573dc..f2c90d123a06 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/alex/Manifest b/dev-haskell/alex/Manifest
index c7da888dac5a..edf868e90d45 100644
--- a/dev-haskell/alex/Manifest
+++ b/dev-haskell/alex/Manifest
@@ -5,5 +5,5 @@ DIST alex-3.2.4.tar.gz 110688 BLAKE2B 182f58317bcca6c72f54f63792e04a9108d9311e7f
 EBUILD alex-3.1.3.ebuild 1395 BLAKE2B 7faa32e02de14d493ea000a393f3c5e657b703c78385560810b4ea5bb1c0d4c1bd540f9fd70367962ae3ebd9ba9e9192799b2e65d45a895e7042aad56ed93039 SHA512 3911d252dbe638f92fa1d0bf39dd9fdc17b21b75b51ec6c2bf024c574ff40eccd210704d96a9a15b867b78cff848a987db5cefa0524186a897b97aec39b2c00e
 EBUILD alex-3.1.7.ebuild 1561 BLAKE2B 0d7ee7d66d44610856dc86744b0aae9bff83fa4c277e486d0f88c6a56c616a43f773211e6de3bed22aace4507c1a2b3ed9fda2c1012b5406dd6973f3b02d1758 SHA512 e23c059f452a34df7effb43c9077100c054091b64132cc6401131f0b4a2debf3dc01bc05ab1b2ce098881259279f334d5a0ccaf9ad36dde17ada6a6f7a853a6a
 EBUILD alex-3.2.1.ebuild 1591 BLAKE2B a047ea6f07bb005082575fe065e92e83972946a0cf13e7283abba7ec23f0eed592bafeb29bd752f22bd2224d765143bb8ae302b8801fd1cafae3da5589bef8b9 SHA512 0da96d5d3bd2256967d99ef6c551631ac01d87c1feeefabf9a69cd26c374421e222eb28651efa6973f7e73b63cb9618c3ce59f09927479df28332f0682a353b8
-EBUILD alex-3.2.4.ebuild 1327 BLAKE2B ef970ae84c0a0b43fc9244053cb54eab7ac18f0fc072ad1a5a02efa225ff74b07a3a9492d409b0a8825ba32ee7c890614965c1790dd79a482b5df81c98857555 SHA512 fc07c8b3b2602c61c0bdaa8f5f777cc25539353d73f1917ddffe71de30c59021dc3587419e5172b8baf8b66674f98286599da0107356b673c9ffb3221a1ddbe9
+EBUILD alex-3.2.4.ebuild 1464 BLAKE2B 9a29e93a0f7a359e8d1f4525bb658329c9764360ceb9b7cfa23693470bbc63569074784b6cfdf5d9ae4ce935c8567a1cd02fa6504a0ed33d35255a0b575d6f59 SHA512 5eaaf819d2d4fc0db4fd293abe051cdd924dc519f15f0ebb26d5c5a18bccc3d70ee839596caca6b8d912022615a4e2f9d603b0884c1c11a1f6cb51f678170475
 MISC metadata.xml 349 BLAKE2B 0e0922a706cc99af24707269cbe80a8969df912d02317294a007d43a81263b232a3f2b199b4f981a023143a765427851335493a10235feb627ff8adf85497c62 SHA512 9c41217241498cd036d00fce456cea108f675c71c12bab05305dcfbdbd5d55d5c7db8163e5315eef12f9ca8467276b6fad9038d47da729f448338655691a9ff8
diff --git a/dev-haskell/alex/alex-3.2.4.ebuild b/dev-haskell/alex/alex-3.2.4.ebuild
index 0adfe9957174..d25604349f3f 100644
--- a/dev-haskell/alex/alex-3.2.4.ebuild
+++ b/dev-haskell/alex/alex-3.2.4.ebuild
@@ -57,8 +57,10 @@ src_compile() {
 }
 
 src_test() {
-	# workaround https://github.com/haskell/cabal/issues/2398
-	emake -k -C tests all
+	# 1. workaround Setup.hs deadlock: https://github.com/haskell/cabal/issues/2398
+	# 2. use freshly built ALEX= binary and datadir path
+	alex_datadir="${S}"/data \
+	emake -k -C tests all ALEX="${S}"/dist/build/alex/alex
 }
 
 src_install() {
diff --git a/dev-haskell/bytestring-builder/Manifest b/dev-haskell/bytestring-builder/Manifest
index bc1b3996ea99..b98fd5930e7b 100644
--- a/dev-haskell/bytestring-builder/Manifest
+++ b/dev-haskell/bytestring-builder/Manifest
@@ -3,5 +3,5 @@ DIST bytestring-builder-0.10.8.1.0.tar.gz 43904 BLAKE2B 220e323b0fc7b56b9cf984d2
 DIST bytestring-builder-0.10.8.2.0.tar.gz 47366 BLAKE2B 37bb8898f30791b20e30766bc085e729088d446f90fde21228d8241f6a62f6a28316cb191e05a48b51832655f3d989cd1abe47b3e3ea6dddc127cc09ec624e87 SHA512 bb3c5bee6f05d7ce9213f490f65293d3eb2a59f2f7b4d6423a66e7e20e375ec957c8a030fc58296b59d5314a6fd4684e03fe625b8edad89429e503ada73367e0
 EBUILD bytestring-builder-0.10.6.0.0.ebuild 537 BLAKE2B 0af2d8ad6b94a4bd3d51f54715b8a46b2470b4c7952b06820c11648700a4e009afc8b073c79c1af7100525590cc85e1b5f953eb0b6b5f015313f79e0d2b71a64 SHA512 c319686ebd8d3718e2ce7de11d1060ad8f3a5f9594b9750f813dc8bcb881240fd98d48a463296e6f131a3a36c54ca8c068850216076531a5994ffecc367f7b6b
 EBUILD bytestring-builder-0.10.8.1.0.ebuild 566 BLAKE2B 5dac46c890fdf084a8415a8a797787afe1dac08a67b96f515e9466211f9be359deec51cebbf2462117aaacc2959570a3b70d6a18194c78bb62c1a4ae3d6756b5 SHA512 18f27d7e0e997fe079c41bb323ee6011dcc61bb681720748bf45fffe09834d71d471e87e25d613c171200c715220e4a2c726466147a5784c630d9019ad80ece0
-EBUILD bytestring-builder-0.10.8.2.0.ebuild 566 BLAKE2B d7c031e56c1febc43d2b958ef4a7285e64e1cbaa749f7b8e33c6069f14256a9b15118bd88518108645f11965658e7ffcb1515aaa35e9b9835c547f0f0bc4d4ce SHA512 d76520ed6dc9edc25b34282b8643b31a6c5de2f660579989d15323884266567f06802a60562f60a33c542cbf6337845a0c1fc1752acba6ed3438cda794c09d82
+EBUILD bytestring-builder-0.10.8.2.0.ebuild 542 BLAKE2B a123b32e5e1c22ec95aa4553c059802203ae153ff05b55db3f1bbbdf10e910a516765c7f7b85f8b010bba37324dedd248afe74e637a172057903b266535b5cd3 SHA512 4714bc955179522eba392383ff8287f3f7a6459b90916c4fa8bdd77df0219496a4201bd4b46f1f9cd09c99eb23d69779acf8d7aa28da290d4f2b998d10ef4eb1
 MISC metadata.xml 1612 BLAKE2B 25d3bd6bf77c1253da3736dd3c9731a7613c392c2c9b1eaee6829fc01c492127408eb69be113cca4353441abe939dbf449e3a629432d01dadd391f165d08dbe0 SHA512 98c65c411de64a52485367b4263905b0893bcd358ca8c27398216df8ab6adfbd6fd85be34bae2fbe9583083e7ca4ef7838fe35c1ddf35f293d5bdb26dcead5bb
diff --git a/dev-haskell/bytestring-builder/bytestring-builder-0.10.8.2.0.ebuild b/dev-haskell/bytestring-builder/bytestring-builder-0.10.8.2.0.ebuild
index ec45702f1b2e..d616575d3898 100644
--- a/dev-haskell/bytestring-builder/bytestring-builder-0.10.8.2.0.ebuild
+++ b/dev-haskell/bytestring-builder/bytestring-builder-0.10.8.2.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # ebuild generated by hackport 0.6.9999
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
+CABAL_FEATURES="lib profile"
 inherit haskell-cabal
 
 DESCRIPTION="The new bytestring builder, packaged outside of GHC"
diff --git a/dev-haskell/hlint/Manifest b/dev-haskell/hlint/Manifest
index 44a39ce4621d..84f1c29fc7ea 100644
--- a/dev-haskell/hlint/Manifest
+++ b/dev-haskell/hlint/Manifest
@@ -2,7 +2,7 @@ AUX 60hlint-gentoo.el 231 BLAKE2B 2fef831bc7a3056d59e67dcfbb6cd5ca86a4ad4d46c872
 DIST hlint-1.8.57.tar.gz 79071 BLAKE2B 5c538ecd36a22d879b0746fa0f3df3715e7d8f85407ff3375f4b850256eb125d0dd01d875fe6babe8c912b62402da7fd88df6d05194e5501c449f9230f33b500 SHA512 1fca029067cf34f9d024640fbacfc455e733adb239e339471131b014c3d5cab671e5c267d855d1df7dd76440dab45a8981502dd840073005a4e5c50d177f91da
 DIST hlint-1.9.21.tar.gz 88802 BLAKE2B 08708331c50b73433c7fde7c826d976126f7bdd758722f6a8903d18d45da6d9ffcd32b883036f17c74165feb0245199e2e248fee9701c01153736d62f73b9494 SHA512 e7e87aba3905bb577d952a960a92038816bf057ed19aa85cff0deaa653a9c248b6a4b44b907024ad271abf615ab94ebac6f4801c77f545cadbddf0db57f13ad8
 DIST hlint-1.9.35.tar.gz 97402 BLAKE2B ea3bb516769c496be4943ab57a37bde97e1a03fca56dd6c9bdc3da30ac86b1b0538796e868de85049d28fa8286bfd45e0f1fb960e15cf12294bdb74dab08f926 SHA512 14daa5ad5652f93b3e3c4d5cff1df3735755c1561c2eb6c7ae3d05401d4a253ccba87d0cb5d09e690ce1a30f0352a26839856dd648bb10a13013cb43aed28606
-EBUILD hlint-1.8.57.ebuild 1471 BLAKE2B 03780911726df94403ac1deb84c8bcc4f8489858545d536d791d17bee693597a771ec6cf59b6051ec3144790b2c7f252deab50ab2990287f6412daaf74339e05 SHA512 f14e3148853a97a20e7d601d0bd259d209226ac51bfe020cf84c84f31094e80f68ad2c007ef87f2c027e4f433a11d3ba5c453e2d0047336c9b745cdf82d0eaaf
-EBUILD hlint-1.9.21.ebuild 1640 BLAKE2B 46782d69d429f88228d805d3f6c83ee1873d8b52fc16129eaaa8a3b531dc889c7e1153f3262f1d9a5cc9477b016142126154e70b249b1b5a976d8f6dd321c590 SHA512 9fe7fb03a3ddcf5eafcf7a09c5bc35cec6b95bed4e2fd6ce7e8c8f6b6f3ac637e04e69843ffef1cf48a3d04946dc97a612b0538d9e8adf7049f4c35fa0cadf37
-EBUILD hlint-1.9.35.ebuild 1706 BLAKE2B 1ad96bbbb42befa8093fc07f8581fb174fc909ef73b9af9a037247339ae002a83be8b158538d7170563b4dbe5ba06fa14a989eed0a71c7587038f063be150803 SHA512 b9434e18dda5bfb8e276a5b5d66726447e8a9b73eac17b08a592a00735e9544e2b6156966e6943facbdd74921f51fcd9ee0a2e4674ed82d9073c19c1db47d6d7
+EBUILD hlint-1.8.57.ebuild 1510 BLAKE2B 301453bd59088ed714cccdb12d06c3778649bdd948cf58404d70f1fa78f927d90722533d2fe367bc4085130d0673a16f6d63ada4d94eaaf25b4232021574040b SHA512 4e3818c8778ff8ad917e5ffa83c38227d475328a5e4e6956304a22298fd30b8cc3f32f0319c90e2ebac27baeef7fc7f654b12072d96b9107fe51398feb2797e3
+EBUILD hlint-1.9.21.ebuild 1679 BLAKE2B 19062804e9238655e80e3d5c48243e5f889ea1b1a3074b25da89a660e4dd0f51096fdd77abe356e3f2fa7a19467823805e1483b4cbf9bd7ed96e956fe4cb7bf1 SHA512 aef9fcffb4506a8b4c944d888b22947708750dbc807f1ef59bc79702d87d97e77e362736d2a9b7f273200fcdcb4d4c7c962c51052c1c388c6f2f4badebeab481
+EBUILD hlint-1.9.35.ebuild 1745 BLAKE2B 4cdf84877fbaaa17ab02e3e23b7427eb5ee405578faaac93c09cbc6b32640b5f9c5acf2d8d0d7e31cb28986c2cf1cf43981a895928095c2b3ad7178f35997a02 SHA512 24dcb66f37772594966ae025973e5a1d6c12f75e404794f727de13afc6ba39dc8750f5385e843678ef484c94b30e5de91f7fb43ec27547d7bde40fe8733d7786
 MISC metadata.xml 514 BLAKE2B 9d4466ded84b33d243146bf75ecc80aa920dd4d959ed661498d6bc8d51676bea2024441300a79a3c6f39bb94bfc4d9b3a5727f5f79c012ff8ea91ad5596bc0d7 SHA512 09783e5f456c5e5f7c9b4cc0b61d5d45d9a77ba4e582368f75e17fb8cd3b7a94ac56c6acbe1a5eee4a65a53fce1c72bf7ce3d0a00e736aaa249c0211b76926c5
diff --git a/dev-haskell/hlint/hlint-1.8.57.ebuild b/dev-haskell/hlint/hlint-1.8.57.ebuild
index 17867b15618d..20dddcc621fc 100644
--- a/dev-haskell/hlint/hlint-1.8.57.ebuild
+++ b/dev-haskell/hlint/hlint-1.8.57.ebuild
@@ -23,6 +23,7 @@ RDEPEND=">=dev-haskell/cpphs-1.11:=[profile?]
 	>=dev-haskell/transformers-0.0:=[profile?]
 	>=dev-haskell/uniplate-1.5:=[profile?]
 	>=dev-lang/ghc-6.10.4:=
+	emacs? ( >=app-editors/emacs-23.1:* )
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.6.0.3
diff --git a/dev-haskell/hlint/hlint-1.9.21.ebuild b/dev-haskell/hlint/hlint-1.9.21.ebuild
index 5df901d53401..3bed99fe3f51 100644
--- a/dev-haskell/hlint/hlint-1.9.21.ebuild
+++ b/dev-haskell/hlint/hlint-1.9.21.ebuild
@@ -25,6 +25,7 @@ RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?]
 	>=dev-haskell/transformers-0.0:=[profile?]
 	>=dev-haskell/uniplate-1.5:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
+	emacs? ( >=app-editors/emacs-23.1:* )
 	gpl? ( >=dev-haskell/hscolour-1.21:=[profile?] )
 "
 DEPEND="${RDEPEND}
diff --git a/dev-haskell/hlint/hlint-1.9.35.ebuild b/dev-haskell/hlint/hlint-1.9.35.ebuild
index da15af90b52e..6ee0f0185d98 100644
--- a/dev-haskell/hlint/hlint-1.9.35.ebuild
+++ b/dev-haskell/hlint/hlint-1.9.35.ebuild
@@ -26,6 +26,7 @@ RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?]
 	dev-haskell/transformers:=[profile?]
 	>=dev-haskell/uniplate-1.5:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
+	emacs? ( >=app-editors/emacs-23.1:* )
 	gpl? ( >=dev-haskell/hscolour-1.21:=[profile?] )
 "
 DEPEND="${RDEPEND}
diff --git a/dev-haskell/hscolour/Manifest b/dev-haskell/hscolour/Manifest
index 1a9dfb6bb664..127d2a8901a1 100644
--- a/dev-haskell/hscolour/Manifest
+++ b/dev-haskell/hscolour/Manifest
@@ -1,4 +1,3 @@
-AUX hscolour-1.19-ghc-7.5.patch 1701 BLAKE2B 70c2628e3adaab9c7ec06dbf054c55d9e4f7709c09ddfe39fa578194c870e17afd2c9d78743cf929b1edd94f0948458ae8b64e6dfa68f4b774b3c3b3e1ea42e5 SHA512 302fe056e61d58537c2010c2d286ff6abf1b4eea25beb9b2069492000b1edc257830892369bd16576675d00fb376c04f83f17508b9491140ee92d062b9736c29
 DIST hscolour-1.20.3.tar.gz 25810 BLAKE2B 28a394ab9f90ac4a7d311e1aa7e4f41c55b26e51e02a72ed3d869d1d9dae566c7a70f3e15c136cbb538f56c303c0a5083d4f725ce2fc6f9cadf27d21b1b563a6 SHA512 759f0a3c3c36b48db7932477468f1c5de8fddec654010dbbd0d136e0f8a8f4e3c34bc9349467766a1cb90ffb56b950ee6b7926f4f62dcb68f8e048e2c212d853
 DIST hscolour-1.22.tar.gz 25979 BLAKE2B 42d974c9ffe439010df53d88c0b71397869eef64765eb60554e5bce060492a780d4bea8eeb805f271ac2b62ad4060bf5dee96f69ebe90caa9f62a572d8266207 SHA512 9762599fb4eef8f68a0a40ddfc8e7f50eb8592b1b3d7e4c8177f23f08300264c80a73dbedbe954fbcb9ff3fe1b80497b131e3f8d9adb8c1697d7195d48ef69a0
 DIST hscolour-1.23.tar.gz 26027 BLAKE2B 4dba77d61aff026f515d47c0cf84bd747b28f5d00739986f8a877171860835610812b8e1827879f8bad118bb7234ccfddccc8651c819696841a35ee3229f1b48 SHA512 a1525e0827bc399c0747898c814ad4b7947620c610e6ec579afa120ddb5f1d012f7f10547f09dd10e0bba9cd89cd220ab204ee0e40c37f0048c7222db04de23f
diff --git a/dev-haskell/hscolour/files/hscolour-1.19-ghc-7.5.patch b/dev-haskell/hscolour/files/hscolour-1.19-ghc-7.5.patch
deleted file mode 100644
index 25e29728ca3a..000000000000
--- a/dev-haskell/hscolour/files/hscolour-1.19-ghc-7.5.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- hscolour-1.19-orig/Language/Haskell/HsColour/Colourise.hs	2011-06-06 03:05:04.000000000 +1000
-+++ hscolour-1.19/Language/Haskell/HsColour/Colourise.hs	2012-06-24 10:29:57.990963394 +1000
-@@ -1,3 +1,7 @@
-+{-# LANGUAGE CPP #-}
-+#if (__GLASGOW_HASKELL__>=705)
-+{-# LANGUAGE ScopedTypeVariables #-}
-+#endif
- module Language.Haskell.HsColour.Colourise
-   ( module Language.Haskell.HsColour.ColourHighlight
-   , ColourPrefs(..)
-@@ -9,6 +13,9 @@
- import Language.Haskell.HsColour.ColourHighlight
- import Language.Haskell.HsColour.Classify (TokenType(..))
- 
-+#if (__GLASGOW_HASKELL__>=705)
-+import Control.Exception (catch, SomeException)
-+#endif
- import System.IO (hPutStrLn,stderr)
- import System.Environment (getEnv)
- import Data.List
-@@ -51,6 +58,16 @@
- -- | Read colour preferences from .hscolour file in the current directory, or failing that,
- --   from \$HOME\/.hscolour, and failing that, returns a default set of prefs.
- readColourPrefs :: IO ColourPrefs
-+#if (__GLASGOW_HASKELL__>=705)
-+readColourPrefs = catch
-+  (do val <- readFile ".hscolour"
-+      parseColourPrefs ".hscolour" val)
-+  (\(_ :: SomeException) -> catch
-+    (do home <- getEnv "HOME"
-+        val <- readFile (home++"/.hscolour")
-+        parseColourPrefs (home++"/.hscolour") val)
-+    (\(_ :: SomeException) -> return defaultColourPrefs))
-+#else
- readColourPrefs = catch
-   (do val <- readFile ".hscolour"
-       parseColourPrefs ".hscolour" val)
-@@ -59,6 +76,7 @@
-         val <- readFile (home++"/.hscolour")
-         parseColourPrefs (home++"/.hscolour") val)
-     (\_-> return defaultColourPrefs))
-+#endif
- 
- -- | Convert token classification to colour highlights.
- colourise :: ColourPrefs -> TokenType -> [Highlight]
diff --git a/dev-haskell/language-javascript/Manifest b/dev-haskell/language-javascript/Manifest
index c0b3737e5630..9701b7668571 100644
--- a/dev-haskell/language-javascript/Manifest
+++ b/dev-haskell/language-javascript/Manifest
@@ -2,6 +2,6 @@ DIST language-javascript-0.5.14.2.tar.gz 48466 BLAKE2B 16fa3dd229634230e30f7bd1e
 DIST language-javascript-0.6.0.14.tar.gz 75969 BLAKE2B ca286024545ae1b6ceb84150865c9b4768fd7ba3e783b86c01a977793cee868b55c1bec2daaa498ecc6b672be01358f76df9bcc8196c73d7463ed3213c9e6e42 SHA512 e51dc2d94339583cea58dafc5092571d54ea170a11dd1b38068f656af63ede76cc914dbbe2c18d3743c68108e3d143c8b153ecfb39410f8a4cbe108cea26fa56
 DIST language-javascript-0.6.0.9.tar.gz 103168 BLAKE2B 80b7e95a9db9e1ee474a492dabb3423664bfcf22b5cdc4957e4834dc351e8825ae9e744b96a081e97cd6ea276e31deebd8d0a70e3c659a0b2bc20d66438c0f44 SHA512 ca5fc4f541ed2834ce492417f858593e2bb42677e787e8d91055e53a400f563ad940757bf2b341d490cd6d1c1feb07a304dacc79acbf5f731f20996acd1418f9
 EBUILD language-javascript-0.5.14.2.ebuild 896 BLAKE2B 0da6007608a6499b77ef45278a81a6734fe51931fe5cb762444ddd3fd14d1ea1af07f261ea14a1d9c3c494bc633356878d39f5d4cd721a33a354bdeaac553a75 SHA512 de499e6a4cbe6c7f2154c6a1bd94c684a6eaaa2749d16cae49159689d84e53ea9a67e4431873a3f3f859adae03f05c1ba13cc6148bc64ef0217b634ac0095d24
-EBUILD language-javascript-0.6.0.14.ebuild 911 BLAKE2B 22ad726ed175ce584bcfb31398771aacbbae78cb4c4f6b7d8b3750c0110868c2359a86445e51dd8fcb74fff8f74f0fd3a1fe77938ecd63174636b5763e6dae89 SHA512 a3aa0c62347180455a339637c38506e58dcf02ae6a6aed4b6a8f723f4a8c0f626a92950d97d28a0cfedb48eded40054e77045fc7d343025dcde2819aca2ddd6b
+EBUILD language-javascript-0.6.0.14.ebuild 921 BLAKE2B 7dd00d593d113cd92e1c40f7aa4adcec952038457fed19522bcada2299b5911c48a213775dc5d10d698d3d9b78ab810c334264e83bd9be58c58c2a327475caa1 SHA512 7ce29ff9c327eebb3065d09f4a0b5d687469a2aebd9b71bbb622f939b7104cad62977db00d991a921a14b94a5cb640f2fd5c54c9795d45a74c5b621559fe43e0
 EBUILD language-javascript-0.6.0.9.ebuild 866 BLAKE2B ee01fdd875931b925c80276d63cd5d37455ceb29db109f2b2f57223521852b83a9bee279f911a2472cdec222fe2411e3d8484def3617f269b4e08314856da3a2 SHA512 b9d3d23d6b287f125672ce9b3ee4bad80ca620c7556f6fa06652ca0b26a5a54448b89cf00d55c3d769aefdd2fc4901ff778d1e20500d9034cc12b7fc1435bb3a
 MISC metadata.xml 477 BLAKE2B 881b6ca7702a8337971936193008870d6c8d0d39b9f30f12bdedaae28834c4ea73977b4c2379ea27a843e403260848c3059b4665209ccec992c9c38b45ade1a3 SHA512 3037f1e027cba2227010814d743afda935197fc1878411a9d9c8c116152377baca93cbafcf22ce33a6d719c1fce9f2928d31bcca6644f39dae796500ee4b9007
diff --git a/dev-haskell/language-javascript/language-javascript-0.6.0.14.ebuild b/dev-haskell/language-javascript/language-javascript-0.6.0.14.ebuild
index 3ace9a1a08e5..f06f2a718c6c 100644
--- a/dev-haskell/language-javascript/language-javascript-0.6.0.14.ebuild
+++ b/dev-haskell/language-javascript/language-javascript-0.6.0.14.ebuild
@@ -27,7 +27,7 @@ RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?]
 DEPEND="${RDEPEND}
 	dev-haskell/alex
 	>=dev-haskell/cabal-1.9.2
-	dev-haskell/happy
+	>=dev-haskell/happy-1.19.12
 	test? ( dev-haskell/hspec
 		>=dev-haskell/quickcheck-2
 		>=dev-haskell/utf8-light-0.4 )
diff --git a/dev-haskell/opengl/Manifest b/dev-haskell/opengl/Manifest
index 9e7f035ee6b3..341321d4b012 100644
--- a/dev-haskell/opengl/Manifest
+++ b/dev-haskell/opengl/Manifest
@@ -1,4 +1,3 @@
-AUX opengl-2.2.1.1-ghc-7.4.patch 1209 BLAKE2B e8b6cd8d35cba6ff61fcddf1087a3993df0a81f9775d71552010efbc90b66bf80c294a2282c708ec711e8ee7dbbb3f1db6f38f00de01bfac5ad1cf30f43af1d7 SHA512 0e774a69cba5d99e6362ff2e36a94b212e96ea95de7817b3d6cf15e383d4de4e9cb9ab5c7fbd07e33951e4b6b1a67c7e6f0512c4cd41fe92ab722f1d76ea47e1
 AUX opengl-2.9.2.0-ghc-7.10.patch 538 BLAKE2B 1d532d8a36627c389a10d341c7f887d71c2f97b9e101caf40da87c2e1ee319c8bcd57b9d6c97e99583ca52d1a82a58a37af42316bc141b5fad1b1b4638f1528a SHA512 df64e2277c053b9404369ba6def4b474bb49302947405558b3a49ae054a5416a7f28c858e51e3457d2fd90e28af74aeb08424afe3a7389ef381ca4e3b321ee53
 DIST OpenGL-2.12.0.1.tar.gz 125419 BLAKE2B f6cb30335f783d9474d112159fef0d7af744c3bef54580485e1df77d58f625d4ba9a6c46120c1dc5d96fa98c89f34a6e63e91909f0f5dd1f7626460ad3f55612 SHA512 58c21efade5a8e10a78a61eaee35986e61581e3ef898f657e3f4c0479e0e35f60772bfa489bf49dfdbf3c395826df513f3f116278fb400d568babed1061e4765
 DIST OpenGL-2.9.2.0.tar.gz 122514 BLAKE2B f6d4e40b2b49dcbf542e7ec8e437d5b69834b593d0584ac512dffde97478b5e2f66d94c96129c910d428e1c7311319a0c751b48d52402fc90993407545bd124a SHA512 1abb31033fe57056a0a3d00308910033d25d800f3da9ee4ecfd43bf25d8a392d6344463f3173da432a35ab3bbe5b5964c2aa5b0de5252e4f274025fd8d0dd0e9
diff --git a/dev-haskell/opengl/files/opengl-2.2.1.1-ghc-7.4.patch b/dev-haskell/opengl/files/opengl-2.2.1.1-ghc-7.4.patch
deleted file mode 100644
index 772b17539523..000000000000
--- a/dev-haskell/opengl/files/opengl-2.2.1.1-ghc-7.4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Fix build failure against ghc-7.4
-
-[ 4 of 84] Compiling Graphics.Rendering.OpenGL.GL.GLboolean ( Graphics/Rendering/OpenGL/GL/GLboolean.hs, dist/build/Graphics/Rendering/OpenGL/GL/GLboolean.o )
-
-Graphics/Rendering/OpenGL/GL/GLboolean.hs:27:23:
-    Could not deduce (Eq a) arising from a use of `/='
-    from the context (Num a)
-      bound by the type signature for
-                 unmarshalGLboolean :: Num a => a -> Bool
-      at Graphics/Rendering/OpenGL/GL/GLboolean.hs:27:1-27
-    Possible fix:
-      add (Eq a) to the context of
-        the type signature for unmarshalGLboolean :: Num a => a -> Bool
-    In the expression: (/= 0)
-    In an equation for `unmarshalGLboolean':
-        unmarshalGLboolean = (/= 0)
-
-Reported-by: Christian Lask
-diff --git a/Graphics/Rendering/OpenGL/GL/GLboolean.hs b/Graphics/Rendering/OpenGL/GL/GLboolean.hs
-index cab7356..cc4faa8 100644
---- a/Graphics/Rendering/OpenGL/GL/GLboolean.hs
-+++ b/Graphics/Rendering/OpenGL/GL/GLboolean.hs
-@@ -23,5 +23,5 @@ marshalGLboolean :: Num a => Bool -> a
- marshalGLboolean False = 0
- marshalGLboolean True  = 1
- 
--unmarshalGLboolean :: Num a => a -> Bool
-+unmarshalGLboolean :: (Eq a, Num a) => a -> Bool
- unmarshalGLboolean = (/= 0)
diff --git a/dev-haskell/pango/Manifest b/dev-haskell/pango/Manifest
index f45e39e56f1f..3627d27bfb18 100644
--- a/dev-haskell/pango/Manifest
+++ b/dev-haskell/pango/Manifest
@@ -1,3 +1,4 @@
+AUX pango-0.13.6.1-cabal-1.24.patch 1461 BLAKE2B 22714a58c508541d814ac22af3f739e06b82c2707bee00d28fb0d970edaa71e04567d3762d4df264475aa7bc48ee6f129e91a0f8bf18e5ac70aaa8f810cd233d SHA512 8bac955e52d2f0c406955b5d33f04e1a49d51ccf309948e09d67bc42ad8238d02a1007eccf1280ddbb252d44fe10902498d0704baa9d0e9fcfb1f0b1e643a724
 DIST pango-0.12.5.3.tar.gz 60968 BLAKE2B 93abd241ed7809b3ece5862e667c80153169011a48bb901e7f14bab71da98fa62d564823bc3a30f3b9d6f3d5ead96d63b99abd34cd278fdf580413f97f7962b5 SHA512 bf93159f10519a0b5c313e0398f4fef703aa97eb4d0c998851be1cb1b7b69b2e28595dbfea2659de89cd2b0df64e1a945a90c22aee503eed2e85482bfa583d45
 DIST pango-0.13.1.1.tar.gz 61730 BLAKE2B 185e53cb9b5355a1eb4ffe39e56eb043ab2ce09bd902a7af85f4c8d5925f8640c5aa64f74fe3d630fa155745eed5eb73e409889bde953ed9ed850cfd4724e5ff SHA512 4dd021e03e18bea64b51ad1b4c5cae2cd214f0f26bd41deecf83626f25d70670e2472877e60ff49c30cd0f3e993d8cb4ba7adc3fee26454f8713e2a5bc7a9284
 DIST pango-0.13.3.1.tar.gz 52564 BLAKE2B 1c562635e9c0586363e5f3b234ae7303bf6f624a9e368afabdd3ee83477c9f4a831e072c336347af10c6b6442edac19714e4839b0f5b8a8d142b7309718e9e52 SHA512 7bcdd64abaf768bcbfc08f2fad93bc8ac142aa30b17ac0ee67ceec1429368f5a1c7cda6ed14d78278b69c948cdd4cd01630febfe41d9078c7f54d72c59d7b9b6
@@ -5,5 +6,5 @@ DIST pango-0.13.6.1.tar.gz 52637 BLAKE2B 1e7febf9c60271404e49b91f06ebfcea06657b7
 EBUILD pango-0.12.5.3.ebuild 912 BLAKE2B 74ce2de01b9f2f8f7407cfe065cb47676c26de2dc7691704edb57c642ab78b7a48a07bbbe9f4ce67a5e6609787df05fcfabc409bf4c8b04627e9f25bb91897bf SHA512 4c44da62f922b4352403dfe3063f64f560bfbf810a89ca51be342cde460eb561d014d5bbb1dc1be600ea3ec3f8e4e1185ee5303d872516a0a78b4556cb1bb77e
 EBUILD pango-0.13.1.1.ebuild 917 BLAKE2B c74d0e258633b46d5f4c470c94b5742d7749cf56d48c6d147aabece7a434894658b444d383da0ea9d99a66b956a3fc35615b99be4b30e1cc6f084de00002fe20 SHA512 7f7128f050e61d03155d7f1a1e22649c929ada7a478764029407f197c9e2e398caf3b9d0f5d3d2a94330be40fed4dca0f62c1f98ccc1a5cc6bc9e8be7906bfdb
 EBUILD pango-0.13.3.1.ebuild 884 BLAKE2B 968bd1fe4d530dc93549953aeda7713a47d2a511a68a5b5b353ba640d9d577666e9d5f2de6ec2dd9e62bfe2cd8dc139654d8d1679f6423cab8cdb9b35e661b1b SHA512 73b3a0cc0e0c0fd9a97a994ad13dab60363e4f7df76023e41880fb6cd3a805312f818b12d59c15dc94122ca4fa29b0fe8bf9e7a07e6367e740a62bd8b3e48852
-EBUILD pango-0.13.6.1.ebuild 984 BLAKE2B 0183e7dfcd2dc5c647c68f92c19f7537e9fa3715641ccb3f76f1daa232681ef034809fa2de2a697aa411b64192acd52d680e4276ce33404cb18733876c26cadf SHA512 30a98d348710c00a915d1b0d9959aba80d70302f99c30fcde8449598c593c887b29e566954e6f136d670a9fe4fe1c889a81de9901d1a2a374445af5d1f556e47
+EBUILD pango-0.13.6.1.ebuild 1031 BLAKE2B 0739eabc76bbd50e0b454647760af2c4458014e108360ccf564a1eae7515e15d502c680b4885dd0d5452bb2c0113808628f3444d9b27b27a0f4e266244b87d10 SHA512 d03aa26a750c0032bafa429b21f790d17c69626c82bb016baa47e4cfb12909ff95b375a785ca5795afdd92463fc830ff24faecc6ff1a1049c5fdd90d53577b89
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/pango/files/pango-0.13.6.1-cabal-1.24.patch b/dev-haskell/pango/files/pango-0.13.6.1-cabal-1.24.patch
new file mode 100644
index 000000000000..fbe18552e3e5
--- /dev/null
+++ b/dev-haskell/pango/files/pango-0.13.6.1-cabal-1.24.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/702986
+
+--- a/Setup.hs
++++ b/Setup.hs
+@@ -8,7 +8,7 @@ import Distribution.Simple ( defaultMainWithHooks, UserHooks(postConf),
+ import Gtk2HsSetup ( gtk2hsUserHooks, getPkgConfigPackages)
+ import Distribution.Simple.Setup ( ConfigFlags(configVerbosity), fromFlag)
+ import Distribution.Simple.LocalBuildInfo ( LocalBuildInfo(..) )
+-import Distribution.Simple.BuildPaths ( autogenPackageModulesDir )
++import Distribution.Simple.BuildPaths ( autogenModulesDir )
+ import Distribution.Text ( display )
+ import Distribution.Version ( Version(..) )
+ import Distribution.Verbosity
+@@ -49,7 +49,7 @@ writePangoVersionHeaderFile verbosity lbi (Version (major:minor:micro:_) []) = d
+     , "#define PANGO_VERSION_MICRO " ++ show micro
+     ]
+   where
+-    targetDir  = autogenPackageModulesDir lbi
++    targetDir  = autogenModulesDir lbi
+     targetFile = targetDir </> "hspangoversion.h"
+ 
+ writeVersionHeaderFile _ _ version =
+--- a/Setup.hs
++++ b/Setup.hs
+@@ -43,7 +43,7 @@ writePangoVersionHeaderFile verbosity lbi (versionNumbers -> (major:minor:micro:
+ writePangoVersionHeaderFile verbosity lbi (Version (major:minor:micro:_) []) = do
+ #endif
+   createDirectoryIfMissingVerbose verbosity True targetDir
+-  rewriteFileEx verbosity targetFile $ unlines
++  rewriteFile targetFile $ unlines
+     [ "#define PANGO_VERSION_MAJOR " ++ show major
+     , "#define PANGO_VERSION_MINOR " ++ show minor
+     , "#define PANGO_VERSION_MICRO " ++ show micro
diff --git a/dev-haskell/pango/pango-0.13.6.1.ebuild b/dev-haskell/pango/pango-0.13.6.1.ebuild
index 8f7055b24914..24af52382b9a 100644
--- a/dev-haskell/pango/pango-0.13.6.1.ebuild
+++ b/dev-haskell/pango/pango-0.13.6.1.ebuild
@@ -30,3 +30,5 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
 	virtual/pkgconfig
 "
+
+PATCHES=("${FILESDIR}"/${P}-cabal-1.24.patch)
diff --git a/dev-haskell/vector-algorithms/Manifest b/dev-haskell/vector-algorithms/Manifest
index efa1f0216c3d..cc6805393797 100644
--- a/dev-haskell/vector-algorithms/Manifest
+++ b/dev-haskell/vector-algorithms/Manifest
@@ -1,4 +1,3 @@
-AUX vector-algorithms-0.5.4.1-ghc-7.4.patch 572 BLAKE2B a15668a5a6d0bc85e2a9b864cd81cc3b55949f9eb949001fc7fa92a9d724f900847febe95e42056d16778a9c6186024b713a0c0faceaac1d99a44a3cc97ffa7b SHA512 51b42eadba9515a9e0bfae85b1b24c0567f54a8d526380e30566abc50ebc0d8063cdf23321986524abf7a3f72a874582848ffe69d80a15eade6d60045612481f
 AUX vector-algorithms-0.7.0.1-ghc-8.0.2_rc1.patch 2344 BLAKE2B 8902fb6e1946589e79577408d6a4c34b7512f3dea6bad7ab73a95498ca41e758d8115d7c005ad83ef14a845df792009bb9190f8b584086c9dc63898f481a5940 SHA512 f92d82039f56c9ae5cba5c93e0df041877dba1a3f5be7a8be1efd9f5a652ff2c1a06c7091faab76247876b9018614688d404aa6542b59ccedc3b199bad3dcf2c
 DIST vector-algorithms-0.6.0.4.tar.gz 20455 BLAKE2B 0d0c4ef7ed8996d1ebe65971a451d4cb49118faedbf9cb4a987afb281adf563808778a689df608d2fb3c8fe9398af995d1c5e31cc89fd4f2075c2ebdd7ca4277 SHA512 5e99a77771831f0b9a4485f48aa7be5f5928e811512f0a68e18fa65ecace185dfea74ec09037b05d56e1a9208d2cdbcfed94ce2678d504f6d12267496a3616bf
 DIST vector-algorithms-0.7.0.1.tar.gz 25435 BLAKE2B f9cb3bf592316c92bff4313d264370cc35d62c64e7dec6f14ee9954c0fc12f573e799172793501e1b4f9c556fa1ea8e3db1ac3381ff71bb143e33520c69c18b8 SHA512 1ea718eeb062defee830fa7dba323981678691c5d320b8929dcd695af17f82d65007cfd35103310026dab51cf10462dbead09082fc0ba5ddd0c2e18e305c4c6a
diff --git a/dev-haskell/vector-algorithms/files/vector-algorithms-0.5.4.1-ghc-7.4.patch b/dev-haskell/vector-algorithms/files/vector-algorithms-0.5.4.1-ghc-7.4.patch
deleted file mode 100644
index edabcf2e8b54..000000000000
--- a/dev-haskell/vector-algorithms/files/vector-algorithms-0.5.4.1-ghc-7.4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- vector-algorithms-0.5.4.1-orig/vector-algorithms.cabal	2012-08-16 06:39:54.000000000 +1000
-+++ vector-algorithms-0.5.4.1/vector-algorithms.cabal	2012-08-17 17:05:37.875993915 +1000
-@@ -52,9 +52,15 @@
-         FlexibleContexts,
-         CPP
- 
--    GHC-Options:
--        -Odph
--        -funbox-strict-fields
-+    if impl(ghc >= 7.4.0)
-+        GHC-Options:
-+            -Odph
-+            -funbox-strict-fields
-+            -fsimpl-tick-factor=153
-+    else
-+        GHC-Options:
-+           -Odph
-+           -funbox-strict-fields
- 
-     Include-Dirs:
-         include