From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 25 Aug 2020 10:45:55 +0100
Subject: gentoo resync : 25.08.2020

---
 dev-haskell/aws/Manifest                        | 11 +---
 dev-haskell/aws/aws-0.11.3-r1.ebuild            | 83 -------------------------
 dev-haskell/aws/aws-0.12.1.ebuild               | 75 ----------------------
 dev-haskell/aws/aws-0.14.1.ebuild               | 74 ----------------------
 dev-haskell/aws/aws-0.22-r1.ebuild              | 79 +++++++++++++++++++++++
 dev-haskell/aws/files/aws-0.11.3-ghc-7.10.patch | 20 ------
 dev-haskell/aws/metadata.xml                    |  3 +
 7 files changed, 85 insertions(+), 260 deletions(-)
 delete mode 100644 dev-haskell/aws/aws-0.11.3-r1.ebuild
 delete mode 100644 dev-haskell/aws/aws-0.12.1.ebuild
 delete mode 100644 dev-haskell/aws/aws-0.14.1.ebuild
 create mode 100644 dev-haskell/aws/aws-0.22-r1.ebuild
 delete mode 100644 dev-haskell/aws/files/aws-0.11.3-ghc-7.10.patch

(limited to 'dev-haskell/aws')

diff --git a/dev-haskell/aws/Manifest b/dev-haskell/aws/Manifest
index ca99a978f29d..423abb78b4c0 100644
--- a/dev-haskell/aws/Manifest
+++ b/dev-haskell/aws/Manifest
@@ -1,8 +1,3 @@
-AUX aws-0.11.3-ghc-7.10.patch 975 BLAKE2B 0e5e21abc586c434da612c0ad29c5b8285da3f57575e0b97daa96d4aa257283f844cfb417f3d04c5f48207c4b3580e2a96110ced73f43295be31ca0111865616 SHA512 6675ee77d5698a190f2c7b882699cb241a2f94981e6a8b7cee1c4ac72adf1cb8507e36103df32f0773f9f3ecb3de169c81ebddca5d88eaa2ccb72406dbbb14b6
-DIST aws-0.11.3.tar.gz 90102 BLAKE2B 4a22b5fe3cabdaeda68229ac9bd653221242a17c259245c650a9e92fed87ee8d58ed3cef4cbc732d0c5f8e92481b42d4a3be4a5b3ecb5c183e52e9e922941938 SHA512 0343d8ef17ad06525c7c131eb97408d3298c46f4dd472604bd4b3a20c2bb1e880e12f9a0e345ee2fe9bfe56b684fd653e9a99b7919e8d97fce4ca0cdd720afb5
-DIST aws-0.12.1.tar.gz 90763 BLAKE2B ef33803420a163c51386165e3d3b94efb61d1e8d4983ab7c23e6c94b09b4f8638e2663657587a1b1ed381446e01a9bc120ca4a3ef9057114698ab870332961e2 SHA512 8c89a982196b654ad4f001d30cb415a9272aacb582c8879173babc4183ca4eb21c025399f1bb5e2624a77a1c38da9b4637bf1dfa0a5bbccb888808a5e654bbf9
-DIST aws-0.14.1.tar.gz 95017 BLAKE2B eab2eccdfc160b16ccd35e6028854e8bcaebf3309269199be752a240a2757a69be496eae0e6d757a814d1d0f6b30f0d3f6cd87954a95a5aaf2d8347245956b29 SHA512 0616d085291748d3ec1ef24d7914562f85fde0577f8100b0dd7f8bc2c817fffb4945372fb80aad98dce652fbf1f063a55afe3ba7aff89ddd5bcd2ba43047ad8c
-EBUILD aws-0.11.3-r1.ebuild 3607 BLAKE2B 8fb51fb466e36bb765d01b2b31961961d873e31a2487d33713e7769daf3f202dccaea2b032643f94576b3d38601774a8b829d1a3a90955b2a27ec24284471a3b SHA512 d0b0e537eb1943709ea1515a821e6a54365994b40e4ca3b98229bdb42608504bd9c77ac2fcba9fb1c43364ee68deb2ba64bb09ec59d10db0b524f885d69f8821
-EBUILD aws-0.12.1.ebuild 3478 BLAKE2B 4bd214fed7366424ea5715a6c45b1b7dfc3523a1f99f09ced4ec7cbbf089d5318477b8cd3a232ac44946f3c88e9236af4afc58bcbfd43bcc06186cda3a641778 SHA512 79aec8aad7beeee9535fe436cfce7c393c83f8869883f216b09f0d462f6809cc00494b9d9991379b86fb16474903dfdbb3b078d4fc8a33181eb839d9a0d73a56
-EBUILD aws-0.14.1.ebuild 3285 BLAKE2B 29c4926111ea63045b5a4e9af9d4989b64ff07f61dce13ea5f7718e20771539b9d69529ffb2881f3b75060037125e6cc22a492dc9233f112378b26dd5aa7de89 SHA512 ed26c0a8c38971efac8b90762fc83d97c8d6c8b62ca67af604f65b5a3ac5e5c08d40add9d1dbab29d8bb32eb19080d3805eda8b43c19b785dc100df68ac0b2ea
-MISC metadata.xml 579 BLAKE2B 994c0d3d2e70a04f4a4bac3981c9e994476cb9fab61d2a135183b547fe4c66adf08e7a5bb76dfffcb6436f867b4b6b813ccf023d1a1bf32ae12afb847f819e1f SHA512 e539e4a84e42065fd427edf1c8c32d8a55aa3df19407bdafa9cf301a9a19ac89d1102e0cd429ed92343e0e7d31a3669993614aff42ef4e643ee88ed3565cc5fd
+DIST aws-0.22.tar.gz 106122 BLAKE2B b4ff46e2742d53323c80952c303a4605d13600fd60085a2e0501af2fc0a74f0c2769c6bf0692710bbfd972c474b9cab26fd97e9126fdcfb3eaff90afbab1d9ae SHA512 e7ff376c47a7ca7a65c8f10f19e591d4a4b4d2cfa333b4727f88f0b170d7acb0aff402617f2d617c522fe5d16ce92b249a23f1fb0a8bfe5bbefaef2931b786bd
+EBUILD aws-0.22-r1.ebuild 3742 BLAKE2B 801fcaaab3d293fe5fe9a043b23f6193a13f76ec2819cc4a30f19947d3d1a64aa54c97301c9fa4e4923d63fab36bc28e5fab92b83c89c8ba58dc7b797ef6f091 SHA512 22989ef8e6d7cf9504d0f52cff5260f8d5c65b2ced95e927083b22659cef19da407f761a247bd331dababdaba8c627b7bd14f584c678b56f67091195241201c4
+MISC metadata.xml 640 BLAKE2B f09daee7af7e239659387756b4f561368a358982ea1530133bebe9deeb5c40231b0ea42b307009fc099b82d5a250abc2726a1e96a74304eba5c92582db3176e5 SHA512 de390e781cd303c5fe6da48d5ea0de08e37f05da6c77c67c8d5be2112ce2d7995ee33bd2a0a806cdcfc12aa15a01f2a76bfa17476ca6bb6b1f89b6f64c3a6c42
diff --git a/dev-haskell/aws/aws-0.11.3-r1.ebuild b/dev-haskell/aws/aws-0.11.3-r1.ebuild
deleted file mode 100644
index 2281a78aba40..000000000000
--- a/dev-haskell/aws/aws-0.11.3-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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="https://github.com/aristidb/aws"
-SRC_URI="https://hackage.haskell.org/package/${P}/${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/aws-0.12.1.ebuild b/dev-haskell/aws/aws-0.12.1.ebuild
deleted file mode 100644
index 80a2473ebaa4..000000000000
--- a/dev-haskell/aws/aws-0.12.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Amazon Web Services (AWS) for Haskell"
-HOMEPAGE="https://github.com/aristidb/aws"
-SRC_URI="https://hackage.haskell.org/package/${P}/${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.14:=[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.4:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-	examples? ( >=dev-haskell/errors-1.4:=[profile?] <dev-haskell/errors-2.0:=[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.16.0
-	test? ( >=dev-haskell/aeson-0.7
-		>=dev-haskell/errors-1.4.7 <dev-haskell/errors-2.0
-		>=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 ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples examples)
-}
diff --git a/dev-haskell/aws/aws-0.14.1.ebuild b/dev-haskell/aws/aws-0.14.1.ebuild
deleted file mode 100644
index a3c09d620d2e..000000000000
--- a/dev-haskell/aws/aws-0.14.1.ebuild
+++ /dev/null
@@ -1,74 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Amazon Web Services (AWS) for Haskell"
-HOMEPAGE="https://github.com/aristidb/aws"
-SRC_URI="https://hackage.haskell.org/package/${P}/${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.14:=[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.6:=[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.8:=[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.10:=[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.4:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	examples? ( >=dev-haskell/errors-2.0:=[profile?]
-			dev-haskell/exceptions:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/aeson-0.7
-		>=dev-haskell/http-client-0.3 <dev-haskell/http-client-0.5
-		<dev-haskell/http-client-tls-0.5
-		>=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-hunit-0.8
-		>=dev-haskell/tasty-quickcheck-0.8
-		>=dev-haskell/text-1.1
-		>=dev-haskell/transformers-base-0.4
-		!examples? ( >=dev-haskell/errors-2.0 ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples examples)
-}
diff --git a/dev-haskell/aws/aws-0.22-r1.ebuild b/dev-haskell/aws/aws-0.22-r1.ebuild
new file mode 100644
index 000000000000..d5a5b18362a0
--- /dev/null
+++ b/dev-haskell/aws/aws-0.22-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: networkbsd:network-3
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Amazon Web Services (AWS) for Haskell"
+HOMEPAGE="https://github.com/aristidb/aws"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-3 examples"
+
+RESTRICT=test # requires aws account
+
+RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
+	>=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[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.6:=[profile?]
+	>=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
+	>=dev-haskell/conduit-extra-1.3:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?]
+	>=dev-haskell/cryptonite-0.11:=[profile?]
+	>=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
+	>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
+	>=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
+	>=dev-haskell/http-conduit-2.3:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-1.0:=[profile?]
+	>=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
+	dev-haskell/memory:=[profile?]
+	>=dev-haskell/monad-control-0.3:=[profile?]
+	>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?]
+	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?]
+	>=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
+	>=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?]
+	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[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.8:=[profile?] <dev-haskell/xml-conduit-2.0:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+	examples? ( >=dev-haskell/errors-2.0:=[profile?] )
+	network-3? ( >=dev-haskell/network-3:=[profile?] <dev-haskell/network-4:=[profile?]
+		>=dev-haskell/network-bsd-2.8:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] )
+	!network-3? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-3:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/aeson-0.7
+		>=dev-haskell/http-client-0.3 <dev-haskell/http-client-0.7
+		>=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-hunit-0.8
+		>=dev-haskell/tasty-quickcheck-0.8
+		>=dev-haskell/text-1.1
+		>=dev-haskell/transformers-base-0.4
+		!examples? ( >=dev-haskell/errors-2.0 ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag examples examples) \
+		$(cabal_flag network-3 networkbsd)
+}
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
deleted file mode 100644
index 4d2db5d35a5f..000000000000
--- a/dev-haskell/aws/files/aws-0.11.3-ghc-7.10.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
- 
diff --git a/dev-haskell/aws/metadata.xml b/dev-haskell/aws/metadata.xml
index f05125d63240..de6f465da317 100644
--- a/dev-haskell/aws/metadata.xml
+++ b/dev-haskell/aws/metadata.xml
@@ -5,6 +5,9 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<use>
+		<flag name="network-3">Use network-3</flag>
+	</use>
 	<longdescription>
 		Bindings for Amazon Web Services (AWS), with the aim of supporting all AWS services. To see a high level overview of the library, see the README at &lt;https://github.com/aristidb/aws/blob/master/README.org&gt;.
 	</longdescription>
-- 
cgit v1.2.3