dev-haskell/scientific: Hackage revision bump

Re-enable tests

Signed-off-by: hololeap <hololeap@protonmail.com>
Signed-off-by: Sam James <sam@gentoo.org>

4 files changed, 51 insertions, 67 deletions

diff --git a/dev-haskell/scientific/Manifest b/dev-haskell/scientific/Manifest
index 1030244299af..db6ffb23739d 100644
--- a/dev-haskell/scientific/Manifest
+++ b/dev-haskell/scientific/Manifest
@@ -1,2 +1,2 @@
-DIST scientific-0.3.7.0-r1.cabal 4826 BLAKE2B 5c97f879ac7fe64e6584283bd65539aba51a66844bdb19926c163117d36ffc7412434a7191657f4d0f53904299be4893486da489fceba2bfbaa3b6ab8622184e SHA512 e4f9a79dfc05bf9619df070ce9553322bcbf36d81c649ec25afc3ea148fba0eed89ea9e4725942da664109ba3468e383433e4afc9a93d903a17eb50735246832
+DIST scientific-0.3.7.0-rev5.cabal 4854 BLAKE2B b9490a11d6cea1395cf1cea0bc85627a097aeff7db397de045195b2d0a0db093a39861d5b50e447d98a4b96da3c61eb6d53dffba216c6257ec5b7a009290d6c2 SHA512 3a2c8babc65040692c95f5bbf033d31ec4a3e63382739dfa27a6c0920c96cbcebb982a05222983c796cb04ac81a7b641a742f1d6b9a657f3450bb07242859e90
 DIST scientific-0.3.7.0.tar.gz 24723 BLAKE2B b50d995f6b46d37011823cdd096b1166244c1ab453db490da61eefcf0913f28b9a0b70798aa4ec3c29e6b836d473800b556b6ff062e1e2bee6a25174cd18d52d SHA512 dbd13060a6d1d101138715b4106382a78d115cff247859cb6f83aca3cdb6f6caf8a2c52d7ae99be64845c5e4a7959940bbf31df6265b15079c236f193b087865
diff --git a/dev-haskell/scientific/metadata.xml b/dev-haskell/scientific/metadata.xml
index 2900651af244..1b6ea2a6660c 100644
--- a/dev-haskell/scientific/metadata.xml
+++ b/dev-haskell/scientific/metadata.xml
@@ -5,21 +5,8 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A @Scientific@ number is an arbitrary-precision floating-point number
-		represented using scientific notation.
-
-		A scientific number with 'coefficient' @c@ and
-		'base10Exponent' @e@ corresponds to the
-		'Fractional' number: @'fromInteger' c * 10 '^^' e@
-
-		Its primary use-case is to serve as the target of
-		parsing floating point numbers. Since the textual
-		representation of floating point numbers use
-		scientific notation they can be efficiently
-		parsed to a @Scientific@ number.
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">scientific</remote-id>
 		<remote-id type="github">basvandijk/scientific</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/scientific/scientific-0.3.7.0-r1.ebuild b/dev-haskell/scientific/scientific-0.3.7.0-r1.ebuild
deleted file mode 100644
index d3f15fad4a24..000000000000
--- a/dev-haskell/scientific/scientific-0.3.7.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 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 ~arm64 ~ppc64 ~riscv ~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
-}
diff --git a/dev-haskell/scientific/scientific-0.3.7.0-r2.ebuild b/dev-haskell/scientific/scientific-0.3.7.0-r2.ebuild
new file mode 100644
index 000000000000..68dbd52ad020
--- /dev/null
+++ b/dev-haskell/scientific/scientific-0.3.7.0-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+#hackport: flags: -integer-simple
+
+CABAL_HACKAGE_REVISION=5
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Numbers represented using scientific notation"
+HOMEPAGE="https://github.com/basvandijk/scientific"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~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
+	)
+"
+pkg_pretend() {
+	if use test; then
+		ewarn "The \"test\" USE flag for this package creates cycles within the"
+		ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+		ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+	fi
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-integer-simple
+}