gentoo auto-resync : 23:07:2022 - 08:50:15

3 files changed, 55 insertions, 38 deletions

diff --git a/dev-haskell/scientific/Manifest b/dev-haskell/scientific/Manifest
index 7830d5e48f17..f22f08f76fa7 100644
--- a/dev-haskell/scientific/Manifest
+++ b/dev-haskell/scientific/Manifest
@@ -1,3 +1,4 @@
-DIST scientific-0.3.6.2.tar.gz 23510 BLAKE2B 096cd305cdbc4856f48e81de5387b229c4f23fdbfc641243ffa56a74422ec7b224fb2979f22cbdcf747d56c6073ce74ff6ca773093570a8d0a774e2b33d26697 SHA512 47a74524c8fb25d381adf868d823a6b6772f3f69b0b3cf9f9de015a03bc941857ef3fca1b4f8cbf23e998164e71a914e167221e753c6f32dc8644047d1ef57ee
-EBUILD scientific-0.3.6.2.ebuild 1010 BLAKE2B a93245d9fad18561696cedde95a71d6c7aee4a0371163af0f8f67e6c07174f135be82a2b8707f0acbd04eefe4c6d3717e4b9472251020f4ef2e49e0701555317 SHA512 f3409cd47b3e56a5e01ff3e85e6f26edddde0f2312dd17a3f81d472ade70287db3607910f6520306b03a043be1566ad28b8bd02bdfe885e9e4ed9aaa65cb80c5
+DIST scientific-0.3.7.0-r1.cabal 4826 BLAKE2B 5c97f879ac7fe64e6584283bd65539aba51a66844bdb19926c163117d36ffc7412434a7191657f4d0f53904299be4893486da489fceba2bfbaa3b6ab8622184e SHA512 e4f9a79dfc05bf9619df070ce9553322bcbf36d81c649ec25afc3ea148fba0eed89ea9e4725942da664109ba3468e383433e4afc9a93d903a17eb50735246832
+DIST scientific-0.3.7.0.tar.gz 24723 BLAKE2B b50d995f6b46d37011823cdd096b1166244c1ab453db490da61eefcf0913f28b9a0b70798aa4ec3c29e6b836d473800b556b6ff062e1e2bee6a25174cd18d52d SHA512 dbd13060a6d1d101138715b4106382a78d115cff247859cb6f83aca3cdb6f6caf8a2c52d7ae99be64845c5e4a7959940bbf31df6265b15079c236f193b087865
+EBUILD scientific-0.3.7.0-r1.ebuild 1594 BLAKE2B 184eace154460e6a3a104012136d0544875b1d052861bf26d2dd2986cdc4a3ebdcd42aad1552c91bb48a20c8ac81c67caf2010833729073731a6af8f8c705064 SHA512 f31b3262a8c67fa52fad5be987385e52c162b8f0dc7d6005b1a0841798ccce7af01cb3395c89bfc8c7652ac9cf9d204c5c7169fc7ea10ed9349c84127cc0b1c5
 MISC metadata.xml 866 BLAKE2B 3f2306ce6b2a6fbd6783f8483bbd28055e0c54263928b320026d75bf294120a4d3d546adc16252a915f0b6a560e7d122d133b5d6475170b628274a721f81b24f SHA512 921e57c9c8427335d9a913a91923aca3414a0f063973a7d00ba661c91ee315d059f82df0dc9efa8a8c31f3c426ed2d837a6e4e6c4c09daa24639206b4772b920
diff --git a/dev-haskell/scientific/scientific-0.3.6.2.ebuild b/dev-haskell/scientific/scientific-0.3.6.2.ebuild
deleted file mode 100644
index ed495c9c6b43..000000000000
--- a/dev-haskell/scientific/scientific-0.3.6.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-#hackport: flags: -integer-simple
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # disable test-suite: circular depends
-inherit haskell-cabal
-
-DESCRIPTION="Numbers represented using scientific notation"
-HOMEPAGE="https://github.com/basvandijk/scientific"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RESTRICT=test # circular depends
-
-RDEPEND=">=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
-	>=dev-haskell/hashable-1.1.2:=[profile?]
-	>=dev-haskell/integer-logarithms-1:=[profile?]
-	>=dev-haskell/primitive-0.1:=[profile?]
-	>=dev-haskell/text-0.8:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flags=-integer-simple
-}
diff --git a/dev-haskell/scientific/scientific-0.3.7.0-r1.ebuild b/dev-haskell/scientific/scientific-0.3.7.0-r1.ebuild
new file mode 100644
index 000000000000..e52d4bd7e423
--- /dev/null
+++ b/dev-haskell/scientific/scientific-0.3.7.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -integer-simple
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+CABAL_HACKAGE_REVISION="2"
+inherit haskell-cabal
+RESTRICT="test" # circular dependencies
+
+DESCRIPTION="Numbers represented using scientific notation"
+HOMEPAGE="https://github.com/basvandijk/scientific"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal -> ${PF}.cabal"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND=">=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-haskell/integer-logarithms-1.0.3.1:=[profile?] <dev-haskell/integer-logarithms-1.1:=[profile?]
+	>=dev-haskell/primitive-0.7.1.0:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1"
+#	test? ( >=dev-haskell/quickcheck-2.14.2
+#		>=dev-haskell/smallcheck-1.0
+#		>=dev-haskell/tasty-1.4.0.1
+#		>=dev-haskell/tasty-hunit-0.8
+#		>=dev-haskell/tasty-quickcheck-0.8
+#		>=dev-haskell/tasty-smallcheck-0.2 )
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+
+	# Convert to unix line endings
+	dos2unix "${S}/${PN}.cabal" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-integer-simple
+}