From 3a2444aaf0bafd5c58c0dc8dda102352f20c76d8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 29 Sep 2022 15:22:55 +0100 Subject: gentoo auto-resync : 29:09:2022 - 15:22:54 --- dev-haskell/mustache/Manifest | 6 --- .../mustache-2.3.2-disable-langspec-tests.patch | 17 --------- .../files/mustache-2.4.0-ghc-8_10-fix.patch | 30 --------------- ...tache-2.4.0-unordered-containers-2_17-fix.patch | 32 ---------------- dev-haskell/mustache/metadata.xml | 16 -------- dev-haskell/mustache/mustache-2.4.0.ebuild | 43 ---------------------- 6 files changed, 144 deletions(-) delete mode 100644 dev-haskell/mustache/Manifest delete mode 100644 dev-haskell/mustache/files/mustache-2.3.2-disable-langspec-tests.patch delete mode 100644 dev-haskell/mustache/files/mustache-2.4.0-ghc-8_10-fix.patch delete mode 100644 dev-haskell/mustache/files/mustache-2.4.0-unordered-containers-2_17-fix.patch delete mode 100644 dev-haskell/mustache/metadata.xml delete mode 100644 dev-haskell/mustache/mustache-2.4.0.ebuild (limited to 'dev-haskell/mustache') diff --git a/dev-haskell/mustache/Manifest b/dev-haskell/mustache/Manifest deleted file mode 100644 index cdcf67559456..000000000000 --- a/dev-haskell/mustache/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX mustache-2.3.2-disable-langspec-tests.patch 568 BLAKE2B 6a104033711861c42d2131590205192fe11d46378615af1c9ef557ff564440471cf1b53df049b83a830dab509fde905725b736c916e830134508486b352ce724 SHA512 cb0f86de792fb6e4ad0284327999328c0d5bc0bd4ad4370fea4a5a225ca71e69557e61615e5980ad7799dffc082c7431c29cb25c01947475e2fce9d0717f2688 -AUX mustache-2.4.0-ghc-8_10-fix.patch 1174 BLAKE2B cedd8b3c476fb10a11d687ae5d8ad24abe51485ded157007b170a6347bb61e23e5be5003541e2addbe82db3a63b3a25c115327c3daf228faf9bc250db57ad9a2 SHA512 fc337825a61aed1e0a862e35b44441b7e99f8cd1e480558c351514c4fa9f825acceb551f1a8d4def5ab6c950b42b315cbaf0f12e19a17f0a63c28831652516a6 -AUX mustache-2.4.0-unordered-containers-2_17-fix.patch 1161 BLAKE2B 6063bf8a1e099c2dc89560654a2ba23824379e1e9e41f182ef78578d991fae62b00def3717d3ef0979ae2bde2a3b04f6b153933c7fabe308c4869e3087178f23 SHA512 5a7356c98eb1af4d478ec645b7be9bae5f10416b828785ad6fb0167c243b95bf8e147c3737fffa534c2867322062927a59e3f038570ff6e5161dcd9b610a6478 -DIST mustache-2.4.0.tar.gz 20434 BLAKE2B d38261bd5ca0e3336c7bfd32db957f1c50d6146a306ff5983b7b576d820d8626e60c5197181cdf14907cd10c8719d970f68cdfcbd21e39815d03945863af086d SHA512 897cd682648a363a4fe4225a65f782f743fb9631dc9e58d99eb443931989975b42bee0815037ee839fc70e1a40887e5417a05b105e4ca79565e2bd52b5fcd385 -EBUILD mustache-2.4.0.ebuild 1127 BLAKE2B bd14bae60ee43532fd4362c2a2ce21b913c5b24b9c63a02d7f1b4aacfb577238b60d2a39bc07c8db0a626cc9a50f78cbd3dd2cb7072372d224319ec9eed976f0 SHA512 a0fdcc5e43dd7a309e53562005f1279f71b14bd1caa83758e6922dd0a02bc3b3b27184d006ebbd531868c4e1c2b621a3c40aacfec7d83fe2c8f159bc41fe3152 -MISC metadata.xml 577 BLAKE2B f746deebec79f73042cbaddc5cc8461ab59ba6b903e21b533181df1f6d12a3775fcdf6261f04ce894fb8aed78284e475011b3f7de94f1faff6f5a93be8f0b795 SHA512 76e51dccf22dd2c5d134f0c6d263f27be973ebed6506b18513ca4dfcc525be78ed1451fc2fe02995a743e3af5a16f245fe25953d219338894db87ab49280472d diff --git a/dev-haskell/mustache/files/mustache-2.3.2-disable-langspec-tests.patch b/dev-haskell/mustache/files/mustache-2.3.2-disable-langspec-tests.patch deleted file mode 100644 index 3c2521e7014a..000000000000 --- a/dev-haskell/mustache/files/mustache-2.3.2-disable-langspec-tests.patch +++ /dev/null @@ -1,17 +0,0 @@ -From: hololeap -Signed-off-by: hololeap - -The `language-specifications` test suite tries to make connections to the -internet. It needs to be disabled. - -diff -urN mustache-2.3.2/mustache.cabal mustache-2.3.2-r1/mustache.cabal ---- mustache-2.3.2/mustache.cabal 2022-01-20 13:27:20.348803958 -0700 -+++ mustache-2.3.2-r1/mustache.cabal 2022-01-20 13:28:25.348803990 -0700 -@@ -118,6 +118,7 @@ - , yaml - , zlib - default-language: Haskell2010 -+ buildable: False - - test-suite unit-tests - type: exitcode-stdio-1.0 diff --git a/dev-haskell/mustache/files/mustache-2.4.0-ghc-8_10-fix.patch b/dev-haskell/mustache/files/mustache-2.4.0-ghc-8_10-fix.patch deleted file mode 100644 index 295fcdd876f9..000000000000 --- a/dev-haskell/mustache/files/mustache-2.4.0-ghc-8_10-fix.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: hololeap -Signed-off-by: hololeap - -Fixes a weird bug observed in a sandbox with ghc-8.10.6. This may not be -necessary on other systems. - -diff -urN mustache-2.4.0/src/Text/Mustache/Parser.hs mustache-2.4.0-r1/src/Text/Mustache/Parser.hs ---- mustache-2.4.0/src/Text/Mustache/Parser.hs 2021-11-23 07:31:36.000000000 -0700 -+++ mustache-2.4.0-r1/src/Text/Mustache/Parser.hs 2022-02-22 18:30:48.436611631 -0700 -@@ -37,9 +37,10 @@ - - import Control.Monad - import Data.Char (isAlphaNum, isSpace) -+import Data.Functor.Identity - import Data.List (nub) - import Data.Monoid ((<>)) --import Data.Text as T (Text, null, pack) -+import Data.Text as T (Text, null, pack, uncons) - import Prelude as Prel - import Text.Mustache.Types - import Text.Parsec as P hiding (endOfLine, parse) -@@ -66,6 +67,8 @@ - | Tag (Node Text) - | HandledTag - -+instance {-# OVERLAPPING #-} Stream Text Identity Char where -+ uncons = return . T.uncons - - -- | @#@ - sectionBegin :: Char diff --git a/dev-haskell/mustache/files/mustache-2.4.0-unordered-containers-2_17-fix.patch b/dev-haskell/mustache/files/mustache-2.4.0-unordered-containers-2_17-fix.patch deleted file mode 100644 index 084e03ea06fd..000000000000 --- a/dev-haskell/mustache/files/mustache-2.4.0-unordered-containers-2_17-fix.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 19b97b58b35ee746fdae1fc34ba97d7967175a62 Mon Sep 17 00:00:00 2001 -From: sternenseemann -Date: Tue, 15 Mar 2022 12:09:27 +0100 -Subject: [PATCH] Support unordered-containers >= 0.2.17.0 -Bug: https://github.com/JustusAdam/mustache/pull/59 - -We just need to make the orphan HashMap instance conditional on the -unordered-containers version. ---- - src/Text/Mustache/Internal/Types.hs | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/Text/Mustache/Internal/Types.hs b/src/Text/Mustache/Internal/Types.hs -index 74f6665..d499ba3 100644 ---- a/src/Text/Mustache/Internal/Types.hs -+++ b/src/Text/Mustache/Internal/Types.hs -@@ -394,12 +394,15 @@ deriveLift ''DataIdentifier - deriveLift ''Node - deriveLift ''Template - -+-- Data.HashMap 0.2.17.0 introduces its own Lift instance -+#if !MIN_VERSION_unordered_containers(0,2,17) - instance Lift TemplateCache where - #if MIN_VERSION_template_haskell(2,16,0) - liftTyped m = [|| HM.fromList $$(liftTyped $ HM.toList m) ||] - #else - lift m = [| HM.fromList $(lift $ HM.toList m) |] - #endif -+#endif - - --Data.Text 1.2.4.0 introduces its own Lift Text instance - #if !MIN_VERSION_text(1,2,4) diff --git a/dev-haskell/mustache/metadata.xml b/dev-haskell/mustache/metadata.xml deleted file mode 100644 index 328b0ce87aef..000000000000 --- a/dev-haskell/mustache/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - haskell@gentoo.org - Gentoo Haskell - - - Allows parsing and rendering template files with mustache markup. See the - mustache <http://mustache.github.io/mustache.5.html language reference>. - - Implements the mustache spec version 1.1.3. - - /Note/: Versions including and beyond 0.4 are compatible with ghc 7.8 again. - - diff --git a/dev-haskell/mustache/mustache-2.4.0.ebuild b/dev-haskell/mustache/mustache-2.4.0.ebuild deleted file mode 100644 index dc5e45cc2bde..000000000000 --- a/dev-haskell/mustache/mustache-2.4.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# ebuild generated by hackport 0.7.1.1.9999 - -CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" -inherit haskell-cabal - -DESCRIPTION="A mustache template parser library" -HOMEPAGE="https://github.com/JustusAdam/mustache" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" - -PATCHES=( - "${FILESDIR}/${PN}-2.3.2-disable-langspec-tests.patch" - "${FILESDIR}/${PN}-2.4.0-ghc-8_10-fix.patch" - "${FILESDIR}/${PN}-2.4.0-unordered-containers-2_17-fix.patch" -) - -RDEPEND="dev-haskell/aeson:=[profile?] - dev-haskell/cmdargs:=[profile?] - dev-haskell/scientific:=[profile?] - dev-haskell/th-lift:=[profile?] - dev-haskell/unordered-containers:=[profile?] - dev-haskell/vector:=[profile?] - dev-haskell/yaml:=[profile?] - >=dev-lang/ghc-8.4.3:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-2.2.0.1 - test? ( dev-haskell/base-unicode-symbols - dev-haskell/hspec - dev-haskell/lens - dev-haskell/tar - dev-haskell/temporary - dev-haskell/wreq - dev-haskell/zlib ) -" -- cgit v1.2.3