Bump warp to 2.1.0

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

4 files changed, 66 insertions, 63 deletions

diff --git a/dev-haskell/warp/ChangeLog b/dev-haskell/warp/ChangeLog
index cbf236f63e35..17cc2e1c7d1e 100644
--- a/dev-haskell/warp/ChangeLog
+++ b/dev-haskell/warp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/warp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/warp/ChangeLog,v 1.7 2014/03/06 08:20:07 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/warp/ChangeLog,v 1.8 2014/03/09 13:12:02 gienah Exp $
+
+*warp-2.1.0 (09 Mar 2014)
+
+  09 Mar 2014; Mark Wright <gienah@gentoo.org> +warp-2.1.0.ebuild,
+  -warp-1.3.9.1.ebuild:
+  Bump warp to 2.1.0
 
 *warp-2.0.3.3 (06 Mar 2014)
 
diff --git a/dev-haskell/warp/Manifest b/dev-haskell/warp/Manifest
index 7d50d5e140c3..ca86f4a0c932 100644
--- a/dev-haskell/warp/Manifest
+++ b/dev-haskell/warp/Manifest
@@ -1,24 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST warp-1.3.9.1.tar.gz 20171 SHA256 fb03683fe9a85f0c8d71ae8a1ee1b070526617683defb7da9613f79beccb1269 SHA512 59cbf0a2f2c9f1c920cff10fea09d0dd1406d203cd477f923ebdfdd5be802e1c013077a473d7f2209ac1f73169e1ada50ac7d159d5d9929b2bf5c0df235f3b17 WHIRLPOOL 707213688a69b1007648e4df2b110533b30ccab6a329f3bcff0313d505debf75dd926dcb50fea03006769582657af952fe269061fed96c5d6838642dd7dc020d
 DIST warp-1.3.9.2.tar.gz 20177 SHA256 e76469c030163d54b7584764c774ac04c5d4cf294f14b980d369c743dbc19150 SHA512 07628f24d36f0ad91bdfd442db71665e65b2c3142f39f7cde149e2ed4e0841f49e5fd14818f8661e9b30af7ff609d53a22e93f966efec82b46b442ef5e9f3472 WHIRLPOOL ff6567c7f29e784dea0314326829204c57f3656a41eabf6a3e4bc71329d5d9da0ed87651fadac581336218db18a63876bff7b2f5f06726820bf813d2dc082441
 DIST warp-2.0.3.3.tar.gz 35031 SHA256 0ee0f84a749862c6f644f463bca24c5392bc45c2a9c6d6fb004bb28b9c44900b SHA512 36efa01a6b442d00f6ecbc147cfdb522ac8eabd06a336aecf1d16fd450c93d6783ebba95f3bf34cd225f181485d112329dec43fa01749fc388e44848b93e5e22 WHIRLPOOL fedbdfdb2962757326a7b0d64a626264ad9a716e81a12053db14fed4647e7e697c331c52d0f3f0e38e08569527a7c6fb4c3052aba4e6c9925b18b0b94ba857c0
-EBUILD warp-1.3.9.1.ebuild 1717 SHA256 400e93338249212e7590d7cbbc2030bac406b47f19f2dfd146214eb4a0c5cdcb SHA512 7fd6ed25ea6ea911f15e730b313b76befc520374b7525c1522f73eccf5d7b638b36167aef210a84aa765d08b018a1f3e8857cbf44c2070ae758f7d09bc57c497 WHIRLPOOL 03f6ca378e72e332e24a8c3ed61989da1cb511f23b2f0bec5e6996fa79bf1c9ebe4ab3b421410604d103dc3e7298ee4e1ce1eacd754f80dca074a5a956b5831b
+DIST warp-2.1.0.tar.gz 36733 SHA256 dca3092585ffdb87a3b010fa83c031b3bb0f4a89015d2fd6230c5c0c2cbbfca6 SHA512 78224dac8bf4c2c5397945b3d0f89452bcfbb0ec0a3d73235f084e275be03ec3b66797f3d478143fe0e4251fef386bc5b2bc3f24077cfbcb044b4a9019ea9869 WHIRLPOOL 77013f725fe6428d1d6f89973b1c4cb58e523c916a251c3771c5e83d55f7c8740b42b8fec5c7897a1881674be67b66149c0fa05ab6a1a5f50ca20220e43eaf33
 EBUILD warp-1.3.9.2.ebuild 1991 SHA256 3edc7622c4b35e7ebd7a56e1765b7575d0b835d59bbed907da2c22927144bfb7 SHA512 1f405423a3082ab2612ad90a29a4ae40868e3e372c343c0d36d93ed17ac528db33f5d007543aedb9b9430ad1a9afd15e912dbba465369f21d343f4766de5f317 WHIRLPOOL b770607c784bb81c4cd3f385cb4fc00e16355c355cafe57cb7bcf429b816623c15d7dba6ad0184f74445bbbf830b7f0b67cfc8bf6d1f7d03b87485aacea83340
 EBUILD warp-2.0.3.3.ebuild 1959 SHA256 b03539e598af1f59a82a859d27cfc2c52fd56f1fe30d69f02fe851a571306b55 SHA512 0bdd650530f4ba88a5b1f2a1555cd984d7c6a66827ca9cf0f661d7395fa090475d0fc92f3c0b4f0d3281c5a79a9abe6f453bb07c85716e57a6f46a4beec283c9 WHIRLPOOL 5f2b55d9a82f56699b3f5a19f170db9b13d9ac9193c96c4d739190f57559d83669fa18fb5b50411b201db737c66dab84c80e30a4ff424efe644977725bbc8328
