Bump warp to 2.1.0

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

3 files changed, 60 insertions, 51 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/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
+}