summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wright <gienah@gentoo.org>2015-04-03 09:46:57 +0000
committerMark Wright <gienah@gentoo.org>2015-04-03 09:46:57 +0000
commit4958a18b6095b19b2d742520ea28bbe01ab65e2f (patch)
tree4082f685950d946b0655812026585646bd043d8f /app-text/pandoc
parentdrop old after new stabilization (diff)
downloadgentoo-2-4958a18b6095b19b2d742520ea28bbe01ab65e2f.tar.gz
gentoo-2-4958a18b6095b19b2d742520ea28bbe01ab65e2f.tar.bz2
gentoo-2-4958a18b6095b19b2d742520ea28bbe01ab65e2f.zip
Loosen filepath and QuickCheck dependencies in pandoc-1.13.2-r1
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Diffstat (limited to 'app-text/pandoc')
-rw-r--r--app-text/pandoc/ChangeLog5
-rw-r--r--app-text/pandoc/pandoc-1.13.2-r1.ebuild11
2 files changed, 13 insertions, 3 deletions
diff --git a/app-text/pandoc/ChangeLog b/app-text/pandoc/ChangeLog
index 2a8e73b8480f..f14afefad8c5 100644
--- a/app-text/pandoc/ChangeLog
+++ b/app-text/pandoc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-text/pandoc
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/ChangeLog,v 1.37 2015/02/18 21:20:05 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/ChangeLog,v 1.38 2015/04/03 09:46:57 gienah Exp $
+
+ 03 Apr 2015; Mark Wright <gienah@gentoo.org> pandoc-1.13.2-r1.ebuild:
+ Loosen filepath and QuickCheck dependencies in pandoc-1.13.2-r1
18 Feb 2015; Sergei Trofimovich <slyfox@gentoo.org> pandoc-1.12.1.ebuild,
pandoc-1.12.2.1.ebuild, pandoc-1.12.3.1.ebuild, pandoc-1.12.3.3.ebuild,
diff --git a/app-text/pandoc/pandoc-1.13.2-r1.ebuild b/app-text/pandoc/pandoc-1.13.2-r1.ebuild
index 86fbc6cf3b11..c440776dfbf4 100644
--- a/app-text/pandoc/pandoc-1.13.2-r1.ebuild
+++ b/app-text/pandoc/pandoc-1.13.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.13.2-r1.ebuild,v 1.2 2015/02/18 21:20:05 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.13.2-r1.ebuild,v 1.3 2015/04/03 09:46:57 gienah Exp $
EAPI=5
@@ -66,7 +66,7 @@ DEPEND="${RDEPEND}
>=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
>=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
- >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8
+ >=dev-haskell/quickcheck-2.4:2
>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
@@ -74,6 +74,13 @@ DEPEND="${RDEPEND}
PATCHES=("${FILESDIR}/${PN}-1.13.2-ghc-7.10.patch")
+src_prepare() {
+ base_src_prepare
+ cabal_chdeps \
+ 'filepath >= 1.1 && < 1.4' 'filepath >= 1.1' \
+ 'QuickCheck >= 2.4 && < 2.8' 'QuickCheck >= 2.4'
+}
+
src_configure() {
haskell-cabal_src_configure \
$(cabal_flag embed_data_files embed_data_files) \