gentoo resync : 25.08.2020

3 files changed, 38 insertions, 4 deletions

diff --git a/dev-haskell/hsql/Manifest b/dev-haskell/hsql/Manifest
index 044fbdbf31da..fc2fe618bab3 100644
--- a/dev-haskell/hsql/Manifest
+++ b/dev-haskell/hsql/Manifest
@@ -1,3 +1,4 @@
+AUX hsql-1.8.2-ghc84.patch 886 BLAKE2B 67507e8fe5e335238df8139d6dfe20acfcd2e895a27c3f574c9b706e898509839022d4858e4fd4e977363d6b38741aeda8441038da59c34424814985a947c55d SHA512 63caa5dbfd6c0333c04cc83658b44df4847015a3002d700ac45e883c4e4986fc8dc4e633ec761eb9d725d9accfc78eacb570336ade7d9d183f8ad50349d39dd9
 DIST hsql-1.8.2.tar.gz 10568 BLAKE2B 9890847e6ec5c78feb414e247098a108bf0d6135f8795e9efeb4934fb1b5ad76ab3fb8e78f14016007932b2c51bdda635551078c391db5ccb758b1ddd25632b1 SHA512 f4a002573bead2de330d526ab4158517e66f92f4d6a87a517dd2e7949abb7566c318d96e4072535b157f3d40a5714702f4127ea106ab976bf5f0ec302e50c6f6
-EBUILD hsql-1.8.2-r1.ebuild 820 BLAKE2B 8ffe5e1f9299746f329b8d65a9f62d880c560e738d59ea705740b66e7c60d683546c948237b65f8c940ea9a5a6c569577fb8c8a0b0765aa4aa405916e6214366 SHA512 3c96250f406dfa449ab2c3fac470d303c6efb797510f7acfa51e9821950805c13240e13c85c6b85bc46a89522e56b648303ce6703a96e6cbb039322d390cfbab
+EBUILD hsql-1.8.2-r1.ebuild 855 BLAKE2B a298ae922ae074c170047ac01e384d37221dcb8e7ab1b36233c5fd21f31d7675bc1b7c5cd9977a00973f199d2f4fe44a9fcd90d68783028073fd1be3344686ba SHA512 a16444bae69d827c8d3477e82ff945aae91556e7cf921b60f5f7a3f345a98fd662e466d27a17b1625743aa624481f1ed0ac5ea72e73e4f1a3f3373a18b0f3346
 MISC metadata.xml 339 BLAKE2B 0f227505e5d36cc98afc1d9e770c9cfde26195ff4e32321fcf2996774df9319777f216a4c363c673fa1698c7bae4e312b6f7df1674b7895ef9f3a36b2cc2fe6d SHA512 9eed48b011c1e92d73780819bc36bd99a57369569dc4923c6f6fdf49095ddf0fdf170a15cdb610cc0ec2bc72464ab16fd543d94565dab1c7bc4ff713ba0e4b18
diff --git a/dev-haskell/hsql/files/hsql-1.8.2-ghc84.patch b/dev-haskell/hsql/files/hsql-1.8.2-ghc84.patch
new file mode 100644
index 000000000000..8f90d43393e2
--- /dev/null
+++ b/dev-haskell/hsql/files/hsql-1.8.2-ghc84.patch
@@ -0,0 +1,29 @@
+--- a/DB/HSQL/Core.hs
++++ b/DB/HSQL/Core.hs
+@@ -7,3 +7,3 @@ import Control.Exception(Exception,throw,catch,handle)
+ import Control.Concurrent.MVar(MVar,withMVar,modifyMVar_)
+-import Data.Dynamic(cast)
++import Data.Typeable(cast)
+ 
+--- a/DB/HSQL/Error.hs
++++ b/DB/HSQL/Error.hs
+@@ -7,3 +7,3 @@ module DB.HSQL.Error(SqlError(..)) where
+ import Control.Exception(Exception(..),SomeException(..))
+-import Data.Dynamic(Typeable,TyCon,mkTyCon3,cast)
++import Data.Typeable(Typeable, cast)
+ import DB.HSQL.Type(SqlType)
+@@ -32,14 +32,3 @@ data SqlError
+     | SqlClosedHandle -- ^ referenced handle is already closed
+-#ifdef __GLASGOW_HASKELL__
+    deriving (Eq,Ord,Typeable)
+-#else
+-   deriving (Eq,Ord)
+-
+-instance Typeable SqlError where
+-	typeOf _ = mkAppTy sqlErrorTc []
+-#endif
+-
+--- | The `TyCon' of `SqlError'.
+-sqlErrorTc :: TyCon
+-sqlErrorTc = mkTyCon3 "DB.HSQL" "Error" "SqlError"
+ 
diff --git a/dev-haskell/hsql/hsql-1.8.2-r1.ebuild b/dev-haskell/hsql/hsql-1.8.2-r1.ebuild
index dda2ba44b7d0..53a5a9d3ae0b 100644
--- a/dev-haskell/hsql/hsql-1.8.2-r1.ebuild
+++ b/dev-haskell/hsql/hsql-1.8.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 # ebuild generated by hackport 0.4.6.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/old-time:=[profile?]
@@ -24,8 +24,12 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.10
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-ghc84.patch
+)
+
 pkg_postinst() {
-	ghc-package_pkg_postinst
+	haskell-cabal_pkg_postinst
 
 	elog "You will probably want to emerge one or more HSQL backend."
 	elog "These backends are available:"