gentoo resync : 15.12.2019

3 files changed, 72 insertions, 0 deletions

diff --git a/dev-haskell/encoding/Manifest b/dev-haskell/encoding/Manifest
index eb9a93fed3c2..905c5ad405af 100644
--- a/dev-haskell/encoding/Manifest
+++ b/dev-haskell/encoding/Manifest
@@ -1,9 +1,12 @@
+AUX encoding-0.8.2-cabal22.patch 914 BLAKE2B d80455cd8477ad38ec5ab8653f64553b70e181e4fec824e16203e8bcdd8740bd05200a5071061cbe127931164c4f3319615c304ec5264908b08054d28f116103 SHA512 aca99c6fe58d5f33797f11026d82eecce241440c3643be22eedf0b28a6caa68d42cc669e53ea9ab8d5bdb3537432adcfe73700e14b949b4ac5114ac72305b6ab
 DIST encoding-0.6.7.2.tar.gz 832564 BLAKE2B b61a113be8ac4d26c85343d5e459c35a4cdf35ceea734370b12816e3c16b748b7c47d4720db2263f74952006802be2d735a15a9e8cd8709a925d58ad6ea87945 SHA512 2a258cb20d49ddc3f1c78f7392e4440d503774680f0da0d297ce27466bace8303b1364e9b4fc5937ca6b1753d0648a6ff8cfc99dd77d52d851dfe9e0481a3cb2
 DIST encoding-0.7.0.2.tar.gz 320988 BLAKE2B f1fdef3e4b9d247c03f9669b7506cbd9082acdd85bd2d96e988c8731b3e9c774bb498717e49089cf4030d50a94e24bc461d65ef3923a14a0212d4e8741547c91 SHA512 60ede0397d68bcea292ed9fb09fe2bafcbc0afdd7d374b098049afe9a7146cc4be5615a83dbfb13c1a44db2e52a77f231fbac3ab2249398d3fb9921041aadd04
 DIST encoding-0.8.1.tar.gz 1034198 BLAKE2B 67bcc5c36698e21eeb827d19585bafe4a8ce599703863295097c83b1c6908bec82bcf98c2d9b9c4ea492bfd79435d064330a7d1d1e57f7d7ea27f587145bcbbb SHA512 f77088138888673f0802b57cba3f14cf84a1bee15ad013a1335d8a9e8d7206d716078c3b2ab299545f49174d9de9db4c67089f1b01664c86337c31ec91c5cf46
+DIST encoding-0.8.2.tar.gz 412630 BLAKE2B 2e6fd3599d4c1062c85389a1d12d332e982beecfb4f98b92ee8b1618e50ed1f91ec65b94273a325995bcbaa8fc6f41878870069c6400365e899b946592b740da SHA512 e8cbb1b64f3555945c185485688bfb7e73ca7104cbbbf5bec8ec55937656df1e3b99bae24aa1513c0c690d3521bca9c111f0258f2245637c7c8d706709cdcd62
 DIST encoding-0.8.tar.gz 321410 BLAKE2B ee87c14457c3474c571ebe25b5f98d50713b85666aeb5e099767d787bfaa9b10d03feb0e596c6c93ddf68bfc583285971f30d8e526cdc12d7570ae63b9b80f77 SHA512 c1f05333fa34eb0dc9ed1e1c82bc4d84e9fb3d0252a45519998a199ef1eafd49e9dea7ad60e8ae855b4efdaf4977f8a9aa6324d7b73bfd122bdef60341dea1e0
 EBUILD encoding-0.6.7.2-r2.ebuild 995 BLAKE2B f7ce8fe394ebb9d5ad3c37b2fa64239e0163696760c8b93724b2411ad209fae4d78a9223569d2a8fe646616ca6f305ef6daa5e919ed0e73304270bd5d5c351b3 SHA512 8162145271b843c95a3fd94bd219496ac46ce50c6beb7478762dc12ad283c03be628453606f1ebd339841e8a59525044fac430ce7112b875d9cb09789033eaab
 EBUILD encoding-0.7.0.2-r1.ebuild 919 BLAKE2B 24ce2fb6b01d147e720b83ec22165258bc1c035990170a89a38aeaabd6262d43985518a70c4f81a54a3568859e4cb8f1a4daab884f4e1ae1c7c794ea652da777 SHA512 bc2c866da05e7f67e913ac802d6c2bef0e9eeec953bffd498ecdfeb832c2320443c8b99c9055c2eb87c69adb705344a0d8684fe72b84e630178584b0f5d37e09
 EBUILD encoding-0.8.1.ebuild 940 BLAKE2B 996af11245528fdaf98c1ef207d7142534806032e5a40045d6cc763588d454c21803c169e56ebe81750195a5ae28dd18b6a89b8e7a6dd098f260983e65c5bbfe SHA512 d2aba8c6406b67823ad4ff72096c0e15e4eea14231e3096551308234e2cf0e066c54111d6449b5b1fe5b19b2c4240e9c23c353f782806ec31e5911ad3859f484
