diff options
author | Sergei Trofimovich <slyfox@gentoo.org> | 2015-06-01 20:45:46 +0000 |
---|---|---|
committer | Sergei Trofimovich <slyfox@gentoo.org> | 2015-06-01 20:45:46 +0000 |
commit | 8ec7d0755482259e16c9a5811025073cb84bf828 (patch) | |
tree | d828c2355455e30387798e6a6fc0fd2f5ad0111e /dev-haskell | |
parent | clean up app-emulation/emul-linux which has been removed (diff) | |
download | historical-8ec7d0755482259e16c9a5811025073cb84bf828.tar.gz historical-8ec7d0755482259e16c9a5811025073cb84bf828.tar.bz2 historical-8ec7d0755482259e16c9a5811025073cb84bf828.zip |
Port to upcoming ghc-7.10.
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA
Diffstat (limited to 'dev-haskell')
-rw-r--r-- | dev-haskell/alex/ChangeLog | 6 | ||||
-rw-r--r-- | dev-haskell/alex/Manifest | 25 | ||||
-rw-r--r-- | dev-haskell/alex/alex-3.1.4.ebuild | 11 | ||||
-rw-r--r-- | dev-haskell/alex/files/alex-3.1.4-ghc-7.10.patch | 24 |
4 files changed, 45 insertions, 21 deletions
diff --git a/dev-haskell/alex/ChangeLog b/dev-haskell/alex/ChangeLog index c61f255217c4..456dc47a194d 100644 --- a/dev-haskell/alex/ChangeLog +++ b/dev-haskell/alex/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/alex # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/ChangeLog,v 1.85 2015/01/25 20:47:30 qnikst Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/ChangeLog,v 1.86 2015/06/01 20:45:45 slyfox Exp $ + + 01 Jun 2015; Sergei Trofimovich <slyfox@gentoo.org> + +files/alex-3.1.4-ghc-7.10.patch, alex-3.1.4.ebuild: + Port to upcoming ghc-7.10. *alex-3.1.4 (25 Jan 2015) diff --git a/dev-haskell/alex/Manifest b/dev-haskell/alex/Manifest index 8163ff78b699..8a3f6d04fac1 100644 --- a/dev-haskell/alex/Manifest +++ b/dev-haskell/alex/Manifest @@ -1,6 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX alex-3.1.4-ghc-7.10.patch 981 SHA256 b52087776e19970301ae86e27b6a0fe95f295754c9d30f8320769ba7637aadc5 SHA512 45e735149bae59cce3ca70140d8b7c32a806d5c4638c5a751cf41666063f8c01386f2e0f579f0d68573a4aed1c5e4a04944bd1b73e8a88233129513105c28831 WHIRLPOOL e47246d19fa679e777419dee56501745a14f5c384fb8a2e80764d6af09510836a76a54be144ab48ae3747d55b7d75851cf6b50a8e0836b0023862ba3aee7450c DIST alex-3.0.5.tar.gz 100004 SHA256 c3326417a0538e355e5ad1871ab931b9c8145391e8b2ff79668eb643d9b99659 SHA512 0a6a2500b4f8a96e1fd6252b11f7684e47875b80c0113a4ba0e855b54ccd45054f21af6cac30c3edb3b9ac86a7fc60810ea33376a7ab78794f980e3cf9a22eb9 WHIRLPOOL 5c9b07f7eae546d5920c9da4dd2d198d440275da1943d155ae53aaa92fbb9bc9e8c9c91a1303c6130c9341c7ba6518665f0ff383605fa1ecb8d4bd58066f3a87 DIST alex-3.1.2.tar.gz 101215 SHA256 1d14eb255c44f440f04876c496ed5db24aba8d05b45d665463633afe92361e6d SHA512 21874caf41412d926866b0450db9e29984d1df076d277a2325b3d0b80114e039462ab766b0964177f98d9b625635e219489271ab2853e39f1fef3e7d6caa8660 WHIRLPOOL f38c2381d5587bb11754011c31104477a4fbc577f9fd469eab9b255e74a0efe093a25538296093bdf4a0369e545402865fff8c92f20ec3982d83113c761a46ce DIST alex-3.1.3.tar.gz 99868 SHA256 8d41a6e72a016155f00c846f7146ab4b27fe9640668a4b592d6a9b856f970a92 SHA512 f09f720627b9f2cae5d9d3a99488c2249e82c9310f0a436bccbd5238bd3215fae287706ee6f7530533c801348bdbfebc9fd54cafc15a75d528462b2ee987eb3c WHIRLPOOL 8bdaaa8ee0e4f431603f2e299a83b3d0c30b46bfe19863a04c487687afe377ec5df34ba411c3669412cc406e30ab4e176afad51491ea1612bd19ab620a99f1f1 @@ -8,25 +9,13 @@ DIST alex-3.1.4.tar.gz 101827 SHA256 d64e4eccd953c62795ed566a6de5f3d150b653e0587 EBUILD alex-3.0.5.ebuild 1567 SHA256 a5471d101186752f23d247d7fc951b310f9074c627aa308ee27812423c69e91f SHA512 ffe3f02130d7966ad96bb1b6c8709f47b8cc23a10c042699b0536ee50478b797e226e6dd9f1888492986b1b5e904d67d82cd9816ecf22a6fc0fc8b3a9c6d4b7c WHIRLPOOL d2e8807c82b0a0b8d29774abffa2a3d17898316958c40a6e1ddbb7eed8f116327f200b3b2384aae58246880d7cf61fb24d3218976f4ed59156152b08290002b0 EBUILD alex-3.1.2.ebuild 1511 SHA256 0be9c005615636014ef82b682bccec6b5cf1a4924bb42317b98745e5b78266ad SHA512 4d6edd8d40bfa9469fc1ccf1ecbd5586f989604833d3980012e881039250e2f246bbe713e42c64a7f6ad53eae3bca5415fa87f7c656caa62bc9f1142a2e8969b WHIRLPOOL 111c7eb90af43a96800b41fbc54ced9026b9cdb8c30bb86581c4396af049c032bd0189d78c05cc854844284504b9cbe742c277e7b47111c5410ee5481a4f282a EBUILD alex-3.1.3.ebuild 1513 SHA256 5383c6f87b80b4e100123c170d9084f9cc7e3b810fcf9d45bc136b06903fd1e0 SHA512 0de5120ebc3e79f8f70da0380d20260d9f294ed530a9c1227103cdd29a4eac33cca404cd932a7fb9615c3aef9cf41a9b4907908ebcefef8a1abf558e5cbb1824 WHIRLPOOL 6a1eb6729dd3df818e7298fdc617ee77b067dfdc798f8ce0bcca3d2367148fae9af527354e0e2e5fc26f4aa8b0425378e4b274e2254cf834305438cf567fbfdc -EBUILD alex-3.1.4.ebuild 1519 SHA256 d9b14453f0a51c528c540c9a1d67e7998c9aaa6d5e3f4057678dd69eea355dbb SHA512 a5024ecf02420bf4981850d9c59e83b8b1361cdfe568bcf8e95f31e8cbad0bf35cd12bd1e990607e845dde07065481a111837d6151b222abbe32bdfe53e72779 WHIRLPOOL 360d34e74190c168dd46d35851a4d0ed38072704aad427018a49f401813ef20b620543e71bab1b99b26094a93067effb2291d3ab35ed40462cfc743980abe043 -MISC ChangeLog 9949 SHA256 4991d1144d1c069e48d6833760eb3c371edfa8ccf1bfa858966ef5358b746e52 SHA512 00cfbd4a59261bb07460cd6b4add87516dc565d39bae08a981c6c21c5146379ce9769155c6bb6a37e245cae63b1765e2edbe2ddac0887b3980501bebc8a7ab84 WHIRLPOOL aeb2886c80ef84aa2b1750ae0c3846d8fdc58265faee0bc6c1c5c311a2ca34b1ae08b20e30833ce035953c97e6c9c68c107821a8c3583608179d8f8ebfdd8796 +EBUILD alex-3.1.4.ebuild 1674 SHA256 d8c51bc697548618f9e20708f4da6dd9309e19ee374e353594a97d0f4cccbb31 SHA512 3cde32143d5858e7fe36b9ad9587f988167141f7d2b872099b58e56022e30c41ddb4af56e3d9ffbfc119a59bb1d97978773180f616e49f666f019eb28a7ad75c WHIRLPOOL dc417312e67c471880235eee384e83c235658445d1198481a76ba0734e3bb96d2421efa2caf2493a214b4a1b74c329e435b875d7b164c5ed36cf2658ded613d0 +MISC ChangeLog 10088 SHA256 e8a0f878770daf922250a7418e151401c84de3bd1420f68e26dcc10e1b822f7a SHA512 847e711a8daca4c449184afaa02e08d3fe8886e42d739482cd70912638720fab6fe482e776858eda7944b4756e3882164a62ffbb6e8fbaf86cb4b8333ab8946a WHIRLPOOL 722625b9cf7001a1dd38f1e777a4bfe3135d93786a57b3c025fdb57f7f8b98d48d1574e87ac527f06215232d17fd765d3843ed8cb3ecbcc4b1e206fed31229e4 MISC metadata.xml 261 SHA256 1e677e189c240bbf6762850aa0e7286ccb07c9cfb71fa9736c620d7db3ebb926 SHA512 e29fc62b18b680b51399a7ddcc6dd98aed13c9fc1494b8a69db26323412394769e9f69dca8035139063445c5305de7c68f5747da6badba6dbb39bfd0c3b4159c WHIRLPOOL f54f02a59b761e037b2340c2a5388f7c042c852904f24f489ab4b169304d9c47e2262dccd7d9de600b2a0e501efb835b20a18858cd5623453f75e979e6cf30be -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 +Version: GnuPG v2 -iQJ8BAEBCABmBQJUxVZmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxNUIwNzhGMTk3NjE4NjBCQTA0QTQyNjM3 -NjUxMkJCQTA5REQzRDUzAAoJEHZRK7oJ3T1TNyAP+wYdltuG7G4rQESSh6xj5FlE -s9JKCrXr0cMl8BD+S8SLQoftW3jJQOrAEqSqCn3vLXvb+hxL8Ix2i+XeIa1s/UTC -opIaK6dN2Zucs7wU/6M1vNLsPYLTZo/hZN/UI0gkhUTcq6y7qzFivgWWGEMYVtok -/mcxGk/z855drO/CfMkCXcVRi0UCyYWtUyRvMbTqDacMuvAUzGGEnnFQb3CKu/Ou -OGnUg/1+esgafMMonDcDqbQerg0S7DF1HSF2tSi2Qb8bJdXlnuIPc4+DgC4HCT7Q -2OjjSHMJXhCWtKwM5q0dGZd0Cc6ZAN/datH9YRe4WBM5GCox/bXFGuLMpbPew9Ka -kPSe5PED/8yEDKCdmiAHwvFF/JgOTxV56bW57qtd5MSORP8ujIBSWAUIxuHNPlfB -aHzW6/hKrCnlUWwfhTXQEMEySr1JlKzm5czs4d4UoRFmsKPeHsHJ1UUVLkYjwvya -Mdh94rKQwP9fOLYxFtthgGiJmc+6e4asl/Cc/YsUca2e4C3FsM+b9AvgKQnNug21 -Ywr4xPqgkVsrQog02knsqCw2Ox90o1ZgAZxUh/R98Q+aPqdkcBGbAeELurItjO3r -GJtrl9unyD15Ve0mW8mLRJP/vwk8Pg7UVtKSwYtmkOBYxnhPn1LeAR3E3cbL5Z+Z -gGXtdZ31IDqsYTS5wqBk -=hVqt +iEYEAREIAAYFAlVsxHoACgkQcaHudmEf86o44ACaA67JEHebg1Ni/Jqc7/7+N09F +nskAn1O/q54Ey/zuyPamSzCiW8++n63G +=yfyd -----END PGP SIGNATURE----- diff --git a/dev-haskell/alex/alex-3.1.4.ebuild b/dev-haskell/alex/alex-3.1.4.ebuild index 3b8a226d6b53..a013cdf73351 100644 --- a/dev-haskell/alex/alex-3.1.4.ebuild +++ b/dev-haskell/alex/alex-3.1.4.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/alex-3.1.4.ebuild,v 1.1 2015/01/25 20:47:30 qnikst Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/alex-3.1.4.ebuild,v 1.2 2015/06/01 20:45:45 slyfox Exp $ EAPI=5 # ebuild generated by hackport 0.3.4.9999 CABAL_FEATURES="bin test-suite" -inherit autotools haskell-cabal +inherit autotools eutils haskell-cabal DESCRIPTION="Alex is a tool for generating lexical analysers in Haskell" HOMEPAGE="http://www.haskell.org/alex/" @@ -28,6 +28,8 @@ DEPEND="${RDEPEND} >=dev-libs/libxslt-1.1.2 )" src_prepare() { + epatch "${FILESDIR}"/${P}-ghc-7.10.patch + # drop depend on itself and happy, otherwise cabal tries to regenerate it rm src/{Scan.x,Parser.y} || die @@ -62,6 +64,11 @@ src_compile() { fi } +src_test() { + # workaround https://github.com/haskell/cabal/issues/2398 + emake -k -C tests all || die +} + src_install() { cabal_src_install diff --git a/dev-haskell/alex/files/alex-3.1.4-ghc-7.10.patch b/dev-haskell/alex/files/alex-3.1.4-ghc-7.10.patch new file mode 100644 index 000000000000..cb422b60d7c5 --- /dev/null +++ b/dev-haskell/alex/files/alex-3.1.4-ghc-7.10.patch @@ -0,0 +1,24 @@ +diff --git a/templates/wrappers.hs b/templates/wrappers.hs +index a1a1a6d..c020cc7 100644 +--- a/templates/wrappers.hs ++++ b/templates/wrappers.hs +@@ -284,6 +284,19 @@ runAlex input (Alex f) + + newtype Alex a = Alex { unAlex :: AlexState -> Either String (AlexState, a) } + ++instance Functor Alex where ++ fmap f a = Alex $ \s -> case unAlex a s of ++ Left msg -> Left msg ++ Right (s', a') -> Right (s', f a') ++ ++instance Applicative Alex where ++ pure a = Alex $ \s -> Right (s, a) ++ fa <*> a = Alex $ \s -> case unAlex fa s of ++ Left msg -> Left msg ++ Right (s', f) -> case unAlex a s' of ++ Left msg -> Left msg ++ Right (s'', b) -> Right (s'', f b) ++ + instance Monad Alex where + m >>= k = Alex $ \s -> case unAlex m s of + Left msg -> Left msg |