From 746fe162f3443d526b339e30c3ffaa8dc404db07 Mon Sep 17 00:00:00 2001
From: Mark Wright <gienah@gentoo.org>
Date: Sat, 4 Apr 2015 00:01:39 +0000
Subject: [PATCH] Bump aws to 0.11.3, patch for ghc 7.10.1, allow tagged 0.8

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F
---
 dev-haskell/aws/ChangeLog                     |  8 +-
 dev-haskell/aws/Manifest                      | 25 ++----
 dev-haskell/aws/aws-0.11.3-r1.ebuild          | 84 +++++++++++++++++++
 .../aws/files/aws-0.11.3-ghc-7.10.patch       | 20 +++++
 4 files changed, 119 insertions(+), 18 deletions(-)
 create mode 100644 dev-haskell/aws/aws-0.11.3-r1.ebuild
 create mode 100644 dev-haskell/aws/files/aws-0.11.3-ghc-7.10.patch

diff --git a/dev-haskell/aws/ChangeLog b/dev-haskell/aws/ChangeLog
index 4133f26e7e23..0d8c4d447cef 100644
--- a/dev-haskell/aws/ChangeLog
+++ b/dev-haskell/aws/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/aws
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/aws/ChangeLog,v 1.2 2015/01/25 21:12:35 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/aws/ChangeLog,v 1.3 2015/04/04 00:01:32 gienah Exp $
+
+*aws-0.11.3-r1 (04 Apr 2015)
+
+  04 Apr 2015; Mark Wright <gienah@gentoo.org> +aws-0.11.3-r1.ebuild,
+  +files/aws-0.11.3-ghc-7.10.patch:
+  Bump aws to 0.11.3, patch for ghc 7.10.1, allow tagged 0.8
 
 *aws-0.11.2 (25 Jan 2015)
 
diff --git a/dev-haskell/aws/Manifest b/dev-haskell/aws/Manifest
index 07a158b14ab4..005a555e0d3b 100644
--- a/dev-haskell/aws/Manifest
+++ b/dev-haskell/aws/Manifest
@@ -1,26 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX aws-0.11.3-ghc-7.10.patch 975 SHA256 757b5fcb3342bea99c8d899f2f72943171e6ed38d6ba14358f2b294d34cb8e86 SHA512 6675ee77d5698a190f2c7b882699cb241a2f94981e6a8b7cee1c4ac72adf1cb8507e36103df32f0773f9f3ecb3de169c81ebddca5d88eaa2ccb72406dbbb14b6 WHIRLPOOL 486af52ab1af33d4319f7e9a6fc5926acf3ee2b5ed10d34ec26bd277494552473707d7a5c87b1fc0f9ad5a323f12a334fea297ab0219c0852d4e203296586099
 DIST aws-0.11.2.tar.gz 89149 SHA256 f1e3df0c141823f384f3410c9eef92eb410b716b0caa6534aec67dacb82b1697 SHA512 5e69f0bdb7459f6da7e123c2bf3435805b724d4c2ff3178728b241ae2d7e772e742d669c55fc0f51e42bfdee14fa940cba323e8473af3a16c286000f7b8c2733 WHIRLPOOL 03326691ee667c09153b7c89af150dd11816905b04d691f395f59bd3d5fc48bdae625dde08af7bb35d12275cb3daf0eb3c32cde66eb7608c93a8cf4746a69ff2
+DIST aws-0.11.3.tar.gz 90102 SHA256 14a9a9f4435f92b9a0364de66469e293f3ad09c7fe54aacce3486280866de30a SHA512 0343d8ef17ad06525c7c131eb97408d3298c46f4dd472604bd4b3a20c2bb1e880e12f9a0e345ee2fe9bfe56b684fd653e9a99b7919e8d97fce4ca0cdd720afb5 WHIRLPOOL 49e49b802c0c996d3b94d68dafcc3eed82f0b104f1a339e1ff3f9c8e12638543021394c79d24bbba3cf51c3f2a6c8638f71b8be8f8ca7e7c656924c52700ebc3
 EBUILD aws-0.11.2.ebuild 3448 SHA256 437fcc5e2d5d5df0d35c32e255072d8dc8c9a27ed8712e344e33d1f54971338e SHA512 a52819921a53e6df138cd2b5c519211a42bbc278ba6816fd77c54a5c0d5bdf760c91d717bab588d98843ede0246fd9cc480fd2f8f9397f7ca21e88afd797497f WHIRLPOOL 8e60ccce2d3a920e6aad5580caf2e19c8743a4273341196199665dc4b8e0fb6bdc3b6cf42b10e08ef5b7f02af34fa158c679cdd5b2afabf1cbac9e13212cfda3
-MISC ChangeLog 546 SHA256 5c744a944e80f0dd71826898c813e376a9152337070ca81439634db2b9233f5c SHA512 ebe059c81779d925c905888a04e5c68702b0112ccd76f024b749096db19b9af18fb990156916fd8e897180f29d70591fbfadf61a5e9628b26967eb3302e3cd1b WHIRLPOOL bf3e0b5c5e1952424317ff99610a881eeb7a9873d8d049cef2fef6d4f467fafaecac9f5c3957daf4dfc1031097bb88fc855143f8c7d96721b656beb6be4f40ac
+EBUILD aws-0.11.3-r1.ebuild 3725 SHA256 616943abb743848f30c51751e4e51e87b755fe6713ccd9a058faab45cde0dcc4 SHA512 ce8285e9d511c1464a8057b8dc09d2c0f6cbd475229ca72e972df9ea397305e6c39562f5d0b99a2563e817d9c99edb695c06bc2ed47c3eb3a6a6bb92ef59f0bf WHIRLPOOL 6a93be676005c6a3560280373f158af75302ed4f4a78bd05a0b42572667e59f3ba97952f9f388ef1e1192c2397a70b0659e21f78b5551c1b928cc2363c2f38bf
+MISC ChangeLog 744 SHA256 8ee991c15208e62261cef69da35a5e4c71b9131ff71671c145f3b763f16520fb SHA512 a519e08a119ef46e2385af6f544c8e77611e779a89a1710e3816151068b6080080d8ce5456eae39361e4d0c9a7d25fe4e72d94fad2d5e59b3fda234148e8025b WHIRLPOOL 41f4f91ae5b1b2e18c90d289950c1a1308af3748b1c4a0b901347d8cfe3933d19291d12e940e2fecc4477973966243b69f1dd7058149ad24ff0a3706cceca008
 MISC metadata.xml 414 SHA256 44c23b13c3103a885fa492f84a4f923b9080cd51b4ea54e80aae326dacc93475 SHA512 8f40b35b6bd6f8081d43823151127b50ba8d479f862ad597c90bb53e6c1327e05d4fa7aff91b4a4d1592ef5be103ac03f04fba53105c476a8d4fc823f1ebfc1a WHIRLPOOL d317f4b20275f1025398a0a0c518691812a56e42379f65767309afbb2dc4bc39c8535b05fafc5eb59071c9a01774fd49153b353e3699533b7d0ae2a71906bc7f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUxVxMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxNUIwNzhGMTk3NjE4NjBCQTA0QTQyNjM3