+EBUILD encoding-0.8.2.ebuild 1189 BLAKE2B b6e3d1b24d1144936c268ff61603f568368cf665127d821a43f403f95199016bbaf0c14435af94f4b0681c355d851b7237d19533ad47a6d9cccee6dfc3daa316 SHA512 be1b535c4f78b3e7d6c74ad99a190be4649a2950dc02d1c105d1dde665b26e6ca7bd5e0c11c729171680ac58f3ca232f1bd3bb12697d1177c5bfc202580e900f
 EBUILD encoding-0.8.ebuild 874 BLAKE2B 7914dda85b6b4b4757b06ede65a7ca0a02e87ddcdb8230e0b0972872c13495fdfa0e6694bad665e612be6bd43f97c0e37eb99f5e6eb99d4062f4d98296030776 SHA512 b2bd1f5c75645156daa1ece7929b1fd8348fcb649a26916a6e78fb3ad0b8f9ae175891fefec3a97e32105ec4b4dad1a5dba368308462f67454a757c6d1b63403
 MISC metadata.xml 676 BLAKE2B e2bfda2c8e81fdbb369a7a99d555ab71d7cdd93517bc54a4f399d3ae9dafc384d1921a0f0e78f9b738bb0d72cbb9814ea75613b4ffaec0ff2615141b5f795014 SHA512 86d83b18876390cb974df3ea61782f32b5e8c893877664e7e9722e6ad5d596c2b6454c60fe6537c2c2492f9fa28d614fe0c473a5bc702a21632210f516328d3c
diff --git a/dev-haskell/encoding/encoding-0.8.2.ebuild b/dev-haskell/encoding/encoding-0.8.2.ebuild
new file mode 100644
index 000000000000..695bd93c4395
--- /dev/null
+++ b/dev-haskell/encoding/encoding-0.8.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.3.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A library for various character encodings"
+HOMEPAGE="http://code.haskell.org/encoding/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+systemencoding"
+
+RDEPEND=">=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
+	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/regex-compat-0.71:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24
+	>=dev-haskell/haxml-1.22 <dev-haskell/haxml-1.26
+	test? ( dev-haskell/hunit
+		dev-haskell/quickcheck )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cabal22.patch
+)
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'regex-compat >=0.71 && <0.95' 'regex-compat >=0.71' \
+		'containers >=0.4 && <0.6' 'containers >=0.4 && <0.7'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag systemencoding systemencoding)
+}
diff --git a/dev-haskell/encoding/files/encoding-0.8.2-cabal22.patch b/dev-haskell/encoding/files/encoding-0.8.2-cabal22.patch
new file mode 100644
index 000000000000..bc1614deb71e
--- /dev/null
+++ b/dev-haskell/encoding/files/encoding-0.8.2-cabal22.patch
@@ -0,0 +1,22 @@
+diff --git a/Setup.hs b/Setup.hs
+index de719e6..e58a316 100644
+--- a/Setup.hs
++++ b/Setup.hs
+@@ -1 +1,2 @@
++{-# LANGUAGE CPP #-}
+ module Main where
+@@ -6,2 +7,11 @@ import Data.Encoding.Preprocessor.XMLMappingBuilder
+ 
++#if MIN_VERSION_Cabal(2,2,0)
++main = defaultMainWithHooks (simpleUserHooks
++                             {hookedPreProcessors = (("mapping",\_ _ _ -> mappingPreprocessor)
++                                                     :("mapping2",\_ _ _ -> mappingPreprocessor)
++                                                     :("xml",\_ _ _ -> xmlPreprocessor)
++                                                     :(hookedPreProcessors simpleUserHooks)
++                                                    )
++                             })
++#else
+ main = defaultMainWithHooks (simpleUserHooks
+@@ -13 +23,2 @@ main = defaultMainWithHooks (simpleUserHooks
+                              })
++#endif