diff options
Diffstat (limited to 'dev-haskell')
36 files changed, 64 insertions, 403 deletions
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz Binary files differindex 2eacf8f2948c..5f002f5b5698 100644 --- a/dev-haskell/Manifest.gz +++ b/dev-haskell/Manifest.gz diff --git a/dev-haskell/abstract-deque/Manifest b/dev-haskell/abstract-deque/Manifest index a1955314b415..7e71cdaa027e 100644 --- a/dev-haskell/abstract-deque/Manifest +++ b/dev-haskell/abstract-deque/Manifest @@ -1,3 +1,4 @@ +AUX abstract-deque-0.3-atomic-primops.patch 412 BLAKE2B b59de5a3ff423ffd1cf5e56f6c0cbbd32fd295aa9d069707d7be50cd5ef8e3d9ae9af8a135fb010a0579e8083185f3ce99cb0621aa9f813f59caab438307149a SHA512 f5efd76b7bdd7c26ce8610d6a4403e8166d6dcea4ce044cbf21aea11c500b4be1e12f268ea0cf34b3c83f79905c33f34dffff420ff98280a4560a386eeb950df DIST abstract-deque-0.3.tar.gz 7219 BLAKE2B 46bb9997b6ff7dc111bafb650feaf35fa2955d2b2db34dbb964c982a042967bec5994b43e333b2b248717f6e486347a202b3abc2c688e305e9fa683b3ef59df6 SHA512 9293a366918f54458ffe13f6737bab2bee961b730732eff563d900b451bf5f7dde30276c9406bfc5c0ea64104afb70db3588b13d478bf9c60842dad906195f7a -EBUILD abstract-deque-0.3.ebuild 746 BLAKE2B 2fea0f84e767a9ab5acb1e8816fa8ce775bb626f9e5e58b8690d1e44b94b485af181153768c7545dc832ea4308c0a302bacd5326efe8fbf85220473bb1a2ce90 SHA512 c7ff6ee9c5b9bb644ea8081f729dfc5ce7ea193ad19c412a94c7d168ac60b72b9dac1ec495175b6e9db650a713eb785a0cc1b23759e5aaf733f1499739579055 +EBUILD abstract-deque-0.3.ebuild 797 BLAKE2B 8fad45c254e3a8a308a035ee0d15cb8d70a25b8573557de66551d062dfcee3ce7c439bab05158717380683bc82c0a65dc75e6f4261220a75b84f62388757f1ea SHA512 f77a67a003075dd2fb8e187431d5a3b4e1f51b2aa8905d67880ad3eabd9cc5af11fdc5e2e85174621bdec37738c8829b79b236be0fd0d835f925cb15a6daa2de MISC metadata.xml 1178 BLAKE2B 0e3b3bc8f5bd9fc0b9027f95f6ebfa7fa942ee1b81c229cc72d20a2fb0bc8d7c92bf486b472ef3159443fc12bfed64200e00d2c42bbc2090b9c7ecd1f67b4a87 SHA512 0cc30ac24a6ea65a0b9a66910d5f75ecc91a0daeb4f029eb2a6ff835788fac38aa4a286828ad0575cee2105df42ec19d72e5ce1553ef88963986e390f8d6ebfc diff --git a/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild b/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild index 540860f98763..74ca8d523ded 100644 --- a/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild +++ b/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild @@ -25,6 +25,8 @@ DEPEND="${RDEPEND} >=dev-haskell/cabal-1.8 " +PATCHES=("${FILESDIR}"/${P}-atomic-primops.patch) + src_configure() { haskell-cabal_src_configure \ $(cabal_flag usecas usecas) diff --git a/dev-haskell/abstract-deque/files/abstract-deque-0.3-atomic-primops.patch b/dev-haskell/abstract-deque/files/abstract-deque-0.3-atomic-primops.patch new file mode 100644 index 000000000000..83d408fc7fe4 --- /dev/null +++ b/dev-haskell/abstract-deque/files/abstract-deque-0.3-atomic-primops.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/750206 +--- a/Data/Concurrent/Deque/Reference.hs ++++ b/Data/Concurrent/Deque/Reference.hs +@@ -27,7 +27,7 @@ import Data.IORef + + #ifdef USE_CAS + #warning "abstract-deque: reference implementation using CAS..." +-import Data.CAS (atomicModifyIORefCAS) ++import Data.Atomics (atomicModifyIORefCAS) + -- Toggle these and compare performance: + modify = atomicModifyIORefCAS + _is_using_CAS = True diff --git a/dev-haskell/base-orphans/Manifest b/dev-haskell/base-orphans/Manifest index b06cd7f9458a..09084cd61725 100644 --- a/dev-haskell/base-orphans/Manifest +++ b/dev-haskell/base-orphans/Manifest @@ -1,3 +1,3 @@ -DIST base-orphans-0.8.2.tar.gz 20727 BLAKE2B bf9c46e1d142bfbebb64a74eed6d367c253e16bc7ac5503b71afa0894b9d890773410d2b5542a5e927bdc76f349ecf7cc06156199f98ba8dce1d675873d4104d SHA512 f438d3434fa2f276af3bd23288e4cab2af94dfbb392b0a7eec747af3fed3856cdac2ce5f9476962cbf5ddbb2e48577469155101e84f7603534fc4d097da882e9 -EBUILD base-orphans-0.8.2.ebuild 717 BLAKE2B 05ab30a26a4c73c43835f6ed367fa3a8ca89833f45f4cbb460493c25d0823ccfe3b0fb9ec8222ce43124b16c1a9991321562a0d432bca9f97be575f1cff0c92a SHA512 2b3208a240b2b6477a4f73565d09f23dbf0c87f2a08eb4344fdd6acdcc2b7d6e26eb711126bfb62dc75bbb4665b6468553d29d51ebfb60409d79a36536c6276e +DIST base-orphans-0.8.4.tar.gz 22573 BLAKE2B 0fe59f562864e41419a9b77087d70488cc6d9e5c762c92815d05d326bfb0a6aaa11e3da82b4bb0664549e56e4abd5f81330a836010f7b56cb26f86c8b82c3038 SHA512 ce59bd56c5acc38f3c5c55d619b27684a8cc35c0b14c2dac6a4cfa56d503e25c7a764210a7cb9cef93b0acc02371af0e40d8024b7a48e88a8ebdf406fed206a6 +EBUILD base-orphans-0.8.4.ebuild 790 BLAKE2B e8072f13620f5ffa1173729e5bfc9d7ed5ef10e7ad8ef28fe914183e7c7d6e067d83935b4a8dd0148e17c7b14cc4b9926d9169e35233a1c585466e0828ec73a9 SHA512 2a30e915053b256e3cd0b32399061a07e9f1f618cd1603953272bf8f27d32c9c0283e45531b4379cfb1f03fc333f2b80df6628c35a3271e9a0673298e126749c MISC metadata.xml 806 BLAKE2B d4196716e787b1274e91334b61667f00c67ff9ac70153089aa95b93ce2f5730d761be0d62a5cc97a20921573fea9a1153b937f27cc7c2b808f6d7c9e8a22d647 SHA512 68f21e99d939f8b6488595980f717948f9b4eec2c096dde3463d851de8025a461fc465660750a1840bd6157d2787364fa69525002589de5f4fbeca55f7999278 diff --git a/dev-haskell/base-orphans/base-orphans-0.8.2.ebuild b/dev-haskell/base-orphans/base-orphans-0.8.4.ebuild index f7b80070c8c4..3edd14593a73 100644 --- a/dev-haskell/base-orphans/base-orphans-0.8.2.ebuild +++ b/dev-haskell/base-orphans/base-orphans-0.8.4.ebuild @@ -3,9 +3,9 @@ EAPI=7 -# ebuild generated by hackport 0.6.4 +# ebuild generated by hackport 0.6.6.9999 -CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite": circular depends +CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite" inherit haskell-cabal DESCRIPTION="Backwards-compatible orphan instances for base" @@ -22,5 +22,7 @@ RESTRICT=test # circular depends: base-orphans[test]->hspec->hspec-core->tempora RDEPEND=">=dev-lang/ghc-7.4.1:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.12 -" + >=dev-haskell/cabal-1.12" +# test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 +# dev-haskell/quickcheck ) +# " diff --git a/dev-haskell/ghc-syb-utils/Manifest b/dev-haskell/ghc-syb-utils/Manifest deleted file mode 100644 index 3b4b975c7aa8..000000000000 --- a/dev-haskell/ghc-syb-utils/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST ghc-syb-utils-0.3.0.0.tar.gz 2895 BLAKE2B 26ee12941b9cf2a4295ef2ad2db87f918afaa25fbb781d918955d8c37a63e41295a6c4a62b9ea769803313ccb4fe20704788e0b5804922c18e8193c2abf97868 SHA512 e55cc7e830d34113eae55f89124f836390c6c8a80afce9f1b245aebc35acf1863beb9f7f0388fb22e4d1ee771c332da8f9b36d88fd89080ac50d287b2272aa3b -EBUILD ghc-syb-utils-0.3.0.0.ebuild 584 BLAKE2B e7da77b316eea4193b488d63bffe1ca8f482772f044a12e4f0c5907725338252457c99079c89408a9b4a781eff7e5e7edc1b32095c17edd488a2790046c414a4 SHA512 1ed72d3c539dde905e95afe92a2c0d95255e064ee42140bf234f73a84e85e98d6ea355896a9ac1320048fb97282cc28e8a44c890e6a40ca153f62f670f7aafba -MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015 diff --git a/dev-haskell/ghc-syb-utils/ghc-syb-utils-0.3.0.0.ebuild b/dev-haskell/ghc-syb-utils/ghc-syb-utils-0.3.0.0.ebuild deleted file mode 100644 index 8f362de4d4fd..000000000000 --- a/dev-haskell/ghc-syb-utils/ghc-syb-utils-0.3.0.0.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# ebuild generated by hackport 0.6.6.9999 - -CABAL_FEATURES="lib profile haddock hoogle hscolour" -inherit haskell-cabal - -DESCRIPTION="Scrap Your Boilerplate utilities for the GHC API" -HOMEPAGE="https://github.com/DanielG/ghc-syb" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-haskell/syb-0.1.0:=[profile?] - >=dev-lang/ghc-7.4.1:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.10 -" diff --git a/dev-haskell/ghc-syb-utils/metadata.xml b/dev-haskell/ghc-syb-utils/metadata.xml deleted file mode 100644 index b7878815d80d..000000000000 --- a/dev-haskell/ghc-syb-utils/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>haskell@gentoo.org</email> - <name>Gentoo Haskell</name> - </maintainer> -</pkgmetadata> diff --git a/dev-haskell/hedgehog/Manifest b/dev-haskell/hedgehog/Manifest index 295e9d6f9bf6..c87e19ee7093 100644 --- a/dev-haskell/hedgehog/Manifest +++ b/dev-haskell/hedgehog/Manifest @@ -1,3 +1,3 @@ -DIST hedgehog-1.0.2.tar.gz 66986 BLAKE2B adb4e40bedb3ffa76b39b8ee87fdd4a05d467c5a0d9e225257123ea02721a5bae5146a9e0d2d0fb79ca0d0dd41987559da2ae505662652b9e97aea3c25d362eb SHA512 b34004210f4af480e10e6fd0a715ee0efb7d718a7c0d8b84355639064b105840e59be223e90cc4fa26a9fa564df6d9686e77b03d996a8820955b19a6ef42c1bb -EBUILD hedgehog-1.0.2-r1.ebuild 2273 BLAKE2B 49f87a7d8ad30197bf46979540dd62ddedb2b77f4f85fad5b8b7f098f44591bf3943ee91082dee991a65b30a6d03612d314148a591622f130a7ad50458f974c4 SHA512 63b375e94b00e847c834c5b857fe5bc8695ee567ad090a1e53498050b8116956bbd965903ede31c250f460477995dc4211d5dffe7466395268fe905e8684e938 +DIST hedgehog-1.0.4.tar.gz 68959 BLAKE2B db9b5d2202d1a27fd27703f45083ac3b1e6c26505e4ead2c26bc79f5bd42f9523f2c11299cfa42b095467e289a5c80d2b75cf628828af4b702ad22195f2b1457 SHA512 71eb946550c0189e598d2a4205547c007cc4fd101e1cfab38f79535e7c158dfa3b43dec6dde2331d5fe9cb5b0d4c6212f51b820ec146e47ecd9823a99f0f8133 +EBUILD hedgehog-1.0.4.ebuild 1905 BLAKE2B 7bd39a3a986fadb18f88dcce8882e1a47915e21de0f58a8d7198a3cb4407215f93fda1d440aaff8c40af34d20bd0892d193a7a3d9e48ed1cbbf8405c266bb9a8 SHA512 264ce5a3948bd5c845663f8f23e6c9be70d7130e1c44c1f5896cb2bbcfb6eabcad8355c2ec91cdf8d75082be729b8ab40550beaa267ebb2125ed0f98ac6340ad MISC metadata.xml 612 BLAKE2B e9c79854510cac1e5f3d11a701d3d8d478f690183434819dfa9dcf052e9e3b679c1827fbc989339b1e6740ab2dbe756985b502d0ecf28b295ccbd7995dd75a7a SHA512 c02f6852606af839838bfc9395be1d8a09cdc3a4f15916c41b8eac9c6f61e362c42e40c0ab8306ec720c562455b031f5eca0d4fcb132e90a8a707f39e322966d diff --git a/dev-haskell/hedgehog/hedgehog-1.0.2-r1.ebuild b/dev-haskell/hedgehog/hedgehog-1.0.4.ebuild index 4eb9dc8b0c26..2b09e994ae4d 100644 --- a/dev-haskell/hedgehog/hedgehog-1.0.2-r1.ebuild +++ b/dev-haskell/hedgehog/hedgehog-1.0.4.ebuild @@ -3,12 +3,12 @@ EAPI=7 -# ebuild generated by hackport 0.6.2.9999 +# ebuild generated by hackport 0.6.6.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal -DESCRIPTION="Hedgehog will eat all your bugs" +DESCRIPTION="Release with confidence" HOMEPAGE="https://hedgehog.qa" SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" @@ -17,21 +17,19 @@ SLOT="0/${PV}" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND=">=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0.11:=[profile?] +RDEPEND=">=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0.12:=[profile?] >=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-haskell/concurrent-output-1.7:=[profile?] <dev-haskell/concurrent-output-1.11:=[profile?] >=dev-haskell/erf-2.0:=[profile?] <dev-haskell/erf-2.1:=[profile?] >=dev-haskell/exceptions-0.7:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] - >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?] >=dev-haskell/lifted-async-0.7:=[profile?] <dev-haskell/lifted-async-0.11:=[profile?] >=dev-haskell/mmorph-1.0:=[profile?] <dev-haskell/mmorph-1.2:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] - >=dev-haskell/pretty-show-1.6:=[profile?] + >=dev-haskell/pretty-show-1.6:=[profile?] <dev-haskell/pretty-show-1.11:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-0.8:=[profile?] - >=dev-haskell/random-1.1:=[profile?] <dev-haskell/random-1.2:=[profile?] + >=dev-haskell/random-1.1:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] - >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/stm-2.4:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/text-1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-base-0.4.5.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] @@ -41,11 +39,3 @@ RDEPEND=">=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal- DEPEND="${RDEPEND} >=dev-haskell/cabal-1.24.0.0 " - -src_prepare() { - default - - cabal_chdeps \ - 'template-haskell >= 2.10 && < 2.16' 'template-haskell >= 2.10' \ - 'pretty-show >= 1.6 && < 1.10' 'pretty-show >= 1.6' -} diff --git a/dev-haskell/lvmlib/Manifest b/dev-haskell/lvmlib/Manifest deleted file mode 100644 index 0e35466da02f..000000000000 --- a/dev-haskell/lvmlib/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX lvmlib-1.1-ghc-7.10.patch 2590 BLAKE2B 165938d0813dbf6806068ffa4e72c695d1a56eac4a7c2ba31a2dab12fca0549ff7210273eaa23039ad2f0d794727d541d0520609745e9bdcbcedcf8538c45931 SHA512 a645db9a37614752afa29d176133ee237511773e1d7c8d2f5959828264ad909360f441673b3e6bef5137bb0deb2f1eb108371032fafaa77a86d5a7be5fec2867 -AUX lvmlib-1.1-ghc-8.8.patch 547 BLAKE2B da9cb3500669435cef400e58c9f0bbbceb5d0e1a7a47d36c3437ef1b9b571884e9330a8d1043536ce196be4065517aac0dea9f1a4f4740c3e64077b6134d8619 SHA512 ce89864d5ff457774fe495fc4cde899b0e1903993288926f83dcc237da9fd72300d5989c0b5bcb76390fccb3d41364e969a8b6f3edf9079e9f4b7e448e31b35f -AUX lvmlib-1.1-ghc84.patch 352 BLAKE2B 62c3937287a1c6af5696b879249e560bab9757c71ec2c6aff8d19a0b064c88fce319c02fa2d8decbc30fe217fef5e263ca583ca9261150bfb536d887d2effad3 SHA512 a639d7686f6e6c8d5798b31e656a4293c58c5f830b366f521a5b95ed5cfbb3962ade71d625cea16651f1eab81a8e6530c0ac910ed19df2abd107943642345ed3 -DIST lvmlib-1.1.tar.gz 62388 BLAKE2B 9effe8b0b71ef36b3f73e792a9702d44efa5a7ed9f48f35825d75706a7dad2d5f5cac06d5941f60730c79216af5f3009110919dfa397343287e7359e702c5fbc SHA512 3f085f3ff8e53ab19de3b425c4c5a271111afcd334ec08fefd983838608ae436005c20c2d7c545650f0dd1b76d466f81661a14c8ce972df27d79a78c22023861 -EBUILD lvmlib-1.1.ebuild 754 BLAKE2B 014580976485b6e43773a31d9669c8b6d8e62a0d1bb00ddaeec04d9670ae288afc38cfd652909755d1a2dfb9230087daafdd9e7ef1dc14f3ebfecba8fe16706b SHA512 b1853f8811e22c33b227b8c996f4691b2e207a64e20b13f9e2bdaa2f4527f1641aa3b13c042f60fe09365613e5212d4136339534b143b6b2403a5f5f132d1384 -MISC metadata.xml 822 BLAKE2B 6c75a01261fb049e7b175c7f4b8de7da8978bca198f5a55581630087682920da280185d6c1512a81a0e05bbe02b8728b8261564c4d7d6a15db67218baa47f5b6 SHA512 95c53741b0af7d02006f5715e9468b01d984c5145a4f0582f268da5c3ef19c7902d7a9fe48a8b07c1825dbe9a8e09cc03c208a405218ec930b72ddd9e9d31219 diff --git a/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-7.10.patch b/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-7.10.patch deleted file mode 100644 index ad68d78f56e7..000000000000 --- a/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-7.10.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff --git a/Lvm/Asm/Data.hs b/Lvm/Asm/Data.hs -index 7939754..f3da0b7 100644 ---- a/Lvm/Asm/Data.hs -+++ b/Lvm/Asm/Data.hs -@@ -17,2 +17,3 @@ import Lvm.Core.Module - import Text.PrettyPrint.Leijen -+import Prelude hiding ((<$>)) - -diff --git a/Lvm/Common/IdMap.hs b/Lvm/Common/IdMap.hs -index a50bcb6..10758e6 100644 ---- a/Lvm/Common/IdMap.hs -+++ b/Lvm/Common/IdMap.hs -@@ -24,2 +24,3 @@ import Lvm.Common.Id - import Control.Arrow (first) -+import Prelude hiding (foldMap) - -diff --git a/Lvm/Core/Expr.hs b/Lvm/Core/Expr.hs -index 8bc50d7..935e16a 100644 ---- a/Lvm/Core/Expr.hs -+++ b/Lvm/Core/Expr.hs -@@ -17,2 +17,3 @@ import Lvm.Core.PrettyId - import Text.PrettyPrint.Leijen -+import Prelude hiding ((<$>)) - -diff --git a/Lvm/Core/Module.hs b/Lvm/Core/Module.hs -index 923870e..ac52201 100644 ---- a/Lvm/Core/Module.hs -+++ b/Lvm/Core/Module.hs -@@ -24,2 +24,3 @@ import Lvm.Instr.Data - import Text.PrettyPrint.Leijen -+import Prelude hiding ((<$>)) - -diff --git a/Lvm/Instr/Data.hs b/Lvm/Instr/Data.hs -index 497a690..959cb5c 100644 ---- a/Lvm/Instr/Data.hs -+++ b/Lvm/Instr/Data.hs -@@ -19,2 +19,3 @@ import Lvm.Common.Id - import Text.PrettyPrint.Leijen -+import Prelude hiding ((<$>)) - -diff --git a/Lvm/Instr/Resolve.hs b/Lvm/Instr/Resolve.hs -index 6845f74..4172a74 100644 ---- a/Lvm/Instr/Resolve.hs -+++ b/Lvm/Instr/Resolve.hs -@@ -10,2 +10,4 @@ module Lvm.Instr.Resolve (instrResolve) where - import Control.Exception (assert) -+import Control.Applicative -+import Control.Monad - import Data.Maybe -@@ -32,2 +34,6 @@ instance Functor Resolve where - -+instance Applicative Resolve where -+ pure = return -+ (<*>) = ap -- defined in Control.Monad -+ - instance Monad Resolve where -diff --git a/Lvm/Read.hs b/Lvm/Read.hs -index 7137331..25797f9 100644 ---- a/Lvm/Read.hs -+++ b/Lvm/Read.hs -@@ -9,2 +9,3 @@ module Lvm.Read (lvmReadFile, lvmRead) where - -+import Control.Applicative - import Control.Monad -@@ -390,2 +391,7 @@ instance Functor (Read v) where - Result x st2 -> Result (f x) st2) -+ -+instance Applicative (Read v) where -+ pure = return -+ (<*>) = ap -- defined in Control.Monad -+ - instance Monad (Read v) where -diff --git a/Lvm/Write.hs b/Lvm/Write.hs -index 48570f8..37469bc 100644 ---- a/Lvm/Write.hs -+++ b/Lvm/Write.hs -@@ -11,2 +11,3 @@ import qualified Control.Exception as CE (assert, catch, IOException) - import Control.Monad -+import Control.Applicative - import Data.Maybe -@@ -465,2 +466,6 @@ instance Functor Emit where - -+instance Applicative Emit where -+ pure = return -+ (<*>) = ap -- defined in Control.Monad -+ - instance Monad Emit where diff --git a/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-8.8.patch b/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-8.8.patch deleted file mode 100644 index 36d680794f07..000000000000 --- a/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-8.8.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/Lvm/Common/IdMap.hs -+++ b/Lvm/Common/IdMap.hs -@@ -121,10 +121,10 @@ unionMaps :: [IdMap a] -> IdMap a - unionMaps = foldr unionMap emptyMap - - foldMapWithId :: (Id -> a -> b -> b) -> b -> IdMap a -> b --foldMapWithId f z (IdMap m) = IntMap.foldWithKey (f . idFromInt) z m -+foldMapWithId f z (IdMap m) = IntMap.foldrWithKey (f . idFromInt) z m - - foldMap :: (a -> b -> b) -> b -> IdMap a -> b --foldMap f z (IdMap m) = IntMap.fold f z m -+foldMap f z (IdMap m) = IntMap.foldr f z m - - sizeMap :: IdMap a -> Int - sizeMap (IdMap m) = IntMap.size m diff --git a/dev-haskell/lvmlib/files/lvmlib-1.1-ghc84.patch b/dev-haskell/lvmlib/files/lvmlib-1.1-ghc84.patch deleted file mode 100644 index 8f9e85402f9c..000000000000 --- a/dev-haskell/lvmlib/files/lvmlib-1.1-ghc84.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/Lvm/Common/Byte.hs -+++ b/Lvm/Common/Byte.hs -@@ -19,2 +19,3 @@ import System.Exit - import System.IO -+import qualified Data.Semigroup as S - -@@ -68,2 +69,7 @@ max32 = 2^(32::Int) -1 -- Bastiaan (Todo: check) - -+instance S.Semigroup Bytes where -+ (<>) bs Nil = bs -+ (<>) Nil cs = cs -+ (<>) bs cs = Cat bs cs -+ - instance Monoid Bytes where diff --git a/dev-haskell/lvmlib/lvmlib-1.1.ebuild b/dev-haskell/lvmlib/lvmlib-1.1.ebuild deleted file mode 100644 index 7184d226bf02..000000000000 --- a/dev-haskell/lvmlib/lvmlib-1.1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# ebuild generated by hackport 0.4.4.9999 - -CABAL_FEATURES="bin lib profile haddock hoogle hscolour" -inherit eutils haskell-cabal - -DESCRIPTION="The Lazy Virtual Machine (LVM)" -HOMEPAGE="http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-haskell/parsec:=[profile?] - dev-haskell/wl-pprint:=[profile?] - >=dev-lang/ghc-7.4.1:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.10.1.0 -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1-ghc-7.10.patch - "${FILESDIR}"/${PN}-1.1-ghc84.patch - "${FILESDIR}"/${PN}-1.1-ghc-8.8.patch -) diff --git a/dev-haskell/lvmlib/metadata.xml b/dev-haskell/lvmlib/metadata.xml deleted file mode 100644 index 2d49cd8f1b3c..000000000000 --- a/dev-haskell/lvmlib/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>haskell@gentoo.org</email> - <name>Gentoo Haskell</name> - </maintainer> - <longdescription> - The Lazy Virtual Machine (LVM) defines a portable instruction set and file - format. It is specifically designed to execute languages with non-strict (or - lazy) semantics. This cabal package defines the core assembler (coreasm) for - compiling core programs into LVM instructions and a library. The LVM is used - as a backend for the Helium compiler. At the moment, one LVM runtime - implementation is available (written in C). More information about LVM can be - found in Chapter 6 of Daan Leijen's PhD Thesis, The Lambda Abroad. - </longdescription> -</pkgmetadata> diff --git a/dev-haskell/persistent/Manifest b/dev-haskell/persistent/Manifest index 1567536d1e61..39b8acc08a85 100644 --- a/dev-haskell/persistent/Manifest +++ b/dev-haskell/persistent/Manifest @@ -1,3 +1,3 @@ DIST persistent-2.10.5.2.tar.gz 72570 BLAKE2B fb5fe4704076e66b6aa24615e4faa14803879b18da6dc972f7f05a5ecc27435ee4e7f46376a2082bb327b189db4cc51aa04f673ffc8df46d8b85a56e2c26b111 SHA512 5d7fe9259d89ab210bd136d9f9b0f3e52d48825a003cc02dfb01f50457324daf2c8659b9123cc0e958b636613fa61004f649f97980c6a5427d425656ceb166f1 -EBUILD persistent-2.10.5.2.ebuild 1450 BLAKE2B 6e0948e2bce0270be888e167aa407a334f7fd446a098b0c5ad8d49f8ede331657a32657517a97a8f4108164c60beb311018a197ec9b6eb50a98aae0360e4cebe SHA512 6bd999d9855f9357a69c21f5fc869dc0818f8a9e8df51ed8db615927ee6e1725ec5e5d55fbde00c7dfed2e0392e8a630e0f8cdf81807fca8094ba937653e643f -MISC metadata.xml 545 BLAKE2B 930ddcf3f9a50ed279af337a1c0e8972a8dd34d71218d1ec57b312bffb4700efc425359798ba71cb15f764ac4e74333b9835f877c91aadefc5aea7bac9ede850 SHA512 be844f5ffd48d9573cff4389f30efe79882dab1e6786b1e22f8d3b168cf81a83e10da15a4deaa2c6e1189645b70e097f72fcb99242581083c855213065fa686d +EBUILD persistent-2.10.5.2.ebuild 1454 BLAKE2B 7a6e304a9ad84b3ba6a8415a4a7458444293e66dd804ca0e0bf6e8f98fbaa827c3b7acc997a4d8a83bcb1bd02f462036405a66ee4279f68b628eed77054c8e6c SHA512 860b65f4ff961863f3f295191c1517f2f06380f4e0cc454004364ae2b7d975719e87312c647c4b10a476f2fc6f21ca6e182da1c86b7d3cc1cd1bf05c0a632474 +MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015 diff --git a/dev-haskell/persistent/metadata.xml b/dev-haskell/persistent/metadata.xml index 1d312dd3e939..b7878815d80d 100644 --- a/dev-haskell/persistent/metadata.xml +++ b/dev-haskell/persistent/metadata.xml @@ -5,10 +5,4 @@ <email>haskell@gentoo.org</email> <name>Gentoo Haskell</name> </maintainer> - <longdescription> - This library provides just the general interface and helper functions. You must use a specific backend in order to make this useful. - </longdescription> - <use> - <flag name="nooverlap">Use OverlappingInstances only for String. Only developers should use this.</flag> - </use> </pkgmetadata> diff --git a/dev-haskell/persistent/persistent-2.10.5.2.ebuild b/dev-haskell/persistent/persistent-2.10.5.2.ebuild index c2eb4b4262cc..8d61a278b2a5 100644 --- a/dev-haskell/persistent/persistent-2.10.5.2.ebuild +++ b/dev-haskell/persistent/persistent-2.10.5.2.ebuild @@ -3,7 +3,8 @@ EAPI=7 -# ebuild generated by hackport 0.6.4.9999 +# ebuild generated by hackport 0.6.6.9999 +#hackport: flags: -nooverlap CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal @@ -15,7 +16,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="MIT" SLOT="0/${PV}" KEYWORDS="~amd64 ~x86" -IUSE="nooverlap" +IUSE="" RDEPEND=">=dev-haskell/aeson-1.0:=[profile?] dev-haskell/attoparsec:=[profile?] @@ -45,5 +46,5 @@ DEPEND="${RDEPEND} src_configure() { haskell-cabal_src_configure \ - $(cabal_flag nooverlap nooverlap) + --flag=-nooverlap } diff --git a/dev-haskell/shuffle/Manifest b/dev-haskell/shuffle/Manifest deleted file mode 100644 index 5ef583e2576d..000000000000 --- a/dev-haskell/shuffle/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST shuffle-0.1.3.3.tar.gz 31685 BLAKE2B 007f91bedca1cd7b7a7d40b3425f528b3e76e5636447b509bfa30ba09894267c51a759ca512a39c8c3c296765b816df28ad6952085e5135f24b6169dfab8d519 SHA512 44fcb34a3a9c251970c132c5a504aa4fe30befbc2829ff8b4f788e797c8a35373c5ed4325fb3e5d5846caf0f566b84c398f53be0c7d33d4392343e4f8655a096 -EBUILD shuffle-0.1.3.3.ebuild 1040 BLAKE2B 407cdb6c6b0714bda33c76d6e5ddba70b05398fe59227a2990c7de170c2d5514f1ded64f8fcd2c251c7c7b9f818a51f9706b3cce1815ce1ddde67fb05776dd6b SHA512 c7d70a67b9d8ade01632db7f4a3023068fbbe813c25b590405078eff34a5fa0e12d357aecf2d7725f9037f48c05603e6427828e7981573564967ac66aee3f078 -MISC metadata.xml 435 BLAKE2B 254e6a4b4bc5b625d4032d3a060234792728bfd3302928df4b0d2480f5db577a1f1877c963d3fc6002d080762ee429c7e14e8c23c3b9d65606c3796cdb4ac7d8 SHA512 239c7d73bdfc1097f2faf44f201d26a47d9cebb604b04274f01d1b9eb81bac78eeab10a097ca2d36909beb134f5860734711701fe77b77305f4c816a5b8c4c4c diff --git a/dev-haskell/shuffle/metadata.xml b/dev-haskell/shuffle/metadata.xml deleted file mode 100644 index 10e4152273f6..000000000000 --- a/dev-haskell/shuffle/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>haskell@gentoo.org</email> - <name>Gentoo Haskell</name> - </maintainer> - <use> - <flag name="network-uri">Get Network.URI from the network-uri package.</flag> - </use> - <upstream> - <remote-id type="github">UU-ComputerScience/shuffle</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-haskell/shuffle/shuffle-0.1.3.3.ebuild b/dev-haskell/shuffle/shuffle-0.1.3.3.ebuild deleted file mode 100644 index 8c75f97db9a5..000000000000 --- a/dev-haskell/shuffle/shuffle-0.1.3.3.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# ebuild generated by hackport 0.4.5.9999 - -CABAL_FEATURES="bin lib profile haddock hoogle hscolour" -inherit haskell-cabal - -DESCRIPTION="Shuffle tool for UHC" -HOMEPAGE="https://github.com/UU-ComputerScience/shuffle" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="+network-uri" - -RDEPEND=">=dev-haskell/cabal-1.14:=[profile?] - >=dev-haskell/uhc-util-0.1.5.5:=[profile?] - >=dev-haskell/uuagc-0.9.40.3:=[profile?] - >=dev-haskell/uuagc-cabal-1.0.3.0:=[profile?] - >=dev-haskell/uulib-0.9:=[profile?] - >=dev-lang/ghc-7.4.1:= - network-uri? ( >=dev-haskell/network-2.6:=[profile?] - >=dev-haskell/network-uri-2.6:=[profile?] ) - !network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] ) -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.8 -" - -src_configure() { - haskell-cabal_src_configure \ - $(cabal_flag network-uri network-uri) -} diff --git a/dev-haskell/tasty-hedgehog/Manifest b/dev-haskell/tasty-hedgehog/Manifest index 88389c5cbcc1..0165e8a5f7c0 100644 --- a/dev-haskell/tasty-hedgehog/Manifest +++ b/dev-haskell/tasty-hedgehog/Manifest @@ -1,3 +1,3 @@ DIST tasty-hedgehog-1.0.0.2.tar.gz 4387 BLAKE2B 3681115e233a1ff73b026caf18862825dfe1b94bcab1f4f48fd8aee619b1e263eab412ec0820cdf0929cd2d5a66bb6beb19be0a39ba59183c540316ec1e5cd4d SHA512 56ac4db27b97bc6902633ec398bdbae28f6121d818a29fde62ddea4a4619af0fe7b058b55479414a627119a0014f2c84d6b795c86e9e36d21fd25bf1033a9c4b -EBUILD tasty-hedgehog-1.0.0.2.ebuild 960 BLAKE2B 7fce4777dbb750879b7c7fd10e74f864d939fe5f6521875090864cc4843cce918a696bd242e0486065d0b4378a00af6eeccee3264367b3993b6fae12c3450100 SHA512 744a4f104b774810bf111e9cc8f9c65790d902f8d6a79021179976f20c85dd783b2e7c294fde4888f52bb027262da1cb0efa8560ca4a32c248235739875a4478 +EBUILD tasty-hedgehog-1.0.0.2-r1.ebuild 1093 BLAKE2B a0c32725fb564d2e84ec59791c9ed5acbdd67806e8faeb17d2e79ff8e6cfa643b4c7a8e1c576a04e69f1cc90dc49004f6949ff27f50d7938a6889aeda5e273e4 SHA512 d8014a02bf694a8515aabb48033fddbf7262a8d98163fc91a3732b389c26085e230e23e00a5a8e2049fe2938e041d93829bf54fca9c5b896184ee13ee9506cc3 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015 diff --git a/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.0.0.2.ebuild b/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.0.0.2-r1.ebuild index e02a9847ed19..00d5c2279d89 100644 --- a/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.0.0.2.ebuild +++ b/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.0.0.2-r1.ebuild @@ -17,19 +17,21 @@ SLOT="0/${PV}" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND=">=dev-haskell/hedgehog-1.0.2:=[profile?] <dev-haskell/hedgehog-1.0.3:=[profile?] +RDEPEND=">=dev-haskell/hedgehog-1.0.2:=[profile?] <dev-haskell/hedgehog-1.1:=[profile?] >=dev-haskell/tagged-0.8:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/tasty-0.11:=[profile?] <dev-haskell/tasty-1.3:=[profile?] >=dev-lang/ghc-7.10.1:= " DEPEND="${RDEPEND} >=dev-haskell/cabal-1.22.2.0 - test? ( >=dev-haskell/tasty-expected-failure-0.11 <dev-haskell/tasty-expected-failure-0.12 ) + test? ( >=dev-haskell/tasty-expected-failure-0.11 <dev-haskell/tasty-expected-failure-0.13 ) " src_prepare() { default cabal_chdeps \ - 'base >= 4.8 && <4.14' 'base >= 4.8' + 'base >= 4.8 && <4.14' 'base >= 4.8' \ + 'tasty-expected-failure >= 0.11 && < 0.12' 'tasty-expected-failure >= 0.11' \ + 'hedgehog >= 1.0.2 && < 1.0.3' 'hedgehog >= 1.0.2' } diff --git a/dev-haskell/text-icu/Manifest b/dev-haskell/text-icu/Manifest index 07231f085473..320f9226b728 100644 --- a/dev-haskell/text-icu/Manifest +++ b/dev-haskell/text-icu/Manifest @@ -1,3 +1,4 @@ +AUX text-icu-0.7.0.1-icu.patch 394 BLAKE2B 712015502f7692141388cf7d0c8d5650d6a44f5ab246a2ba50a2baa26660d1938aa10d595263244e6974487f2419b52bf713c4527026bc4f7ed2b1a97faa8ee8 SHA512 ecd63935a4f5343fdfbe5be3d319b3db29ed21acd6f7d444ee6dad022fe6da37db975697650fcf1aa48e17c0ba48b608afd6bade06f4cdbf80b56e20480f54d0 DIST text-icu-0.7.0.1.tar.gz 45533 BLAKE2B 1eda34ad7a8bcaa26814cb4fdb864e67531aca5dc80ece9a71dd770022ec7729e7e2960729c707ab9b5d4e8ad3b112e50572d26a2f2a573ffd6f3c914a0b5545 SHA512 54551ce0d629bffcca32fc855bfcdf2e24282359ce3a32578a98de4f4ad15378fa7df98c59d73323549a2ac873b10a10202bda02f5be83fbe1ab945aac5e50a9 -EBUILD text-icu-0.7.0.1.ebuild 743 BLAKE2B e7ba5ac5fca288179ef458045e51f7fb30f22bac4a5f37ef01895494c34f0cf2d22a80dcfa86554d6f8a9ef24308aba1bfcb3eed925c43746418fb1fbc4c0429 SHA512 268e708bc7f09470dcaf3f665ba10b3ba8fc0690f0babf0c1008efbb03ca5c476b21bc791b37cba0af67cf6b9c9d7150dcc96b0ac744bb6e977e12c604cfaf81 +EBUILD text-icu-0.7.0.1.ebuild 792 BLAKE2B 9fe2288a1eaa58e4ef5cb5942cb4e51515278e6ff14b851bf7d744294bcc1ef379b50a9e375507d603482d32007865e276171f38490f93df08f9c82dd91086f9 SHA512 0d169a01c09f968e86a396a2f82395ed30e32f06ab205acbde21347ec6e85e7a27d85c3440278485643ebfc869c2f486a8f808fb4d58dad303e622cfd04f5d8b MISC metadata.xml 1375 BLAKE2B 598c2f18ecd8c76ae5b8de8f9bf78c75e4d185f49e2ca74425b7379240018fcbef5c390bcc23747c919855fa3be2357f7fe8c5367fe3d30aedb7510dbb789f9c SHA512 0ff41b1b72b3cc09947f6937b969a07e98c9d04bb0967cf4feb066c755ea1da415a6138099aff4550cc7423a02d1c5f95a16e865c2c127e3551a62521e05d79f diff --git a/dev-haskell/text-icu/files/text-icu-0.7.0.1-icu.patch b/dev-haskell/text-icu/files/text-icu-0.7.0.1-icu.patch new file mode 100644 index 000000000000..5a29309e7c45 --- /dev/null +++ b/dev-haskell/text-icu/files/text-icu-0.7.0.1-icu.patch @@ -0,0 +1,12 @@ +icu-68 disable TRUE/FALSE by default. +--- a/cbits/text_icu.c ++++ b/cbits/text_icu.c +@@ -305,7 +305,7 @@ int32_t __hs_u_strFoldCase(UChar *dest, int32_t destCapacity, + + int32_t __hs_u_strCompareIter(UCharIterator *iter1, UCharIterator *iter2) + { +- return u_strCompareIter(iter1, iter2, TRUE); ++ return u_strCompareIter(iter1, iter2, true); + } + + UBlockCode __hs_ublock_getCode(UChar32 c) diff --git a/dev-haskell/text-icu/text-icu-0.7.0.1.ebuild b/dev-haskell/text-icu/text-icu-0.7.0.1.ebuild index 9a2bbca610d0..88b4ba6c94cb 100644 --- a/dev-haskell/text-icu/text-icu-0.7.0.1.ebuild +++ b/dev-haskell/text-icu/text-icu-0.7.0.1.ebuild @@ -20,6 +20,8 @@ IUSE="" RESTRICT=test # QuickCheck occasionally finds counterexamples # and fails to build: Duplicate instance declarations: instance NFData Ordering +PATCHES=("${FILESDIR}"/${PN}-0.7.0.1-icu.patch) + RDEPEND=">=dev-haskell/text-0.9.1.0:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/icu:= diff --git a/dev-haskell/uhc-light/Manifest b/dev-haskell/uhc-light/Manifest deleted file mode 100644 index 3dbbe3e97bad..000000000000 --- a/dev-haskell/uhc-light/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST uhc-light-1.1.9.5.tar.gz 4546645 BLAKE2B df1d0303af2ca9b59d508582a90a490204cb6dca4c5431e130c3551017d2c066b7fe93ee323ce765f6cededa77563de4dbf29a740e15e42193383fa9928a9cd5 SHA512 1d31cf2be92689dc0fd989db158623ba36455f33dad70905063cd0849e65cd3f2b78d29a6ed7a943a371e14afc45c95dc552c5a6c64109b192b9ca57cacc7fea -EBUILD uhc-light-1.1.9.5.ebuild 1049 BLAKE2B 9873c3f1741926174b0fe4a4952c36b96eea9ab798143e2d05f03b27dc0cafbf81e361f6a318bcb095487043c9f1eb9f4990d650042f97fa132fcba5e90f2b42 SHA512 0a6312111090f1a71490b2a1c3d773ce90d0c67c14122bea8c4d4308dc25e69bffff2a8c0d83ecbaa0919e5cd39cce977fbecd780bd3750b3a9bdad47066f45a -MISC metadata.xml 710 BLAKE2B 2411b1890459eea90145859fdbae06de58bf1beedf16d178e8d3c2b60814a9bcb7350f236bf18277075f98c0b7cad8713112cef730437a4cf0bd1abe3873805c SHA512 e652a332e09923a7cb6c132c0b86bb87eb3d3d6cfe3f16d443514ad5cf48aafa4ef5ebbe00cab08a6a4987841df9ea240977a7326975ceaa6e6cf3b42c1e7fd1 diff --git a/dev-haskell/uhc-light/metadata.xml b/dev-haskell/uhc-light/metadata.xml deleted file mode 100644 index cd3392e2775f..000000000000 --- a/dev-haskell/uhc-light/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>haskell@gentoo.org</email> - <name>Gentoo Haskell</name> - </maintainer> - <longdescription> - A 'light' variant of UHC including only an API and executables for compiling to Core representation (uhcl) and running CoreRun (uhcr). This version is just to test the infrastructure. Later versions will provide a fleshing out of the API and completion of the now rudimentary platform independent (Haskell) interpreted running etc.. - </longdescription> - <upstream> - <remote-id type="github">UU-ComputerScience/uhc</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-haskell/uhc-light/uhc-light-1.1.9.5.ebuild b/dev-haskell/uhc-light/uhc-light-1.1.9.5.ebuild deleted file mode 100644 index ba85c126fd10..000000000000 --- a/dev-haskell/uhc-light/uhc-light-1.1.9.5.ebuild +++ /dev/null @@ -1,35 +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.5.1.9999 - -CABAL_FEATURES="lib profile" # broken markup: haddock hoogle hscolour" -inherit haskell-cabal - -DESCRIPTION="Part of UHC packaged as cabal/hackage installable library" -HOMEPAGE="https://github.com/UU-ComputerScience/uhc" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-haskell/fgl:=[profile?] - >=dev-haskell/hashable-1.2.4:=[profile?] <dev-haskell/hashable-1.3:=[profile?] - dev-haskell/mtl:=[profile?] - dev-haskell/network:=[profile?] - dev-haskell/old-locale:=[profile?] - dev-haskell/primitive:=[profile?] - dev-haskell/syb:=[profile?] - >=dev-haskell/uhc-util-0.1.6.7:=[profile?] <dev-haskell/uhc-util-0.1.7:=[profile?] - dev-haskell/utf8-string:=[profile?] - >=dev-haskell/uulib-0.9.19:=[profile?] - dev-haskell/vector:=[profile?] - >=dev-lang/ghc-7.8.2:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.18.1.3 -" diff --git a/dev-haskell/uhc-util/Manifest b/dev-haskell/uhc-util/Manifest deleted file mode 100644 index caed5bf062e6..000000000000 --- a/dev-haskell/uhc-util/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST uhc-util-0.1.6.7.tar.gz 113857 BLAKE2B 3115383b3951c9dbe38dfb17248c59ef0f1af4857c9479e1164c7a64983748b2e937fb7669e70fa7c0369653e038cc739d4aaf50e7552d8e91e7a3af912f7a8b SHA512 02c8ce0af2aa19f2f9870aa03822860ec6285028867c5e0d7e28fc8bc3ec57cc308d428c8a48c7aa8c78301ac68d9e0ace0721eb35d91c5ae6caf3661236efad -EBUILD uhc-util-0.1.6.7.ebuild 856 BLAKE2B fdf0ce5f7ce086c18704ccb5ad808f42e54a69c60ffe280ae97fc43bf819c20fd3f0604e8923798ff6e960842b738b583230aa7bf5c95de2bd4b96a96afb379d SHA512 4af853314168b4bdbfe0cf9abd64142355fff74b35774eb61475923992b8a97fd6c081efbb4ce1492ad6bc878a282ef616aecd6b792620e93d62aa3b0256fb78 -MISC metadata.xml 341 BLAKE2B 09f778b447c5b751d47e67bc1400db3544872c69005a803e2b444fa1af05598665e0a91f850b1365823b0c80f4c0f15ba6f81509046bf01584173f4ef1474311 SHA512 fc3fe3bd74e01fc9a8e61bbafd7c0c2fa19fe3849d89c00c9efc310b4abc0fa12ad5a69c81059c23499889360ee5a5588d199d2c9beac1fa877254f9c6871c6c diff --git a/dev-haskell/uhc-util/metadata.xml b/dev-haskell/uhc-util/metadata.xml deleted file mode 100644 index 4f1d9f5d6ed6..000000000000 --- a/dev-haskell/uhc-util/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>haskell@gentoo.org</email> - <name>Gentoo Haskell</name> - </maintainer> - <upstream> - <remote-id type="github">UU-ComputerScience/uhc-util</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-haskell/uhc-util/uhc-util-0.1.6.7.ebuild b/dev-haskell/uhc-util/uhc-util-0.1.6.7.ebuild deleted file mode 100644 index 1a84fd58be83..000000000000 --- a/dev-haskell/uhc-util/uhc-util-0.1.6.7.ebuild +++ /dev/null @@ -1,32 +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.5.1.9999 - -CABAL_FEATURES="lib profile haddock hoogle hscolour" -inherit haskell-cabal - -DESCRIPTION="UHC utilities" -HOMEPAGE="https://github.com/UU-ComputerScience/uhc-util" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-haskell/fclabels-2.0.3:=[profile?] - >=dev-haskell/fgl-5.4:=[profile?] - >=dev-haskell/hashable-1.2.4:=[profile?] - >=dev-haskell/logict-state-0.1.0.2:=[profile?] - >=dev-haskell/mtl-2:=[profile?] - >=dev-haskell/pqueue-1.3.1:=[profile?] - >=dev-haskell/time-compat-0.1.0.1:=[profile?] - >=dev-haskell/uulib-0.9.19:=[profile?] - >=dev-lang/ghc-7.10.2:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.22.4.0 -" diff --git a/dev-haskell/uri-bytestring/Manifest b/dev-haskell/uri-bytestring/Manifest index f410071e51d0..6fabc3e2796b 100644 --- a/dev-haskell/uri-bytestring/Manifest +++ b/dev-haskell/uri-bytestring/Manifest @@ -1,3 +1,3 @@ -DIST uri-bytestring-0.3.2.2.tar.gz 22743 BLAKE2B fc4a5e2421350bc71c07d7353a4934150b6fd46dcacb68ec77c516113c13324663fcf1d09a5b21303bb4c9d5f9587f52a3e0779db35f4c02eb1000744ad19932 SHA512 82565afbdb00b9b4a56f8eaa3ccd42732a16a79f894c950c67cede6346af5112dcb2d226f4b11bde135cf6cfacc687799d33f660d98556d031d262ffe65cf422 -EBUILD uri-bytestring-0.3.2.2.ebuild 1277 BLAKE2B 23b18cca922cd22da0df7e1e03db9143feede3705a435402894265343f339f1948ce1a8c7f22953ef3f0ac8eb1d2ca00565d031850c9f8e6898680cdfcd3acef SHA512 4188e2c307c29c95c237cd7078d80bce91a89032328258d864b4ed5161e57b48906ae25566778b94157a335d57aed19de808873bcba5f65c2d2ec8592f8032cf +DIST uri-bytestring-0.3.3.0.tar.gz 22994 BLAKE2B 1dbe396e48773b93a3f1aae0bb84c1d525e0b5ff5831dade79c709ee215e79c1e7834296680341dc074953e249af3472e5b1504526854a28750ef5aee6acd50e SHA512 29be8a04bc95e5d86cb3f1c042e0acfec3970af7d9424c8e3218e143b2b9d783d1e7585597ba588928bd843b4d7f02dbb7f3ad862f39c60e4baa6c262faa9669 +EBUILD uri-bytestring-0.3.3.0.ebuild 1358 BLAKE2B c47bf2dfc1161ad5c008eaa145cc5b1792c40b38634deca9772fd576c23c40feec740262eaaac9943e5b5a51e8e7d3b2640c9da1a1f796006e9e3df2e827dd8f SHA512 5873c0308e80007025a807021c326e05ca53364e9cd6b6cc24c8bc7a4b3688196442b3b3c63a74e502bdddbbdd3f84ed7c0f08909a5c45800025278da708b7ec MISC metadata.xml 511 BLAKE2B eb475c8f280a44c0f4b09e34c344ed478a2503d2821711b57d12c40971d4c75081455e1cb4e13350846a4cd2cc0a92bc1b69228f4e8ecfa9d90439fcc10a5d27 SHA512 d21aadfa0df81fe2542de2a92f94fe055c0040e5c963d33bbdab5a8a2da085b64788f4141fad8ddf6c5e0959c275ae650be95298e7a984e7535045503b257a42 diff --git a/dev-haskell/uri-bytestring/uri-bytestring-0.3.2.2.ebuild b/dev-haskell/uri-bytestring/uri-bytestring-0.3.3.0.ebuild index 05a82249e7a7..a0ef989d8d67 100644 --- a/dev-haskell/uri-bytestring/uri-bytestring-0.3.2.2.ebuild +++ b/dev-haskell/uri-bytestring/uri-bytestring-0.3.3.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -# ebuild generated by hackport 0.6.1.9999 +# ebuild generated by hackport 0.6.6.9999 #hackport: flags: -lib-werror CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" @@ -22,7 +22,7 @@ RDEPEND=">=dev-haskell/attoparsec-0.13.1.0:=[profile?] >=dev-haskell/blaze-builder-0.3.0.0:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?] >=dev-haskell/semigroups-0.16.2.2:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] - >=dev-haskell/th-lift-0.7.5:=[profile?] + >=dev-haskell/th-lift-0.7.5:=[profile?] <dev-haskell/th-lift-0.9:=[profile?] >=dev-haskell/th-lift-instances-0.1.8:=[profile?] >=dev-lang/ghc-7.8.2:= " @@ -37,6 +37,7 @@ DEPEND="${RDEPEND} dev-haskell/tasty-hunit ) " +# th-lift only required for <dev-lang/ghc-8 src_prepare() { default |