-NjUxMkJCQTA5REQzRDUzAAoJEHZRK7oJ3T1TKEEP+gJN0GAZ5UEWU8UvdmD4RptG
-8aTlsXkZWZBLPTWsn6jth4hydEyUE/hrF86d75biQwSqLJJEWAvzk67ODQ5VZNtd
-GYnXXvRgU4+v3ZkFg+xOgklLfpbWuIudaNStdaIjGUaaaG8m5C5nFby1ArIGk4qP
-YHGr70KhQzCqKAQncIJjkjsWHkTJmzoXgChrt+Y9rfLp/1JfmNu9l0VGh3d1qzQX
-IDNV1BqQY5PATdqnMR0Addb1Kf3EQxEEs16d7jFK7bit7cQJruENVFejHobWpm0y
-/67L66OwnE502TW9ma/KqIeNJgcsTVDwbo5LuqDnd51P2X58Tf9wQ0TeHjnsbubd
-mc//EUzn/0cwENjZwQWPMsXkVhg3BqAMqXcGYNJffxLXjNlSjen3Iw21380otYnO
-0MYHcfl6TcW9jzDaLLwEVmlzWDE7oRelj0WokGN0lPOHXkv4RIcMltpz8pQnrfZM
-iDOrw9agbJMAOC1+F2xYSwCl4gWjQjXi9Nay3rb2inaUrAww9Un8TGsvHSbfFFEu
-ll+uYubRe8Z7iK9M4Yu03i71QT2p2l7JhF4fhcd7RYHKHvAR/h/S2twN5YwQk/yb
-uPeS87pjenmNu+4qh5NjcAGXpLW6GOVEA8QwZKjAAV+xJJwGfo3yrQmCNfEBg1Zl
-i41DwUBpXmpKgNS9VLN7
-=AVdq
+iF4EAREIAAYFAlUfKeIACgkQoBEVQmGOlx+PvAD8Ds6NpLlIvsV+KcRazFLMnLD6
+fh9dOigJTK5MEtK6e1IA/0ArWkynp9lZ1Sh8uVaKiZZizuhB6vJhzE8Er8iPoRi+
+=TGi1
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/aws/aws-0.11.3-r1.ebuild b/dev-haskell/aws/aws-0.11.3-r1.ebuild
new file mode 100644
index 000000000000..04469a98088b
--- /dev/null
+++ b/dev-haskell/aws/aws-0.11.3-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/aws/aws-0.11.3-r1.ebuild,v 1.1 2015/04/04 00:01:32 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit base haskell-cabal
+
+DESCRIPTION="Amazon Web Services (AWS) for Haskell"
+HOMEPAGE="http://github.com/aristidb/aws"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RESTRICT=test # needs aws accound
+
+RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
+	>=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.13:=[profile?]
+	>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
+	>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
+	>=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?]
+	>=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	>=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.5:=[profile?]
+	>=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
+	>=dev-haskell/conduit-extra-1.1:=[profile?] <dev-haskell/conduit-extra-1.2:=[profile?]
+	>=dev-haskell/cryptohash-0.11:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
+	>=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.6:=[profile?]
+	>=dev-haskell/http-conduit-2.1:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-0.9:=[profile?]
+	>=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
+	>=dev-haskell/monad-control-0.3:=[profile?]
+	>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?]
+	>=dev-haskell/network-2:=[profile?] <dev-haskell/network-3:=[profile?]
+	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?]
+	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
+	>=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?]
+	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?]
+	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?]
+	>=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	examples? ( >=dev-haskell/errors-1.4:=[profile?]
+			dev-haskell/exceptions:=[profile?]
+			>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?] )
+	!examples? ( >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/aeson-0.7
+		>=dev-haskell/errors-1.4.7
+		>=dev-haskell/http-client-0.3
+		>=dev-haskell/lifted-base-0.2
+		>=dev-haskell/mtl-2.1
+		>=dev-haskell/quickcheck-2.7
+		>=dev-haskell/quickcheck-instances-0.3
+		>=dev-haskell/tasty-0.8
+		>=dev-haskell/tasty-quickcheck-0.8
+		>=dev-haskell/text-1.1
+		>=dev-haskell/transformers-base-0.4
+		!examples? ( >=dev-haskell/transformers-0.3 ) )
+"
+
+PATCHES=("${FILESDIR}/${P}-ghc-7.10.patch")
+
+src_prepare() {
+	base_src_prepare
+	cabal_chdeps \
+		'tagged               >= 0.7     && < 0.8' 'tagged               >= 0.7     && < 0.9'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag examples examples)
+}
diff --git a/dev-haskell/aws/files/aws-0.11.3-ghc-7.10.patch b/dev-haskell/aws/files/aws-0.11.3-ghc-7.10.patch
new file mode 100644
index 000000000000..4d2db5d35a5f
--- /dev/null
+++ b/dev-haskell/aws/files/aws-0.11.3-ghc-7.10.patch
@@ -0,0 +1,20 @@
+--- aws-0.11.3-orig/aws.cabal	2015-03-24 05:26:53.000000000 +1100
++++ aws-0.11.3/aws.cabal	2015-04-04 10:18:21.057164803 +1100
+@@ -126,7 +126,7 @@
+                        cryptohash           >= 0.11    && < 0.12,
+                        data-default         >= 0.5.3   && < 0.6,
+                        directory            >= 1.0     && < 1.3,
+-                       filepath             >= 1.1     && < 1.4,
++                       filepath             >= 1.1     && < 1.5,
+                        http-conduit         >= 2.1     && < 2.2,
+                        http-types           >= 0.7     && < 0.9,
+                        lifted-base          >= 0.1     && < 0.3,
+--- aws-0.11.3-orig/Examples/DynamoDb.hs	2015-03-24 05:26:53.000000000 +1100
++++ aws-0.11.3/Examples/DynamoDb.hs	2015-04-04 10:18:43.712140567 +1100
+@@ -1,5 +1,6 @@
+ {-# LANGUAGE OverloadedStrings   #-}
+ {-# LANGUAGE ScopedTypeVariables #-}
++{-# LANGUAGE FlexibleContexts #-}
+ 
+ module Main where
+ 
-- 
2.26.2