From d53da775bbeb337d882867b2f3f32f82a41d718b Mon Sep 17 00:00:00 2001
From: Alexander Vershilov <alexander.vershilov@gmail.com>
Date: Fri, 3 May 2013 23:21:37 +0400
Subject: [PATCH] snap fix

---
 dev-haskell/snap/Manifest                        |  2 +-
 ...snap-0.11.2.2.ebuild => snap-0.11.3.1.ebuild} | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)
 rename dev-haskell/snap/{snap-0.11.2.2.ebuild => snap-0.11.3.1.ebuild} (84%)

diff --git a/dev-haskell/snap/Manifest b/dev-haskell/snap/Manifest
index 4ccc4e6018..b60f95a8ed 100644
--- a/dev-haskell/snap/Manifest
+++ b/dev-haskell/snap/Manifest
@@ -1 +1 @@
-DIST snap-0.11.2.2.tar.gz 79641 SHA256 16edc767941b5677f31d8e5c9417e9ade7a4e11b760210e1a5363ed1333095bb SHA512 4364adda96241a53229311af2b47a92c5e4f4c96626e64329533f249dde58ae05f9a1b2dc2e2c3c9beaabf8d65487ec3a2c88c7a164f7b34bcfecc60aaa58bfb WHIRLPOOL 5655f108d9bf64ea37f315c621c68b6882b192488e82620c11f0f6a687246d32a31255ab7db5e7dfa704e27468838fb41085e56b65aac931996954d49552a25c
+DIST snap-0.11.3.1.tar.gz 79663 SHA256 32bf3d30119310e7736efacf7133d498c2a7c63d720083d4e509e1c9f2bf9c42 SHA512 b68acce9308c0be02d535e50c76466b32a87fea165fc36875151318016e2eed026769102045bf48c82d334911ca533bcc5e0fc05f688110d34b997054f7f167f WHIRLPOOL 5ba21139d7b14ecd1e36adc7d8e18c8263a6891b6e45d51b51ae262d44c0465795cd4ed8e7447ff1fffd4152d0750ccd2f3ea869937b50e335935c46d0ba2bb7
diff --git a/dev-haskell/snap/snap-0.11.2.2.ebuild b/dev-haskell/snap/snap-0.11.3.1.ebuild
similarity index 84%
rename from dev-haskell/snap/snap-0.11.2.2.ebuild
rename to dev-haskell/snap/snap-0.11.3.1.ebuild
index 18e7a41ebb..b05c2f978d 100644
--- a/dev-haskell/snap/snap-0.11.2.2.ebuild
+++ b/dev-haskell/snap/snap-0.11.3.1.ebuild
@@ -30,10 +30,9 @@ RDEPEND="=dev-haskell/aeson-0.6*:=[profile?]
 		=dev-haskell/directory-tree-0.11*:=[profile?]
 		=dev-haskell/dlist-0.5*:=[profile?]
 		=dev-haskell/errors-1.4*:=[profile?]
-		=dev-haskell/hashable-1.2*:=[profile?]
 		=dev-haskell/heist-0.11*:=[profile?]
 		>=dev-haskell/lens-3.7.6:=[profile?]
-		<dev-haskell/lens-3.8:=[profile?]
+		<dev-haskell/lens-3.10:=[profile?]
 		>=dev-haskell/logict-0.4.2:=[profile?]
 		<dev-haskell/logict-0.7:=[profile?]
 		>=dev-haskell/monadcatchio-transformers-0.2:=[profile?]
@@ -52,7 +51,6 @@ RDEPEND="=dev-haskell/aeson-0.6*:=[profile?]
 		<dev-haskell/stm-2.5:=[profile?]
 		>=dev-haskell/syb-0.1:=[profile?]
 		<dev-haskell/syb-0.5:=[profile?]
-		<dev-haskell/tagged-0.5:=[profile?]
 		=dev-haskell/text-0.11*:=[profile?]
 		>=dev-haskell/transformers-0.2:=[profile?]
 		<dev-haskell/transformers-0.4:=[profile?]
@@ -64,6 +62,16 @@ RDEPEND="=dev-haskell/aeson-0.6*:=[profile?]
 		<dev-haskell/vector-algorithms-0.6:=[profile?]
 		>=dev-haskell/xmlhtml-0.1:=[profile?]
 		<dev-haskell/xmlhtml-0.3:=[profile?]
-		>=dev-lang/ghc-6.12.1:="
+		>=dev-lang/ghc-6.12.1:=
+		|| ( ( >=dev-haskell/hashable-1.1:=[profile?]
+			<dev-haskell/hashable-1.2:=[profile?]
+		) ( >=dev-haskell/hashable-1.2.0.6:=[profile?]
+			<dev-haskell/hashable-1.3:=[profile?]
+		) )
+		|| ( ( >=dev-haskell/hashable-1.1:=[profile?]
+			<dev-haskell/hashable-1.2:=[profile?]
+		) ( >=dev-haskell/hashable-1.2.0.6:=[profile?]
+			<dev-haskell/hashable-1.3:=[profile?]
+		) )"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.8"