diff options
author | Sergei Trofimovich <slyfox@gentoo.org> | 2014-11-22 11:31:10 +0000 |
---|---|---|
committer | Sergei Trofimovich <slyfox@gentoo.org> | 2014-11-22 11:31:10 +0000 |
commit | 48ca71b55c959cf935383eb0dbba4447efd0b8d4 (patch) | |
tree | 8cd3cf2b3cb85f3228b7b1d4591204c0600c1b36 /dev-haskell/aeson | |
parent | Version bump. Readd missing patch (bug #527728 by Alex Efros). (diff) | |
download | gentoo-2-48ca71b55c959cf935383eb0dbba4447efd0b8d4.tar.gz gentoo-2-48ca71b55c959cf935383eb0dbba4447efd0b8d4.tar.bz2 gentoo-2-48ca71b55c959cf935383eb0dbba4447efd0b8d4.zip |
Fix depend against scientific (bug #530088 by Johannes Schmidt).
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Diffstat (limited to 'dev-haskell/aeson')
-rw-r--r-- | dev-haskell/aeson/ChangeLog | 6 | ||||
-rw-r--r-- | dev-haskell/aeson/aeson-0.7.0.2.ebuild | 45 | ||||
-rw-r--r-- | dev-haskell/aeson/aeson-0.7.0.3.ebuild | 45 | ||||
-rw-r--r-- | dev-haskell/aeson/aeson-0.7.0.6.ebuild | 4 |
4 files changed, 7 insertions, 93 deletions
diff --git a/dev-haskell/aeson/ChangeLog b/dev-haskell/aeson/ChangeLog index cb8a33e69ddf..a43e3c00ae97 100644 --- a/dev-haskell/aeson/ChangeLog +++ b/dev-haskell/aeson/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/aeson # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/aeson/ChangeLog,v 1.11 2014/07/25 08:58:40 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/aeson/ChangeLog,v 1.12 2014/11/22 11:31:10 slyfox Exp $ + + 22 Nov 2014; Sergei Trofimovich <slyfox@gentoo.org> -aeson-0.7.0.2.ebuild, + -aeson-0.7.0.3.ebuild, aeson-0.7.0.6.ebuild: + Fix depend against scientific (bug #530088 by Johannes Schmidt). 25 Jul 2014; Sergei Trofimovich <slyfox@gentoo.org> metadata.xml: Drop redundant '<maintainer>' field, leave only '<herd>'. diff --git a/dev-haskell/aeson/aeson-0.7.0.2.ebuild b/dev-haskell/aeson/aeson-0.7.0.2.ebuild deleted file mode 100644 index 553efe4ccd3b..000000000000 --- a/dev-haskell/aeson/aeson-0.7.0.2.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/aeson/aeson-0.7.0.2.ebuild,v 1.1 2014/03/09 06:28:22 gienah Exp $ - -EAPI=5 - -# ebuild generated by hackport 0.3.6.9999 - -CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" -inherit haskell-cabal - -DESCRIPTION="Fast JSON parsing and encoding" -HOMEPAGE="https://github.com/bos/aeson" -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="developer" - -RDEPEND=">=dev-haskell/attoparsec-0.10.2.1:=[profile?] - >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] - >=dev-haskell/dlist-0.2:=[profile?] - >=dev-haskell/hashable-1.1.2.0:=[profile?] - dev-haskell/mtl:=[profile?] - >=dev-haskell/scientific-0.2:=[profile?] - dev-haskell/syb:=[profile?] - >=dev-haskell/text-0.11.1.0:=[profile?] - >=dev-haskell/unordered-containers-0.2.3.0:=[profile?] - >=dev-haskell/vector-0.7.1:=[profile?] - >=dev-lang/ghc-7.4.1:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.8 - test? ( dev-haskell/hunit - dev-haskell/quickcheck - dev-haskell/test-framework - dev-haskell/test-framework-hunit - dev-haskell/test-framework-quickcheck2 ) -" - -src_configure() { - haskell-cabal_src_configure \ - $(cabal_flag developer developer) -} diff --git a/dev-haskell/aeson/aeson-0.7.0.3.ebuild b/dev-haskell/aeson/aeson-0.7.0.3.ebuild deleted file mode 100644 index f5e007de53e2..000000000000 --- a/dev-haskell/aeson/aeson-0.7.0.3.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/aeson/aeson-0.7.0.3.ebuild,v 1.1 2014/04/13 13:05:43 slyfox Exp $ - -EAPI=5 - -# ebuild generated by hackport 0.4.9999 - -CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" -inherit haskell-cabal - -DESCRIPTION="Fast JSON parsing and encoding" -HOMEPAGE="https://github.com/bos/aeson" -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="developer" - -RDEPEND=">=dev-haskell/attoparsec-0.10.2.1:=[profile?] - >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] - >=dev-haskell/dlist-0.2:=[profile?] - >=dev-haskell/hashable-1.1.2.0:=[profile?] - dev-haskell/mtl:=[profile?] - >=dev-haskell/scientific-0.2:=[profile?] - dev-haskell/syb:=[profile?] - >=dev-haskell/text-0.11.1.0:=[profile?] - >=dev-haskell/unordered-containers-0.2.3.0:=[profile?] - >=dev-haskell/vector-0.7.1:=[profile?] - >=dev-lang/ghc-7.4.1:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.8 - test? ( dev-haskell/hunit - dev-haskell/quickcheck - dev-haskell/test-framework - dev-haskell/test-framework-hunit - dev-haskell/test-framework-quickcheck2 ) -" - -src_configure() { - haskell-cabal_src_configure \ - $(cabal_flag developer developer) -} diff --git a/dev-haskell/aeson/aeson-0.7.0.6.ebuild b/dev-haskell/aeson/aeson-0.7.0.6.ebuild index ac0d838936f1..a832e8cf46f4 100644 --- a/dev-haskell/aeson/aeson-0.7.0.6.ebuild +++ b/dev-haskell/aeson/aeson-0.7.0.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/aeson/aeson-0.7.0.6.ebuild,v 1.1 2014/07/02 00:01:59 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/aeson/aeson-0.7.0.6.ebuild,v 1.2 2014/11/22 11:31:10 slyfox Exp $ EAPI=5 @@ -23,7 +23,7 @@ RDEPEND=">=dev-haskell/attoparsec-0.11.3.4:=[profile?] >=dev-haskell/dlist-0.2:=[profile?] >=dev-haskell/hashable-1.1.2.0:=[profile?] dev-haskell/mtl:=[profile?] - >=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?] + >=dev-haskell/scientific-0.3.1:=[bytestring-builder,profile?] <dev-haskell/scientific-0.4:=[bytestring-builder,profile?] dev-haskell/syb:=[profile?] >=dev-haskell/text-0.11.1.0:=[profile?] >=dev-haskell/unordered-containers-0.2.3.0:=[profile?] |