-MISC ChangeLog 1195 SHA256 fdcfac5a60a13d99722bd9514b1a41bedf734c293120a02a6e55c3fac218bb74 SHA512 c04aba6eaed3638090c2df0eab32b77b6f2af7c020e3c2f078c573be17ea499664e7ac30d10142d92f6800533f9bc8dd160a4094686c795e805b0c5db85c131e WHIRLPOOL 2457d0e4bcf7abd3991186babba91da4a4b2d63abfd63d696a449984a3f37a601f0863406a97ce5e32ae1e430b361676fd0b1ae59d6c80f93bdacc0f7332381f
+EBUILD warp-2.1.0.ebuild 1957 SHA256 a02c630cc88510ed87731f00d80816f7bb30299d3e35dbfa3f843db9fbcda0c3 SHA512 cf509960e0a3469944c0639049a6b0b398a1aaf498db584a4ecca4735247615d3be33c760e4882a42d1160c70efb2b4864617cee67b2f7cde0dc1b2d847ae096 WHIRLPOOL d29a167b94cacb2bbdde10bbb4132a78f4fc0bd33b4c37396ca15fc8e5bac0e980b869c84e1dc31b647fe0710d36ea536bbcfe8ad94f04504d68964723f6ac00
+MISC ChangeLog 1335 SHA256 1b6342d79d8fc42ee16ff04daaa2036724647662b9d34bb8b0ab406969af80b1 SHA512 43deab48127734713073dc00b4cf10c4ba018a44b2706f637b3b888042b5fe80ed5fef0d12a9399830f591d0852d4c240da5c6b2ce92c687e4a8579d65af0b89 WHIRLPOOL 4699b88f7a3b15373e4b7c380e198b29aae44428b679b356675db0a2e6d7d3bc988ea96f17d97c35582f9e5bd4214a0edcb44ef7dd418d34a73ba1cb1393b3b6
 MISC metadata.xml 529 SHA256 1252717376eda27f90ab2a6370455a2b433865aa77412971a14579ad27af2a53 SHA512 8cf9cd1445737433e5973f96841655e76ebdd138523bbcd5d61933a3b7dc041d7f9fd654f9212ee86b4ad5febb85cd74634ef980d992752a5a117b63f2122f91 WHIRLPOOL 6147f8d8c8d0f814d61dc16d7b1900a6e605e8294306737ba9235b7475cafd84c491490ffe92b4f9f2d8be54d0d62634a2a798ae8a194c3616182dc84044e410
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQF8BAEBCABmBQJTGC/AXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwMTlGQTEwRTVCMUJCNjdFRDM5Qzg3RjdF
-QUQ1MEQ2NEQ4RDM1NzFBAAoJEOrVDWTY01cavbsH/0AkjSn7I/zagqcmDQtmt8AG
-Wurq2K7/V6BWYFsNS1P3EIHXBerP9RPCZWt7we1PL2x9PRbRuE945BXwSNJxgyMm
-oSYVUPrtAfrMD7EcS0db9VI1Hn7UsYLHjOd84JTMTJnyq0w8uWyXwY4G/kv9hFic
-YnnXHz/Ita7DsC0rnH38Y8VfR856CsIKe0IgB/oIjRP579n9tHTOAkDz2VHolujf
-R80Vm9eas4qkt9txqrKpN2dsN3P3gOKdi8SagRs4tb5wLWQ4VMLMEcRKcAI8ylzo
-F6uPHh3tKhTJ8SInUkYy+8v6tcUCBAuBEGMe3ZUPDK6BtuWCyiiKsfZ1mDJPYGA=
-=QcZy
+iF4EAREIAAYFAlMcaKkACgkQoBEVQmGOlx8t6QEAvLA8zGFqqoHFu4G0L3Wx2ljR
+upWFj0ghEp3m15K2PFABAL1075clA7zYYjyhX2eQn46n19Sx3eZCQ/l5x0bmAbc2
+=nr/o
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/warp/warp-1.3.9.1.ebuild b/dev-haskell/warp/warp-1.3.9.1.ebuild
deleted file mode 100644
index aced9b5f83b0..000000000000
--- a/dev-haskell/warp/warp-1.3.9.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/warp/warp-1.3.9.1.ebuild,v 1.2 2013/08/27 04:24:02 qnikst Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A fast, light-weight web server for WAI applications."
-HOMEPAGE="http://github.com/yesodweb/wai"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-		<dev-haskell/blaze-builder-0.4:=[profile?]
-		>=dev-haskell/blaze-builder-conduit-0.5:=[profile?]
-		<dev-haskell/blaze-builder-conduit-1.1:=[profile?]
-		>=dev-haskell/case-insensitive-0.2:=[profile?]
-		>=dev-haskell/conduit-0.5:=[profile?]
-		<dev-haskell/conduit-1.1:=[profile?]
-		dev-haskell/http-attoparsec:=[profile?]
-		>=dev-haskell/http-types-0.7:=[profile?]
-		>=dev-haskell/lifted-base-0.1:=[profile?]
-		>=dev-haskell/network-conduit-0.5:=[profile?]
-		<dev-haskell/network-conduit-1.1:=[profile?]
-		>=dev-haskell/simple-sendfile-0.2.7:=[profile?]
-		<dev-haskell/simple-sendfile-0.3:=[profile?]
-		>=dev-haskell/transformers-0.2.2:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		>=dev-haskell/unix-compat-0.2:=[profile?]
-		dev-haskell/void:=[profile?]
-		>=dev-haskell/wai-1.3:=[profile?]
-		<dev-haskell/wai-1.5:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		>=dev-haskell/network-2.3:=[profile?]
-		"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( dev-haskell/hashable
-			>=dev-haskell/hspec-1.3
-			dev-haskell/hunit
-			dev-haskell/quickcheck
-		)"
diff --git a/dev-haskell/warp/warp-2.1.0.ebuild b/dev-haskell/warp/warp-2.1.0.ebuild
new file mode 100644
index 000000000000..235796f0f9b6
--- /dev/null
+++ b/dev-haskell/warp/warp-2.1.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/warp/warp-2.1.0.ebuild,v 1.1 2014/03/09 13:12:02 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.6.9999
+#hackport: flags: -network-bytestring
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A fast, light-weight web server for WAI applications."
+HOMEPAGE="http://github.com/yesodweb/wai"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+allow-sendfilefd"
+RESTRICT="test"
+
+RDEPEND=">=dev-haskell/blaze-builder-0.3.3:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
+	>=dev-haskell/blaze-builder-conduit-0.5:=[profile?] <dev-haskell/blaze-builder-conduit-1.1:=[profile?]
+	>=dev-haskell/case-insensitive-0.2:=[profile?]
+	>=dev-haskell/conduit-0.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?]
+	dev-haskell/http-date:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?]
+	>=dev-haskell/lifted-base-0.1:=[profile?]
+	>=dev-haskell/network-2.3:=[profile?]
+	>=dev-haskell/network-conduit-0.5:=[profile?] <dev-haskell/network-conduit-1.1:=[profile?]
+	>=dev-haskell/simple-sendfile-0.2.7:=[profile?] <dev-haskell/simple-sendfile-0.3:=[profile?]
+	>=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
+	>=dev-haskell/unix-compat-0.2:=[profile?]
+	dev-haskell/void:=[profile?]
+	>=dev-haskell/wai-2.1:=[profile?] <dev-haskell/wai-2.2:=[profile?]
+	>=dev-lang/ghc-6.10.4:=
+	allow-sendfilefd? ( dev-haskell/hashable:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/doctest-0.9.3
+		>=dev-haskell/hspec-1.3
+		dev-haskell/http
+		dev-haskell/hunit
+		dev-haskell/quickcheck )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag allow-sendfilefd allow-sendfilefd) \
+		--flag=-network-bytestring
+}