From c8f83ad526fb6b554daf375e0ad65eb2d56e669b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 31 Aug 2022 04:49:49 +0100 Subject: gentoo auto-resync : 31:08:2022 - 04:49:49 --- dev-lang/Manifest.gz | Bin 19197 -> 19196 bytes dev-lang/ghc/Manifest | 3 --- dev-lang/ghc/files/ghc-8.10.3-C99-typo-ac270.patch | 12 ----------- dev-lang/ghc/files/ghc-9.0.2-modorigin.patch | 24 --------------------- .../ghc/files/ghc-9.0.2-verbose-modunusable.patch | 12 ----------- 5 files changed, 51 deletions(-) delete mode 100644 dev-lang/ghc/files/ghc-8.10.3-C99-typo-ac270.patch delete mode 100644 dev-lang/ghc/files/ghc-9.0.2-modorigin.patch delete mode 100644 dev-lang/ghc/files/ghc-9.0.2-verbose-modunusable.patch (limited to 'dev-lang') diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz index 1aa5809a6ad5..3022204c9546 100644 Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest index 40df033a5a97..249c29f51ca1 100644 --- a/dev-lang/ghc/Manifest +++ b/dev-lang/ghc/Manifest @@ -1,7 +1,6 @@ AUX ghc-7.0.4-CHOST-prefix.patch 276 BLAKE2B 77c706d291928a229edad6bcde37786b2c11cf52f42b22f44d3bbb7cfe12f83b8725cae020f95994e0f12022989b125d1f1e6f43ad0cc6698452264b8634651c SHA512 9d5d30b95c0467bb77f320c82458be5eaace5bbd77684725b9f3fd70d9640accdd771e36aa957c66f9bfb01e45088d32a5f811444b472058574ccbf89e10efbb AUX ghc-7.8.3-prim-lm.patch 444 BLAKE2B a930bb9657441a48941debf79711e06223c5680df0f60d7d972e0150950109bf8f8a99c35c7dbcda21172dddcb15d8a379085813e44647583e3888f27f597568 SHA512 6979e002589a54c870c70eee8357dad4feb55b4e5102350cc09a466145677dacaa1bab5ebe4818cf0d3cd8ab50ee0ec2ab642ab0fb3fd34f4a266e5e90f9f389 AUX ghc-8.10.1-allow-cross-bootstrap.patch 541 BLAKE2B b77b3c9ebb7a33af6f82ec1b9927664e9bfce04450560a8e436ffa87feca50d606824192b7333e3b98d5552622592b6d39d0b184037ce646d6f7ebd205deb348 SHA512 d87a99ac96846e161d8c939079f8314d380be8e1dc62f956e3afcce1339a76447a14002b30bac1c86c807fd8eba23a0648912a3d074248f3513f9aadacd27489 -AUX ghc-8.10.3-C99-typo-ac270.patch 348 BLAKE2B 8d23baffa0ae781db4610ee78fea812ebc25450c94e942d8008c591cca78c6072c24b042e7a9dab08ae5213ed4ba931ff932ad4685fc029fc004039494a70c7f SHA512 9e224c6863b5f0f0deb032d4554dd41f2396a8cbc373b860294ba76feaf1abe7594711ac02e9a06356c024df8d6fc6a7a064ca428eaa1e4e6209b3a29d4317fb AUX ghc-8.10.5-modorigin-verbose-conflict.patch 956 BLAKE2B 8ce1e156c92d0d931930a4ad366f62be184be46beb1f25b92ad97be03d47c9702313be758c33a17c40002816a26e70f4017e4e02325f1513864086e50ac6136b SHA512 27f884e8b4e6250cbd2620a190531ae72693518da8cb56e736fe58bc436fca67ba9eb8d3fa89fcd0234858a8533ca3e15d5b0c20ed1953fba56736000fc8a732 AUX ghc-8.2.1-darwin.patch 910 BLAKE2B 2f1a44dd7ead59301b5dd59c8cab932710655416640f2c8d5273cf07da4a45bf702d840768e2d32822e89f1b07cc9ed3a6110e1847e11468fca5c515e9e26f70 SHA512 0177fda8717d9158a99d96853feb1bf40ff13df8f5c5669c7c48f33accf69d6ddb05876776cda66705e85ee56c5ecff8f81722d8e748b6c2ed6b9bf611e42a2c AUX ghc-8.2.1_rc1-hp2ps-cross.patch 3865 BLAKE2B d68b1e15c091047d086be780dc0bb5ce2a1b713244ee240ae045052ccac947baf6a5bdea8cad50d0fac2984700069af7dcd320b96ca09af8c7b81021329da41c SHA512 d2ed48701216f5c03567e61c207e32d6218009380941275c690edd8eb0197728e7e3c0edb00d512792dc2041a958de82ceef393e96d3324b690157162e28d29a @@ -12,8 +11,6 @@ AUX ghc-9.0.2-darwin.patch 916 BLAKE2B ece65347ee4d40ce729642766273792c5f619c5f2 AUX ghc-9.0.2-disable-unboxed-arrays.patch 1298 BLAKE2B d3d8cf5b8f7f012cb93f6481822348c68e7ff79896664f51de5e4b248f8de68ea04144791bf8959b83ea265f384c055100fc27caf0da17f9a5a173c333928c4b SHA512 cc979c2fdb877716dee3fb75d9ee0734737f2f9a5611a0a1d20e2d603b48ebeaa339d09a130a79fce45eebe659a3741cf862b17eafecf814f408399139250806 AUX ghc-9.0.2-fix-tests-python310.patch 1116 BLAKE2B fc7a7390cbbc737c66ea8401c9211318d078499bfd103f07ec2df0db9824041dfee279e364601a21d4d37a694a9442f3570c0333b2baab6173d6daa366c931da SHA512 0620ebffc49a06a65bd45bf324de4674b98e874291e6bebae1a95d585bbdf38cc201a734f7f20133880b46e9abf0839b59278688b00c892b94091d1c0257352b AUX ghc-9.0.2-modorigin-semigroup.patch 1210 BLAKE2B e29917dd740bded98257366ca37d3ac8fdc8ffd0e988e6286b8cf21fb9f0232ce1584a1a22665f4afad36e5585c29091040cac16b1204022f5a5f3328420c4ff SHA512 dc54fb02dfed55f5a9309c61ec23859ad4f80fd271fe0ccb41b786fc7d44bc0d9722069e2f56731c6af5ad1703c5081ba9e4b4e683911af4ad9b498f53b67a5e -AUX ghc-9.0.2-modorigin.patch 1169 BLAKE2B 33a02689b5404bf28cd2a04dc601412db54ae1bb64611c3d7831a8478aadf38848f76042206b441983f07d505ad81fc3593625ee91c96e9bdacfb1621c4408a6 SHA512 f319ce4e4af1bdacefc0cc34e508bc9cb37307e5dd4e3b573af8c40232ec5669e094e9231b8fe9a6d21a2bce32fda2e443953ac5f14a7104232c03231cd337df -AUX ghc-9.0.2-verbose-modunusable.patch 572 BLAKE2B 425b5cea58690a8856ee8f7054263dc65c40badedc88c819e7de0b466cac4e87246e03555b39823e5886a5ca28ac26f64d56cec1bf0b0654294ff61c9679bb2d SHA512 b84e459b12815d7fd42b87ecca95514e0f2f8132c53299f6e289efc4c47d618e49f19795249e1a9a328baa270a92b018184e6e9eb05062c01355ce06fd76b9e9 AUX ghc-bash-completion 6496 BLAKE2B dc94a1979e886026a2fbe04bf7b45718ffa3e025a0e8945262e21a1243bfce6517fa1794f2ba6cd54cc853e93ad5d80472b9019b95762f10b5be83634a479955 SHA512 ede79ccf23555f60f48297d29bd98e3ccfd67d2cf27462153e00beb930398cb497e34ba8316e91df44c577ed11fdbe5606f7c6a2777e35d5e783590e49ccfeb5 DIST ghc-8.10.6-src.tar.xz 19932832 BLAKE2B f5d0c43aa5df87648e32beeb5ed6866b231cbce4f344fb03110db826b36bbac435f5e89d9ffeef3f87c15e830fdee6b95150b7bdcd06906575bfcd9c83797dff SHA512 6314eb9744d47d803b30b621bd12bf6179dad5cc578ec267b3a65b89e9c9b431bdb4913936f040c7ca4fcc71a676a43e78b5f6173d123a844e7f29004405b8b6 DIST ghc-8.10.6-testsuite.tar.xz 2265044 BLAKE2B 72a1e955acecc92a720ee2747d96cacf56f2968c9deabb254c882a969c154baa0fdb639a857844ec91a4e47ee553dd13b58c3b790202e7e73500095c1ec85ee9 SHA512 f74d743bd8f889c2941be8fd5348e92abcaf75bce48140f7f9cc0c6ce33ba24a8479bef48631ffe2a10397c0ecf166b3bddb6ca8ee905859c029175de5d43f2a diff --git a/dev-lang/ghc/files/ghc-8.10.3-C99-typo-ac270.patch b/dev-lang/ghc/files/ghc-8.10.3-C99-typo-ac270.patch deleted file mode 100644 index 762622a07e00..000000000000 --- a/dev-lang/ghc/files/ghc-8.10.3-C99-typo-ac270.patch +++ /dev/null @@ -1,12 +0,0 @@ -autoconf-2.70 does not allow macros with underscores. ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -673,7 +673,7 @@ AC_DEFUN([FP_SET_CFLAGS_C99], - CPPFLAGS="$$3" - unset ac_cv_prog_cc_c99 - dnl perform detection -- _AC_PROG_CC_C99 -+ AC_PROG_CC_C99 - fp_cc_c99="$ac_cv_prog_cc_c99" - case "x$ac_cv_prog_cc_c99" in - x) ;; # noop diff --git a/dev-lang/ghc/files/ghc-9.0.2-modorigin.patch b/dev-lang/ghc/files/ghc-9.0.2-modorigin.patch deleted file mode 100644 index 3c7053778e98..000000000000 --- a/dev-lang/ghc/files/ghc-9.0.2-modorigin.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/compiler/GHC/Unit/State.hs b/compiler/GHC/Unit/State.hs -index cefa5e5058bf68e68aaafadad0c7874189bf8225..92b38443c8378eb69db19a40d23abca47d6acee8 100644 ---- a/compiler/GHC/Unit/State.hs -+++ b/compiler/GHC/Unit/State.hs -@@ -224,14 +224,16 @@ fromFlag :: ModuleOrigin - fromFlag = ModOrigin Nothing [] [] True - - instance Semigroup ModuleOrigin where -- ModOrigin e res rhs f <> ModOrigin e' res' rhs' f' = -+ x@(ModOrigin e res rhs f) <> y@(ModOrigin e' res' rhs' f') = - ModOrigin (g e e') (res ++ res') (rhs ++ rhs') (f || f') - where g (Just b) (Just b') - | b == b' = Just b -- | otherwise = panic "ModOrigin: package both exposed/hidden" -+ | otherwise = pprPanic "ModOrigin: package both exposed/hidden" $ -+ text "x: " <> ppr x $$ text "y: " <> ppr y - g Nothing x = x - g x Nothing = x -- _x <> _y = panic "ModOrigin: hidden module redefined" -+ x <> y = pprPanic "ModOrigin: hidden module redefined" $ -+ text "x: " <> ppr x $$ text "y: " <> ppr y - - instance Monoid ModuleOrigin where - mempty = ModOrigin Nothing [] [] False diff --git a/dev-lang/ghc/files/ghc-9.0.2-verbose-modunusable.patch b/dev-lang/ghc/files/ghc-9.0.2-verbose-modunusable.patch deleted file mode 100644 index 13d12efdc0ec..000000000000 --- a/dev-lang/ghc/files/ghc-9.0.2-verbose-modunusable.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN ghc-9.0.2/compiler/GHC/Unit/State.hs ghc-9.0.2-r1/compiler/GHC/Unit/State.hs ---- ghc-9.0.2/compiler/GHC/Unit/State.hs 2021-10-19 05:20:00.000000000 -0600 -+++ ghc-9.0.2-r1/compiler/GHC/Unit/State.hs 2022-02-17 01:04:05.117930250 -0700 -@@ -194,7 +194,7 @@ - - instance Outputable ModuleOrigin where - ppr ModHidden = text "hidden module" -- ppr (ModUnusable _) = text "unusable module" -+ ppr (ModUnusable reason) = text "unusable module" $$ ppr reason - ppr (ModOrigin e res rhs f) = sep (punctuate comma ( - (case e of - Nothing -> [] -- cgit v1.2.3