public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sergei Trofimovich" <slyfox@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-haskell/megaparsec/
Date: Thu, 14 Jun 2018 11:41:09 +0000 (UTC)	[thread overview]
Message-ID: <1528976463.eabc41f9609968b4b20c140b2e444da166a0e05e.slyfox@gentoo> (raw)

commit:     eabc41f9609968b4b20c140b2e444da166a0e05e
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 14 11:36:02 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Jun 14 11:41:03 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eabc41f9

dev-haskell/megaparsec: allow parser-combinators-1

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../{megaparsec-6.5.0.ebuild => megaparsec-6.5.0-r1.ebuild}      | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dev-haskell/megaparsec/megaparsec-6.5.0.ebuild b/dev-haskell/megaparsec/megaparsec-6.5.0-r1.ebuild
similarity index 82%
rename from dev-haskell/megaparsec/megaparsec-6.5.0.ebuild
rename to dev-haskell/megaparsec/megaparsec-6.5.0-r1.ebuild
index 7435ecb9720..805cfacfc1e 100644
--- a/dev-haskell/megaparsec/megaparsec-6.5.0.ebuild
+++ b/dev-haskell/megaparsec/megaparsec-6.5.0-r1.ebuild
@@ -21,7 +21,7 @@ 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/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?]
@@ -33,6 +33,13 @@ DEPEND="${RDEPEND}
 		>=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 \


             reply	other threads:[~2018-06-14 11:41 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-14 11:41 Sergei Trofimovich [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-04-02  9:54 [gentoo-commits] repo/gentoo:master commit in: dev-haskell/megaparsec/ Sergei Trofimovich
2021-02-04  7:05 Sergei Trofimovich
2020-09-12 21:40 Sergei Trofimovich
2018-06-14 11:41 Sergei Trofimovich
2018-06-08 15:04 Manuel Rüger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1528976463.eabc41f9609968b4b20c140b2e444da166a0e05e.slyfox@gentoo \
    --to=slyfox@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox