gentoo auto-resync : 30:07:2022 - 09:09:33

2 files changed, 26 insertions, 19 deletions

diff --git a/dev-haskell/cassava/Manifest b/dev-haskell/cassava/Manifest
index befff9eedb50..696769721fa3 100644
--- a/dev-haskell/cassava/Manifest
+++ b/dev-haskell/cassava/Manifest
@@ -1,3 +1,4 @@
+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
-EBUILD cassava-0.5.2.0.ebuild 1796 BLAKE2B 639a16e0b693f73fd479e160b35529f1dd698b3f2ddcf9fd2d12e4a9e8a9e70136a94595b1cf6ba400839f164fb75131d662b90a9f62e2578fb2c195e8928220 SHA512 c5abca5853914356be1e6cf72a9b95b5d4c28baa1b319ec4e7c97bd07d2e9aa6a91fa1264aacfd815110b5d5068718815b5d5b0f9a06c1e11df46a4d4901d692
+EBUILD cassava-0.5.2.0-r1.ebuild 1940 BLAKE2B 1c764995d41f50416db49af25c232dba67fa3d3b34ff95f0e634a46dd77cfb93d747cd4173108dfc8ac52f552321342ba6c4df7e464344271ccfc2e903e7fc30 SHA512 3786c4d6b304f2d01adf10aae5eb8e9e6d780502140d7da00bac98883c16f0f389f39029338b778de8691f9d631bd8152973a39ee5fa93a9e865bfaa29bf0bac
 MISC metadata.xml 328 BLAKE2B 4c208ed9a0d98908226ee05ca1cf035b2b32cb6a25ef3144b31295ef7282201581e2c092e3b858235904613a0d9ad77d5e0140917efb3c9c67609673ea840253 SHA512 9ccd0c72602f132a1135e10dca562e35ba6ba62c12f17a66aba5659a9e951dfa6597e7927c25c4474cbd3063c2fcbcffed68c75997c206d09f6d766d9b6ec14f
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..2e18d8474b4d 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-2022 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 ~ppc64 ~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
 }