gentoo resync : 16.09.2020

3 files changed, 0 insertions, 217 deletions

diff --git a/dev-haskell/esqueleto/Manifest b/dev-haskell/esqueleto/Manifest
index d4083c429157..0f0a866d99b7 100644
--- a/dev-haskell/esqueleto/Manifest
+++ b/dev-haskell/esqueleto/Manifest
@@ -1,6 +1,3 @@
-AUX esqueleto-2.4.3-persistent-2.5.patch 6114 BLAKE2B 594cb0dfd2f6e6fb5ac28df75a1e6451bee2483036f5e465fbcb6bcbc98a10214fa7ec534558022b60096b849e68440060f8c1b4f95c235691a4b32b4d2e05d7 SHA512 a229ebc9e9f513102324e78641a4eb4e86d9fa87764f2f88fdf8512d96c6eb223ad870d20dcd0c7805d3a695cebb7e03bb3912421fa25cd7647d804b21320b65
-DIST esqueleto-2.4.3.tar.gz 39664 BLAKE2B 03f56caca53815bf751503eaba55d0c6c225d9bcd2751371aeadaa1244c90649babf7cc2f05f8dcc2206fc5a7e235de14c11cde3f246c1fb78967defe566cc88 SHA512 50ad774bbd83c587775887320e24b329b575c9b3dad5aed920d83da7b8e5fa259624c38a40c457a3c12258e2b34cce39042c1b33002a06dcd3020bf370a06cbb
 DIST esqueleto-3.3.3.2.tar.gz 88010 BLAKE2B 18ffba5a512f92bac2c98a6ce730bd5004d5ff4c97e1d777a16e9d2601508d93878a7a3e13ebed79c55c46aae5516d3caf82f1579fd0ffbc60c670413125c702 SHA512 96496f60affcbaa4051b75671bb8b8f54f8c42b350d88bc4d81a687f05d2516bf0e2aceb7540a477d8dd995cb431e575e184d741e06e3bc12f1f4794a40a001f
-EBUILD esqueleto-2.4.3-r1.ebuild 1372 BLAKE2B 3d042c033ea9a939f27d1e72e39dbcd45546b699a2c2555fe53e7e41e0ac4adef9e796b5fb4a3ee7fbf9f0fc4b02f38ad4cfdcaeb26fc8696a4e8b47961b8863 SHA512 69cf8a6a1bb11697a21288316ef6424075efc3e75fb22eb4d39dad4d31598f90d938cf42eee9d10c16b6b67628c5bc137f7519dbd93ac568b2206bcb34c957f7
 EBUILD esqueleto-3.3.3.2.ebuild 1682 BLAKE2B 9d1336d56f81ce3cb47bda2e7e31fa5d18f67fa345592aceea36b151bf618aab97d6e621724fd736bcfef038b628ed893356167156ec9fb3c59e8d695775007d SHA512 9aeeb0420f4a7022ae125238c3c1f97fc3a2ca5d84d12664f14c412491beb7d13ef1c3d26c40015274dabe42fb0485bbb5675060702b18003a141cb2ca4a139c
 MISC metadata.xml 2043 BLAKE2B 7b418084368f204d12010f088f55544feed211ed193787a9698a45c891f5c5c579a9e9b583cc606401ff43975755fbe73725588ebcf27e8dcfd77b3344534596 SHA512 162af6c274fb74b5df2c040c8dc8de89ab08bf5839f6c80b099a7c906e4168c92a1c49a09ecae0dda69e45239002625abdf70fa323ab1258d55c314931875599
