summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-haskell/cassava')
-rw-r--r--dev-haskell/cassava/Manifest5
-rw-r--r--dev-haskell/cassava/cassava-0.4.4.0.ebuild35
-rw-r--r--dev-haskell/cassava/cassava-0.4.5.0.ebuild35
-rw-r--r--dev-haskell/cassava/cassava-0.5.2.0-r1.ebuild (renamed from dev-haskell/cassava/cassava-0.5.2.0.ebuild)42
-rw-r--r--dev-haskell/cassava/cassava-0.5.3.0.ebuild55
-rw-r--r--dev-haskell/cassava/metadata.xml9
6 files changed, 85 insertions, 96 deletions
diff --git a/dev-haskell/cassava/Manifest b/dev-haskell/cassava/Manifest
index 567666013021..dea222dd9578 100644
--- a/dev-haskell/cassava/Manifest
+++ b/dev-haskell/cassava/Manifest
@@ -1,3 +1,4 @@
-DIST cassava-0.4.4.0.tar.gz 32631 BLAKE2B dd7bf6e4b4378ffd0dad3c402465b20f8a830d1dd156826fbb0eedced28598297d0f5056d25acc1e2c8457934f077a4ac34b2caa1852397d9d0fe17b875ac3b9 SHA512 af0954754bbcfe8068ccd029417327770c60a62ecc5503b3cce5a58962940a804e167688760aec7ead42ec99b404295715d2f8fd65e4b4ed2918e1c5e063b36b
-DIST cassava-0.4.5.0.tar.gz 33104 BLAKE2B 0b0726f3060f0857ecb4135bbf71cba7e6a8b108268f948b29d6a0f61d09336097689f24bcbe77e913b5461e3872b07f6ba2d0a9e35738dc125add0a05d2650d SHA512 24f017ac44f48cdf000cab4108023d6f30a67638964831f0d7cd167bcd96ba85337d3aec6855128d370b9b383394042b3adf8dfd7299e616a385fd09125005a5
+DIST cassava-0.5.2.0-rev7.cabal 6051 BLAKE2B 934cf9b067a8c9503f13676e3ee8f4d3a79a7ab030f39f4b652d460d89e3a739b1bb2bc231ad06e63d0cc5155e4119f91d2ea1d5d01c423c7cca2e689f07fd46 SHA512 4f8105a7298ff3a5f4dc8d579571296902d44084dce57c0136bd089de4575d75fa6a839fb568a87c7ae0b07ea3cee40a6e33ffe35ca2c8b05dd45905aa8713ea
DIST cassava-0.5.2.0.tar.gz 37411 BLAKE2B 64351820bf75bfef0f29e44d1c3f9177ba41474d3419985b9853893aa4cee1485bbb1dfdd4d11b4c8df2673775fdfa211942b13f11124e8077ac25b91c6fc8d4 SHA512 f7f3fc2ebf58491847fb20b21ecf18595933d296bfd4c48249d35c52e72988c4e2758d7a6d2095a9edb3bed8e154a11170920a7c08262270c9f60cb853085383
+DIST cassava-0.5.3.0-rev1.cabal 6121 BLAKE2B 17a993359521f12b5be13eb3ffa8e92d5814ecd2c6df37a97e9bd07aba6fb476ca13f62def0fc50cac2cbc7e9c7408804ab49936868f69ab2b98c06289234910 SHA512 2b97d8eb0d2a478dfacd771ff33d63e8d8ea27b8a2b721353e49a50a378739de10cb67d7e803884192357b394bcc4b9c943fa108ae71725c229f1a5eb9eae6c1
+DIST cassava-0.5.3.0.tar.gz 38224 BLAKE2B 8b82d77e7698bc608be8637894c2a57361145547f63a48d48d76027f8003d3e0c505777bd61b29f00dab117995d846f442d3de2ee56b392302fc6f57639e7f14 SHA512 6afae52a2facc013d746a83afa975a2493174e2c5bda0c0ad8cab76c13c46dd86e8d3142e0676c881a35c3c8bf5618a5c1e4b70c3ab153443b949cb84b70bcb4
diff --git a/dev-haskell/cassava/cassava-0.4.4.0.ebuild b/dev-haskell/cassava/cassava-0.4.4.0.ebuild
deleted file mode 100644
index 9c14c797e44e..000000000000
--- a/dev-haskell/cassava/cassava-0.4.4.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A CSV parsing and encoding library"
-HOMEPAGE="https://github.com/tibbe/cassava"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
- <dev-haskell/blaze-builder-0.5:=[profile?]
- <dev-haskell/hashable-1.3:=[profile?]
- <dev-haskell/text-1.3:=[profile?]
- <dev-haskell/unordered-containers-0.3:=[profile?]
- <dev-haskell/vector-0.12:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/hunit
- >=dev-haskell/quickcheck-2.0
- dev-haskell/test-framework
- dev-haskell/test-framework-hunit
- dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/cassava/cassava-0.4.5.0.ebuild b/dev-haskell/cassava/cassava-0.4.5.0.ebuild
deleted file mode 100644
index 9e4035f00b02..000000000000
--- a/dev-haskell/cassava/cassava-0.4.5.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A CSV parsing and encoding library"
-HOMEPAGE="https://github.com/hvr/cassava"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
- <dev-haskell/blaze-builder-0.5:=[profile?]
- <dev-haskell/hashable-1.3:=[profile?]
- <dev-haskell/text-1.3:=[profile?]
- <dev-haskell/unordered-containers-0.3:=[profile?]
- <dev-haskell/vector-0.12:=[profile?]
- >=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.16.0
- test? ( dev-haskell/hunit
- >=dev-haskell/quickcheck-2.0
- dev-haskell/test-framework
- dev-haskell/test-framework-hunit
- dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/cassava/cassava-0.5.2.0.ebuild b/dev-haskell/cassava/cassava-0.5.2.0-r1.ebuild
index 73aa92acc462..fa7f3d7de5e1 100644
--- a/dev-haskell/cassava/cassava-0.5.2.0.ebuild
+++ b/dev-haskell/cassava/cassava-0.5.2.0-r1.ebuild
@@ -1,48 +1,54 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-# ebuild generated by hackport 0.6.1.9999
+# ebuild generated by hackport 0.7.1.1.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_HACKAGE_REVISION="7"
inherit haskell-cabal
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
DESCRIPTION="A CSV parsing and encoding library"
HOMEPAGE="https://github.com/hvr/cassava"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+ -> ${CABAL_DISTFILE}"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
-RDEPEND=">=dev-haskell/attoparsec-0.11.3.0:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
- >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- <dev-haskell/hashable-1.4:=[profile?]
- >=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
+RDEPEND=">=dev-haskell/attoparsec-0.11.3.0:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+ <dev-haskell/hashable-1.5:=[profile?]
>=dev-haskell/only-0.1:=[profile?] <dev-haskell/only-0.1.1:=[profile?]
>=dev-haskell/scientific-0.3.4.7:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
- >=dev-haskell/semigroups-0.18.2:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
- <dev-haskell/text-1.3:=[profile?]
>=dev-haskell/text-short-0.1:=[profile?] <dev-haskell/text-short-0.2:=[profile?]
<dev-haskell/unordered-containers-0.3:=[profile?]
>=dev-haskell/vector-0.8:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-lang/ghc-7.8.2:=
+ >=dev-lang/ghc-8.4.3:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
+ >=dev-haskell/cabal-2.2.0.1
test? ( <dev-haskell/hunit-1.7
- >=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.14
+ >=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.15
>=dev-haskell/quickcheck-instances-0.3.12 <dev-haskell/quickcheck-instances-0.4
>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
"
+BDEPEND="app-text/dos2unix"
src_prepare() {
- default
+ # pull revised cabal from upstream
+ cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
- cabal_chdeps \
- 'base >= 4.5 && < 4.14' 'base >= 4.5'
+ # Convert to unix line endings
+ dos2unix "${CABAL_FILE}" || die
+
+ # Apply patches *after* pulling the revised cabal
+ default
}
diff --git a/dev-haskell/cassava/cassava-0.5.3.0.ebuild b/dev-haskell/cassava/cassava-0.5.3.0.ebuild
new file mode 100644
index 000000000000..822b25cc6f0f
--- /dev/null
+++ b/dev-haskell/cassava/cassava-0.5.3.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_HACKAGE_REVISION=1
+inherit haskell-cabal
+
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
+DESCRIPTION="A CSV parsing and encoding library"
+HOMEPAGE="https://github.com/haskell-hvr/cassava"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+ -> ${CABAL_DISTFILE}"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/attoparsec-0.11.3.0:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+ <dev-haskell/hashable-1.5:=[profile?]
+ >=dev-haskell/only-0.1:=[profile?] <dev-haskell/only-0.1.1:=[profile?]
+ >=dev-haskell/scientific-0.3.4.7:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+ <dev-haskell/text-2.1:=[profile?]
+ >=dev-haskell/text-short-0.1:=[profile?] <dev-haskell/text-short-0.2:=[profile?]
+ <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-haskell/vector-0.8:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( <dev-haskell/hunit-1.7
+ >=dev-haskell/quickcheck-2.14 <dev-haskell/quickcheck-2.15
+ >=dev-haskell/quickcheck-instances-0.3.12 <dev-haskell/quickcheck-instances-0.4
+ >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
+ >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
+ >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+ # pull revised cabal from upstream
+ cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
+
+ # Convert to unix line endings
+ dos2unix "${CABAL_FILE}" || die
+
+ # Apply patches *after* pulling the revised cabal
+ default
+}
diff --git a/dev-haskell/cassava/metadata.xml b/dev-haskell/cassava/metadata.xml
index f74f33a503ee..769713f352ca 100644
--- a/dev-haskell/cassava/metadata.xml
+++ b/dev-haskell/cassava/metadata.xml
@@ -1,15 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- A CSV parsing and encoding library optimized for ease of use and high
- performance.
- </longdescription>
<upstream>
- <remote-id type="github">tibbe/cassava</remote-id>
+ <remote-id type="hackage">cassava</remote-id>
+ <remote-id type="github">haskell-hvr/cassava</remote-id>
</upstream>
</pkgmetadata>