gentoo resync : 15.01.2020

3 files changed, 37 insertions, 1 deletions

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)