diff --git a/dev-haskell/esqueleto/esqueleto-2.4.3-r1.ebuild b/dev-haskell/esqueleto/esqueleto-2.4.3-r1.ebuild
deleted file mode 100644
index 7fc3760619cc..000000000000
--- a/dev-haskell/esqueleto/esqueleto-2.4.3-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: -mysql,-postgresql
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type-safe EDSL for SQL queries on persistent backends"
-HOMEPAGE="https://github.com/prowdsponsor/esqueleto"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-html:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?]
-	dev-haskell/monad-logger:=[profile?]
-	>=dev-haskell/persistent-2.1.1.7:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	>=dev-haskell/tagged-0.2:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.8
-		dev-haskell/hunit
-		dev-haskell/monad-control
-		>=dev-haskell/monad-logger-0.3
-		>=dev-haskell/persistent-sqlite-2.1
-		>=dev-haskell/persistent-template-2.1
-		dev-haskell/quickcheck )
-"
-
-PATCHES=("${FILESDIR}"/${P}-persistent-2.5.patch)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-mysql \
-		--flag=-postgresql
-}
diff --git a/dev-haskell/esqueleto/files/esqueleto-2.4.3-persistent-2.5.patch b/dev-haskell/esqueleto/files/esqueleto-2.4.3-persistent-2.5.patch
deleted file mode 100644
index ebff5cb0bd9a..000000000000
--- a/dev-haskell/esqueleto/files/esqueleto-2.4.3-persistent-2.5.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From 675018c54227ce5db4a91a153092d5f4d06f9af0 Mon Sep 17 00:00:00 2001
-From: Paul Rouse <pgr@doynton.org>
-Date: Thu, 9 Jun 2016 20:25:34 +0100
-Subject: [PATCH 1/3] Changes for persistent-2.5
-
----
- esqueleto.cabal                                     |  2 +-
- src/Database/Esqueleto.hs                           |  8 ++++----
- src/Database/Esqueleto/Internal/Language.hs         | 15 +++++----------
- src/Database/Esqueleto/Internal/PersistentImport.hs | 12 +++++++++++-
- test/Test.hs                                        |  8 ++++----
- 5 files changed, 25 insertions(+), 20 deletions(-)
-
-diff --git a/esqueleto.cabal b/esqueleto.cabal
-index 65aa237..1768d2d 100644
---- a/esqueleto.cabal
-+++ b/esqueleto.cabal
-@@ -66,7 +66,7 @@ library
-       base                 >= 4.5     && < 4.9
-     , bytestring
-     , text                 >= 0.11    && < 1.3
--    , persistent           >= 2.1.1.7 && < 2.3
-+    , persistent           >= 2.1.1.7
-     , transformers         >= 0.2
-     , unordered-containers >= 0.2
-     , tagged               >= 0.2
-diff --git a/src/Database/Esqueleto.hs b/src/Database/Esqueleto.hs
-index eb135c2..97e3211 100644
---- a/src/Database/Esqueleto.hs
-+++ b/src/Database/Esqueleto.hs
-@@ -430,8 +430,8 @@ valJ = val . unValue
- 
- -- | Synonym for 'Database.Persist.Store.delete' that does not
- -- clash with @esqueleto@'s 'delete'.
--deleteKey :: ( PersistStore (PersistEntityBackend val)
--             , MonadIO m
--             , PersistEntity val )
--          => Key val -> ReaderT (PersistEntityBackend val) m ()
-+deleteKey :: ( PersistStore backend
-+             , PersistRecordBackend val backend
-+             , MonadIO m )
-+          => Key val -> ReaderT backend m ()
- deleteKey = Database.Persist.delete
-diff --git a/src/Database/Esqueleto/Internal/Language.hs b/src/Database/Esqueleto/Internal/Language.hs
-index fbe88e2..ab18999 100644
---- a/src/Database/Esqueleto/Internal/Language.hs
-+++ b/src/Database/Esqueleto/Internal/Language.hs
-@@ -74,13 +74,11 @@ class (Functor query, Applicative query, Monad query) =>
-   --   In the end, 'fromFinish' is called to materialize the
-   --   @JOIN@.
-   fromStart
--    :: ( PersistEntity a
--       , PersistEntityBackend a ~ backend )
-+    :: PersistRecordBackend a backend
-     => query (expr (PreprocessedFrom (expr (Entity a))))
-   -- | (Internal) Same as 'fromStart', but entity may be missing.
-   fromStartMaybe
--    :: ( PersistEntity a
--       , PersistEntityBackend a ~ backend )
-+    :: PersistRecordBackend a backend
-     => query (expr (PreprocessedFrom (expr (Maybe (Entity a)))))
-   -- | (Internal) Do a @JOIN@.
-   fromJoin
-@@ -926,8 +924,7 @@ class ToBaseId ent where
- -- @
- -- person
- --   :: ( Esqueleto query expr backend
----      , PersistEntity Person
----      , PersistEntityBackend Person ~ backend
-+--      , PersistRecordBackend Person backend
- --      ) => expr (Entity Person)
- -- (person, blogPost)
- --   :: (...) => (expr (Entity Person), expr (Entity BlogPost))
-@@ -1054,14 +1051,12 @@ class Esqueleto query expr backend => FromPreprocess query expr backend a where
-   fromPreprocess :: query (expr (PreprocessedFrom a))
- 
- instance ( Esqueleto query expr backend
--         , PersistEntity val
--         , PersistEntityBackend val ~ backend
-+         , PersistRecordBackend val backend
-          ) => FromPreprocess query expr backend (expr (Entity val)) where
-   fromPreprocess = fromStart
- 
- instance ( Esqueleto query expr backend
--         , PersistEntity val
--         , PersistEntityBackend val ~ backend
-+         , PersistRecordBackend val backend
-          ) => FromPreprocess query expr backend (expr (Maybe (Entity val))) where
-   fromPreprocess = fromStartMaybe
- 
-diff --git a/src/Database/Esqueleto/Internal/PersistentImport.hs b/src/Database/Esqueleto/Internal/PersistentImport.hs
-index ad193e0..02fbd20 100644
---- a/src/Database/Esqueleto/Internal/PersistentImport.hs
-+++ b/src/Database/Esqueleto/Internal/PersistentImport.hs
-@@ -1,7 +1,13 @@
-+{-# LANGUAGE CPP                        #-}
-+{-# LANGUAGE ConstraintKinds            #-}
-+{-# LANGUAGE TypeFamilies               #-}
- -- | Re-export "Database.Persist.Sql" without any clashes with
- -- @esqueleto@.
- module Database.Esqueleto.Internal.PersistentImport
-   ( module Database.Persist.Sql
-+#if ! MIN_VERSION_persistent(2,5,0)
-+    , PersistRecordBackend
-+#endif
-   ) where
- 
- import Database.Persist.Sql hiding
-@@ -10,4 +16,8 @@ import Database.Persist.Sql hiding
-   , selectKeysList, deleteCascadeWhere, (=.), (+=.), (-=.), (*=.), (/=.)
-   , (==.), (!=.), (<.), (>.), (<=.), (>=.), (<-.), (/<-.), (||.)
-   , listToJSON, mapToJSON, getPersistMap, limitOffsetOrder, selectSource
--  , update )
-+  , update, count )
-+
-+#if ! MIN_VERSION_persistent(2,5,0)
-+type PersistRecordBackend record backend = (PersistEntity record, PersistEntityBackend record ~ backend)
-+#endif
-diff --git a/test/Test.hs b/test/Test.hs
-index 80c6784..524bd7c 100644
---- a/test/Test.hs
-+++ b/test/Test.hs
-@@ -1396,10 +1396,10 @@ main = do
- 
- 
- insert' :: ( Functor m
--           , PersistStore (PersistEntityBackend val)
--           , MonadIO m
--           , PersistEntity val )
--        => val -> ReaderT (PersistEntityBackend val) m (Entity val)
-+           , PersistStore backend
-+           , PersistRecordBackend val backend
-+           , MonadIO m )
-+        => val -> ReaderT backend m (Entity val)
- insert' v = flip Entity v <$> insert v
- 
- 
--- 
-2.9.0
-
-From 4c9ecd94f2748be52c50c85ca8ed7314e21b9e82 Mon Sep 17 00:00:00 2001
-From: Paul Rouse <pgr@doynton.org>
-Date: Thu, 9 Jun 2016 20:29:45 +0100
-Subject: [PATCH 2/3] Allow base-4.9 for GHC 8
-
----
- esqueleto.cabal | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/esqueleto.cabal b/esqueleto.cabal
-index 1768d2d..3b9efb9 100644
---- a/esqueleto.cabal
-+++ b/esqueleto.cabal
-@@ -63,7 +63,7 @@ library
-   other-modules:
-     Database.Esqueleto.Internal.PersistentImport
-   build-depends:
--      base                 >= 4.5     && < 4.9
-+      base                 >= 4.5     && < 5
-     , bytestring
-     , text                 >= 0.11    && < 1.3
-     , persistent           >= 2.1.1.7 && < 2.6
--- 
-2.9.0
-