From eabc41f9609968b4b20c140b2e444da166a0e05e Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Thu, 14 Jun 2018 12:36:02 +0100
Subject: dev-haskell/megaparsec: allow parser-combinators-1

Package-Manager: Portage-2.3.40, Repoman-2.3.9
---
 dev-haskell/megaparsec/megaparsec-6.5.0-r1.ebuild | 47 +++++++++++++++++++++++
 dev-haskell/megaparsec/megaparsec-6.5.0.ebuild    | 40 -------------------
 2 files changed, 47 insertions(+), 40 deletions(-)
 create mode 100644 dev-haskell/megaparsec/megaparsec-6.5.0-r1.ebuild
 delete mode 100644 dev-haskell/megaparsec/megaparsec-6.5.0.ebuild

(limited to 'dev-haskell/megaparsec')

diff --git a/dev-haskell/megaparsec/megaparsec-6.5.0-r1.ebuild b/dev-haskell/megaparsec/megaparsec-6.5.0-r1.ebuild
new file mode 100644
index 000000000000..805cfacfc1ee
--- /dev/null
+++ b/dev-haskell/megaparsec/megaparsec-6.5.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5
+#hackport: flags: -dev
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Monadic parser combinators"
+HOMEPAGE="https://github.com/mrkkrp/megaparsec"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3.0:=[profile?]
+	>=dev-haskell/parser-combinators-0.4:=[profile?]
+	>=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+	>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0
+		>=dev-haskell/hspec-expectations-0.5 <dev-haskell/hspec-expectations-0.9
+		>=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.12 )
+"
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'parser-combinators >= 0.4 && < 1.0' 'parser-combinators >= 0.4' \
+		'build-tools:        hspec-discover >= 2.0 && < 3.0' 'build-depends:        hspec-discover >= 2.0 && < 3.0'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-dev
+}
diff --git a/dev-haskell/megaparsec/megaparsec-6.5.0.ebuild b/dev-haskell/megaparsec/megaparsec-6.5.0.ebuild
deleted file mode 100644
index 7435ecb97203..000000000000
--- a/dev-haskell/megaparsec/megaparsec-6.5.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5
-#hackport: flags: -dev
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Monadic parser combinators"
-HOMEPAGE="https://github.com/mrkkrp/megaparsec"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3.0:=[profile?]
-	>=dev-haskell/parser-combinators-0.4:=[profile?] <dev-haskell/parser-combinators-2.0:=[profile?]
-	>=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0
-		>=dev-haskell/hspec-expectations-0.5 <dev-haskell/hspec-expectations-0.9
-		>=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.12 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-dev
-}
-- 
cgit v1.2.3-65-gdbad